September 2016 - Wine-commits

Huw Davies : winmm/tests: Remove a test that can crash on Win 8 and 10.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: ec6e47ddaed7efb4e9802ebb96637e151c6373ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6e47ddaed7efb4e9802ebb9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 13 18:21:19 2016 +0100 winmm/tests: Remove a test that can crash on Win 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 5c9185e..0cbe57e 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -668,10 +668,6 @@ static void test_recordWAVE(HWND hwnd) ok(!err,"mci status samplespersec returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"11025"), "mci status samplespersec expected 11025, got: %s\n", buf); - /* MCI seems to solely support PCM, no need for ACM conversion. */ - err = mciSendStringA("set x format tag 2", NULL, 0, NULL); - ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned %s\n", dbg_mcierr(err)); - /* MCI appears to scan the available devices for support of this format, * returning MCIERR_OUTOFRANGE on machines with no sound. * However some w2k8/w7 machines return no error when there's no wave

1 0

Sebastian Lackner : user32: Fix definition of DeregisterShellHookWindow.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: acdf0012617522327c344cc73740ef3ac8f60388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdf0012617522327c344cc73… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:10:45 2016 +0200 user32: Fix definition of DeregisterShellHookWindow. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index beed6aa..fa0502e 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -538,7 +538,7 @@ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) /*********************************************************************** * RegisterShellHookWindow [USER32.@] */ -BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) +BOOL WINAPI RegisterShellHookWindow(HWND hWnd) { FIXME("(%p): stub\n", hWnd); return FALSE; @@ -548,11 +548,10 @@ BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) /*********************************************************************** * DeregisterShellHookWindow [USER32.@] */ -HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) +BOOL WINAPI DeregisterShellHookWindow(HWND hWnd) { - FIXME("0x%08x stub\n",u); - return 0; - + FIXME("(%p): stub\n", hWnd); + return FALSE; }

1 0

Sebastian Lackner : dxva2: Return E_NOTIMPL from GetPhysicalMonitorsFromIDirect3DDevice9 stub.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 69e49122ec113360656f8e444e117254e89bbe22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e49122ec113360656f8e444… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:13:20 2016 +0200 dxva2: Return E_NOTIMPL from GetPhysicalMonitorsFromIDirect3DDevice9 stub. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index b4704f0..782f0df 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -187,8 +187,7 @@ HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device { FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return E_NOTIMPL; } BOOL WINAPI GetTimingReport( HMONITOR monitor, LPMC_TIMING_REPORT timingReport )

1 0

Sebastian Lackner : include: Fix declaration of DwmDefWindowProc.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 980589471ec7af584dc5bfd60664a955792c44eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=980589471ec7af584dc5bfd60… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:16:44 2016 +0200 include: Fix declaration of DwmDefWindowProc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwmapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index f5191e1..b2f39de 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -136,7 +136,7 @@ typedef struct _DWM_PRESENT_PARAMETERS { #include <poppack.h> -DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL);

1 0

Sebastian Lackner : shlwapi: Return E_NOTIMPL for unknown types in StrRetToBuf{A, W}.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 0198d0d56a47e22d7d08c72ffb262183e57b2070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0198d0d56a47e22d7d08c72ff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:20:28 2016 +0200 shlwapi: Return E_NOTIMPL for unknown types in StrRetToBuf{A,W}. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 4d77c3f..8c4cb71 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1509,7 +1509,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U default: FIXME("unknown type!\n"); - return FALSE; + return E_NOTIMPL; } return S_OK; } @@ -1559,7 +1559,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, default: FIXME("unknown type!\n"); - return FALSE; + return E_NOTIMPL; } return S_OK; }

1 0

Sebastian Lackner : uxtheme: Return E_NOTIMPL in HRESULT stub functions.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 461bfc64ba84250941e79cc898784bdcd8d1670c URL: http://source.winehq.org/git/wine.git/?a=commit;h=461bfc64ba84250941e79cc89… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:26:39 2016 +0200 uxtheme: Return E_NOTIMPL in HRESULT stub functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- dlls/uxtheme/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 753ac36..8f0eabe 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1626,7 +1626,7 @@ HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, FIXME("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 7d07680..625be24 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -762,7 +762,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** @@ -1188,7 +1188,7 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) { FIXME("%s %s: stub\n", debugstr_w(pszIniFileName), debugstr_w(pszUnknown)); - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /**********************************************************************

1 0

