November 2014 - Wine-Commits

Qian Hong : comdlg32/tests: Fixed memory leak (Valgrind).
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 0380ee031c17accb316926c7117eedd403e339b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0380ee031c17accb316926c71… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Nov 20 13:02:41 2014 +0800 comdlg32/tests: Fixed memory leak (Valgrind). --- dlls/comdlg32/tests/printdlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 871807b..7e06c97 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -531,6 +531,7 @@ static void test_PrintDlgExW(void) if (!winetest_interactive) { skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + HeapFree(GetProcessHeap(), 0, pDlg); return; }

1 0

Sebastian Lackner : server: Always remove inflight fd if alloc_console fails.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 9aad600d8656b8515fb90989873030b28d3d8c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aad600d8656b8515fb909898… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 04:01:51 2014 +0100 server: Always remove inflight fd if alloc_console fails. --- server/console.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/server/console.c b/server/console.c index c83ec01..4c2d61d 100644 --- a/server/console.c +++ b/server/console.c @@ -1392,6 +1392,16 @@ DECL_HANDLER(alloc_console) int fd; int attach = 0; + if (req->input_fd != -1) + { + if ((fd = thread_get_inflight_fd( current, req->input_fd )) == -1) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + else fd = -1; + switch (req->pid) { case 0: @@ -1399,6 +1409,7 @@ DECL_HANDLER(alloc_console) renderer = current; if (!(process = current->process->parent)) { + if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } @@ -1415,23 +1426,19 @@ DECL_HANDLER(alloc_console) default: /* renderer is current, console to be attached to req->pid */ renderer = current; - if (!(process = get_process_from_id( req->pid ))) return; + if (!(process = get_process_from_id( req->pid ))) + { + if (fd != -1) close( fd ); + return; + } } if (attach && process->console) { + if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); goto the_end; } - if (req->input_fd != -1) - { - if ((fd = thread_get_inflight_fd( current, req->input_fd )) == -1) - { - set_error( STATUS_INVALID_PARAMETER ); - goto the_end; - } - } - else fd = -1; if ((console = (struct console_input*)create_console_input( renderer, fd ))) {

1 0

Sebastian Lackner : ws2_32/tests: Wait for thread termination before cleaning up winsock.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 69cc90957c2118fc503ea9e18e7b2a14243c7685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cc90957c2118fc503ea9e18… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 12:51:06 2014 +0100 ws2_32/tests: Wait for thread termination before cleaning up winsock. --- dlls/ws2_32/tests/sock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c39545..acc2783 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4354,7 +4354,11 @@ end: if (dst != INVALID_SOCKET) closesocket(dst); if (hThread != NULL) + { + dwRet = WaitForSingleObject(hThread, 500); + ok(dwRet == WAIT_OBJECT_0, "failed to wait for thread termination: %d\n", GetLastError()); CloseHandle(hThread); + } if (ov.hEvent) CloseHandle(ov.hEvent); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Ralf Habacker : comdlg32: Update dmFormName when changing paper size in print UI.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 2b9d337f6d7848cde660ddc41c419eaefc446eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d337f6d7848cde660ddc41… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Thu Nov 20 14:03:33 2014 +0100 comdlg32: Update dmFormName when changing paper size in print UI. --- dlls/comdlg32/printdlg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d52b47d..bedd9c4 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1798,10 +1798,12 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextA(hDlg, cmb2, (char *)lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -1954,10 +1956,12 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextW(hDlg, cmb2, lpdm->dmFormName, CCHFORMNAME); + } } break;

1 0

