September 2016 - Wine-Commits

Alexandre Julliard : winex11: Remove support for synthesizing clipboard formats.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 761d244970dd189b1a639121e668a5089fd0112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=761d244970dd189b1a639121e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 11:35:14 2016 +0900 winex11: Remove support for synthesizing clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 454 ++------------------------------------ dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 14 insertions(+), 441 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=761d244970dd189b1a639…

1 0

Alexandre Julliard : user32: Synthesize bitmap clipboard formats on the user32 side.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 9a652e211c06d1a139f6105173a523450dbf9e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a652e211c06d1a139f610517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 11:35:02 2016 +0900 user32: Synthesize bitmap clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 122 ++++++++++++++++++++++++++++++++++++++---- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/clipboard.c | 18 ++----- dlls/user32/user_private.h | 1 + 4 files changed, 119 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a652e211c06d1a139f61…

1 0

Alexandre Julliard : user32: Synthesize metafile clipboard formats on the user32 side.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 199389845912b523a529f115b738b07f94e81f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199389845912b523a529f115b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 10:51:21 2016 +0900 user32: Synthesize metafile clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/clipboard.c | 6 ++-- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 9383fe3..0fe5631 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -140,6 +140,16 @@ static void add_synthesized_text(void) } } +/* add synthesized metafile formats based on what is already in the clipboard */ +static void add_synthesized_metafile(void) +{ + BOOL has_mf = IsClipboardFormatAvailable( CF_METAFILEPICT ); + BOOL has_emf = IsClipboardFormatAvailable( CF_ENHMETAFILE ); + + if (!has_mf && has_emf) add_synthesized_format( CF_METAFILEPICT, CF_ENHMETAFILE ); + else if (!has_emf && has_mf) add_synthesized_format( CF_ENHMETAFILE, CF_METAFILEPICT ); +} + /* render synthesized ANSI text based on the contents of the 'from' format */ static HANDLE render_synthesized_textA( HANDLE data, UINT format, UINT from ) { @@ -190,6 +200,57 @@ static HANDLE render_synthesized_textW( HANDLE data, UINT from ) return ret; } +/* render a synthesized metafile based on the enhmetafile clipboard data */ +static HANDLE render_synthesized_metafile( HANDLE data ) +{ + HANDLE ret = 0; + UINT size; + void *bits; + METAFILEPICT *pict; + ENHMETAHEADER header; + HDC hdc = GetDC( 0 ); + + size = GetWinMetaFileBits( data, 0, NULL, MM_ISOTROPIC, hdc ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + if (GetEnhMetaFileHeader( data, sizeof(header), &header ) && + GetWinMetaFileBits( data, size, bits, MM_ISOTROPIC, hdc )) + { + if ((ret = GlobalAlloc( GMEM_FIXED, sizeof(*pict) ))) + { + pict = (METAFILEPICT *)ret; + pict->mm = MM_ISOTROPIC; + pict->xExt = header.rclFrame.right - header.rclFrame.left; + pict->yExt = header.rclFrame.bottom - header.rclFrame.top; + pict->hMF = SetMetaFileBitsEx( size, bits ); + } + } + HeapFree( GetProcessHeap(), 0, bits ); + } + ReleaseDC( 0, hdc ); + return ret; +} + +/* render a synthesized enhmetafile based on the metafile clipboard data */ +static HANDLE render_synthesized_enhmetafile( HANDLE data ) +{ + METAFILEPICT *pict; + HANDLE ret = 0; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return 0; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + ret = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + } + return ret; +} + /* render a synthesized format */ static HANDLE render_synthesized_format( UINT format, UINT from ) { @@ -207,6 +268,12 @@ static HANDLE render_synthesized_format( UINT format, UINT from ) case CF_UNICODETEXT: data = render_synthesized_textW( data, from ); break; + case CF_METAFILEPICT: + data = render_synthesized_metafile( data ); + break; + case CF_ENHMETAFILE: + data = render_synthesized_enhmetafile( data ); + break; default: assert( 0 ); } @@ -338,6 +405,7 @@ BOOL WINAPI CloseClipboard(void) { memset( synthesized_formats, 0, sizeof(synthesized_formats) ); add_synthesized_text(); + add_synthesized_metafile(); } SERVER_START_REQ( close_clipboard ) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c674c9d..4c00361 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -665,7 +665,7 @@ static void test_synthesized(void) cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); data = GetClipboardData(cf); - todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf); @@ -756,7 +756,6 @@ static void test_synthesized(void) i, j, cf, tests[i].expected[j] ); if (cf != tests[i].expected[j]) break; data = GetClipboardData( cf ); - todo_wine_if (j && cf == CF_METAFILEPICT) ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); @@ -830,13 +829,12 @@ static void test_synthesized(void) else { ok(!data, "%u: format %04x got data %p\n", i, cf, data); - todo_wine_if( tests[i].format == CF_ENHMETAFILE && tests[i].expected[j] == CF_METAFILEPICT ) ok( rendered == (1 << tests[i].format), "%u.%u: formats %08x have been rendered\n", i, j, rendered ); /* try to render a second time */ data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - todo_wine_if( i > 2 && j == 1 ) + todo_wine_if( i > 4 && j == 1 ) ok( rendered == (1 << tests[i].format), "%u.%u: formats %08x have been rendered\n", i, j, rendered ); }

