diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c index ef7187a1c9..1c20e2f562 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c @@ -121,7 +121,7 @@ _ecore_win32_window_procedure(HWND window, INF("left button up message"); - w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA); + w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWLP_USERDATA); if (w->drag.dragging) { ReleaseCapture(); @@ -147,7 +147,7 @@ _ecore_win32_window_procedure(HWND window, INF("moue move message"); - w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA); + w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWLP_USERDATA); if (w->drag.dragging) { @@ -416,7 +416,7 @@ _ecore_win32_window_procedure(HWND window, { Ecore_Win32_Window *w; - w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA); + w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWLP_USERDATA); ecore_win32_window_geometry_get(w, NULL, NULL, &w->drag.w, &w->drag.h); @@ -438,7 +438,7 @@ _ecore_win32_window_procedure(HWND window, INF("sys command MOVE or SIZE window message : %dx%d", GET_X_LPARAM(data_param), GET_Y_LPARAM(data_param)); - w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA); + w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWLP_USERDATA); w->drag.dragging = 1; return 0; } diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c index 4d69654795..55bbcc6bd7 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c @@ -85,7 +85,7 @@ _ecore_win32_event_handle_key_press(Ecore_Win32_Callback_Data *msg, } store_key: - e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWLP_USERDATA); if (!e->window) { free(e); @@ -136,7 +136,7 @@ _ecore_win32_event_handle_key_release(Ecore_Win32_Callback_Data *msg, } store_key: - e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWLP_USERDATA); if (!e->window) { free(e); @@ -158,7 +158,7 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg, INF("mouse button pressed"); - window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWL_USERDATA); + window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWLP_USERDATA); if (button > 3) { @@ -263,7 +263,7 @@ _ecore_win32_event_handle_button_release(Ecore_Win32_Callback_Data *msg, INF("mouse button released"); - window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); { Ecore_Event_Mouse_Move *e; @@ -326,7 +326,7 @@ _ecore_win32_event_handle_motion_notify(Ecore_Win32_Callback_Data *msg) e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); if (!e) return; - e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->event_window = e->window; e->x = GET_X_LPARAM(msg->data_param); e->y = GET_Y_LPARAM(msg->data_param); @@ -346,7 +346,7 @@ _ecore_win32_event_handle_enter_notify(Ecore_Win32_Callback_Data *msg) e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); if (!e) return; - e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->event_window = e->window; e->x = msg->x; e->y = msg->y; @@ -364,7 +364,7 @@ _ecore_win32_event_handle_enter_notify(Ecore_Win32_Callback_Data *msg) e = (Ecore_Win32_Event_Mouse_In *)calloc(1, sizeof(Ecore_Win32_Event_Mouse_In)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->x = msg->x; e->y = msg->y; e->time = msg->time ; @@ -386,7 +386,7 @@ _ecore_win32_event_handle_leave_notify(Ecore_Win32_Callback_Data *msg) e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); if (!e) return; - e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->event_window = e->window; e->x = msg->x; e->y = msg->y; @@ -404,7 +404,7 @@ _ecore_win32_event_handle_leave_notify(Ecore_Win32_Callback_Data *msg) e = (Ecore_Win32_Event_Mouse_Out *)calloc(1, sizeof(Ecore_Win32_Event_Mouse_Out)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->x = msg->x; e->y = msg->y; e->time = msg->time; @@ -425,7 +425,7 @@ _ecore_win32_event_handle_focus_in(Ecore_Win32_Callback_Data *msg) e = (Ecore_Win32_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_In)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; _ecore_win32_event_last_time = e->time; @@ -443,7 +443,7 @@ _ecore_win32_event_handle_focus_out(Ecore_Win32_Callback_Data *msg) e = (Ecore_Win32_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_Out)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; _ecore_win32_event_last_time = e->time; @@ -461,7 +461,7 @@ _ecore_win32_event_handle_expose(Ecore_Win32_Callback_Data *msg) e = (Ecore_Win32_Event_Window_Damage *)calloc(1, sizeof(Ecore_Win32_Event_Window_Damage)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->x = msg->update.left; e->y = msg->update.top; @@ -483,7 +483,7 @@ _ecore_win32_event_handle_create_notify(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Create)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; @@ -500,7 +500,7 @@ _ecore_win32_event_handle_destroy_notify(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Destroy)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; if (e->window == _ecore_win32_event_last_window) _ecore_win32_event_last_window = NULL; @@ -518,7 +518,7 @@ _ecore_win32_event_handle_map_notify(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Show)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; @@ -535,7 +535,7 @@ _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Hide)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; @@ -562,8 +562,8 @@ _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg) return; } - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); - e->abovewin = (void *)GetWindowLongPtr(window_pos->hwndInsertAfter, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); + e->abovewin = (void *)GetWindowLongPtr(window_pos->hwndInsertAfter, GWLP_USERDATA); e->x = wi.rcClient.left; e->y = wi.rcClient.top; e->width = wi.rcClient.right - wi.rcClient.left; @@ -587,7 +587,7 @@ _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Resize)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->width = rect.right - rect.left; e->height = rect.bottom - rect.top; e->time = _ecore_win32_event_last_time; @@ -605,7 +605,7 @@ _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg) e = calloc(1, sizeof(Ecore_Win32_Event_Window_Delete_Request)); if (!e) return; - e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA); + e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA); e->time = _ecore_win32_event_last_time; ecore_event_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, e, NULL, NULL); diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c index 20edf810d1..0c848dbb5d 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c @@ -94,7 +94,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent, } SetLastError(0); - if (!SetWindowLongPtr(w->window, GWL_USERDATA, (LONG_PTR)w) && (GetLastError() != 0)) + if (!SetWindowLongPtr(w->window, GWLP_USERDATA, (LONG_PTR)w) && (GetLastError() != 0)) { ERR("SetWindowLongPtr() failed"); DestroyWindow(w->window); @@ -1286,7 +1286,7 @@ ecore_win32_window_cursor_set(Ecore_Win32_Window *window, return; if (!SetClassLongPtr(((Ecore_Win32_Window *)window)->window, - GCL_HCURSOR, (LONG_PTR)cursor)) + GCLP_HCURSOR, (LONG_PTR)cursor)) { ERR("SetClassLong() failed"); }