Jacek Caban : mshtml: Added HTMLFrameBase2:: allowTransparency semi-stub implementation.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 504872741c9b9ce6be7a7e6d4309b8887f462901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504872741c9b9ce6be7a7e6d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 11:20:21 2014 +0100 mshtml: Added HTMLFrameBase2::allowTransparency semi-stub implementation. --- dlls/mshtml/htmlframebase.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index bd5c1de..d6e5ed2 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -667,15 +667,20 @@ static HRESULT WINAPI HTMLFrameBase2_get_readyState(IHTMLFrameBase2 *iface, BSTR static HRESULT WINAPI HTMLFrameBase2_put_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + FIXME("(%p)->(%x) semi-stub\n", This, v); + + return S_OK; } static HRESULT WINAPI HTMLFrameBase2_get_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static const IHTMLFrameBase2Vtbl HTMLFrameBase2Vtbl = {

1 0

Sebastian Lackner : server: Fix several fd leaks on error in new_process wineserver call.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: b985b677e8f2c21c93296c90114e3b9017c5b4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b985b677e8f2c21c93296c901… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 04:12:48 2014 +0100 server: Fix several fd leaks on error in new_process wineserver call. --- server/process.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 7b9a3b2..4a356b9 100644 --- a/server/process.c +++ b/server/process.c @@ -911,14 +911,21 @@ DECL_HANDLER(new_process) } /* build the startup info for a new process */ - if (!(info = alloc_object( &startup_info_ops ))) return; + if (!(info = alloc_object( &startup_info_ops ))) + { + close( socket_fd ); + return; + } info->exe_file = NULL; info->process = NULL; info->data = NULL; if (req->exe_file && !(info->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) + { + close( socket_fd ); goto done; + } info->data_size = get_req_data_size(); info->info_size = min( req->info_size, info->data_size ); @@ -929,7 +936,11 @@ DECL_HANDLER(new_process) data_size_t env_size = info->data_size - info->info_size; data_size_t info_size = min( req->info_size, FIELD_OFFSET( startup_info_t, curdir_len )); - if (!(info->data = mem_alloc( sizeof(*info->data) + env_size ))) goto done; + if (!(info->data = mem_alloc( sizeof(*info->data) + env_size ))) + { + close( socket_fd ); + goto done; + } memcpy( info->data, get_req_data(), info_size ); memset( (char *)info->data + info_size, 0, sizeof(*info->data) - info_size ); memcpy( info->data + 1, (const char *)get_req_data() + req->info_size, env_size ); @@ -940,7 +951,11 @@ DECL_HANDLER(new_process) { data_size_t pos = sizeof(*info->data); - if (!(info->data = memdup( get_req_data(), info->data_size ))) goto done; + if (!(info->data = memdup( get_req_data(), info->data_size ))) + { + close( socket_fd ); + goto done; + } #define FIXUP_LEN(len) do { (len) = min( (len), info->info_size - pos ); pos += (len); } while(0) FIXUP_LEN( info->data->curdir_len ); FIXUP_LEN( info->data->dllpath_len );

1 0

Sebastian Lackner : server: Avoid calling close on negative value in create_console_output handler ( Coverity).
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: d00e8ebda7e05738de5bed3fea1397b64691b929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00e8ebda7e05738de5bed3fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 19:46:03 2014 +0100 server: Avoid calling close on negative value in create_console_output handler (Coverity). --- server/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index b7f8206..c83ec01 100644 --- a/server/console.c +++ b/server/console.c @@ -1609,12 +1609,12 @@ DECL_HANDLER(create_console_output) else fd = -1; if (!(console = console_input_get( req->handle_in, FILE_WRITE_PROPERTIES ))) { - close(fd); + if (fd != -1) close( fd ); return; } if (console_input_is_bare( console ) ^ (fd != -1)) { - close( fd ); + if (fd != -1) close( fd ); release_object( console ); set_error( STATUS_INVALID_HANDLE ); return;

1 0

André Hentschel : gdi32: Remove unused string (Clang) .
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: d9d17252957311adb94fa6c9a15f5410cb42db77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d17252957311adb94fa6c9a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 19 22:09:17 2014 +0100 gdi32: Remove unused string (Clang). --- dlls/gdi32/freetype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 924f5f3..b063c80 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -529,10 +529,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', 'S','y','s','t','e','m','L','i','n','k',0}; -static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'F','o','n','t','L','i','n','k','\\', - 'S','y','s','t','e','m','L','i','n','k',0}; - /**************************************** * Notes on .fon files *

1 0

Stefan Dösinger : ddraw/tests: Test messages on window reactivation.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 0edb13a20fedeba4672ff596d0a9a773cc704770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb13a20fedeba4672ff596d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:51 2014 +0100 ddraw/tests: Test messages on window reactivation. --- dlls/ddraw/tests/ddraw1.c | 21 +++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 21 +++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6648937..e48dbab 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2219,6 +2219,20 @@ static void test_coop_level_mode_set(void) {WM_ACTIVATEAPP, TRUE, FALSE}, {0, FALSE, 0}, }; + static const struct message exclusive_focus_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* From the ShowWindow(SW_RESTORE). */ + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Generated by ddraw, matches d3d9 behavior. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching previous message. */ + {WM_SIZE, FALSE, 0}, /* DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0}, /* Ddraw restores mode. */ + /* Native redundantly sets the window size here. */ + {WM_ACTIVATEAPP, TRUE, TRUE}, /* End of ddraw's hooks. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching the one from ShowWindow. */ + {WM_MOVE, FALSE, 0}, /* DefWindowProc. */ + {WM_SIZE, TRUE, SIZE_RESTORED}, /* DefWindowProc. */ + {0, FALSE, 0}, + }; static const struct message normal_messages[] = { @@ -2365,7 +2379,14 @@ static void test_coop_level_mode_set(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); + expect_messages = exclusive_focus_restore_messages; ShowWindow(window, SW_RESTORE); + ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &ddraw_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ddraw_rect.left, ddraw_rect.top, ddraw_rect.right, ddraw_rect.bottom, + r.left, r.top, r.right, r.bottom); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 16ceaf0..b4c3da5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2418,6 +2418,20 @@ static void test_coop_level_mode_set(void) {WM_ACTIVATEAPP, TRUE, FALSE}, {0, FALSE, 0}, }; + static const struct message exclusive_focus_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* From the ShowWindow(SW_RESTORE). */ + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Generated by ddraw, matches d3d9 behavior. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching previous message. */ + {WM_SIZE, FALSE, 0}, /* DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0}, /* Ddraw restores mode. */ + /* Native redundantly sets the window size here. */ + {WM_ACTIVATEAPP, TRUE, TRUE}, /* End of ddraw's hooks. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching the one from ShowWindow. */ + {WM_MOVE, FALSE, 0}, /* DefWindowProc. */ + {WM_SIZE, TRUE, SIZE_RESTORED}, /* DefWindowProc. */ + {0, FALSE, 0}, + }; static const struct message normal_messages[] = { @@ -2571,7 +2585,14 @@ static void test_coop_level_mode_set(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); + expect_messages = exclusive_focus_restore_messages; ShowWindow(window, SW_RESTORE); + ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &ddraw_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ddraw_rect.left, ddraw_rect.top, ddraw_rect.right, ddraw_rect.bottom, + r.left, r.top, r.right, r.bottom); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 03e7362..7e4d046 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2605,6 +2605,20 @@ static void test_coop_level_mode_set(void) {WM_ACTIVATEAPP, TRUE, FALSE}, {0, FALSE, 0}, }; + static const struct message exclusive_focus_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* From the ShowWindow(SW_RESTORE). */ + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Generated by ddraw, matches d3d9 behavior. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching previous message. */ + {WM_SIZE, FALSE, 0}, /* DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0}, /* Ddraw restores mode. */ + /* Native redundantly sets the window size here. */ + {WM_ACTIVATEAPP, TRUE, TRUE}, /* End of ddraw's hooks. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching the one from ShowWindow. */ + {WM_MOVE, FALSE, 0}, /* DefWindowProc. */ + {WM_SIZE, TRUE, SIZE_RESTORED}, /* DefWindowProc. */ + {0, FALSE, 0}, + }; static const struct message normal_messages[] = { @@ -2758,7 +2772,14 @@ static void test_coop_level_mode_set(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); + expect_messages = exclusive_focus_restore_messages; ShowWindow(window, SW_RESTORE); + ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &ddraw_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ddraw_rect.left, ddraw_rect.top, ddraw_rect.right, ddraw_rect.bottom, + r.left, r.top, r.right, r.bottom); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1efd1fb..f1f394a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2282,6 +2282,20 @@ static void test_coop_level_mode_set(void) {WM_ACTIVATEAPP, TRUE, FALSE}, {0, FALSE, 0}, }; + static const struct message exclusive_focus_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* From the ShowWindow(SW_RESTORE). */ + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Generated by ddraw, matches d3d9 behavior. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching previous message. */ + {WM_SIZE, FALSE, 0}, /* DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0}, /* Ddraw restores mode. */ + /* Native redundantly sets the window size here. */ + {WM_ACTIVATEAPP, TRUE, TRUE}, /* End of ddraw's hooks. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, /* Matching the one from ShowWindow. */ + {WM_MOVE, FALSE, 0}, /* DefWindowProc. */ + {WM_SIZE, TRUE, SIZE_RESTORED}, /* DefWindowProc. */ + {0, FALSE, 0}, + }; static const struct message normal_messages[] = { @@ -2435,7 +2449,14 @@ static void test_coop_level_mode_set(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); + expect_messages = exclusive_focus_restore_messages; ShowWindow(window, SW_RESTORE); + ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &ddraw_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ddraw_rect.left, ddraw_rect.top, ddraw_rect.right, ddraw_rect.bottom, + r.left, r.top, r.right, r.bottom); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width