1 0

Akihiro Sagawa : imm32: Set the default IME window title and styles as in native.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 686369022d4b54d8eccaa9f76f53c0943634cdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686369022d4b54d8eccaa9f76… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 7 00:04:45 2016 +0900 imm32: Set the default IME window title and styles as in native. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 6 ++++-- dlls/imm32/tests/imm32.c | 9 +++++++++ dlls/user32/misc.c | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 495d476..3f8ad18 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -109,6 +109,7 @@ static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; static const WCHAR szwIME[] = {'I','M','E',0}; +static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1662,8 +1663,9 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( WS_EX_TOOLWINDOW, - szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); + new = CreateWindowExW( 0, szwIME, szwDefaultIME, + WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, + 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ EnterCriticalSection(&threaddata_cs); /* See if anyone beat us */ diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8e45efb..a2072e9 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -866,6 +866,8 @@ static void test_ImmDefaultHwnd(void) HWND def1, def3; HANDLE thread; HWND hwnd; + char title[16]; + LONG style; hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, @@ -882,6 +884,13 @@ static void test_ImmDefaultHwnd(void) def1 = ImmGetDefaultIMEWnd(hwnd); + GetWindowTextA(def1, title, sizeof(title)); + ok(!strcmp(title, "Default IME"), "got %s\n", title); + style = GetWindowLongA(def1, GWL_STYLE); + ok(style == (WS_DISABLED | WS_POPUP | WS_CLIPSIBLINGS), "got %08x\n", style); + style = GetWindowLongA(def1, GWL_EXSTYLE); + ok(style == 0, "got %08x\n", style); + imc2 = ImmCreateContext(); ImmSetOpenStatus(imc2, TRUE); diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1e60e0d..beed6aa 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -882,7 +882,7 @@ LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { HWND uiwnd; - if (msg==WM_CREATE || msg==WM_NCCREATE) + if (msg==WM_CREATE) return TRUE; if (imm_get_ui_window && is_ime_ui_msg(msg)) @@ -899,7 +899,7 @@ LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { HWND uiwnd; - if (msg==WM_CREATE || msg==WM_NCCREATE) + if (msg==WM_CREATE) return TRUE; if (imm_get_ui_window && is_ime_ui_msg(msg))

1 0

André Hentschel : setupapi/tests: Also check for ERROR_CALL_NOT_IMPLEMENTED at the second call to SetupDiCreateDeviceInfoListExW.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: cfcffd9799dea0044076eea178621f33998f68f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfcffd9799dea0044076eea17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 19:15:24 2016 +0200 setupapi/tests: Also check for ERROR_CALL_NOT_IMPLEMENTED at the second call to SetupDiCreateDeviceInfoListExW. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 319bb31..b6439d5 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -281,6 +281,12 @@ static void test_SetupDiCreateDeviceInfoListEx(void) devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); error = GetLastError(); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + { + /* win10 reports ERROR_CALL_NOT_IMPLEMENTED at first here */ + win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + return; + } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_MACHINENAME || error == ERROR_MACHINE_UNAVAILABLE, "GetLastError returned wrong value : %d, (expected %d or %d)\n", error, ERROR_INVALID_MACHINENAME, ERROR_MACHINE_UNAVAILABLE);

1 0

Huw Davies : winmm/tests: Pass the full size of MIDIHDR to midiOutPrepareHeader().
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 54f7a638454890d73fd580b04c9c5dd400800d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f7a638454890d73fd580b04… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 7 11:12:58 2016 +0100 winmm/tests: Pass the full size of MIDIHDR to midiOutPrepareHeader(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b80d5d2..f3ea62c 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -514,8 +514,8 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)-1); ok(rc==MMSYSERR_INVALPARAM, "midiOutPrepare tiny rc=%s\n", mmsys_error(rc)); - rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); - ok(!rc, "midiOutPrepare old size rc=%s\n", mmsys_error(rc)); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepare size rc=%s\n", mmsys_error(rc)); ok(mhdr.dwFlags & MHDR_PREPARED, "MHDR.dwFlags when prepared %x\n", mhdr.dwFlags); /* The device is still in paused mode and should queue the message. */ @@ -557,9 +557,9 @@ static void test_midiStream(UINT udev, HWND hwnd) /* Native fills dwOffset regardless of the cbMidiHdr size argument to midiStreamOut */ ok(1234567890!=mhdr.dwOffset, "play left MIDIHDR.dwOffset at %u\n", mhdr.dwOffset); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare #2 rc=%s\n", mmsys_error(rc)); trace("MIDIHDR stream flags=%x when finished\n", mhdr.dwFlags); @@ -584,9 +584,9 @@ static void test_midiStream(UINT udev, HWND hwnd) mhdr.dwFlags |= MHDR_ISSTRM; /* Preset flags (e.g. MHDR_ISSTRM) do not disturb. */ - rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutPrepare used flags %x rc=%s\n", mhdr.dwFlags, mmsys_error(rc)); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare used flags %x rc=%s\n", mhdr.dwFlags, mmsys_error(rc)); rc = midiStreamRestart(hm);