Bruno Jesus : ws2_32: Fix handling of POLLHUP in WSAPoll.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: a549245dfc2e5c89aa21b30486237e2e889d99c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a549245dfc2e5c89aa21b3048… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 13 15:38:15 2016 -0300 ws2_32: Fix handling of POLLHUP in WSAPoll. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 15 ++++++++++++++- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2d54013..9d0b60e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5378,7 +5378,20 @@ int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) if (ufds[i].fd != -1) { release_sock_fd(wfds[i].fd, ufds[i].fd); - wfds[i].revents = convert_poll_u2w(ufds[i].revents); + if (ufds[i].revents & POLLHUP) + { + /* Check if the socket still exists */ + int fd = get_sock_fd(wfds[i].fd, 0, NULL); + if (fd != -1) + { + wfds[i].revents = WS_POLLHUP; + release_sock_fd(wfds[i].fd, fd); + } + else + wfds[i].revents = WS_POLLNVAL; + } + else + wfds[i].revents = convert_poll_u2w(ufds[i].revents); } else wfds[i].revents = WS_POLLNVAL; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d216542..320f820 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6672,7 +6672,6 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); @@ -6737,7 +6736,6 @@ todo_wine POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead);

1 0

Sebastian Lackner : taskschd: Do not return ERROR_* constant in HRESULT function.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: e16b9f757b410a5f29ef0e9b3cd1d19a31e33057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16b9f757b410a5f29ef0e9b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 17:46:10 2016 +0200 taskschd: Do not return ERROR_* constant in HRESULT function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder.c | 2 +- dlls/taskschd/tests/scheduler.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index c0eb1fb..26993ca 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -417,7 +417,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (path) { int len = strlenW(path); - if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; + if (len && path[len - 1] == '\\') return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } folder_path = get_full_path(parent, path); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 20f8845..4976f4c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -217,7 +217,6 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -297,7 +296,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Alexandre Julliard : user32/tests: Comment out a test that crashes on 64-bit Vista.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 30179166d2e517b4083b9eb3ccd9dea79fc8e24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30179166d2e517b4083b9eb3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:19:33 2016 +0900 user32/tests: Comment out a test that crashes on 64-bit Vista. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2b030ca..ff5b6fb 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1667,11 +1667,13 @@ static void test_handles( HWND hwnd ) todo_wine ok( !h, "got %p\n", h ); GlobalFree( empty_moveable ); - ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); - h = SetClipboardData( format_id2, ptr ); - /* some platforms don't allocate a 0-size block correctly */ - todo_wine ok( !h || broken( HeapSize( GetProcessHeap(), 0, ptr ) == 1), "got %p\n", h ); - HeapFree( GetProcessHeap(), 0, ptr ); + if (0) /* crashes on vista64 */ + { + ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); + h = SetClipboardData( format_id2, ptr ); + ok( !h, "got %p\n", h ); + HeapFree( GetProcessHeap(), 0, ptr ); + } h = SetClipboardData( format_id2, empty_fixed ); ok( h == empty_fixed, "got %p\n", h );

1 0

Alexandre Julliard : user32: Fix GetClipboardFormatName behavior for integer formats.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 4bdcf512cf5c93ec4833ed772cfe87770ef970e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdcf512cf5c93ec4833ed772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:20:31 2016 +0900 user32: Fix GetClipboardFormatName behavior for integer formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 12 ++++++------ dlls/user32/tests/clipboard.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 326ea03..d8fb68d 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -456,20 +456,20 @@ UINT WINAPI RegisterClipboardFormatA( LPCSTR name ) /************************************************************************** * GetClipboardFormatNameW (USER32.@) */ -INT WINAPI GetClipboardFormatNameW(UINT wFormat, LPWSTR retStr, INT maxlen) +INT WINAPI GetClipboardFormatNameW( UINT format, LPWSTR buffer, INT maxlen ) { - if (wFormat < MAXINTATOM) return 0; - return GlobalGetAtomNameW( wFormat, retStr, maxlen ); + if (format < MAXINTATOM || format > 0xffff) return 0; + return GlobalGetAtomNameW( format, buffer, maxlen ); } /************************************************************************** * GetClipboardFormatNameA (USER32.@) */ -INT WINAPI GetClipboardFormatNameA(UINT wFormat, LPSTR retStr, INT maxlen) +INT WINAPI GetClipboardFormatNameA( UINT format, LPSTR buffer, INT maxlen ) { - if (wFormat < MAXINTATOM) return 0; - return GlobalGetAtomNameA( wFormat, retStr, maxlen ); + if (format < MAXINTATOM || format > 0xffff) return 0; + return GlobalGetAtomNameA( format, buffer, maxlen ); } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index ff5b6fb..61b0d2c 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -416,12 +416,12 @@ todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } - for (format_id = 0; format_id < 0xffff; format_id++) + for (format_id = 0; format_id < 0x10fff; format_id++) { SetLastError(0xdeadbeef); len = GetClipboardFormatNameA(format_id, buf, 256); - if (format_id < 0xc000) + if (format_id < 0xc000 || format_id > 0xffff) ok(!len, "GetClipboardFormatNameA should fail, but it returned %d (%s)\n", len, buf); else if (len && winetest_debug > 1) trace("%04x: %s\n", format_id, len ? buf : "");

1 0