1 0

Stefan Dösinger : wined3d: Fix mode comparison in wined3d_set_adapter_display_mode.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: a835ae864362e02e055c91bbb7163cbb8b0349d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a835ae864362e02e055c91bbb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:49 2014 +0100 wined3d: Fix mode comparison in wined3d_set_adapter_display_mode. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dbd433b..794496b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3325,7 +3325,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if(!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3344,7 +3344,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, && (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency || !(new_mode.dmFields & DM_DISPLAYFREQUENCY)) && (current_mode.u2.dmDisplayFlags == new_mode.u2.dmDisplayFlags - || new_mode.dmFields & DM_DISPLAYFLAGS)) + || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); return WINED3D_OK;

1 0

Bruno Jesus : dbghelp: Remove a dead assignment (Cppcheck).
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: a5c3f38773aaf5333e2d2a1ad64d5c619075cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c3f38773aaf5333e2d2a1ad… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 19 23:36:14 2014 -0200 dbghelp: Remove a dead assignment (Cppcheck). --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index f43d971..b793edb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -515,7 +515,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) static BOOL pe_load_dwarf(struct module* module) { struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; - BOOL ret = FALSE; + BOOL ret; ret = dwarf2_parse(module, module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase,

1 0

Stefan Dösinger : ddraw: Restore the registry display mode.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: f905c7c07a25bb01403d764d6fbe9935d3ced9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f905c7c07a25bb01403d764d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:53 2014 +0100 ddraw: Restore the registry display mode. --- dlls/ddraw/ddraw.c | 14 +------------- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 5 files changed, 17 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f905c7c07a25bb01403d7…

1 0

Stefan Dösinger : wined3d: Don' t minimize hidden windows.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: f4d520d6e2e3d486fa691eefee07fecc0ba6fe6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d520d6e2e3d486fa691eefe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:52 2014 +0100 wined3d: Don't minimize hidden windows. --- dlls/d3d8/tests/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/tests/d3d9ex.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/tests/device.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 3 ++- 4 files changed, 145 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d520d6e2e3d486fa691…

1 0

Stefan Dösinger : wined3d: Set the device window size on focus window activation.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 09a91231a689e5ef8550ef2517de2dc40e0a75b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a91231a689e5ef8550ef251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:50 2014 +0100 wined3d: Set the device window size on focus window activation. --- dlls/d3d8/tests/device.c | 14 +++++++++++++- dlls/d3d9/tests/d3d9ex.c | 6 ++++++ dlls/d3d9/tests/device.c | 28 ++++++++++++++++++++++++---- dlls/wined3d/swapchain.c | 14 ++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6244254..6ee4f89 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2282,6 +2282,14 @@ static void test_wndproc(void) * or before. */ {0, 0, FALSE, 0}, }; + static const struct message reactivate_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -2469,13 +2477,17 @@ static void test_wndproc(void) /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ + expect_messages = reactivate_messages; ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window); flush_events(); SetForegroundWindow(focus_window); - flush_events(); + flush_events(); /* WM_WINDOWPOSCHANGING etc arrive after SetForegroundWindow returns. */ + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + expect_messages = NULL; hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5f54d5b..9f8c163 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2052,6 +2052,12 @@ static void test_wndproc(void) * independent of D3DCREATE_NOWINDOWCHANGES. */ ShowWindow(device_window, SW_MINIMIZE); ShowWindow(device_window, SW_RESTORE); + + /* Reactivation messages like in d3d8/9 are random in native d3d9ex. + * Sometimes they are sent, sometimes they are not (tested on Vista + * and Windows 7). The minimizing and restoring of the device window + * may have something to do with this, but if the messages are sent, + * they are generated by the 3 calls below. */ ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3fd25d1..3e91267 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3244,15 +3244,30 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, {0, 0, FALSE, 0}, }; + static const struct message reactivate_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, + {0, 0, FALSE, 0}, + }; + static const struct message reactivate_messages_nowc[] = + { + /* We're activating the device window before activating the + * focus window, so no ACTIVATEAPP message is sent. */ + {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_ACTIVE}, + {0, 0, FALSE, 0}, + }; static const struct { DWORD create_flags; - const struct message *focus_loss_messages; + const struct message *focus_loss_messages, *reactivate_messages; } tests[] = { - {0, focus_loss_messages}, - {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc}, + {0, focus_loss_messages, reactivate_messages}, + {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc, reactivate_messages_nowc}, }; d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -3441,17 +3456,22 @@ static void test_wndproc(void) ShowWindow(device_window, SW_MINIMIZE); ShowWindow(device_window, SW_RESTORE); } + flush_events(); /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ + expect_messages = tests[i].reactivate_messages; ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window); flush_events(); SetForegroundWindow(focus_window); - flush_events(); + flush_events(); /* WM_WINDOWPOSCHANGING etc arrive after SetForegroundWindow returns. */ + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + expect_messages = NULL; hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 20731ef..d1b6d0b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1178,6 +1178,20 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { if (activate) { + if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + { + /* The d3d versions do not agree on the exact messages here. D3d8 restores + * the window but leaves the size untouched, d3d9 sets the size on an + * invisible window, generates messages but doesn't change the window + * properties. The implementation follows d3d9. + * + * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to + * resume drawing after a focus loss. */ + SetWindowPos(swapchain->device_window, NULL, 0, 0, + swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, + SWP_NOACTIVATE | SWP_NOZORDER); + } + if (swapchain->device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d,

1 0

Detlef Riekenberg : scrrun/tests: Ignore case in path names.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 89bc84a15316f8eeead49bd1c87f4a07523ee822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bc84a15316f8eeead49bd1c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 19 22:08:12 2014 +0100 scrrun/tests: Ignore case in path names. --- dlls/scrrun/tests/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index faa0b0c..54cf4e3 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -893,7 +893,7 @@ static void test_FolderCollection(void) hr = IFolder_get_Path(folder, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, str), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + ok(!lstrcmpiW(buffW, str), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); lstrcpyW(pathW, buffW);

1 0

Bruno Jesus : dinput: Fix device type dump.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: c257e8adf6eb198c441accfc48c3d3b9b5366337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c257e8adf6eb198c441accfc4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 19 23:30:08 2014 -0200 dinput: Fix device type dump. --- dlls/dinput/joystick.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0d61f57..edbb64e 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -400,16 +400,38 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REF return JoystickWGenericImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); } +#define DEBUG_TYPE(x) case (x): str = #x; break void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { + int type = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); + const char *str; TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); - TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : - lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? "DIDEVTYPE_JOYSTICK" : - lpDIDevCaps->dwDevType == DIDEVTYPE_HID ? "DIDEVTYPE_HID" : "UNKNOWN"); + switch(type) + { + /* Directx <= 7 definitions */ + DEBUG_TYPE(DIDEVTYPE_DEVICE); + DEBUG_TYPE(DIDEVTYPE_MOUSE); + DEBUG_TYPE(DIDEVTYPE_KEYBOARD); + DEBUG_TYPE(DIDEVTYPE_JOYSTICK); + DEBUG_TYPE(DIDEVTYPE_HID); + /* Directx >= 8 definitions */ + DEBUG_TYPE(DI8DEVTYPE_DEVICE); + DEBUG_TYPE(DI8DEVTYPE_MOUSE); + DEBUG_TYPE(DI8DEVTYPE_KEYBOARD); + DEBUG_TYPE(DI8DEVTYPE_JOYSTICK); + DEBUG_TYPE(DI8DEVTYPE_GAMEPAD); + DEBUG_TYPE(DI8DEVTYPE_DRIVING); + DEBUG_TYPE(DI8DEVTYPE_FLIGHT); + DEBUG_TYPE(DI8DEVTYPE_1STPERSON); + DEBUG_TYPE(DI8DEVTYPE_DEVICECTRL); + DEBUG_TYPE(DI8DEVTYPE_SCREENPOINTER); + DEBUG_TYPE(DI8DEVTYPE_REMOTE); + DEBUG_TYPE(DI8DEVTYPE_SUPPLEMENTAL); + default: str = "UNKNOWN"; + } + + TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, str); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: %d\n", lpDIDevCaps->dwPOVs); @@ -421,6 +443,7 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) TRACE("dwFFDriverVersion: %d\n", lpDIDevCaps->dwFFDriverVersion); } } +#undef DEBUG_TYPE HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) {

1 0

André Hentschel : msxml3: Remove unused strings ( Clang).
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: c4a73bd4d1812b542ae652201f2d43b39e76c86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a73bd4d1812b542ae652201… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 19 22:09:14 2014 +0100 msxml3: Remove unused strings (Clang). --- dlls/msxml3/xdr.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index af86907..fd7a9b7 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -38,7 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes"; -static const xmlChar XDR_prefix[] = "xdr"; static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar XSD_prefix[] = "xsd"; static const xmlChar XSD_href[] = "http://www.w3.org/2001/XMLSchema"; @@ -51,7 +50,6 @@ static const xmlChar xs_attribute[] = "attribute"; static const xmlChar xs_AttributeType[] = "AttributeType"; static const xmlChar xs_base[] = "base"; static const xmlChar xs_choice[] = "choice"; -static const xmlChar xs_complexContent[] = "complexContent"; static const xmlChar xs_complexType[] = "complexType"; static const xmlChar xs_content[] = "content"; static const xmlChar xs_datatype[] = "datatype"; @@ -61,7 +59,6 @@ static const xmlChar xs_documentation[] = "documentation"; static const xmlChar xs_element[] = "element"; static const xmlChar xs_ElementType[] = "ElementType"; static const xmlChar xs_eltOnly[] = "eltOnly"; -static const xmlChar xs_empty[] = "empty"; static const xmlChar xs_enumeration[] = "enumeration"; static const xmlChar xs_extension[] = "extension"; static const xmlChar xs_group[] = "group"; @@ -75,7 +72,6 @@ static const xmlChar xs_model[] = "model"; static const xmlChar xs_name[] = "name"; static const xmlChar xs_namespace[] = "namespace"; static const xmlChar xs_no[] = "no"; -static const xmlChar xs_one[] = "one"; static const xmlChar xs_open[] = "open"; static const xmlChar xs_optional[] = "optional"; static const xmlChar xs_order[] = "order"; @@ -84,7 +80,6 @@ static const xmlChar xs_ref[] = "ref"; static const xmlChar xs_required[] = "required"; static const xmlChar xs_restriction[] = "restriction"; static const xmlChar xs_schema[] = "schema"; -static const xmlChar xs_Schema[] = "Schema"; static const xmlChar xs_seq[] = "seq"; static const xmlChar xs_sequence[] = "sequence"; static const xmlChar xs_simpleContent[] = "simpleContent"; @@ -99,7 +94,6 @@ static const xmlChar xs_use[] = "use"; static const xmlChar xs_value[] = "value"; static const xmlChar xs_values[] = "values"; static const xmlChar xs_xsd_string[] = "xsd:string"; -static const xmlChar xs_yes[] = "yes"; typedef enum _CONTENT_TYPE {

1 0

André Hentschel : winedbg: Declare debug channel only when needed (Clang).
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 51a4594f960064e012e17039288967d49c444e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a4594f960064e012e170392… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 19 22:09:11 2014 +0100 winedbg: Declare debug channel only when needed (Clang). --- programs/winedbg/be_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 0aafe65..99e3b29 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -21,10 +21,10 @@ #include "debugger.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - #ifdef __i386__ +WINE_DEFAULT_DEBUG_CHANNEL(winedbg); + /* db_disasm.c */ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display);

1 0

Nikolay Sivov : include: Added SHAssocEnumHandlers() and related interfaces definition.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 5ff44e5aefc3987a4a700e17036db4208ee08433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff44e5aefc3987a4a700e170… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 21:38:36 2014 +0300 include: Added SHAssocEnumHandlers() and related interfaces definition. --- include/shobjidl.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 627a6df..7dfc4c4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3440,6 +3440,54 @@ interface ITransferDestination : IUnknown [out, iid_is(riid)] void **presources); } +[ + uuid(92218cab-ecaa-4335-8133-807fd234c2ee), + object, + pointer_default(unique) +] +interface IAssocHandlerInvoker : IUnknown +{ + HRESULT SupportsSelection(); + HRESULT Invoke(); +} + +[ + uuid(f04061ac-1659-4a3f-a954-775aa57fc083), + object, + pointer_default(unique) +] +interface IAssocHandler : IUnknown +{ + HRESULT GetName([out, string] LPWSTR *name); + HRESULT GetUIName([out, string] LPWSTR *uiname); + HRESULT GetIconLocation([out, string] LPWSTR *path, + [out] int *index); + HRESULT IsRecommended(); + HRESULT MakeDefault([in, string] LPCWSTR description); + HRESULT Invoke([in] IDataObject *object); + HRESULT CreateInvoker([in] IDataObject *object, + [out] IAssocHandlerInvoker **invoker); +} + +[ + uuid(973810ae-9599-4b88-9e4d-6ee98c9552da), + object, + pointer_default(unique) +] +interface IEnumAssocHandlers : IUnknown +{ + HRESULT Next([in] ULONG count, + [out, size_is(count), length_is(*fetched)] IAssocHandler **handlers, + [out] ULONG *fetched); +} + +typedef enum ASSOC_FILTER +{ + ASSOC_FILTER_NONE = 0, + ASSOC_FILTER_RECOMMENDED +} ASSOC_FILTER; +cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") + /***************************************************************************** * ShellObjects typelibrary */

