October 2021 - Wine-commits

Rémi Bernon : dinput: Call *_create_device directly in IDirectInput7WImpl_CreateDeviceEx.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: a83e6db3531012c60c6d8f72193e7661666b2b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83e6db3531012c60c6d8f72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 26 09:17:29 2021 +0200 dinput: Call *_create_device directly in IDirectInput7WImpl_CreateDeviceEx. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 21 +++++++-------------- dlls/dinput/dinput_private.h | 3 +++ dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index bee919cebff..ffa78be2fb5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -610,7 +610,6 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx( IDirectInput7W *iface, { IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); IDirectInputDevice8W *device; - unsigned int i; HRESULT hr; TRACE( "iface %p, guid %s, iid %s, out %p, outer %p\n", iface, debugstr_guid( guid ), @@ -622,20 +621,14 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx( IDirectInput7W *iface, if (!guid) return E_POINTER; if (!impl->initialized) return DIERR_NOTINITIALIZED; - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) - { - if (!dinput_devices[i]->create_device) continue; - if (SUCCEEDED(hr = dinput_devices[i]->create_device( impl, guid, &device ))) - { - hr = IDirectInputDevice8_QueryInterface( device, iid, out ); - IDirectInputDevice8_Release( device ); - return hr; - } - } + if (IsEqualGUID( &GUID_SysKeyboard, guid )) hr = keyboard_create_device( impl, guid, &device ); + else if (IsEqualGUID( &GUID_SysMouse, guid )) hr = mouse_create_device( impl, guid, &device ); + else hr = hid_joystick_create_device( impl, guid, &device ); - WARN( "invalid device GUID %s\n", debugstr_guid( guid ) ); - return DIERR_DEVICENOTREG; + if (FAILED(hr)) return hr; + hr = IDirectInputDevice8_QueryInterface( device, iid, out ); + IDirectInputDevice8_Release( device ); + return hr; } static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7W iface, REFGUID rguid, diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 553906e705d..e9b40bb95b6 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -60,8 +60,11 @@ struct dinput_device { }; extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); +extern HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); +extern HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); +extern HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); struct DevicePlayer { GUID instance_guid; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 8ce55e67ef2..3419fed7d79 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1737,7 +1737,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap return DIENUM_CONTINUE; } -static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { static const DIPROPHEADER filter = { diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 4a3deb161f1..3b8f52b38f2 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -174,7 +174,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan return DI_OK; } -static HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { SysKeyboardImpl *impl; HRESULT hr; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index b120966717e..325d38c90d3 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -104,7 +104,7 @@ HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, return DI_OK; } -static HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { SysMouseImpl *impl; HKEY hkey, appkey;

1 0

Rémi Bernon : dinput: Call hid_joystick_enum_device directly in EnumDevicesBySemantics.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: 5726c77faa5962504632f1e19813588dedcfc692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5726c77faa5962504632f1e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 26 09:17:30 2021 +0200 dinput: Call hid_joystick_enum_device directly in EnumDevicesBySemantics. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index ffa78be2fb5..745fdafa920 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -762,7 +762,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( DIDEVICEINSTANCEW didevi; LPDIRECTINPUTDEVICE8W lpdid; DWORD callbackFlags; - int i, j; + unsigned int i = 0; + HRESULT hr; int device_count = 0; int remain; DIDEVICEINSTANCEW *didevis = 0; @@ -772,28 +773,17 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); - /* Enumerate all the joysticks */ - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + do { - HRESULT enumSuccess; - - if (!dinput_devices[i]->enum_device) continue; - - for (j = 0, enumSuccess = S_OK; SUCCEEDED(enumSuccess); j++) + hr = hid_joystick_enum_device( DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, i++ ); + if (hr != DI_OK) continue; + if (should_enumerate_device( ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance )) { - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - - /* Default behavior is to enumerate attached game controllers */ - enumSuccess = dinput_devices[i]->enum_device(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); - if (enumSuccess == S_OK && - should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) - { - device_count++; - didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count ); - didevis[device_count-1] = didevi; - } + device_count++; + didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count ); + didevis[device_count - 1] = didevi; } - } + } while (SUCCEEDED(hr)); remain = device_count; /* Add keyboard and mouse to remaining device count */

1 0

Alexandre Julliard : Wine release 6.0.2
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: website Branch: master Commit: ce7e591894cec84053bc99e2210855acf0b0706d URL: https://source.winehq.org/git/website.git/?a=commit;h=ce7e591894cec84053bc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 16:40:38 2021 +0200 Wine release 6.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021102601.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2021102601.xml b/news/en/2021102601.xml new file mode 100644 index 00000000..5e6cbba3 --- /dev/null +++ b/news/en/2021102601.xml @@ -0,0 +1,15 @@ +<news> +<date>October 26, 2021</date> +<title>Wine 6.0.2 Released</title> +<body> + The Wine maintenance release 6.0.2 is now available. + <a href="{$root}/announce/6.0.2">What's new</a> in this release: +<ul> + <li>Compilation fixes (freetype, gcc 11)</li> + <li>Default to building with GnuTLS support on macOS, if present</li> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Haidong Yu : shell32: Fix a memory leak.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: ef54f3c22772ab1598d091a2747b7a12efd7cd5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef54f3c22772ab1598d091a2… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Jun 7 17:47:33 2021 +0800 shell32: Fix a memory leak. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 479b6594630c32b345aeb1cfd3c4c9cd8e214f95) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shelllink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1d..10b4769d970 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2150,7 +2150,10 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile if (*pszFile == '\0') *buffer = '\0'; else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname)) - return E_FAIL; + { + heap_free(unquoted); + return E_FAIL; + } else if(!PathFileExistsW(buffer) && !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) hr = S_FALSE;