1 0

Michael Stefaniuc : d3d9: Avoid a cast from a COM object to an interface.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 5562339681de3437898d301bdf484720fbb4c4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5562339681de3437898d301bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 7 13:17:19 2016 +0200 d3d9: Avoid a cast from a COM object to an interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 8f5f143..5772c11 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -498,7 +498,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U } TRACE("Created device %p.\n", object); - *device = (IDirect3DDevice9 *)object; + *device = (IDirect3DDevice9 *)&object->IDirect3DDevice9Ex_iface; return D3D_OK; }

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}1 and add tests.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: b5f95498a9e4c17188d6fdb94efe1c097b1a7999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f95498a9e4c17188d6fdb94… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:56:16 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}1 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 +++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp120/vcomp120.spec | 4 ++-- dlls/vcomp140/vcomp140.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 8 files changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f95498a9e4c17188d6f…

1 0

Bruno Jesus : dinput: Only complain for unsupported effect envelope if it really is useful.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: f85e7d17167760080f31aaec39632c18ed5b7f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85e7d17167760080f31aaec3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 6 15:32:52 2016 -0300 dinput: Only complain for unsupported effect envelope if it really is useful. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 1015105..fe3334a 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -585,7 +585,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( env->fade_length = 0; env->fade_level = 0; } - else + else if(peff->lpEnvelope->dwAttackTime || peff->lpEnvelope->dwAttackLevel || + peff->lpEnvelope->dwFadeTime || peff->lpEnvelope->dwFadeLevel) WARN("Ignoring dinput envelope not supported in the linux effect\n"); }

1 0

Bruno Jesus : ws2_32/tests: Add non-interactive SIO_ADDRESS_LIST_CHANGE tests.
by Alexandre Julliard Sept. 7, 2016

Sept. 7, 2016

Module: wine Branch: master Commit: 9a66463256b534a8c5608ffd32b3c55da37e8e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a66463256b534a8c5608ffd3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 6 23:46:18 2016 -0300 ws2_32/tests: Add non-interactive SIO_ADDRESS_LIST_CHANGE tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 105 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2640dd4..98ff7c7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8336,17 +8336,11 @@ static void test_sioAddressListChange(void) struct in_addr net_address; WSAOVERLAPPED overlapped; struct hostent *h; - DWORD num_bytes; + DWORD num_bytes, error; SOCKET sock; int acount; int ret; - if (!winetest_interactive) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); - return; - } - /* Use gethostbyname to find the list of local network interfaces */ h = gethostbyname(""); if (!h) @@ -8361,8 +8355,105 @@ static void test_sioAddressListChange(void) skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n"); return; } + net_address.s_addr = *(ULONG *) h->h_addr_list[0]; + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + if (!winetest_interactive) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); + return; + } + /* Bind an overlapped socket to the first found network interface */ sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n");

1 0