enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

remove \n in logging messages 

SVN revision: 42738
This commit is contained in:
Vincent Torri 2009-09-27 03:56:12 +00:00
parent b25ed5342f
commit 3a0ee809e3
8 changed files with 209 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
View File

@ -174,7 +174,7 @@ _ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, voi
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Mouse_In *e; Ecore_Win32_Event_Mouse_In *e;
ECORE_EVAS_MSG_INFO("mouse in\n"); ECORE_EVAS_MSG_INFO("mouse in");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -196,7 +196,7 @@ _ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, vo
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Mouse_Out *e; Ecore_Win32_Event_Mouse_Out *e;
ECORE_EVAS_MSG_INFO("mouse out\n"); ECORE_EVAS_MSG_INFO("mouse out");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -220,7 +220,7 @@ _ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Damage *e; Ecore_Win32_Event_Window_Damage *e;
ECORE_EVAS_MSG_INFO("window damage\n"); ECORE_EVAS_MSG_INFO("window damage");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -272,7 +272,7 @@ _ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED_
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Destroy *e; Ecore_Win32_Event_Window_Destroy *e;
ECORE_EVAS_MSG_INFO("window destroy\n"); ECORE_EVAS_MSG_INFO("window destroy");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -290,7 +290,7 @@ _ecore_evas_win32_event_window_show(void *data __UNUSED__, int type __UNUSED__,
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Show *e; Ecore_Win32_Event_Window_Show *e;
ECORE_EVAS_MSG_INFO("window show\n"); ECORE_EVAS_MSG_INFO("window show");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -309,7 +309,7 @@ _ecore_evas_win32_event_window_hide(void *data __UNUSED__, int type __UNUSED__,
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Hide *e; Ecore_Win32_Event_Window_Hide *e;
ECORE_EVAS_MSG_INFO("window hide\n"); ECORE_EVAS_MSG_INFO("window hide");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -328,7 +328,7 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Configure *e; Ecore_Win32_Event_Window_Configure *e;
ECORE_EVAS_MSG_INFO("window configure\n"); ECORE_EVAS_MSG_INFO("window configure");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -386,7 +386,7 @@ _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_Win32_Event_Window_Delete_Request *e; Ecore_Win32_Event_Window_Delete_Request *e;
ECORE_EVAS_MSG_INFO("window delete request\n"); ECORE_EVAS_MSG_INFO("window delete request");
e = event; e = event;
ee = ecore_event_window_match((Ecore_Window)e->window); ee = ecore_event_window_match((Ecore_Window)e->window);
@ -404,7 +404,7 @@ _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __
static void static void
_ecore_evas_win32_free(Ecore_Evas *ee) _ecore_evas_win32_free(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas free\n"); ECORE_EVAS_MSG_INFO("ecore evas free");
ecore_win32_window_free((struct _Ecore_Win32_Window *)ee->prop.window); ecore_win32_window_free((struct _Ecore_Win32_Window *)ee->prop.window);
ecore_event_window_unregister(ee->prop.window); ecore_event_window_unregister(ee->prop.window);
@ -423,7 +423,7 @@ _ecore_evas_win32_callback_delete_request_set(Ecore_Evas *ee,
static void static void
_ecore_evas_win32_move(Ecore_Evas *ee, int x, int y) _ecore_evas_win32_move(Ecore_Evas *ee, int x, int y)
{ {
ECORE_EVAS_MSG_INFO("ecore evas move (%dx%d)\n", x, y); ECORE_EVAS_MSG_INFO("ecore evas move (%dx%d)", x, y);
if ((x != ee->x) || (y != ee->y)) if ((x != ee->x) || (y != ee->y))
{ {
@ -438,7 +438,7 @@ _ecore_evas_win32_move(Ecore_Evas *ee, int x, int y)
static void static void
_ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height) _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
{ {
ECORE_EVAS_MSG_INFO("ecore evas resize (%dx%d)\n", width, height); ECORE_EVAS_MSG_INFO("ecore evas resize (%dx%d)", width, height);
if ((ee->w != width) || (ee->h != height)) if ((ee->w != width) || (ee->h != height))
{ {
@ -465,7 +465,7 @@ _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
static void static void
_ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int height) _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int height)
{ {
ECORE_EVAS_MSG_INFO("ecore evas resize (%dx%d %dx%d)\n", x, y, width, height); ECORE_EVAS_MSG_INFO("ecore evas resize (%dx%d %dx%d)", x, y, width, height);
if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y)) if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y))
{ {
@ -571,7 +571,7 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
static void static void
_ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation) _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation)
{ {
ECORE_EVAS_MSG_INFO("ecore evas rotation: %s\n", rotation ? "yes" : "no"); ECORE_EVAS_MSG_INFO("ecore evas rotation: %s", rotation ? "yes" : "no");
if (ee->rotation == rotation) return; if (ee->rotation == rotation) return;
@ -605,7 +605,7 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation)
static void static void
_ecore_evas_win32_show(Ecore_Evas *ee) _ecore_evas_win32_show(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas show\n"); ECORE_EVAS_MSG_INFO("ecore evas show");
ee->should_be_visible = 1; ee->should_be_visible = 1;
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
@ -618,7 +618,7 @@ _ecore_evas_win32_show(Ecore_Evas *ee)
static void static void
_ecore_evas_win32_hide(Ecore_Evas *ee) _ecore_evas_win32_hide(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas hide\n"); ECORE_EVAS_MSG_INFO("ecore evas hide");
ecore_win32_window_hide((struct _Ecore_Win32_Window *)ee->prop.window); ecore_win32_window_hide((struct _Ecore_Win32_Window *)ee->prop.window);
ee->should_be_visible = 0; ee->should_be_visible = 0;
@ -627,7 +627,7 @@ _ecore_evas_win32_hide(Ecore_Evas *ee)
static void static void
_ecore_evas_win32_raise(Ecore_Evas *ee) _ecore_evas_win32_raise(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas raise\n"); ECORE_EVAS_MSG_INFO("ecore evas raise");
if (!ee->prop.fullscreen) if (!ee->prop.fullscreen)
ecore_win32_window_raise((struct _Ecore_Win32_Window *)ee->prop.window); ecore_win32_window_raise((struct _Ecore_Win32_Window *)ee->prop.window);
@ -638,7 +638,7 @@ _ecore_evas_win32_raise(Ecore_Evas *ee)
static void static void
_ecore_evas_win32_lower(Ecore_Evas *ee) _ecore_evas_win32_lower(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas lower\n"); ECORE_EVAS_MSG_INFO("ecore evas lower");
if (!ee->prop.fullscreen) if (!ee->prop.fullscreen)
ecore_win32_window_lower((struct _Ecore_Win32_Window *)ee->prop.window); ecore_win32_window_lower((struct _Ecore_Win32_Window *)ee->prop.window);
@ -649,7 +649,7 @@ _ecore_evas_win32_lower(Ecore_Evas *ee)
static void static void
_ecore_evas_win32_activate(Ecore_Evas *ee) _ecore_evas_win32_activate(Ecore_Evas *ee)
{ {
ECORE_EVAS_MSG_INFO("ecore evas activate\n"); ECORE_EVAS_MSG_INFO("ecore evas activate");
ecore_win32_window_focus_set((struct _Ecore_Win32_Window *)ee->prop.window); ecore_win32_window_focus_set((struct _Ecore_Win32_Window *)ee->prop.window);
} }
@ -657,7 +657,7 @@ _ecore_evas_win32_activate(Ecore_Evas *ee)
static void static void
_ecore_evas_win32_title_set(Ecore_Evas *ee, const char *title) _ecore_evas_win32_title_set(Ecore_Evas *ee, const char *title)
{ {
ECORE_EVAS_MSG_INFO("ecore evas title set\n"); ECORE_EVAS_MSG_INFO("ecore evas title set");
if (ee->prop.title) free(ee->prop.title); if (ee->prop.title) free(ee->prop.title);
ee->prop.title = NULL; ee->prop.title = NULL;
@ -781,7 +781,7 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
{ {
struct _Ecore_Win32_Window *window; struct _Ecore_Win32_Window *window;
ECORE_EVAS_MSG_INFO("ecore evas fullscreen set\n"); ECORE_EVAS_MSG_INFO("ecore evas fullscreen set");
if ((ee->engine.win32.state.fullscreen && on) || if ((ee->engine.win32.state.fullscreen && on) ||
(!ee->engine.win32.state.fullscreen && !on)) (!ee->engine.win32.state.fullscreen && !on))

24
legacy/ecore/src/lib/ecore_win32/ecore_win32.c
View File

@ -94,7 +94,7 @@ ecore_win32_init()
return 0; return 0;
} }
ECORE_WIN32_MSG_INFO("initializing ecore_win32 (current count: %d)\n", _ecore_win32_init_count); ECORE_WIN32_MSG_INFO("initializing ecore_win32 (current count: %d)", _ecore_win32_init_count);
if (_ecore_win32_init_count > 0) if (_ecore_win32_init_count > 0)
{ {
@ -105,7 +105,7 @@ ecore_win32_init()
_ecore_win32_instance = GetModuleHandle(NULL); _ecore_win32_instance = GetModuleHandle(NULL);
if (!_ecore_win32_instance) if (!_ecore_win32_instance)
{ {
ECORE_WIN32_MSG_ERR("GetModuleHandle() failed\n"); ECORE_WIN32_MSG_ERR("GetModuleHandle() failed");
return 0; return 0;
} }
@ -123,14 +123,14 @@ ecore_win32_init()
if(!RegisterClass(&wc)) if(!RegisterClass(&wc))
{ {
ECORE_WIN32_MSG_ERR("RegisterClass() failed\n"); ECORE_WIN32_MSG_ERR("RegisterClass() failed");
FreeLibrary(_ecore_win32_instance); FreeLibrary(_ecore_win32_instance);
return 0; return 0;
} }
if (!ecore_win32_dnd_init()) if (!ecore_win32_dnd_init())
{ {
ECORE_WIN32_MSG_ERR("ecore_win32_dnd_init() failed\n"); ECORE_WIN32_MSG_ERR("ecore_win32_dnd_init() failed");
FreeLibrary(_ecore_win32_instance); FreeLibrary(_ecore_win32_instance);
return 0; return 0;
} }
@ -161,7 +161,7 @@ ecore_win32_init()
int int
ecore_win32_shutdown() ecore_win32_shutdown()
{ {
ECORE_WIN32_MSG_INFO("shutting down ecore_win32 (current count: %d)\n", _ecore_win32_init_count); ECORE_WIN32_MSG_INFO("shutting down ecore_win32 (current count: %d)", _ecore_win32_init_count);
_ecore_win32_init_count--; _ecore_win32_init_count--;
if (_ecore_win32_init_count > 0) return _ecore_win32_init_count; if (_ecore_win32_init_count > 0) return _ecore_win32_init_count;
@ -171,11 +171,11 @@ ecore_win32_shutdown()
ecore_win32_dnd_shutdown(); ecore_win32_dnd_shutdown();
if (!UnregisterClass(ECORE_WIN32_WINDOW_CLASS, _ecore_win32_instance)) if (!UnregisterClass(ECORE_WIN32_WINDOW_CLASS, _ecore_win32_instance))
{ {
ECORE_WIN32_MSG_INFO("UnregisterClass() failed\n"); ECORE_WIN32_MSG_INFO("UnregisterClass() failed");
} }
if (!FreeLibrary(_ecore_win32_instance)) if (!FreeLibrary(_ecore_win32_instance))
{ {
ECORE_WIN32_MSG_INFO("FreeLibrary() failed\n"); ECORE_WIN32_MSG_INFO("FreeLibrary() failed");
} }
_ecore_win32_instance = NULL; _ecore_win32_instance = NULL;
@ -192,19 +192,19 @@ ecore_win32_screen_depth_get()
HDC dc; HDC dc;
int depth; int depth;
ECORE_WIN32_MSG_INFO("getting screen depth\n"); ECORE_WIN32_MSG_INFO("getting screen depth");
dc = GetDC(NULL); dc = GetDC(NULL);
if (!dc) if (!dc)
{ {
ECORE_WIN32_MSG_ERR("GetDC() failed\n"); ECORE_WIN32_MSG_ERR("GetDC() failed");
return 0; return 0;
} }
depth = GetDeviceCaps(dc, BITSPIXEL); depth = GetDeviceCaps(dc, BITSPIXEL);
if (!ReleaseDC(NULL, dc)) if (!ReleaseDC(NULL, dc))
{ {
ECORE_WIN32_MSG_ERR("ReleaseDC() failed (device context not released)\n"); ECORE_WIN32_MSG_ERR("ReleaseDC() failed (device context not released)");
} }
return depth; return depth;
@ -323,7 +323,7 @@ _ecore_win32_window_procedure(HWND window,
{ {
POINT pt; POINT pt;
ECORE_WIN32_MSG_INFO("mouse in window\n"); ECORE_WIN32_MSG_INFO("mouse in window");
pt.x = GET_X_LPARAM(data_param); pt.x = GET_X_LPARAM(data_param);
pt.y = GET_Y_LPARAM(data_param); pt.y = GET_Y_LPARAM(data_param);
@ -346,7 +346,7 @@ _ecore_win32_window_procedure(HWND window,
} }
else else
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
} }
_ecore_win32_event_handle_motion_notify(data); _ecore_win32_event_handle_motion_notify(data);

8
legacy/ecore/src/lib/ecore_win32/ecore_win32_cursor.c
View File

@ -30,7 +30,7 @@ ecore_win32_cursor_new(const void *pixels_and,
int cursor_width; int cursor_width;
int cursor_height; int cursor_height;
ECORE_WIN32_MSG_INFO("creating cursor\n"); ECORE_WIN32_MSG_INFO("creating cursor");
cursor_width = GetSystemMetrics(SM_CXCURSOR); cursor_width = GetSystemMetrics(SM_CXCURSOR);
cursor_height = GetSystemMetrics(SM_CYCURSOR); cursor_height = GetSystemMetrics(SM_CYCURSOR);
@ -52,7 +52,7 @@ ecore_win32_cursor_new(const void *pixels_and,
void void
ecore_win32_cursor_free(Ecore_Win32_Cursor *cursor) ecore_win32_cursor_free(Ecore_Win32_Cursor *cursor)
{ {
ECORE_WIN32_MSG_INFO("destroying cursor\n"); ECORE_WIN32_MSG_INFO("destroying cursor");
DestroyCursor(cursor); DestroyCursor(cursor);
} }
@ -63,7 +63,7 @@ ecore_win32_cursor_shape_get(Ecore_Win32_Cursor_Shape shape)
Ecore_Win32_Cursor *cursor = NULL; Ecore_Win32_Cursor *cursor = NULL;
const char *cursor_name; const char *cursor_name;
ECORE_WIN32_MSG_INFO("geting shape cursor\n"); ECORE_WIN32_MSG_INFO("geting shape cursor");
switch (shape) switch (shape)
{ {
@ -125,7 +125,7 @@ ecore_win32_cursor_size_get(void)
int width; int width;
int height; int height;
ECORE_WIN32_MSG_INFO("geting size cursor\n"); ECORE_WIN32_MSG_INFO("geting size cursor");
width = GetSystemMetrics(SM_CXCURSOR); width = GetSystemMetrics(SM_CXCURSOR);
height = GetSystemMetrics(SM_CYCURSOR); height = GetSystemMetrics(SM_CYCURSOR);

34
legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c
View File

@ -58,7 +58,7 @@ _ecore_win32_event_handle_key_press(Ecore_Win32_Callback_Data *msg,
{ {
Ecore_Event_Key *e; Ecore_Event_Key *e;
ECORE_WIN32_MSG_INFO("key pressed\n"); ECORE_WIN32_MSG_INFO("key pressed");
e = (Ecore_Event_Key *)malloc(sizeof(Ecore_Event_Key)); e = (Ecore_Event_Key *)malloc(sizeof(Ecore_Event_Key));
if (!e) return; if (!e) return;
@ -108,7 +108,7 @@ _ecore_win32_event_handle_key_release(Ecore_Win32_Callback_Data *msg,
{ {
Ecore_Event_Key *e; Ecore_Event_Key *e;
ECORE_WIN32_MSG_INFO("key released\n"); ECORE_WIN32_MSG_INFO("key released");
e = (Ecore_Event_Key *)calloc(1, sizeof(Ecore_Event_Key)); e = (Ecore_Event_Key *)calloc(1, sizeof(Ecore_Event_Key));
if (!e) return; if (!e) return;
@ -158,7 +158,7 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
{ {
Ecore_Win32_Window *window; Ecore_Win32_Window *window;
ECORE_WIN32_MSG_INFO("mouse button pressed\n"); ECORE_WIN32_MSG_INFO("mouse button pressed");
window = (Ecore_Win32_Window *)GetWindowLong(msg->window, GWL_USERDATA); window = (Ecore_Win32_Window *)GetWindowLong(msg->window, GWL_USERDATA);
@ -260,7 +260,7 @@ _ecore_win32_event_handle_button_release(Ecore_Win32_Callback_Data *msg,
{ {
Ecore_Win32_Window *window; Ecore_Win32_Window *window;
ECORE_WIN32_MSG_INFO("mouse button released\n"); ECORE_WIN32_MSG_INFO("mouse button released");
window = (void *)GetWindowLong(msg->window, GWL_USERDATA); window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
@ -318,7 +318,7 @@ _ecore_win32_event_handle_motion_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Event_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
ECORE_WIN32_MSG_INFO("mouse moved\n"); ECORE_WIN32_MSG_INFO("mouse moved");
e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
if (!e) return; if (!e) return;
@ -337,7 +337,7 @@ _ecore_win32_event_handle_enter_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Event_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
ECORE_WIN32_MSG_INFO("mouse in\n"); ECORE_WIN32_MSG_INFO("mouse in");
e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
if (!e) return; if (!e) return;
@ -376,7 +376,7 @@ _ecore_win32_event_handle_leave_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Event_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
ECORE_WIN32_MSG_INFO("mouse out\n"); ECORE_WIN32_MSG_INFO("mouse out");
e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
if (!e) return; if (!e) return;
@ -414,7 +414,7 @@ _ecore_win32_event_handle_focus_in(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Focus_In *e; Ecore_Win32_Event_Window_Focus_In *e;
ECORE_WIN32_MSG_INFO("focus in\n"); ECORE_WIN32_MSG_INFO("focus in");
e = (Ecore_Win32_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_In)); e = (Ecore_Win32_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_In));
if (!e) return; if (!e) return;
@ -432,7 +432,7 @@ _ecore_win32_event_handle_focus_out(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Focus_Out *e; Ecore_Win32_Event_Window_Focus_Out *e;
ECORE_WIN32_MSG_INFO("focus out\n"); ECORE_WIN32_MSG_INFO("focus out");
e = (Ecore_Win32_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_Out)); e = (Ecore_Win32_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_Out));
if (!e) return; if (!e) return;
@ -450,7 +450,7 @@ _ecore_win32_event_handle_expose(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Damage *e; Ecore_Win32_Event_Window_Damage *e;
ECORE_WIN32_MSG_INFO("window expose\n"); ECORE_WIN32_MSG_INFO("window expose");
e = (Ecore_Win32_Event_Window_Damage *)calloc(1, sizeof(Ecore_Win32_Event_Window_Damage)); e = (Ecore_Win32_Event_Window_Damage *)calloc(1, sizeof(Ecore_Win32_Event_Window_Damage));
if (!e) return; if (!e) return;
@ -472,7 +472,7 @@ _ecore_win32_event_handle_create_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Create *e; Ecore_Win32_Event_Window_Create *e;
ECORE_WIN32_MSG_INFO("window create notify\n"); ECORE_WIN32_MSG_INFO("window create notify");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Create)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Create));
if (!e) return; if (!e) return;
@ -489,7 +489,7 @@ _ecore_win32_event_handle_destroy_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Destroy *e; Ecore_Win32_Event_Window_Destroy *e;
ECORE_WIN32_MSG_INFO("window destroy notify\n"); ECORE_WIN32_MSG_INFO("window destroy notify");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Destroy)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Destroy));
if (!e) return; if (!e) return;
@ -507,7 +507,7 @@ _ecore_win32_event_handle_map_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Show *e; Ecore_Win32_Event_Window_Show *e;
ECORE_WIN32_MSG_INFO("window map notify\n"); ECORE_WIN32_MSG_INFO("window map notify");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Show)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Show));
if (!e) return; if (!e) return;
@ -524,7 +524,7 @@ _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Hide *e; Ecore_Win32_Event_Window_Hide *e;
ECORE_WIN32_MSG_INFO("window unmap notify\n"); ECORE_WIN32_MSG_INFO("window unmap notify");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Hide)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Hide));
if (!e) return; if (!e) return;
@ -543,7 +543,7 @@ _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg)
Ecore_Win32_Event_Window_Configure *e; Ecore_Win32_Event_Window_Configure *e;
WINDOWPOS *window_pos; WINDOWPOS *window_pos;
ECORE_WIN32_MSG_INFO("window configure notify\n"); ECORE_WIN32_MSG_INFO("window configure notify");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Configure)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Configure));
if (!e) return; if (!e) return;
@ -573,7 +573,7 @@ _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg)
RECT rect; RECT rect;
Ecore_Win32_Event_Window_Resize *e; Ecore_Win32_Event_Window_Resize *e;
ECORE_WIN32_MSG_INFO("window resize\n"); ECORE_WIN32_MSG_INFO("window resize");
if (!GetClientRect(msg->window, &rect)) if (!GetClientRect(msg->window, &rect))
return; return;
@ -594,7 +594,7 @@ _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg)
{ {
Ecore_Win32_Event_Window_Delete_Request *e; Ecore_Win32_Event_Window_Delete_Request *e;
ECORE_WIN32_MSG_INFO("window delete request\n"); ECORE_WIN32_MSG_INFO("window delete request");
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Delete_Request)); e = calloc(1, sizeof(Ecore_Win32_Event_Window_Delete_Request));
if (!e) return; if (!e) return;

156
legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
View File

@ -50,7 +50,7 @@ ecore_win32_window_new(Ecore_Win32_Window *parent,
int width, int width,
int height) int height)
{ {
ECORE_WIN32_MSG_INFO("creating window with border\n"); ECORE_WIN32_MSG_INFO("creating window with border");
return ecore_win32_window_internal_new(parent, return ecore_win32_window_internal_new(parent,
x, y, x, y,
@ -66,7 +66,7 @@ ecore_win32_window_override_new(Ecore_Win32_Window *parent,
int width, int width,
int height) int height)
{ {
ECORE_WIN32_MSG_INFO("creating window without border\n"); ECORE_WIN32_MSG_INFO("creating window without border");
return ecore_win32_window_internal_new(parent, return ecore_win32_window_internal_new(parent,
x, y, x, y,
@ -81,7 +81,7 @@ ecore_win32_window_free(Ecore_Win32_Window *window)
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("destroying window\n"); ECORE_WIN32_MSG_INFO("destroying window");
if (wnd->shape.mask != NULL) if (wnd->shape.mask != NULL)
free(wnd->shape.mask); free(wnd->shape.mask);
@ -140,12 +140,12 @@ ecore_win32_window_move(Ecore_Win32_Window *window,
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("moving window (%dx%d)\n", x, y); ECORE_WIN32_MSG_INFO("moving window (%dx%d)", x, y);
w = ((struct _Ecore_Win32_Window *)window)->window; w = ((struct _Ecore_Win32_Window *)window)->window;
if (!GetWindowRect(w, &rect)) if (!GetWindowRect(w, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowRect() failed");
return; return;
} }
@ -154,7 +154,7 @@ ecore_win32_window_move(Ecore_Win32_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
@ -171,12 +171,12 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("resizing window (%dx%d)\n", width, height); ECORE_WIN32_MSG_INFO("resizing window (%dx%d)", width, height);
w = (struct _Ecore_Win32_Window *)window; w = (struct _Ecore_Win32_Window *)window;
if (!GetWindowRect(w->window, &rect)) if (!GetWindowRect(w->window, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowRect() failed");
return; return;
} }
@ -195,12 +195,12 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
rect.bottom = height; rect.bottom = height;
if (!(style = GetWindowLong(w->window, GWL_STYLE))) if (!(style = GetWindowLong(w->window, GWL_STYLE)))
{ {
ECORE_WIN32_MSG_ERR("GetWindowLong() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!AdjustWindowRect(&rect, style, FALSE)) if (!AdjustWindowRect(&rect, style, FALSE))
{ {
ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed");
return; return;
} }
@ -209,7 +209,7 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
@ -226,7 +226,7 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("moving and resizing window (%dx%d %dx%d)\n", x, y, width, height); ECORE_WIN32_MSG_INFO("moving and resizing window (%dx%d %dx%d)", x, y, width, height);
w = ((struct _Ecore_Win32_Window *)window); w = ((struct _Ecore_Win32_Window *)window);
rect.left = 0; rect.left = 0;
@ -239,12 +239,12 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
rect.bottom = height; rect.bottom = height;
if (!(style = GetWindowLong(w->window, GWL_STYLE))) if (!(style = GetWindowLong(w->window, GWL_STYLE)))
{ {
ECORE_WIN32_MSG_ERR("GetWindowLong() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!AdjustWindowRect(&rect, style, FALSE)) if (!AdjustWindowRect(&rect, style, FALSE))
{ {
ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed");
return; return;
} }
@ -253,7 +253,7 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
@ -268,7 +268,7 @@ ecore_win32_window_geometry_get(Ecore_Win32_Window *window,
int w; int w;
int h; int h;
ECORE_WIN32_MSG_INFO("getting window geometry\n"); ECORE_WIN32_MSG_INFO("getting window geometry");
if (!window) if (!window)
{ {
@ -283,7 +283,7 @@ ecore_win32_window_geometry_get(Ecore_Win32_Window *window,
if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window, if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
@ -299,7 +299,7 @@ ecore_win32_window_geometry_get(Ecore_Win32_Window *window,
if (!GetWindowRect(((struct _Ecore_Win32_Window *)window)->window, if (!GetWindowRect(((struct _Ecore_Win32_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WIN32_MSG_ERR("GetWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowRect() failed");
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
@ -322,7 +322,7 @@ ecore_win32_window_size_get(Ecore_Win32_Window *window,
{ {
RECT rect; RECT rect;
ECORE_WIN32_MSG_INFO("getting window size\n"); ECORE_WIN32_MSG_INFO("getting window size");
if (!window) if (!window)
{ {
@ -335,7 +335,7 @@ ecore_win32_window_size_get(Ecore_Win32_Window *window,
if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window, if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
if (width) *width = 0; if (width) *width = 0;
if (height) *height = 0; if (height) *height = 0;
@ -494,13 +494,13 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
GetWindowLong(wnd->window, GWL_EXSTYLE) & (~WS_EX_LAYERED)) && GetWindowLong(wnd->window, GWL_EXSTYLE) & (~WS_EX_LAYERED)) &&
(GetLastError() != 0)) (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
if (!RedrawWindow(wnd->window, NULL, NULL, if (!RedrawWindow(wnd->window, NULL, NULL,
RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN)) RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN))
{ {
ECORE_WIN32_MSG_ERR("RedrawWindow() failed\n"); ECORE_WIN32_MSG_ERR("RedrawWindow() failed");
return; return;
} }
#endif #endif
@ -508,7 +508,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
else else
if (!SetWindowRgn(wnd->window, NULL, TRUE)) if (!SetWindowRgn(wnd->window, NULL, TRUE))
{ {
ECORE_WIN32_MSG_ERR("SetWindowRgn() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowRgn() failed");
} }
return; return;
} }
@ -542,7 +542,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
GetWindowLong(wnd->window, GWL_EXSTYLE) | WS_EX_LAYERED) && GetWindowLong(wnd->window, GWL_EXSTYLE) | WS_EX_LAYERED) &&
(GetLastError() != 0)) (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
wnd->shape.layered = 1; wnd->shape.layered = 1;
@ -552,7 +552,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
if (!(rgn = CreateRectRgn(0, 0, 0, 0))) if (!(rgn = CreateRectRgn(0, 0, 0, 0)))
{ {
ECORE_WIN32_MSG_ERR("CreateRectRgn() failed\n"); ECORE_WIN32_MSG_ERR("CreateRectRgn() failed");
return; return;
} }
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
@ -561,7 +561,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
if (!(rgnLine = CreateRectRgn(0, 0, 0, 0))) if (!(rgnLine = CreateRectRgn(0, 0, 0, 0)))
{ {
ECORE_WIN32_MSG_ERR("CreateRectRgn() failed\n"); ECORE_WIN32_MSG_ERR("CreateRectRgn() failed");
return; return;
} }
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
@ -572,33 +572,33 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
if (!(rgnDot = CreateRectRgn(x, y, x + 1, y + 1))) if (!(rgnDot = CreateRectRgn(x, y, x + 1, y + 1)))
{ {
ECORE_WIN32_MSG_ERR("CreateRectRgn() failed\n"); ECORE_WIN32_MSG_ERR("CreateRectRgn() failed");
return; return;
} }
if (CombineRgn(rgnLine, rgnLine, rgnDot, RGN_OR) == ERROR) if (CombineRgn(rgnLine, rgnLine, rgnDot, RGN_OR) == ERROR)
{ {
ECORE_WIN32_MSG_ERR("CombineRgn() has not created a new region\n"); ECORE_WIN32_MSG_ERR("CombineRgn() has not created a new region");
} }
if (!DeleteObject(rgnDot)) if (!DeleteObject(rgnDot))
{ {
ECORE_WIN32_MSG_ERR("DeleteObject() failed\n"); ECORE_WIN32_MSG_ERR("DeleteObject() failed");
return; return;
} }
} }
} }
if (CombineRgn(rgn, rgn, rgnLine, RGN_OR) == ERROR) if (CombineRgn(rgn, rgn, rgnLine, RGN_OR) == ERROR)
{ {
ECORE_WIN32_MSG_ERR("CombineRgn() has not created a new region\n"); ECORE_WIN32_MSG_ERR("CombineRgn() has not created a new region");
} }
if (!DeleteObject(rgnLine)) if (!DeleteObject(rgnLine))
{ {
ECORE_WIN32_MSG_ERR("DeleteObject() failed\n"); ECORE_WIN32_MSG_ERR("DeleteObject() failed");
return; return;
} }
} }
if (!SetWindowRgn(wnd->window, rgn, TRUE)) if (!SetWindowRgn(wnd->window, rgn, TRUE))
{ {
ECORE_WIN32_MSG_ERR("SetWindowRgn() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowRgn() failed");
} }
} }
@ -607,12 +607,12 @@ ecore_win32_window_show(Ecore_Win32_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("showing window\n"); ECORE_WIN32_MSG_INFO("showing window");
ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_SHOWNORMAL); ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_SHOWNORMAL);
if (!UpdateWindow(((struct _Ecore_Win32_Window *)window)->window)) if (!UpdateWindow(((struct _Ecore_Win32_Window *)window)->window))
{ {
ECORE_WIN32_MSG_ERR("UpdateWindow() failed\n"); ECORE_WIN32_MSG_ERR("UpdateWindow() failed");
} }
} }
@ -622,7 +622,7 @@ ecore_win32_window_hide(Ecore_Win32_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("hiding window\n"); ECORE_WIN32_MSG_INFO("hiding window");
ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_HIDE); ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_HIDE);
} }
@ -632,13 +632,13 @@ ecore_win32_window_raise(Ecore_Win32_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("raising window\n"); ECORE_WIN32_MSG_INFO("raising window");
if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window, if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window,
HWND_TOP, 0, 0, 0, 0, HWND_TOP, 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)) SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
} }
} }
@ -647,13 +647,13 @@ ecore_win32_window_lower(Ecore_Win32_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("lowering window\n"); ECORE_WIN32_MSG_INFO("lowering window");
if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window, if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window,
HWND_BOTTOM, 0, 0, 0, 0, HWND_BOTTOM, 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)) SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
} }
} }
@ -665,11 +665,11 @@ ecore_win32_window_title_set(Ecore_Win32_Window *window,
if (!title || !title[0]) return; if (!title || !title[0]) return;
ECORE_WIN32_MSG_INFO("setting window title\n"); ECORE_WIN32_MSG_INFO("setting window title");
if (!SetWindowText(((struct _Ecore_Win32_Window *)window)->window, title)) if (!SetWindowText(((struct _Ecore_Win32_Window *)window)->window, title))
{ {
ECORE_WIN32_MSG_ERR("SetWindowText() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowText() failed");
} }
} }
@ -678,11 +678,11 @@ ecore_win32_window_focus_set(Ecore_Win32_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WIN32_MSG_INFO("focusing window\n"); ECORE_WIN32_MSG_INFO("focusing window");
if (!SetFocus(((struct _Ecore_Win32_Window *)window)->window)) if (!SetFocus(((struct _Ecore_Win32_Window *)window)->window))
{ {
ECORE_WIN32_MSG_ERR("SetFocus() failed\n"); ECORE_WIN32_MSG_ERR("SetFocus() failed");
} }
} }
@ -699,7 +699,7 @@ ecore_win32_window_iconified_set(Ecore_Win32_Window *window,
((!ew->iconified) && (!on))) ((!ew->iconified) && (!on)))
return; return;
ECORE_WIN32_MSG_INFO("iconifying window: %s\n", on ? "yes" : "no"); ECORE_WIN32_MSG_INFO("iconifying window: %s", on ? "yes" : "no");
ShowWindow(ew->window, on ? SW_MINIMIZE : SW_RESTORE); ShowWindow(ew->window, on ? SW_MINIMIZE : SW_RESTORE);
ew->iconified = on; ew->iconified = on;
@ -721,7 +721,7 @@ ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
((!ew->borderless) && (!on))) ((!ew->borderless) && (!on)))
return; return;
ECORE_WIN32_MSG_INFO("setting window without border: %s\n", on ? "yes" : "no"); ECORE_WIN32_MSG_INFO("setting window without border: %s", on ? "yes" : "no");
w = ew->window; w = ew->window;
@ -730,13 +730,13 @@ ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
{ {
if (!GetClientRect(w, &rect)) if (!GetClientRect(w, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
return; return;
} }
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_STYLE, style & ~(WS_CAPTION | WS_THICKFRAME)) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_STYLE, style & ~(WS_CAPTION | WS_THICKFRAME)) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
} }
@ -744,19 +744,19 @@ ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
{ {
if (!GetWindowRect(w, &rect)) if (!GetWindowRect(w, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowRect() failed");
return; return;
} }
style |= WS_CAPTION | WS_THICKFRAME; style |= WS_CAPTION | WS_THICKFRAME;
if (!AdjustWindowRect (&rect, style, FALSE)) if (!AdjustWindowRect (&rect, style, FALSE))
{ {
ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed");
return; return;
} }
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_STYLE, style) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_STYLE, style) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
} }
@ -765,7 +765,7 @@ ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
rect.right - rect.left, rect.bottom - rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_NOMOVE | SWP_FRAMECHANGED)) SWP_NOMOVE | SWP_FRAMECHANGED))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
return; return;
} }
ew->borderless = on; ew->borderless = on;
@ -785,7 +785,7 @@ ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
((!ew->fullscreen) && (!on))) ((!ew->fullscreen) && (!on)))
return; return;
ECORE_WIN32_MSG_INFO("setting fullscreen: %s\n", on ? "yes" : "no"); ECORE_WIN32_MSG_INFO("setting fullscreen: %s", on ? "yes" : "no");
ew->fullscreen = !!on; ew->fullscreen = !!on;
w = ew->window; w = ew->window;
@ -796,12 +796,12 @@ ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
if (!GetWindowRect(w, &ew->rect)) if (!GetWindowRect(w, &ew->rect))
{ {
ECORE_WIN32_MSG_ERR("GetWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowRect() failed");
return; return;
} }
if (!(ew->style = GetWindowLong(w, GWL_STYLE))) if (!(ew->style = GetWindowLong(w, GWL_STYLE)))
{ {
ECORE_WIN32_MSG_ERR("GetWindowLong() failed\n"); ECORE_WIN32_MSG_ERR("GetWindowLong() failed");
return; return;
} }
style = ew->style & ~WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX; style = ew->style & ~WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX;
@ -809,20 +809,20 @@ ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_STYLE, style) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_STYLE, style) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_EXSTYLE, WS_EX_TOPMOST) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_EXSTYLE, WS_EX_TOPMOST) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
if (!SetWindowPos(w, HWND_TOPMOST, 0, 0, if (!SetWindowPos(w, HWND_TOPMOST, 0, 0,
GetSystemMetrics (SM_CXSCREEN), GetSystemMetrics (SM_CYSCREEN), GetSystemMetrics (SM_CXSCREEN), GetSystemMetrics (SM_CYSCREEN),
SWP_NOCOPYBITS | SWP_SHOWWINDOW)) SWP_NOCOPYBITS | SWP_SHOWWINDOW))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
return; return;
} }
} }
@ -831,13 +831,13 @@ ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_STYLE, ew->style) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_STYLE, ew->style) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w, GWL_EXSTYLE, 0) && (GetLastError() != 0)) if (!SetWindowLongPtr(w, GWL_EXSTYLE, 0) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
return; return;
} }
if (!SetWindowPos(w, HWND_NOTOPMOST, if (!SetWindowPos(w, HWND_NOTOPMOST,
@ -847,7 +847,7 @@ ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
ew->rect.bottom - ew->rect.top, ew->rect.bottom - ew->rect.top,
SWP_NOCOPYBITS | SWP_SHOWWINDOW)) SWP_NOCOPYBITS | SWP_SHOWWINDOW))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
return; return;
} }
} }
@ -857,12 +857,12 @@ void
ecore_win32_window_cursor_set(Ecore_Win32_Window *window, ecore_win32_window_cursor_set(Ecore_Win32_Window *window,
Ecore_Win32_Cursor *cursor) Ecore_Win32_Cursor *cursor)
{ {
ECORE_WIN32_MSG_INFO("setting cursor\n"); ECORE_WIN32_MSG_INFO("setting cursor");
if (!SetClassLong(((struct _Ecore_Win32_Window *)window)->window, if (!SetClassLong(((struct _Ecore_Win32_Window *)window)->window,
GCL_HCURSOR, (LONG)cursor)) GCL_HCURSOR, (LONG)cursor))
{ {
ECORE_WIN32_MSG_ERR("SetClassLong() failed\n"); ECORE_WIN32_MSG_ERR("SetClassLong() failed");
} }
} }
@ -876,7 +876,7 @@ ecore_win32_window_state_set(Ecore_Win32_Window *window,
if (!window || !state || !num) if (!window || !state || !num)
return; return;
ECORE_WIN32_MSG_INFO("setting cursor state\n"); ECORE_WIN32_MSG_INFO("setting cursor state");
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
{ {
@ -939,7 +939,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
ew = (struct _Ecore_Win32_Window *)window; ew = (struct _Ecore_Win32_Window *)window;
w = ew->window; w = ew->window;
ECORE_WIN32_MSG_INFO("sending cursor state\n"); ECORE_WIN32_MSG_INFO("sending cursor state");
switch (state) switch (state)
{ {
@ -963,7 +963,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
if (!SystemParametersInfo(SPI_GETWORKAREA, 0, if (!SystemParametersInfo(SPI_GETWORKAREA, 0,
&rect, 0)) &rect, 0))
{ {
ECORE_WIN32_MSG_ERR("SystemParametersInfo() failed\n"); ECORE_WIN32_MSG_ERR("SystemParametersInfo() failed");
break; break;
} }
y = rect.top; y = rect.top;
@ -971,7 +971,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
if (!GetClientRect(w, &rect)) if (!GetClientRect(w, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
break; break;
} }
@ -980,7 +980,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
height, height,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
break; break;
@ -991,7 +991,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
if (!GetClientRect(w, &rect)) if (!GetClientRect(w, &rect))
{ {
ECORE_WIN32_MSG_ERR("GetClientRect() failed\n"); ECORE_WIN32_MSG_ERR("GetClientRect() failed");
break; break;
} }
@ -1000,7 +1000,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
break; break;
@ -1012,7 +1012,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
if (!SystemParametersInfo(SPI_GETWORKAREA, 0, if (!SystemParametersInfo(SPI_GETWORKAREA, 0,
&rect, 0)) &rect, 0))
{ {
ECORE_WIN32_MSG_ERR("SystemParametersInfo() failed\n"); ECORE_WIN32_MSG_ERR("SystemParametersInfo() failed");
break; break;
} }
@ -1021,7 +1021,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WIN32_MSG_ERR("MoveWindow() failed\n"); ECORE_WIN32_MSG_ERR("MoveWindow() failed");
} }
} }
break; break;
@ -1042,7 +1042,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW)) SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
} }
break; break;
case ECORE_WIN32_WINDOW_STATE_BELOW: case ECORE_WIN32_WINDOW_STATE_BELOW:
@ -1052,7 +1052,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window *window,
0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW)) SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW))
{ {
ECORE_WIN32_MSG_ERR("SetWindowPos() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowPos() failed");
} }
break; break;
case ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION: case ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION:
@ -1071,7 +1071,7 @@ ecore_win32_window_type_set(Ecore_Win32_Window *window,
if (!window) if (!window)
return; return;
ECORE_WIN32_MSG_INFO("setting window type\n"); ECORE_WIN32_MSG_INFO("setting window type");
switch (type) switch (type)
{ {
@ -1124,7 +1124,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
w = (struct _Ecore_Win32_Window *)calloc(1, sizeof(struct _Ecore_Win32_Window)); w = (struct _Ecore_Win32_Window *)calloc(1, sizeof(struct _Ecore_Win32_Window));
if (!w) if (!w)
{ {
ECORE_WIN32_MSG_ERR("malloc() failed\n"); ECORE_WIN32_MSG_ERR("malloc() failed");
return NULL; return NULL;
} }
@ -1134,7 +1134,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
rect.bottom = height; rect.bottom = height;
if (!AdjustWindowRect(&rect, style, FALSE)) if (!AdjustWindowRect(&rect, style, FALSE))
{ {
ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed\n"); ECORE_WIN32_MSG_ERR("AdjustWindowRect() failed");
free(w); free(w);
return NULL; return NULL;
} }
@ -1164,7 +1164,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
NULL, _ecore_win32_instance, NULL); NULL, _ecore_win32_instance, NULL);
if (!w->window) if (!w->window)
{ {
ECORE_WIN32_MSG_ERR("CreateWindowEx() failed\n"); ECORE_WIN32_MSG_ERR("CreateWindowEx() failed");
free(w); free(w);
return NULL; return NULL;
} }
@ -1172,7 +1172,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
SetLastError(0); SetLastError(0);
if (!SetWindowLongPtr(w->window, GWL_USERDATA, (LONG)w) && (GetLastError() != 0)) if (!SetWindowLongPtr(w->window, GWL_USERDATA, (LONG)w) && (GetLastError() != 0))
{ {
ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed\n"); ECORE_WIN32_MSG_ERR("SetWindowLongPtr() failed");
DestroyWindow(w->window); DestroyWindow(w->window);
free(w); free(w);
return NULL; return NULL;

16
legacy/ecore/src/lib/ecore_wince/ecore_wince.c
View File

@ -77,7 +77,7 @@ ecore_wince_init()
return 0; return 0;
} }
ECORE_WINCE_MSG_INFO("initializing ecore_wince (current count: %d)\n", _ecore_wince_init_count); ECORE_WINCE_MSG_INFO("initializing ecore_wince (current count: %d)", _ecore_wince_init_count);
if (_ecore_wince_init_count > 0) if (_ecore_wince_init_count > 0)
{ {
@ -88,7 +88,7 @@ ecore_wince_init()
_ecore_wince_instance = GetModuleHandle(NULL); _ecore_wince_instance = GetModuleHandle(NULL);
if (!_ecore_wince_instance) if (!_ecore_wince_instance)
{ {
ECORE_WINCE_MSG_ERR("GetModuleHandle() failed\n"); ECORE_WINCE_MSG_ERR("GetModuleHandle() failed");
return 0; return 0;
} }
@ -106,7 +106,7 @@ ecore_wince_init()
if(!RegisterClass(&wc)) if(!RegisterClass(&wc))
{ {
ECORE_WINCE_MSG_ERR("RegisterClass() failed\n"); ECORE_WINCE_MSG_ERR("RegisterClass() failed");
FreeLibrary(_ecore_wince_instance); FreeLibrary(_ecore_wince_instance);
return 0; return 0;
} }
@ -137,7 +137,7 @@ ecore_wince_shutdown()
{ {
HWND task_bar; HWND task_bar;
ECORE_WINCE_MSG_INFO("shutting down ecore_wince (current count: %d)\n", _ecore_wince_init_count); ECORE_WINCE_MSG_INFO("shutting down ecore_wince (current count: %d)", _ecore_wince_init_count);
_ecore_wince_init_count--; _ecore_wince_init_count--;
if (_ecore_wince_init_count > 0) return _ecore_wince_init_count; if (_ecore_wince_init_count > 0) return _ecore_wince_init_count;
@ -155,11 +155,11 @@ ecore_wince_shutdown()
if (!UnregisterClass(ECORE_WINCE_WINDOW_CLASS, _ecore_wince_instance)) if (!UnregisterClass(ECORE_WINCE_WINDOW_CLASS, _ecore_wince_instance))
{ {
ECORE_WINCE_MSG_ERR("UnregisterClass() failed\n"); ECORE_WINCE_MSG_ERR("UnregisterClass() failed");
} }
if (!FreeLibrary(_ecore_wince_instance)) if (!FreeLibrary(_ecore_wince_instance))
{ {
ECORE_WINCE_MSG_ERR("FreeLibrary() failed\n"); ECORE_WINCE_MSG_ERR("FreeLibrary() failed");
} }
_ecore_wince_instance = NULL; _ecore_wince_instance = NULL;
@ -275,7 +275,7 @@ _ecore_wince_window_procedure(HWND window,
{ {
POINT pt; POINT pt;
ECORE_WINCE_MSG_INFO("mouse in window\n"); ECORE_WINCE_MSG_INFO("mouse in window");
pt.x = LOWORD(data_param); pt.x = LOWORD(data_param);
pt.y = HIWORD(data_param); pt.y = HIWORD(data_param);
@ -298,7 +298,7 @@ _ecore_wince_window_procedure(HWND window,
} }
else else
{ {
ECORE_WINCE_MSG_ERR("GetClientRect() failed\n"); ECORE_WINCE_MSG_ERR("GetClientRect() failed");
} }
_ecore_wince_event_handle_motion_notify(data); _ecore_wince_event_handle_motion_notify(data);

32
legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c
View File

@ -55,7 +55,7 @@ _ecore_wince_event_handle_key_press(Ecore_WinCE_Callback_Data *msg,
{ {
Ecore_Event_Key *e; Ecore_Event_Key *e;
ECORE_WINCE_MSG_INFO("key pressed\n"); ECORE_WINCE_MSG_INFO("key pressed");
e = (Ecore_Event_Key *)malloc(sizeof(Ecore_Event_Key)); e = (Ecore_Event_Key *)malloc(sizeof(Ecore_Event_Key));
if (!e) return; if (!e) return;
@ -102,7 +102,7 @@ _ecore_wince_event_handle_key_release(Ecore_WinCE_Callback_Data *msg,
{ {
Ecore_Event_Key *e; Ecore_Event_Key *e;
ECORE_WINCE_MSG_INFO("key released\n"); ECORE_WINCE_MSG_INFO("key released");
e = (Ecore_Event_Key *)calloc(1, sizeof(Ecore_Event_Key)); e = (Ecore_Event_Key *)calloc(1, sizeof(Ecore_Event_Key));
if (!e) return; if (!e) return;
@ -149,7 +149,7 @@ _ecore_wince_event_handle_button_press(Ecore_WinCE_Callback_Data *msg,
{ {
Ecore_WinCE_Window *window; Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("mouse button pressed\n"); ECORE_WINCE_MSG_INFO("mouse button pressed");
window = (Ecore_WinCE_Window *)GetWindowLong(msg->window, GWL_USERDATA); window = (Ecore_WinCE_Window *)GetWindowLong(msg->window, GWL_USERDATA);
@ -228,7 +228,7 @@ _ecore_wince_event_handle_button_release(Ecore_WinCE_Callback_Data *msg,
{ {
Ecore_WinCE_Window *window; Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("mouse button released\n"); ECORE_WINCE_MSG_INFO("mouse button released");
window = (void *)GetWindowLong(msg->window, GWL_USERDATA); window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
@ -286,7 +286,7 @@ _ecore_wince_event_handle_motion_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_Event_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
ECORE_WINCE_MSG_INFO("mouse moved\n"); ECORE_WINCE_MSG_INFO("mouse moved");
e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move)); e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
if (!e) return; if (!e) return;
@ -304,7 +304,7 @@ _ecore_wince_event_handle_enter_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Window *window; Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("mouse in\n"); ECORE_WINCE_MSG_INFO("mouse in");
window = (void *)GetWindowLong(msg->window, GWL_USERDATA); window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
@ -347,7 +347,7 @@ _ecore_wince_event_handle_leave_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Window *window; Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("mouse out\n"); ECORE_WINCE_MSG_INFO("mouse out");
window = (void *)GetWindowLong(msg->window, GWL_USERDATA); window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
@ -391,7 +391,7 @@ _ecore_wince_event_handle_focus_in(Ecore_WinCE_Callback_Data *msg)
Ecore_WinCE_Event_Window_Focus_In *e; Ecore_WinCE_Event_Window_Focus_In *e;
struct _Ecore_WinCE_Window *window; struct _Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("focus in\n"); ECORE_WINCE_MSG_INFO("focus in");
e = (Ecore_WinCE_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Focus_In)); e = (Ecore_WinCE_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Focus_In));
if (!e) return; if (!e) return;
@ -420,7 +420,7 @@ _ecore_wince_event_handle_focus_out(Ecore_WinCE_Callback_Data *msg)
Ecore_WinCE_Event_Window_Focus_Out *e; Ecore_WinCE_Event_Window_Focus_Out *e;
struct _Ecore_WinCE_Window *window; struct _Ecore_WinCE_Window *window;
ECORE_WINCE_MSG_INFO("focus out\n"); ECORE_WINCE_MSG_INFO("focus out");
e = (Ecore_WinCE_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Focus_Out)); e = (Ecore_WinCE_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Focus_Out));
if (!e) return; if (!e) return;
@ -447,7 +447,7 @@ _ecore_wince_event_handle_expose(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Damage *e; Ecore_WinCE_Event_Window_Damage *e;
ECORE_WINCE_MSG_INFO("window expose\n"); ECORE_WINCE_MSG_INFO("window expose");
e = (Ecore_WinCE_Event_Window_Damage *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Damage)); e = (Ecore_WinCE_Event_Window_Damage *)calloc(1, sizeof(Ecore_WinCE_Event_Window_Damage));
if (!e) return; if (!e) return;
@ -463,7 +463,7 @@ _ecore_wince_event_handle_expose(Ecore_WinCE_Callback_Data *msg)
e->y = msg->update.top; e->y = msg->update.top;
e->width = msg->update.right - msg->update.left; e->width = msg->update.right - msg->update.left;
e->height = msg->update.bottom - msg->update.top; e->height = msg->update.bottom - msg->update.top;
ECORE_WINCE_MSG_INFO("window expose size: %dx%d\n", e->width, e->height); ECORE_WINCE_MSG_INFO("window expose size: %dx%d", e->width, e->height);
e->time = _ecore_wince_event_last_time; e->time = _ecore_wince_event_last_time;
@ -475,7 +475,7 @@ _ecore_wince_event_handle_create_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Create *e; Ecore_WinCE_Event_Window_Create *e;
ECORE_WINCE_MSG_INFO("window create notify\n"); ECORE_WINCE_MSG_INFO("window create notify");
e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Create)); e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Create));
if (!e) return; if (!e) return;
@ -497,7 +497,7 @@ _ecore_wince_event_handle_destroy_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Destroy *e; Ecore_WinCE_Event_Window_Destroy *e;
ECORE_WINCE_MSG_INFO("window destroy notify\n"); ECORE_WINCE_MSG_INFO("window destroy notify");
e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Destroy)); e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Destroy));
if (!e) return; if (!e) return;
@ -520,7 +520,7 @@ _ecore_wince_event_handle_map_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Show *e; Ecore_WinCE_Event_Window_Show *e;
ECORE_WINCE_MSG_INFO("window map notify\n"); ECORE_WINCE_MSG_INFO("window map notify");
e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Show)); e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Show));
if (!e) return; if (!e) return;
@ -542,7 +542,7 @@ _ecore_wince_event_handle_unmap_notify(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Hide *e; Ecore_WinCE_Event_Window_Hide *e;
ECORE_WINCE_MSG_INFO("window unmap notify\n"); ECORE_WINCE_MSG_INFO("window unmap notify");
e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Hide)); e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Hide));
if (!e) return; if (!e) return;
@ -564,7 +564,7 @@ _ecore_wince_event_handle_delete_request(Ecore_WinCE_Callback_Data *msg)
{ {
Ecore_WinCE_Event_Window_Delete_Request *e; Ecore_WinCE_Event_Window_Delete_Request *e;
ECORE_WINCE_MSG_INFO("window delete request\n"); ECORE_WINCE_MSG_INFO("window delete request");
e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Delete_Request)); e = calloc(1, sizeof(Ecore_WinCE_Event_Window_Delete_Request));
if (!e) return; if (!e) return;

