August 2016 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Copy remap tables when cloning an ImageAttributes.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d26c0ca214cdb20b103f7c1875c6ea4f2bb1f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26c0ca214cdb20b103f7c187… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 26 15:14:10 2016 -0500 gdiplus: Copy remap tables when cloning an ImageAttributes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/imageattributes.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index a76fe3b..2050706 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,18 +30,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { - GpStatus stat; + GpStatus stat = Ok; + struct color_remap_table remap_tables[ColorAdjustTypeCount] = {{0}}; + int i; TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - stat = GdipCreateImageAttributes(cloneImageattr); + for (i=0; i<ColorAdjustTypeCount; i++) + { + if (imageattr->colorremaptables[i].enabled) + { + remap_tables[i].enabled = TRUE; + remap_tables[i].mapsize = imageattr->colorremaptables[i].mapsize; + remap_tables[i].colormap = heap_alloc(sizeof(ColorMap) * remap_tables[i].mapsize); + + if (remap_tables[i].colormap) + { + memcpy(remap_tables[i].colormap, imageattr->colorremaptables[i].colormap, + sizeof(ColorMap) * remap_tables[i].mapsize); + } + else + { + stat = OutOfMemory; + break; + } + } + } + + if (stat == Ok) + stat = GdipCreateImageAttributes(cloneImageattr); if (stat == Ok) + { **cloneImageattr = *imageattr; + memcpy((*cloneImageattr)->colorremaptables, remap_tables, sizeof(remap_tables)); + } + + if (stat != Ok) + { + for (i=0; i<ColorAdjustTypeCount; i++) + heap_free(remap_tables[i].colormap); + } + return stat; }

1 0

Jacek Caban : kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 505406fc83b65dd1f9ebcbaabb582f0fabec1b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=505406fc83b65dd1f9ebcbaab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 22:13:17 2016 +0200 kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fefa373..b04d190 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1726,7 +1726,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (!lcid) return 0; /* special handling for neutral locale names */ - if (info == LOCALE_SNAME && strlenW(locale) == 2) + if (info == LOCALE_SNAME && locale && strlenW(locale) == 2) { if (len && len < 3) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7cb7859..701f8d7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4283,7 +4283,7 @@ static void test_IdnToUnicode(void) static void test_GetLocaleInfoEx(void) { static const WCHAR enW[] = {'e','n',0}; - WCHAR bufferW[80]; + WCHAR bufferW[80], buffer2[80]; INT ret; if (!pGetLocaleInfoEx) @@ -4354,6 +4354,12 @@ static void test_GetLocaleInfoEx(void) ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); ptr++; } + + ret = pGetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(bufferW)+1, "got ret value %d\n", ret); + ret = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SNAME, buffer2, sizeof(buffer2)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(buffer2)+1, "got ret value %d\n", ret); + ok(!lstrcmpW(bufferW, buffer2), "LOCALE_SNAMEs don't match %s %s\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(buffer2)); } }

1 0

Jacek Caban : user32: Introduced ThreadDetach driver entry point.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: f0e7bd248e7e2a2f2d49dde0ccc332e6b6d97306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e7bd248e7e2a2f2d49dde0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:33:45 2016 +0200 user32: Introduced ThreadDetach driver entry point. The problem was diagnosed by Ken Thomases. Currently drivers use DllMain(DLL_THREAD_DETACH) to release thread data. The problem is that DLLs (like native urlmon.dll, esp. reproducible in IE8) may still do user32 calls after driver detaches thread. Loader ensures that since user32.dll was loaded before dependent DLLs, user32's DllMain will be called in the right moment. Due to lazy loading of drivers, we have no control over them. We may use a new entry point to make sure that we detach user32 and driver at the same time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +++++++++++-- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 201988c..32acf28 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -155,6 +155,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(WindowPosChanging); GET_USER_FUNC(WindowPosChanged); GET_USER_FUNC(SystemParametersInfo); + GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } @@ -512,6 +513,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi return FALSE; } +static void CDECL nulldrv_ThreadDetach( void ) +{ +} + static USER_DRIVER null_driver = { /* keyboard functions */ @@ -572,7 +577,9 @@ static USER_DRIVER null_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; @@ -827,5 +834,7 @@ static USER_DRIVER lazy_load_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 45aea81..74a7617 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -303,6 +303,7 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); + USER_Driver->pThreadDetach(); if (thread_info->top_window) WIN_DestroyThreadWindows( thread_info->top_window ); if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e4a2ed1..efad519 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -117,6 +117,8 @@ typedef struct tagUSER_DRIVER { void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*); /* system parameters */ BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); + /* thread management */ + void (CDECL *pThreadDetach)(void); } USER_DRIVER; extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN;

1 0

Jacek Caban : winemac.drv: Added ThreadDetach entry point and use it instead of DllMain.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 8f0557940a5e21c307020850e7ec7a3f15406adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0557940a5e21c307020850e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:36:54 2016 +0200 winemac.drv: Added ThreadDetach entry point and use it instead of DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv_main.c | 8 +++----- dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2ce78d1..3b11751 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -290,9 +290,9 @@ static BOOL process_attach(void) /*********************************************************************** - * thread_detach + * ThreadDetach (MACDRV.@) */ -static void thread_detach(void) +void CDECL macdrv_ThreadDetach(void) { struct macdrv_thread_data *data = macdrv_thread_data(); @@ -382,12 +382,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); macdrv_module = hinst; ret = process_attach(); break; - case DLL_THREAD_DETACH: - thread_detach(); - break; } return ret; } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index aed05d9..2e29722 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -42,6 +42,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo +@ cdecl ThreadDetach() macdrv_ThreadDetach @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UnregisterHotKey(long long long) macdrv_UnregisterHotKey @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow

1 0

Nikolay Sivov : msdaps: Added AddRefAccessor() proxy/stub.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 1dcf2ae5a8ccb441219bb95e9c5b49150e62e890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf2ae5a8ccb441219bb95e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 13:29:14 2016 +0300 msdaps: Added AddRefAccessor() proxy/stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 5f3be4f..43e3aae 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -645,17 +645,40 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut return hr; } -HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) +HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *refcount) { - FIXME("(%p)->(%08lx, %p): stub\n", This, hAccessor, pcRefCount); - return E_NOTIMPL; + IErrorInfo *errorinfo; + DBREFCOUNT ref; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p)\n", This, hAccessor, refcount); + + if (!refcount) + refcount = &ref; + + errorinfo = NULL; + hr = IAccessor_RemoteAddRefAccessor_Proxy(This, hAccessor, refcount, &errorinfo); + if (errorinfo) + { + SetErrorInfo(0, errorinfo); + IErrorInfo_Release(errorinfo); + } + + return hr; } HRESULT __RPC_STUB IAccessor_AddRefAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%08lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p, %p)\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + + hr = IAccessor_AddRefAccessor(This, hAccessor, pcRefCount); + if (FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings,

1 0

Hugh McMaster : reg/tests: Remove embedded BOM tests and add other tests for 'reg import'.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: ae7398e3a498488996e764bd585d6a85de15460c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7398e3a498488996e764bd5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Aug 28 09:35:54 2016 +0000 reg/tests: Remove embedded BOM tests and add other tests for 'reg import'. BOM may only appear at the start of the data stream. Use of an embedded BOM was deprecated in Unicode 3.2. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bd25a94..1dab72b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -927,6 +927,18 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbf REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbf\tREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbf\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -971,18 +983,6 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr(" \xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - - test_import_wstr("\t\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - - test_import_wstr("\n\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Piotr Caban : user32: Fix DefWindowProc behavior on WM_NCRBUTTONDOWN message.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 1c73fcdbcba50fc8525371efb8711c1d2b173eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c73fcdbcba50fc8525371efb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 17:53:17 2016 +0200 user32: Fix DefWindowProc behavior on WM_NCRBUTTONDOWN message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 4 +--- dlls/user32/tests/msg.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4516aa0..55b19cf 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1487,8 +1487,6 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) { case HTCAPTION: case HTSYSMENU: - if (!GetSystemMenu( hwnd, FALSE )) break; - SetCapture( hwnd ); for (;;) { @@ -1502,7 +1500,7 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) } ReleaseCapture(); if (hittest == HTCAPTION || hittest == HTSYSMENU) - SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, msg.lParam ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(msg.pt.x, msg.pt.y)); break; } return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 61980df..9dc1120 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8199,6 +8199,12 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, return 0; } + if (message == WM_CONTEXTMENU) + { + /* don't create context menu */ + return 0; + } + defwndproc_counter++; ret = unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : DefWindowProcA(hwnd, message, wParam, lParam); @@ -13887,13 +13893,46 @@ static void test_paintingloop(void) DestroyWindow(hwnd); } +static const struct message NCRBUTTONDOWNSeq[] = +{ + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent }, + { WM_CONTEXTMENU, sent, /*hwnd*/0, -1 }, + { 0 } +}; + static void test_defwinproc(void) { HWND hwnd; MSG msg; BOOL gotwmquit = FALSE; - hwnd = CreateWindowExA(0, "static", "test_defwndproc", WS_POPUP, 0,0,0,0,0,0,0, NULL); + POINT pos; + RECT rect; + INT x, y; + LRESULT res; + + hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", + WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0,0,500,100,0,0,0, NULL); assert(hwnd); + flush_events(); + + GetCursorPos(&pos); + GetWindowRect(hwnd, &rect); + x = (rect.left+rect.right) / 2; + y = rect.top + GetSystemMetrics(SM_CYFRAME) + 1; + SetCursorPos(x, y); + flush_events(); + res = DefWindowProcA( hwnd, WM_NCHITTEST, 0, MAKELPARAM(x, y)); + ok(res == HTCAPTION, "WM_NCHITTEST returned %ld\n", res); + + flush_sequence(); + PostMessageA( hwnd, WM_RBUTTONUP, 0, 0); + DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); + ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + + SetCursorPos(pos.x, pos.y); + DefWindowProcA( hwnd, WM_ENDSESSION, 1, 0); while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) { if( msg.message == WM_QUIT) gotwmquit = TRUE;

1 0

Akihiro Sagawa : winex11: Fix log message in process_events().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 030e1f4f5f8d28a9ba77e7a929c3b43ad8420d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030e1f4f5f8d28a9ba77e7a92… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 28 23:30:41 2016 +0900 winex11: Fix log message in process_events(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d81ff2e..94b70f7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -468,7 +468,7 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP if (prev_event.type) queued |= call_event_handler( display, &prev_event ); free_event_data( &prev_event ); XFlush( gdi_display ); - if (count) TRACE( "%s %d events\n", queued ? "processed" : "ignored", count ); + if (count) TRACE( "processed %d events, returning %d\n", count, queued ); return queued; }

1 0

Akihiro Sagawa : winex11: Use proper return type for process_events().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 876d5de0b46d30b7a2977b0b66981345620955dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=876d5de0b46d30b7a2977b0b6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 28 23:30:43 2016 +0900 winex11: Use proper return type for process_events(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 94b70f7..a0bfe05 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -405,7 +405,7 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) /*********************************************************************** * process_events */ -static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) +static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0;

1 0

Akihiro Sagawa : user32: Create and destroy the default IME window implicitly.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 911d269be86051cf88337a2b1afe9aa49c3bc6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911d269be86051cf88337a2b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 23 22:13:27 2016 +0900 user32: Create and destroy the default IME window implicitly. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 97 ++++++++++++++++++++++++++++++++++++++-------- dlls/imm32/imm32.spec | 2 + dlls/imm32/tests/imm32.c | 12 +++--- dlls/user32/misc.c | 4 ++ dlls/user32/user_private.h | 2 + dlls/user32/win.c | 15 +++++++ dlls/user32/win.h | 1 + 7 files changed, 110 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=911d269be86051cf88337…

1 0