1 0

Haidong Yu : shell32: Fix a memory leak.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: bd11172b7aac3eb0d32df45b1adeb6b5009a8294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd11172b7aac3eb0d32df45b… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Wed Jun 9 20:53:59 2021 +0800 shell32: Fix a memory leak. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 56976159ab792563e1e3ce237dce39d0ea68d0b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlexec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ce0b8f6d2be..ee1e832df33 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1763,7 +1763,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buf = heap_alloc(size * sizeof(WCHAR)); if (!buf || FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) { heap_free(buf); - return SE_ERR_OOM; + retval = SE_ERR_OOM; + goto end; } heap_free(wszApplicationName);

1 0

Anton Baskanov : fonts: Fix breve glyph position in 16px MS Sans Serif.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 7347cbd07a8a3d2fe2af4e9935b8d058d4ea12c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7347cbd07a8a3d2fe2af4e99… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:24 2021 +0700 fonts: Fix breve glyph position in 16px MS Sans Serif. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ecca23a32a14976641e44e88f79ffa81050f4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- fonts/ms_sans_serif.sfd | 2 +- fonts/ms_sans_serif.ttf | Bin 38536 -> 38536 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index e8c720b528c..f2de1843448 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -5448,7 +5448,7 @@ BDFChar: 291 710 4 1 2 0 9 ^qdb$^qdb$^q]pM BDFChar: 292 711 5 0 3 11 12 OC/%g -BDFChar: 293 728 5 0 4 14 15 +BDFChar: 293 728 5 0 4 11 12 Li<=o BDFChar: 294 729 3 1 1 12 12 J,fQL diff --git a/fonts/ms_sans_serif.ttf b/fonts/ms_sans_serif.ttf index fd20edb4595..8c492c7d310 100644 Binary files a/fonts/ms_sans_serif.ttf and b/fonts/ms_sans_serif.ttf differ

1 0

Anton Baskanov : fonts: Fix dotaccent glyph position in Small Fonts.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 40b962f9ef34f166b637b1ee6c545d000c7815ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b962f9ef34f166b637b1ee… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:25 2021 +0700 fonts: Fix dotaccent glyph position in Small Fonts. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80ef009fc123773ea118f3df57d54f727cab6893) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- fonts/small_fonts.sfd | 2 +- fonts/small_fonts.ttf | Bin 19068 -> 19068 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 28dcee28e12..e8494c8dc8e 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -4638,7 +4638,7 @@ BDFChar: 281 369 5 1 4 0 7 :nRfMOH>QC BDFChar: 282 355 3 1 2 -2 5 JA?\cJ3ZB8 -BDFChar: 283 729 2 0 0 10 10 +BDFChar: 283 729 2 0 0 8 8 J,fQL BDFChar: 284 8470 9 0 8 0 6 `;mo.V#[:kQ[k;#MuWhX diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf index a35230941a7..0e5e7f4127b 100644 Binary files a/fonts/small_fonts.ttf and b/fonts/small_fonts.ttf differ

1 0

Francois Gouget : make_unicode: Add support for the 720 codepage (Arabic, Farsi and Urdu).
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: cd5311958c719e948105822ad11cbac02de7e010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5311958c719e948105822a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 8 12:30:57 2021 +0200 make_unicode: Add support for the 720 codepage (Arabic, Farsi and Urdu). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1bae9f288a53d21a60dca5460b376a493585e07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 1 + dlls/kernelbase/locale.c | 1 + loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/c_720.nls | Bin 0 -> 66594 bytes tools/make_unicode | 1 + 6 files changed, 5 insertions(+) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 0d9dbd29c43..7b63b681f53 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -57,6 +57,7 @@ HKLM val '437' = s 'c_437.nls' val '500' = s 'c_500.nls' val '708' = s 'c_708.nls' + val '720' = s 'c_720.nls' val '737' = s 'c_737.nls' val '775' = s 'c_775.nls' val '850' = s 'c_850.nls' diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index a2925c5203d..250c81de5e4 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -108,6 +108,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 437, L"OEM United States" }, { 500, L"IBM EBCDIC International" }, { 708, L"Arabic ASMO" }, + { 720, L"Arabic (Transparent ASMO)" }, { 737, L"OEM Greek 437G" }, { 775, L"OEM Baltic" }, { 850, L"OEM Multilingual Latin 1" }, diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 8e5798f754b..d3199d167f3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4125,6 +4125,7 @@ c_28605.nls c_437.nls c_500.nls c_708.nls +c_720.nls c_737.nls c_775.nls c_850.nls diff --git a/nls/Makefile.in b/nls/Makefile.in index 4352becac5f..456822aaa83 100644 --- a/nls/Makefile.in +++ b/nls/Makefile.in @@ -46,6 +46,7 @@ SOURCES = \ c_437.nls \ c_500.nls \ c_708.nls \ + c_720.nls \ c_737.nls \ c_775.nls \ c_850.nls \ diff --git a/nls/c_720.nls b/nls/c_720.nls new file mode 100644 index 00000000000..8d3d950e70a Binary files /dev/null and b/nls/c_720.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 69ce845b26a..5afc11ec68c 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -46,6 +46,7 @@ my @allfiles = "CodpageFiles/437.txt", "CodpageFiles/500.txt", "CodpageFiles/708.txt", + "CodpageFiles/720.txt", "CodpageFiles/737.txt", "CodpageFiles/775.txt", "CodpageFiles/850.txt",

1 0

Zebediah Figura : wine.inf: Install the protocol database at etc\protocol.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: f61a3b7d152c04924eace53e58eb37d596138307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f61a3b7d152c04924eace53e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 11:08:20 2021 -0500 wine.inf: Install the protocol database at etc\protocol. Unlike Unix, on Windows the file name is not plural. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03dcb369790f6b9c60806728a26cc71debee3d53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d3199d167f3..82462e492d7 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4069,7 +4069,7 @@ srgb color space profile.icm,"@mscms.dll,-1" [EtcFiles] hosts,"@%11%\ws2_32.dll,-1" networks,"@%11%\ws2_32.dll,-2" -protocols,"@%11%\ws2_32.dll,-3" +protocol,"@%11%\ws2_32.dll,-3" services,"@%11%\ws2_32.dll,-4" [InfFiles]

1 0

Hans Leidekker : winhttp: Use ws.ifelse.io for websocket tests.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 2ed9701ab95c455efe1d3483b45e23ef03383f44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ed9701ab95c455efe1d3483… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 22 12:44:14 2021 +0200 winhttp: Use ws.ifelse.io for websocket tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51631 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9f6e39e8b945466180080d470e1272ba4f807b3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/notification.c | 16 ++++++++++++++-- dlls/winhttp/tests/winhttp.c | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 98e4024867f..e567ed758ee 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -644,6 +644,7 @@ static const struct notification websocket_test[] = { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, @@ -699,7 +700,7 @@ static void test_websocket(void) setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); - connection = WinHttpConnect( session, L"echo.websocket.org", 0, 0 ); + connection = WinHttpConnect( session, L"ws.ifelse.io", 0, 0 ); err = GetLastError(); ok( connection != NULL, "got %u\n", err); ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err ); @@ -769,7 +770,18 @@ static void test_websocket(void) WaitForSingleObject( info.wait, INFINITE ); ok( size == 0xdeadbeef, "got %u\n", size ); ok( type == 0xdeadbeef, "got %u\n", type ); - ok( buffer[0], "unexpected data\n" ); + ok( buffer[0] == 'R', "unexpected data\n" ); + + setup_test( &info, winhttp_websocket_receive, __LINE__ ); + buffer[0] = 0; + size = 0xdeadbeef; + type = 0xdeadbeef; + err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + ok( size == 0xdeadbeef, "got %u\n", size ); + ok( type == 0xdeadbeef, "got %u\n", type ); + ok( buffer[0] == 'h', "unexpected data\n" ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5379640d5fc..6bae45ce6da 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3291,7 +3291,7 @@ static void test_websocket(int port) session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(session != NULL, "got %u\n", GetLastError()); - connection = WinHttpConnect(session, L"echo.websocket.org", 0, 0); + connection = WinHttpConnect(session, L"ws.ifelse.io", 0, 0); ok(connection != NULL, "got %u\n", GetLastError()); request = WinHttpOpenRequest(connection, L"GET", L"/", NULL, NULL, NULL, 0); @@ -3316,6 +3316,15 @@ static void test_websocket(int port) socket = pWinHttpWebSocketCompleteUpgrade(request, 0); ok(socket != NULL, "got %u\n", GetLastError()); + buf[0] = 0; + count = 0; + type = 0xdeadbeef; + error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); + ok(!error, "got %u\n", error); + ok(buf[0] == 'R', "got %c\n", buf[0]); + ok(count == 26, "got %u\n", count); + ok(type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, "got %u\n", type); + error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); @@ -3388,10 +3397,10 @@ static void test_websocket(int port) error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, &len); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); - len = 0; + len = 0xdeadbeef; error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, &len); - ok(error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error); - ok(len, "len not set\n"); + ok(!error, "got %u\n", error); + ok(!len, "got %u\n", len); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 1, &len); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); @@ -3402,7 +3411,7 @@ static void test_websocket(int port) error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), &len); ok(!error, "got %u\n", error); ok(close_status == 1000, "got %08x\n", close_status); - ok(len == sizeof("success"), "got %u\n", len); + ok(!len, "got %u\n", len); WinHttpCloseHandle(socket); WinHttpCloseHandle(request);

1 0