108
legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
View File

@ -37,12 +37,12 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
HWND window; HWND window;
RECT rect; RECT rect;
ECORE_WINCE_MSG_INFO("creating window\n"); ECORE_WINCE_MSG_INFO("creating window");
w = (struct _Ecore_WinCE_Window *)calloc(1, sizeof(struct _Ecore_WinCE_Window)); w = (struct _Ecore_WinCE_Window *)calloc(1, sizeof(struct _Ecore_WinCE_Window));
if (!w) if (!w)
{ {
ECORE_WINCE_MSG_ERR("malloc() failed\n"); ECORE_WINCE_MSG_ERR("malloc() failed");
return NULL; return NULL;
} }
@ -52,7 +52,7 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
rect.bottom = height; rect.bottom = height;
if (!AdjustWindowRectEx(&rect, WS_CAPTION | WS_SYSMENU | WS_VISIBLE, FALSE, WS_EX_TOPMOST)) if (!AdjustWindowRectEx(&rect, WS_CAPTION | WS_SYSMENU | WS_VISIBLE, FALSE, WS_EX_TOPMOST))
{ {
ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed\n"); ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed");
free(w); free(w);
return NULL; return NULL;
} }
@ -67,14 +67,14 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
NULL, _ecore_wince_instance, NULL); NULL, _ecore_wince_instance, NULL);
if (!window) if (!window)
{ {
ECORE_WINCE_MSG_ERR("CreateWindowEx() failed\n"); ECORE_WINCE_MSG_ERR("CreateWindowEx() failed");
free(w); free(w);
return NULL; return NULL;
} }
if (!_ecore_wince_hardware_keys_register(window)) if (!_ecore_wince_hardware_keys_register(window))
{ {
ECORE_WINCE_MSG_ERR("_ecore_wince_hardware_keys_register() failed\n"); ECORE_WINCE_MSG_ERR("_ecore_wince_hardware_keys_register() failed");
DestroyWindow(window); DestroyWindow(window);
free(w); free(w);
return NULL; return NULL;
@ -85,7 +85,7 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
SetLastError(0); SetLastError(0);
if (!SetWindowLong(window, GWL_USERDATA, (LONG)w) && (GetLastError() != 0)) if (!SetWindowLong(window, GWL_USERDATA, (LONG)w) && (GetLastError() != 0))
{ {
ECORE_WINCE_MSG_ERR("SetWindowLong() failed\n"); ECORE_WINCE_MSG_ERR("SetWindowLong() failed");
DestroyWindow(window); DestroyWindow(window);
free(w); free(w);
return NULL; return NULL;
@ -101,7 +101,7 @@ ecore_wince_window_free(Ecore_WinCE_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WINCE_MSG_INFO("destroying window\n"); ECORE_WINCE_MSG_INFO("destroying window");
DestroyWindow(((struct _Ecore_WinCE_Window *)window)->window); DestroyWindow(((struct _Ecore_WinCE_Window *)window)->window);
free(window); free(window);
@ -127,12 +127,12 @@ ecore_wince_window_move(Ecore_WinCE_Window *window,
if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen) if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
return; return;
ECORE_WINCE_MSG_INFO("moving window (%dx%d)\n", x, y); ECORE_WINCE_MSG_INFO("moving window (%dx%d)", x, y);
w = ((struct _Ecore_WinCE_Window *)window)->window; w = ((struct _Ecore_WinCE_Window *)window)->window;
if (!GetWindowRect(w, &rect)) if (!GetWindowRect(w, &rect))
{ {
ECORE_WINCE_MSG_ERR("GetWindowRect() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowRect() failed");
return; return;
} }
@ -141,7 +141,7 @@ ecore_wince_window_move(Ecore_WinCE_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WINCE_MSG_ERR("MoveWindow() failed\n"); ECORE_WINCE_MSG_ERR("MoveWindow() failed");
} }
} }
@ -160,12 +160,12 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen) if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
return; return;
ECORE_WINCE_MSG_INFO("resizing window (%dx%d)\n", width, height); ECORE_WINCE_MSG_INFO("resizing window (%dx%d)", width, height);
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
if (!GetWindowRect(w->window, &rect)) if (!GetWindowRect(w->window, &rect))
{ {
ECORE_WINCE_MSG_ERR("GetWindowRect() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowRect() failed");
return; return;
} }
@ -177,17 +177,17 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
rect.bottom = height; rect.bottom = height;
if (!(style = GetWindowLong(w->window, GWL_STYLE))) if (!(style = GetWindowLong(w->window, GWL_STYLE)))
{ {
ECORE_WINCE_MSG_ERR("GetWindowLong() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!(exstyle = GetWindowLong(w->window, GWL_EXSTYLE))) if (!(exstyle = GetWindowLong(w->window, GWL_EXSTYLE)))
{ {
ECORE_WINCE_MSG_ERR("GetWindowLong() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle)) if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle))
{ {
ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed\n"); ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed");
return; return;
} }
@ -196,7 +196,7 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
FALSE)) FALSE))
{ {
ECORE_WINCE_MSG_ERR("MoveWindow() failed\n"); ECORE_WINCE_MSG_ERR("MoveWindow() failed");
} }
} }
@ -215,7 +215,7 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen) if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
return; return;
ECORE_WINCE_MSG_INFO("moving and resizing window (%dx%d %dx%d)\n", x, y, width, height); ECORE_WINCE_MSG_INFO("moving and resizing window (%dx%d %dx%d)", x, y, width, height);
w = ((struct _Ecore_WinCE_Window *)window); w = ((struct _Ecore_WinCE_Window *)window);
rect.left = 0; rect.left = 0;
@ -224,17 +224,17 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
rect.bottom = height; rect.bottom = height;
if (!(style = GetWindowLong(w->window, GWL_STYLE))) if (!(style = GetWindowLong(w->window, GWL_STYLE)))
{ {
ECORE_WINCE_MSG_ERR("GetWindowLong() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!(exstyle = GetWindowLong(w->window, GWL_EXSTYLE))) if (!(exstyle = GetWindowLong(w->window, GWL_EXSTYLE)))
{ {
ECORE_WINCE_MSG_ERR("GetWindowLong() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowLong() failed");
return; return;
} }
if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle)) if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle))
{ {
ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed\n"); ECORE_WINCE_MSG_ERR("AdjustWindowRectEx() failed");
return; return;
} }
@ -243,7 +243,7 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
rect.bottom - rect.top, rect.bottom - rect.top,
TRUE)) TRUE))
{ {
ECORE_WINCE_MSG_ERR("MoveWindow() failed\n"); ECORE_WINCE_MSG_ERR("MoveWindow() failed");
} }
} }
@ -252,20 +252,20 @@ ecore_wince_window_show(Ecore_WinCE_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WINCE_MSG_INFO("showing window\n"); ECORE_WINCE_MSG_INFO("showing window");
if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_SHOWNORMAL)) if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_SHOWNORMAL))
{ {
ECORE_WINCE_MSG_ERR("ShowWindow() failed\n"); ECORE_WINCE_MSG_ERR("ShowWindow() failed");
return; return;
} }
if (!UpdateWindow(((struct _Ecore_WinCE_Window *)window)->window)) if (!UpdateWindow(((struct _Ecore_WinCE_Window *)window)->window))
{ {
ECORE_WINCE_MSG_ERR("UpdateWindow() failed\n"); ECORE_WINCE_MSG_ERR("UpdateWindow() failed");
} }
if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 1, 0)) if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 1, 0))
{ {
ECORE_WINCE_MSG_ERR("SendMessage() failed\n"); ECORE_WINCE_MSG_ERR("SendMessage() failed");
} }
} }
@ -274,16 +274,16 @@ ecore_wince_window_hide(Ecore_WinCE_Window *window)
{ {
if (!window) return; if (!window) return;
ECORE_WINCE_MSG_INFO("hiding window\n"); ECORE_WINCE_MSG_INFO("hiding window");
if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_HIDE)) if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_HIDE))
{ {
ECORE_WINCE_MSG_ERR("ShowWindow() failed\n"); ECORE_WINCE_MSG_ERR("ShowWindow() failed");
return; return;
} }
if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 0, 0)) if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 0, 0))
{ {
ECORE_WINCE_MSG_ERR("SendMessage() failed\n"); ECORE_WINCE_MSG_ERR("SendMessage() failed");
} }
} }
@ -297,14 +297,14 @@ ecore_wince_window_title_set(Ecore_WinCE_Window *window,
if (!title || !title[0]) return; if (!title || !title[0]) return;
ECORE_WINCE_MSG_INFO("setting window title\n"); ECORE_WINCE_MSG_INFO("setting window title");
wtitle = evil_char_to_wchar(title); wtitle = evil_char_to_wchar(title);
if (!wtitle) return; if (!wtitle) return;
if (!SetWindowText(((struct _Ecore_WinCE_Window *)window)->window, wtitle)) if (!SetWindowText(((struct _Ecore_WinCE_Window *)window)->window, wtitle))
{ {
ECORE_WINCE_MSG_ERR("SetWindowText() failed\n"); ECORE_WINCE_MSG_ERR("SetWindowText() failed");
} }
free(wtitle); free(wtitle);
} }
@ -317,7 +317,7 @@ ecore_wince_window_backend_set(Ecore_WinCE_Window *window, int backend)
if (!window) if (!window)
return; return;
ECORE_WINCE_MSG_INFO("setting backend\n"); ECORE_WINCE_MSG_INFO("setting backend");
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
w->backend = backend; w->backend = backend;
@ -331,7 +331,7 @@ ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend)(int))
if (!window) if (!window)
return; return;
ECORE_WINCE_MSG_INFO("setting suspend callback\n"); ECORE_WINCE_MSG_INFO("setting suspend callback");
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
w->suspend = suspend; w->suspend = suspend;
@ -345,7 +345,7 @@ ecore_wince_window_resume_set(Ecore_WinCE_Window *window, int (*resume)(int))
if (!window) if (!window)
return; return;
ECORE_WINCE_MSG_INFO("setting resume callback\n"); ECORE_WINCE_MSG_INFO("setting resume callback");
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
w->resume = resume; w->resume = resume;
@ -362,7 +362,7 @@ ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
int w; int w;
int h; int h;
ECORE_WINCE_MSG_INFO("getting window geometry\n"); ECORE_WINCE_MSG_INFO("getting window geometry");
if (!window) if (!window)
{ {
@ -377,7 +377,7 @@ ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window, if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WINCE_MSG_ERR("GetClientRect() failed\n"); ECORE_WINCE_MSG_ERR("GetClientRect() failed");
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
@ -393,7 +393,7 @@ ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
if (!GetWindowRect(((struct _Ecore_WinCE_Window *)window)->window, if (!GetWindowRect(((struct _Ecore_WinCE_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WINCE_MSG_ERR("GetWindowRect() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowRect() failed");
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
@ -416,7 +416,7 @@ ecore_wince_window_size_get(Ecore_WinCE_Window *window,
{ {
RECT rect; RECT rect;
ECORE_WINCE_MSG_INFO("getting window size\n"); ECORE_WINCE_MSG_INFO("getting window size");
if (!window) if (!window)
{ {
@ -429,7 +429,7 @@ ecore_wince_window_size_get(Ecore_WinCE_Window *window,
if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window, if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window,
&rect)) &rect))
{ {
ECORE_WINCE_MSG_ERR("GetClientRect() failed\n"); ECORE_WINCE_MSG_ERR("GetClientRect() failed");
if (width) *width = 0; if (width) *width = 0;
if (height) *height = 0; if (height) *height = 0;
@ -454,7 +454,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
((!ew->fullscreen) && (!on))) ((!ew->fullscreen) && (!on)))
return; return;
ECORE_WINCE_MSG_INFO("setting fullscreen: %s\n", on ? "yes" : "no"); ECORE_WINCE_MSG_INFO("setting fullscreen: %s", on ? "yes" : "no");
ew->fullscreen = !!on; ew->fullscreen = !!on;
w = ew->window; w = ew->window;
@ -464,7 +464,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
/* save the position and size of the window */ /* save the position and size of the window */
if (!GetWindowRect(w, &ew->rect)) if (!GetWindowRect(w, &ew->rect))
{ {
ECORE_WINCE_MSG_ERR("GetWindowRect() failed\n"); ECORE_WINCE_MSG_ERR("GetWindowRect() failed");
return; return;
} }
@ -472,21 +472,21 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
task_bar = FindWindow(L"HHTaskBar", NULL); task_bar = FindWindow(L"HHTaskBar", NULL);
if (!task_bar) if (!task_bar)
{ {
ECORE_WINCE_MSG_INFO("FindWindow(): can not find task bar\n"); ECORE_WINCE_MSG_INFO("FindWindow(): can not find task bar");
} }
if (!ShowWindow(task_bar, SW_HIDE)) if (!ShowWindow(task_bar, SW_HIDE))
{ {
ECORE_WINCE_MSG_INFO("ShowWindow(): task bar already hidden\n"); ECORE_WINCE_MSG_INFO("ShowWindow(): task bar already hidden");
} }
if (!EnableWindow(task_bar, FALSE)) if (!EnableWindow(task_bar, FALSE))
{ {
ECORE_WINCE_MSG_INFO("EnableWindow(): input already disabled\n"); ECORE_WINCE_MSG_INFO("EnableWindow(): input already disabled");
} }
/* style: visible + popup */ /* style: visible + popup */
if (!SetWindowLong(w, GWL_STYLE, WS_POPUP | WS_VISIBLE)) if (!SetWindowLong(w, GWL_STYLE, WS_POPUP | WS_VISIBLE))
{ {
ECORE_WINCE_MSG_INFO("SetWindowLong() failed\n"); ECORE_WINCE_MSG_INFO("SetWindowLong() failed");
} }
/* resize window to fit the entire screen */ /* resize window to fit the entire screen */
@ -495,7 +495,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED)) SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED))
{ {
ECORE_WINCE_MSG_INFO("SetWindowPos() failed\n"); ECORE_WINCE_MSG_INFO("SetWindowPos() failed");
} }
/* /*
* It seems that SetWindowPos is not sufficient. * It seems that SetWindowPos is not sufficient.
@ -507,7 +507,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
TRUE)) TRUE))
{ {
ECORE_WINCE_MSG_INFO("MoveWindow() failed\n"); ECORE_WINCE_MSG_INFO("MoveWindow() failed");
} }
} }
else else
@ -516,21 +516,21 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
task_bar = FindWindow(L"HHTaskBar", NULL); task_bar = FindWindow(L"HHTaskBar", NULL);
if (!task_bar) if (!task_bar)
{ {
ECORE_WINCE_MSG_INFO("FindWindow(): can not find task bar\n"); ECORE_WINCE_MSG_INFO("FindWindow(): can not find task bar");
} }
if (!ShowWindow(task_bar, SW_SHOW)) if (!ShowWindow(task_bar, SW_SHOW))
{ {
ECORE_WINCE_MSG_INFO("ShowWindow(): task bar already visible\n"); ECORE_WINCE_MSG_INFO("ShowWindow(): task bar already visible");
} }
if (!EnableWindow(task_bar, TRUE)) if (!EnableWindow(task_bar, TRUE))
{ {
ECORE_WINCE_MSG_INFO("EnableWindow(): input already enabled\n"); ECORE_WINCE_MSG_INFO("EnableWindow(): input already enabled");
} }
/* style: visible + caption + sysmenu */ /* style: visible + caption + sysmenu */
if (!SetWindowLong(w, GWL_STYLE, WS_CAPTION | WS_SYSMENU | WS_VISIBLE)) if (!SetWindowLong(w, GWL_STYLE, WS_CAPTION | WS_SYSMENU | WS_VISIBLE))
{ {
ECORE_WINCE_MSG_INFO("SetWindowLong() failed\n"); ECORE_WINCE_MSG_INFO("SetWindowLong() failed");
} }
/* restaure the position and size of the window */ /* restaure the position and size of the window */
if (!SetWindowPos(w, HWND_TOPMOST, if (!SetWindowPos(w, HWND_TOPMOST,
@ -540,7 +540,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
ew->rect.bottom - ew->rect.top, ew->rect.bottom - ew->rect.top,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED)) SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED))
{ {
ECORE_WINCE_MSG_INFO("SetWindowLong() failed\n"); ECORE_WINCE_MSG_INFO("SetWindowLong() failed");
} }
/* /*
* It seems that SetWindowPos is not sufficient. * It seems that SetWindowPos is not sufficient.
@ -554,7 +554,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
ew->rect.bottom - ew->rect.top, ew->rect.bottom - ew->rect.top,
TRUE)) TRUE))
{ {
ECORE_WINCE_MSG_INFO("MoveWindow() failed\n"); ECORE_WINCE_MSG_INFO("MoveWindow() failed");
} }
} }
} }
@ -572,14 +572,14 @@ _ecore_wince_hardware_keys_register(HWND window)
core_dll = LoadLibrary(L"coredll.dll"); core_dll = LoadLibrary(L"coredll.dll");
if (!core_dll) if (!core_dll)
{ {
ECORE_WINCE_MSG_ERR("LoadLibrary() failed\n"); ECORE_WINCE_MSG_ERR("LoadLibrary() failed");
return 0; return 0;
} }
unregister_fct = (UnregisterFunc1Proc)GetProcAddress(core_dll, L"UnregisterFunc1"); unregister_fct = (UnregisterFunc1Proc)GetProcAddress(core_dll, L"UnregisterFunc1");
if (!unregister_fct) if (!unregister_fct)
{ {
ECORE_WINCE_MSG_ERR("GetProcAddress() failed\n"); ECORE_WINCE_MSG_ERR("GetProcAddress() failed");
FreeLibrary(core_dll); FreeLibrary(core_dll);
return 0; return 0;
} }