1 0

Hans Leidekker : ieframe: Send command state change notifications from history navigation handlers.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: d22928fb3cf57cb29ba7c6fbdda0f097af7d038e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22928fb3cf57cb29ba7c6fbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 19 13:40:49 2014 +0100 ieframe: Send command state change notifications from history navigation handlers. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 35 ++++++++ dlls/ieframe/oleobject.c | 3 + dlls/ieframe/tests/webbrowser.c | 173 +++++++++++++++++++++++++++++++++++----- 4 files changed, 191 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d22928fb3cf57cb29ba7c…

1 0

Nikolay Sivov : dwrite: Implement SetCurrentTransform() for bitmap render target.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 9db50228dd3dcda87f1b678a7fd99f5e5e82fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db50228dd3dcda87f1b678a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 15:35:50 2014 +0300 dwrite: Implement SetCurrentTransform() for bitmap render target. --- dlls/dwrite/gdiinterop.c | 18 +++++++++++++----- dlls/dwrite/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 3715bf0..1496efd 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +static const DWRITE_MATRIX identity = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f +}; + struct gdiinterop { IDWriteGdiInterop IDWriteGdiInterop_iface; IDWriteFactory *factory; @@ -171,8 +178,11 @@ static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%p): stub\n", This, transform); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, transform); + + This->m = transform ? *transform : identity; + return S_OK; } static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) @@ -233,9 +243,7 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite return hr; } - target->m.m11 = target->m.m22 = 1.0; - target->m.m12 = target->m.m21 = 0.0; - target->m.dx = target->m.dy = 0.0; + target->m = identity; target->pixels_per_dip = 1.0; *ret = &target->IDWriteBitmapRenderTarget_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ed43839..cc0b23c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -666,6 +666,25 @@ if (0) /* crashes on native */ ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + memset(&m, 0, sizeof(m)); + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(m.m11 == 0.0 && m.m22 == 0.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); + ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); + ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + /* pixels per dip */ pdip = IDWriteBitmapRenderTarget_GetPixelsPerDip(target); ok(pdip == 1.0, "got %.2f\n", pdip);

