From: Vincent T. <vt...@un...> - 2010-02-27 05:52:19
|
On Fri, 26 Feb 2010, Enlightenment SVN wrote: > Log: > Convert everything to EINA_(TRUE|FALSE) > > make it consistent. I'm not convinced by that patch: those values (TRUE / FALSE) are Windows one. I would like to keep them as is, and not using eina values. Vincent > > By: Lucas de Marchi. > > > Author: barbieri > Date: 2010-02-26 16:01:10 -0800 (Fri, 26 Feb 2010) > New Revision: 46539 > > Modified: > trunk/ecore/src/lib/ecore/ecore_main.c trunk/ecore/src/lib/ecore/ecore_pipe.c trunk/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c trunk/ecore/src/lib/ecore_win32/ecore_win32.c trunk/ecore/src/lib/ecore_win32/ecore_win32_window.c trunk/ecore/src/lib/ecore_wince/ecore_wince.c trunk/ecore/src/lib/ecore_wince/ecore_wince_window.c > > Modified: trunk/ecore/src/lib/ecore/ecore_main.c > =================================================================== > --- trunk/ecore/src/lib/ecore/ecore_main.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore/ecore_main.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -958,7 +958,7 @@ > > if (timeout == 0) return 0; > > - result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, FALSE, > + result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, EINA_FALSE, > timeout, QS_ALLINPUT); > > FD_ZERO(readfds); > > Modified: trunk/ecore/src/lib/ecore/ecore_pipe.c > =================================================================== > --- trunk/ecore/src/lib/ecore/ecore_pipe.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore/ecore_pipe.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -238,8 +238,8 @@ > * printf ("no sink"); > * goto failure; > * } > - * g_object_set (G_OBJECT (sink), "sync", TRUE, NULL); > - * g_object_set (G_OBJECT (sink), "signal-handoffs", TRUE, NULL); > + * g_object_set (G_OBJECT (sink), "sync", EINA_TRUE, NULL); > + * g_object_set (G_OBJECT (sink), "signal-handoffs", EINA_TRUE, NULL); > * g_signal_connect (sink, "handoff", > * G_CALLBACK (handoff), pipe); > * > > Modified: trunk/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c > =================================================================== > --- trunk/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -68,7 +68,7 @@ > if (md->handle == INVALID_HANDLE_VALUE) > goto free_md; > > - md->event = CreateEvent(NULL, FALSE, FALSE, NULL); > + md->event = CreateEvent(NULL, EINA_FALSE, EINA_FALSE, NULL); > if (!md->event) > goto close_handle; > > @@ -87,7 +87,7 @@ > if (!ReadDirectoryChangesW(md->handle, > md->buffer, > ECORE_FILE_MONITOR_WIN32_BUFFER_SIZE, > - FALSE, > + EINA_FALSE, > filter, > &md->buf_length, > &md->overlapped, > @@ -140,7 +140,7 @@ > > md = (Ecore_File_Monitor_Win32_Data *)data; > > - if (!GetOverlappedResult (md->handle, &md->overlapped, &buf_length, TRUE)) > + if (!GetOverlappedResult (md->handle, &md->overlapped, &buf_length, EINA_TRUE)) > return 1; > > fni = (PFILE_NOTIFY_INFORMATION)md->buffer; > @@ -216,7 +216,7 @@ > ReadDirectoryChangesW(md->handle, > md->buffer, > ECORE_FILE_MONITOR_WIN32_BUFFER_SIZE, > - FALSE, > + EINA_FALSE, > filter, > &md->buf_length, > &md->overlapped, > > Modified: trunk/ecore/src/lib/ecore_win32/ecore_win32.c > =================================================================== > --- trunk/ecore/src/lib/ecore_win32/ecore_win32.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore_win32/ecore_win32.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -381,7 +381,7 @@ > return 0; > case WM_MOVING: > printf (" * ecore message : moving\n"); > - return TRUE; > + return EINA_TRUE; > case WM_MOVE: > printf (" * ecore message : moved\n"); > return 0; > @@ -389,7 +389,7 @@ > printf (" * ecore message : sizing\n"); > _ecore_win32_event_handle_resize(data); > _ecore_win32_event_handle_configure_notify(data); > - return TRUE; > + return EINA_TRUE; > case WM_SIZE: > printf (" * ecore message : sized\n"); > return 0; > @@ -416,7 +416,7 @@ > { > RECT rect; > > - if (GetUpdateRect(window, &rect, FALSE)) > + if (GetUpdateRect(window, &rect, EINA_FALSE)) > { > PAINTSTRUCT ps; > HDC hdc; > > Modified: trunk/ecore/src/lib/ecore_win32/ecore_win32_window.c > =================================================================== > --- trunk/ecore/src/lib/ecore_win32/ecore_win32_window.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore_win32/ecore_win32_window.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -152,7 +152,7 @@ > if (!MoveWindow(w, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -198,7 +198,7 @@ > ERR("GetWindowLong() failed"); > return; > } > - if (!AdjustWindowRect(&rect, style, FALSE)) > + if (!AdjustWindowRect(&rect, style, EINA_FALSE)) > { > ERR("AdjustWindowRect() failed"); > return; > @@ -207,7 +207,7 @@ > if (!MoveWindow(w->window, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -242,7 +242,7 @@ > ERR("GetWindowLong() failed"); > return; > } > - if (!AdjustWindowRect(&rect, style, FALSE)) > + if (!AdjustWindowRect(&rect, style, EINA_FALSE)) > { > ERR("AdjustWindowRect() failed"); > return; > @@ -251,7 +251,7 @@ > if (!MoveWindow(w->window, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -506,7 +506,7 @@ > #endif > } > else > - if (!SetWindowRgn(wnd->window, NULL, TRUE)) > + if (!SetWindowRgn(wnd->window, NULL, EINA_TRUE)) > { > ERR("SetWindowRgn() failed"); > } > @@ -535,7 +535,7 @@ > > #if defined(WS_EX_LAYERED) > version_info.dwOSVersionInfoSize = sizeof(version_info); > - if (GetVersionEx(&version_info) == TRUE && version_info.dwMajorVersion == 5) > + if (GetVersionEx(&version_info) == EINA_TRUE && version_info.dwMajorVersion == 5) > { > SetLastError(0); > if (!SetWindowLongPtr(wnd->window, GWL_EXSTYLE, > @@ -596,7 +596,7 @@ > return; > } > } > - if (!SetWindowRgn(wnd->window, rgn, TRUE)) > + if (!SetWindowRgn(wnd->window, rgn, EINA_TRUE)) > { > ERR("SetWindowRgn() failed"); > } > @@ -748,7 +748,7 @@ > return; > } > style |= WS_CAPTION | WS_THICKFRAME; > - if (!AdjustWindowRect (&rect, style, FALSE)) > + if (!AdjustWindowRect (&rect, style, EINA_FALSE)) > { > ERR("AdjustWindowRect() failed"); > return; > @@ -978,7 +978,7 @@ > if (!MoveWindow(w, rect.left, y, > rect.right - rect.left, > height, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -998,7 +998,7 @@ > if (!MoveWindow(w, 0, rect.top, > GetSystemMetrics(SM_CXSCREEN), > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -1019,7 +1019,7 @@ > if (!MoveWindow(w, 0, 0, > GetSystemMetrics(SM_CXSCREEN), > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -1132,7 +1132,7 @@ > rect.top = 0; > rect.right = width; > rect.bottom = height; > - if (!AdjustWindowRect(&rect, style, FALSE)) > + if (!AdjustWindowRect(&rect, style, EINA_FALSE)) > { > ERR("AdjustWindowRect() failed"); > free(w); > > Modified: trunk/ecore/src/lib/ecore_wince/ecore_wince.c > =================================================================== > --- trunk/ecore/src/lib/ecore_wince/ecore_wince.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore_wince/ecore_wince.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -154,7 +154,7 @@ > if (task_bar) > { > ShowWindow(task_bar, SW_SHOW); > - EnableWindow(task_bar, TRUE); > + EnableWindow(task_bar, EINA_TRUE); > } > > if (!UnregisterClass(ECORE_WINCE_WINDOW_CLASS, _ecore_wince_instance)) > > Modified: trunk/ecore/src/lib/ecore_wince/ecore_wince_window.c > =================================================================== > --- trunk/ecore/src/lib/ecore_wince/ecore_wince_window.c 2010-02-26 23:59:47 UTC (rev 46538) > +++ trunk/ecore/src/lib/ecore_wince/ecore_wince_window.c 2010-02-27 00:01:10 UTC (rev 46539) > @@ -50,7 +50,7 @@ > rect.top = 0; > rect.right = width; > 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, EINA_FALSE, WS_EX_TOPMOST)) > { > ERR("AdjustWindowRectEx() failed"); > free(w); > @@ -139,7 +139,7 @@ > if (!MoveWindow(w, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -185,7 +185,7 @@ > ERR("GetWindowLong() failed"); > return; > } > - if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle)) > + if (!AdjustWindowRectEx(&rect, style, EINA_FALSE, exstyle)) > { > ERR("AdjustWindowRectEx() failed"); > return; > @@ -194,7 +194,7 @@ > if (!MoveWindow(w->window, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - FALSE)) > + EINA_FALSE)) > { > ERR("MoveWindow() failed"); > } > @@ -232,7 +232,7 @@ > ERR("GetWindowLong() failed"); > return; > } > - if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle)) > + if (!AdjustWindowRectEx(&rect, style, EINA_FALSE, exstyle)) > { > ERR("AdjustWindowRectEx() failed"); > return; > @@ -241,7 +241,7 @@ > if (!MoveWindow(w->window, x, y, > rect.right - rect.left, > rect.bottom - rect.top, > - TRUE)) > + EINA_TRUE)) > { > ERR("MoveWindow() failed"); > } > @@ -478,7 +478,7 @@ > { > INF("ShowWindow(): task bar already hidden"); > } > - if (!EnableWindow(task_bar, FALSE)) > + if (!EnableWindow(task_bar, EINA_FALSE)) > { > INF("EnableWindow(): input already disabled"); > } > @@ -505,7 +505,7 @@ > if (!MoveWindow(w, > 0, 0, > GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), > - TRUE)) > + EINA_TRUE)) > { > INF("MoveWindow() failed"); > } > @@ -522,7 +522,7 @@ > { > INF("ShowWindow(): task bar already visible"); > } > - if (!EnableWindow(task_bar, TRUE)) > + if (!EnableWindow(task_bar, EINA_TRUE)) > { > INF("EnableWindow(): input already enabled"); > } > @@ -552,7 +552,7 @@ > ew->rect.top, > ew->rect.right - ew->rect.left, > ew->rect.bottom - ew->rect.top, > - TRUE)) > + EINA_TRUE)) > { > INF("MoveWindow() failed"); > } > > > ------------------------------------------------------------------------------ > Download Intel® Parallel Studio Eval > Try the new software tools for yourself. Speed compiling, find bugs > proactively, and fine-tune applications for parallel performance. > See why Intel Parallel Studio got high marks during beta. > http://p.sf.net/sfu/intel-sw-dev > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > |