May 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] windowscodecs/tests: Test CreateNewFrame for DDS encoder.
by Ziqing Hui May 26, 2021

May 26, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 51 ++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)

2 1

[PATCH] ntdll/tests: Do not test old xstate structure details in test_user_shared_data().
by Paul Gofman May 26, 2021

May 26, 2021

Fixes test failures on 32 bit Testbot machines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7d457e2d5b8..22ee7f06ac7 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -928,12 +928,10 @@ static void test_user_shared_data(void) struct old_xstate_configuration *xs_old = (struct old_xstate_configuration *)((char *)user_shared_data + 0x3e0); - memset(&xstate, 0, sizeof(xstate)); - xstate.EnabledFeatures = xstate.EnabledVolatileFeatures = xs_old->EnabledFeatures; - memcpy(&xstate.Size, &xs_old->Size, sizeof(*xs_old) - offsetof(struct old_xstate_configuration, Size)); - for (i = 0; i < 3; ++i) - xstate.AllFeatures[i] = xs_old->Features[i].Size; - xstate.AllFeatureSize = 512 + sizeof(XSTATE); + ok(feature_mask == xs_old->EnabledFeatures, "Got unexpected xs_old->EnabledFeatures %s.\n", + wine_dbgstr_longlong(xs_old->EnabledFeatures)); + win_skip("Old structure layout.\n"); + return; } trace("XState EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); @@ -960,7 +958,7 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { ok(xstate.AllFeatures[i] == feature_sizes[i] - || broken(!xstate.AllFeatures[i]) /* win10pro */, + || broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */, "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, -- 2.31.1

2 1

[PATCH 2/2] ntdll: Use DECLSPEC_HIDDEN for a few more symbols.
by Jacek Caban May 26, 2021

May 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 7 +++++-- dlls/ntdll/unix/signal_x86_64.c | 10 ++++++++-- dlls/ntdll/unix/system.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] ntdll: Make get_machine_wow64_dir static.
by Jacek Caban May 26, 2021

May 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu May 26, 2021

May 26, 2021

Don't skip MoveCaret if it would actually change the selection when it is invalid. This can happen, for example, in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox, when the listbox has nothing selected. In this case, the item with the index zero would not be selected the first time the mouse moves over it, since the focus_item would be zero. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This can be easily tested with winecfg. Launch winecfg, go to `Libraries` tab, click on the combobox arrow dropdown for `New override for library` to open the listbox, then hover the mouse over the first entry (acledit). Notice that it does not get highlighted, which is the issue. If you move the mouse to the second entry (aclui) and then back to (acledit), it works. With this patch, the first hover over the first entry will also work as it should. dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 239f54a..1f5d3c9 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2337,7 +2337,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.30.0

2 3

[PATCH] dinput8: Use scan codes to test uAppData.
by Arkadiusz Hiler May 26, 2021

May 26, 2021

Virtual key codes are layout dependant while direct input works with scan codes. Using virtual key code for 'A' with AZERTY layout resulted in scan code for 'Q' being sent out, which in turn made the tests fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50987 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/dinput8/tests/device.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3e6da23b4ab..17deed193dd 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); + keybd_event(0, event, KEYEVENTF_SCANCODE, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -307,7 +307,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 10); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 10); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -319,7 +319,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetDataFormat(data->keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "SetDataFormat failed: %08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -327,13 +327,13 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, 'V', 11); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_V, 11); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data->keyboard, data->lpdiaf, NULL, 0); ok(SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); } static void test_action_mapping(void) @@ -402,19 +402,19 @@ static void test_action_mapping(void) /* Test keyboard BuildActionMap */ test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIDFT_PSHBUTTON, DIK_SPACE); /* Test keyboard input */ - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); /* setting format should reset action map */ hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); test_appdata_property_vs_map(&data); @@ -958,7 +958,7 @@ static void test_appdata_property(void) ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); /* the default value */ - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; @@ -992,19 +992,19 @@ static void test_appdata_property(void) hr = IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, 3); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', 4); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', 5); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_SPACE, 3); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, 4); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, 5); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); /* setting data format resets APPDATA */ hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); DestroyWindow(hwnd); IDirectInputDevice_Release(di_keyboard); -- 2.31.1

2 1

[PATCH 1/4] dinput8/tests: Make input helper function more versatile.
by Arkadiusz Hiler May 26, 2021

May 26, 2021

test_device_input() now takes properly sized appdata expected value and can be used to send any keyboard event. It also drains device's queue so it can be called multiple times on a single device instance. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/dinput8/tests/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2fc04358cc1..02574961ec1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -80,7 +80,7 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) +static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event( event, DIK_SPACE, 0, 0); + keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -107,7 +107,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO return; } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); /* Check for buffer overflow */ for (i = 0; i < 17; i++) @@ -132,6 +132,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + /* drain device's queue */ + while (data_size == 1) + { + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + if (hr != DI_OK) break; + } + IDirectInputDevice_Unacquire(lpdid); } -- 2.30.1

3 7

[PATCH] winex11: Allow user to set WM_CLASS
by Nicholas Little May 26, 2021

May 26, 2021

This commit allows the user to optionally set the WM_CLASS by setting an environment variable WINEWMCLASS with the aim of allowing him to ensure desktop environments can correctly identify wine windows, unfortunately the executable filename isn't always sufficient as some programs share a common executable name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50095 --- dlls/winex11.drv/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..6b87166c830 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -837,6 +837,7 @@ static void set_initial_wm_hints( Display *display, Window window ) Atom protocols[3]; Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; + char *wine_wm_class; /* wm protocols */ i = 0; @@ -849,8 +850,9 @@ static void set_initial_wm_hints( Display *display, Window window ) /* class hints */ if ((class_hints = XAllocClassHint())) { + wine_wm_class = getenv( "WINEWMCLASS" ); class_hints->res_name = process_name; - class_hints->res_class = process_name; + class_hints->res_class = wine_wm_class ? wine_wm_class : process_name; XSetClassHint( display, window, class_hints ); XFree( class_hints ); } -- 2.26.2

2 2

[PATCH 1/6] dinput/tests: Check IDirectInputDevice2AImpl_GetObjectInfo error codes.
by Rémi Bernon May 26, 2021

May 26, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 12 ++++++------ dlls/dinput/joystick.c | 8 +++++++- dlls/dinput/mouse.c | 8 +++++++- dlls/dinput/tests/device.c | 10 ++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 31b859801c7..c1388551644 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1457,9 +1457,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( DIDEVICEOBJECTINSTANCEW didoiW; HRESULT res; - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); @@ -1492,9 +1492,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( TRACE("(%p) %d(0x%08x) -> %p\n", This, dwHow, dwObj, pdidoi); - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W)) return DIERR_INVALIDPARAM; switch (dwHow) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 3749eed7efe..ab8b87f552b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -580,12 +580,18 @@ HRESULT WINAPI JoystickAGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = JoystickWGenericImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 65f173daa81..bc99ea37c68 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -802,12 +802,18 @@ static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = SysMouseWImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 9be00a671fb..485acca4f61 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -158,6 +158,16 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_GetObjectInfo(device, NULL, 16, DIPH_BYOFFSET); + ok(hr == E_POINTER, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, E_POINTER); + + obj_info.dwSize = 1; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + obj_info.dwSize = 0xdeadbeef; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + /* No need to test devices without axis */ obj_info.dwSize = sizeof(obj_info); hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); -- 2.31.0

1 5

[PATCH] webservices: Support IPv6 address format in WsDecodeUrl.
by Hans Leidekker May 26, 2021

May 26, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/url.c | 4 ++++ dlls/webservices/url.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 718f072f19c..4343dc6a3dd 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -50,6 +50,8 @@ static void test_WsDecodeUrl(void) static const WCHAR url25[] = L"http://host?query%202"; static const WCHAR url26[] = L"http://host#frag%202"; static const WCHAR url27[] = L"http://host/%c3%ab/"; + static const WCHAR url28[] = L"net.tcp://[::1]"; + static const WCHAR url29[] = L"net.tcp://[::1]:1111"; static const struct { const WCHAR *str; @@ -97,6 +99,8 @@ static void test_WsDecodeUrl(void) { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, L"query 2", 7 }, { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, L"frag 2", 6 }, { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, L"/\x00eb/", 3 }, + { url28, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url28 + 10, 5, 808, NULL, 0, NULL, 0 }, + { url29, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url29 + 10, 5, 1111, url29 + 16, 4, NULL, 0 }, }; WS_HEAP *heap; WS_STRING str; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index f2fbda83c1f..b44ee468e27 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -169,16 +169,14 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) /************************************************************************** * WsDecodeUrl [webservices.@] */ -HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, - WS_ERROR *error ) +HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, WS_ERROR *error ) { HRESULT hr = WS_E_QUOTA_EXCEEDED; WCHAR *p, *q, *decoded = NULL; WS_HTTP_URL *url = NULL; ULONG len, len_decoded, port = 0; - TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, - heap, ret, error ); + TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!str || !heap) return E_INVALIDARG; @@ -203,7 +201,15 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS if (!--len || *++q != '/') goto done; p = ++q; len--; - while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + if (*q == '[') + { + while (len && *q != ']') { q++; len--; }; + if (*q++ != ']') goto done; + } + else + { + while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + } if (q == p) goto done; url->host.length = q - p; url->host.chars = p; -- 2.30.2

1 0