1 0

Sebastian Lackner : regedit: Fix incorrect usage of CompareString in parseKeyName.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: fb37d215cd31bcd0adafa87c1d216027cff028db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37d215cd31bcd0adafa87c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:55:58 2014 +0100 regedit: Fix incorrect usage of CompareString in parseKeyName. --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1adeddf..80beb21 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -320,7 +320,7 @@ static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) *hKey = NULL; for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], len) == CSTR_EQUAL && + if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], -1) == CSTR_EQUAL && len == lstrlenW(reg_class_namesW[i])) { *hKey = reg_class_keys[i]; break;

1 0

Sebastian Lackner : shlwapi: Fix incorrect usage of CompareString in StrRStrIW.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 1b672e55ce738c5e02bd8c77df5dbf4668b7e30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b672e55ce738c5e02bd8c77d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:31:40 2014 +0100 shlwapi: Fix incorrect usage of CompareString in StrRStrIW. --- dlls/shlwapi/string.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 316dd3f..9ba6038 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -625,6 +625,7 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) */ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) { + LPWSTR lpszRet = NULL; INT iLen; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -632,18 +633,23 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; + iLen = strlenW(lpszSearch); + if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenW(lpszEnd)); - iLen = strlenW(lpszSearch); - - while (lpszEnd > lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - lpszEnd--; - if (!StrCmpNIW(lpszEnd, lpszSearch, iLen)) - return (LPWSTR)lpszEnd; + if (!ChrCmpIW(*lpszSearch, *lpszStr)) + { + if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) + lpszRet = (LPWSTR)lpszStr; + } + lpszStr++; } - return NULL; + return lpszRet; } /*************************************************************************

1 0

Nikolay Sivov : ole32/tests: Use proper wrappers for IObjContext methods.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 2487afa5d30532c2faa05b95bd80ce8c81e6afbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2487afa5d30532c2faa05b95b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 09:44:45 2014 +0300 ole32/tests: Use proper wrappers for IObjContext methods. --- dlls/ole32/tests/compobj.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1dfa9fb..0d9c624 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1910,10 +1910,10 @@ static void test_CoGetContextToken(void) ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); @@ -1926,13 +1926,13 @@ static void test_CoGetContextToken(void) ok(token, "Expected token != 0\n"); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 1, "Expected 0, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 0, "Expected 0, got %u\n", refs); CoUninitialize();

1 0

Sebastian Lackner : server: Avoid reallocating region data when there is still enough space.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 9d63e3f9496781d7717a445d52e7580f9397f5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d63e3f9496781d7717a445d5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 05:45:50 2014 +0100 server: Avoid reallocating region data when there is still enough space. --- server/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/region.c b/server/region.c index 8b85c34..464c5ad 100644 --- a/server/region.c +++ b/server/region.c @@ -108,7 +108,7 @@ static const rectangle_t empty_rect; /* all-zero rectangle for empty regions */ /* add a rectangle to a region */ static inline rectangle_t *add_rect( struct region *reg ) { - if (reg->num_rects >= reg->size - 1) + if (reg->num_rects >= reg->size) { rectangle_t *new_rect = realloc( reg->rects, 2 * sizeof(rectangle_t) * reg->size ); if (!new_rect)

1 0