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