wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Zhiyi Zhang : ddraw: Don't report unsupported device capabilities in d3d3_EnumDevices().
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 4f00a1f9e2f5bc60edfe9c15f3720785cd68a978 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f00a1f9e2f5bc60edfe9c15f37207… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 17:19:28 2022 +0800 ddraw: Don't report unsupported device capabilities in d3d3_EnumDevices(). --- dlls/ddraw/ddraw.c | 5 +++++ dlls/ddraw/tests/ddraw1.c | 6 ------ dlls/ddraw/tests/ddraw2.c | 6 ------ dlls/ddraw/tests/ddraw4.c | 6 ------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 64eb7235ebf..fd4c5bd4862 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3882,6 +3882,9 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA hal_desc.dcmColorModel = 0; /* RGB, RAMP and MMX devices cannot report HAL hardware flags */ hal_desc.dwFlags = 0; + /* RGB, REF, RAMP and MMX devices don't report hardware transform and lighting capability */ + hal_desc.dwDevCaps &= ~(D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX); + hel_desc.dwDevCaps &= ~(D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX); hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, device_name, &hal_desc, &hel_desc, context); @@ -3906,6 +3909,8 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); /* HAL devices have a HEL dcmColorModel of 0 */ hel_desc.dcmColorModel = 0; + /* HAL devices report hardware transform and lighting capability, but not in hel */ + hel_desc.dwDevCaps &= ~(D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX); hr = callback((GUID *)&IID_IDirect3DHALDevice, wined3d_description, device_name, &hal_desc, &hel_desc, context); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c9702bbfaf8..94d41dbc34d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -15174,16 +15174,12 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwFlags == 0, "RGB Device hal caps has hardware flags %#lx\n", hal->dwFlags); ok(hel->dwFlags != 0, "RGB Device hel caps has hardware flags %#lx\n", hel->dwFlags); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hal device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); } @@ -15197,12 +15193,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT, "HAL Device hal device caps does not have D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); ok(hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX, "HAL Device hal device caps does not have D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index eae41eb77ae..d5b72793526 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -16120,16 +16120,12 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwFlags == 0, "RGB Device hal caps has hardware flags %#lx\n", hal->dwFlags); ok(hel->dwFlags != 0, "RGB Device hel caps has hardware flags %#lx\n", hel->dwFlags); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hal device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); } @@ -16143,12 +16139,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT, "HAL Device hal device caps does not have D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); ok(hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX, "HAL Device hal device caps does not have D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index eb1852e0832..471f6fc3f09 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19189,16 +19189,12 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwFlags == 0, "RGB Device hal caps has hardware flags %#lx\n", hal->dwFlags); ok(hel->dwFlags != 0, "RGB Device hel caps has hardware flags %#lx\n", hel->dwFlags); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hal device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hal device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); } @@ -19212,12 +19208,10 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d ok(hal->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT, "HAL Device hal device caps does not have D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device hel device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); ok(hal->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX, "HAL Device hal device caps does not have D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); - todo_wine ok((hel->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device hel device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); }

1 0

Zhiyi Zhang : ddraw: Don't report unsupported device capabilities in d3d7_EnumDevices().
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 6c391ac139f90549f068ea21390b1e028549574c URL: https://gitlab.winehq.org/wine/wine/-/commit/6c391ac139f90549f068ea21390b1e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 17:09:46 2022 +0800 ddraw: Don't report unsupported device capabilities in d3d7_EnumDevices(). Fix Battle Realms: Zen Edition failing to start. The game expects to find a device without D3DDEVCAPS_HWTRANSFORMANDLIGHT. --- dlls/ddraw/ddraw.c | 7 +++++++ dlls/ddraw/tests/ddraw7.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bb244222018..64eb7235ebf 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -49,6 +49,7 @@ static struct enum_device_entry char interface_name[100]; char device_name[100]; const GUID *device_guid; + DWORD unsupported_caps; } device_list7[] = { /* T&L HAL device */ @@ -56,6 +57,7 @@ static struct enum_device_entry "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D", "Wine D3D7 T&L HAL", &IID_IDirect3DTnLHalDevice, + 0, }, /* HAL device */ @@ -63,6 +65,7 @@ static struct enum_device_entry "WINE Direct3D7 Hardware acceleration using WineD3D", "Direct3D HAL", &IID_IDirect3DHALDevice, + D3DDEVCAPS_HWTRANSFORMANDLIGHT, }, /* RGB device */ @@ -70,6 +73,7 @@ static struct enum_device_entry "WINE Direct3D7 RGB Software Emulation using WineD3D", "Wine D3D7 RGB", &IID_IDirect3DRGBDevice, + D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX, }, }; @@ -3757,6 +3761,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA { struct ddraw *ddraw = impl_from_IDirect3D7(iface); D3DDEVICEDESC7 device_desc7; + DWORD dev_caps; HRESULT hr; size_t i; @@ -3772,12 +3777,14 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_unlock(); return hr; } + dev_caps = device_desc7.dwDevCaps; for (i = 0; i < ARRAY_SIZE(device_list7); i++) { HRESULT ret; device_desc7.deviceGUID = *device_list7[i].device_guid; + device_desc7.dwDevCaps = dev_caps & ~device_list7[i].unsupported_caps; ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); if (ret != DDENUMRET_OK) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 99c9c7df2bc..15ab548ebc6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19402,7 +19402,6 @@ static HRESULT WINAPI test_enum_devices_caps_callback(char *device_desc, char *d } else if (IsEqualGUID(&device_desc7->deviceGUID, &IID_IDirect3DHALDevice)) { - todo_wine ok((device_desc7->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "HAL Device device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); ok(device_desc7->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX, @@ -19410,10 +19409,8 @@ static HRESULT WINAPI test_enum_devices_caps_callback(char *device_desc, char *d } else if (IsEqualGUID(&device_desc7->deviceGUID, &IID_IDirect3DRGBDevice)) { - todo_wine ok((device_desc7->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n"); - todo_wine ok((device_desc7->dwDevCaps & D3DDEVCAPS_DRAWPRIMITIVES2EX) == 0, "RGB Device device caps has D3DDEVCAPS_DRAWPRIMITIVES2EX set\n"); }

1 0

Zhiyi Zhang : ddraw/tests: Add more capability tests for enumerated devices.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 0868bed1805c1fdb49cae43f8954b4995d3bbe57 URL: https://gitlab.winehq.org/wine/wine/-/commit/0868bed1805c1fdb49cae43f8954b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 17:00:25 2022 +0800 ddraw/tests: Add more capability tests for enumerated devices. Add tests for D3DDEVCAPS_HWTRANSFORMANDLIGHT and D3DDEVCAPS_DRAWPRIMITIVES2EX. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 218 insertions(+)

1 0

Zhiyi Zhang : ddraw/tests: Move the capability tests for enumerated devices.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 3c899df3b5a76cfa91e48ee816305f7c8828fc78 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c899df3b5a76cfa91e48ee816305f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 16:50:09 2022 +0800 ddraw/tests: Move the capability tests for enumerated devices. Move the capability tests for enumerated devices from d3d.c to ddraw{1,2,4}.c. --- dlls/ddraw/tests/d3d.c | 165 ---------------------------------------------- dlls/ddraw/tests/ddraw1.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 492 insertions(+), 165 deletions(-)

1 0

Zhiyi Zhang : ddraw/tests: Add a comment to note that tests in d3d.c are deprecated.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 21beb2a8c7a9dbd3632fb5562b6c54b30eb291e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/21beb2a8c7a9dbd3632fb5562b6c54… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 15:38:10 2022 +0800 ddraw/tests: Add a comment to note that tests in d3d.c are deprecated. And new tests should be added to tests/ddraw{1,2,4,7}.c. --- dlls/ddraw/tests/d3d.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 87d0648b699..7005908fc3a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2227,6 +2227,8 @@ START_TEST(d3d) }; unsigned int i; + /* These tests are deprecated. New tests should be added to tests/ddraw{1,2,4,7}.c */ + init_function_pointers(); if(!pDirectDrawCreateEx) { win_skip("function DirectDrawCreateEx not available\n");

1 0

Martin Storsjö : bcrypt: Fix the non-PE build after ECDH_P384 was added.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: fcb553ffc2caec728381fc577f1774432d3a969e URL: https://gitlab.winehq.org/wine/wine/-/commit/fcb553ffc2caec728381fc577f1774… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 24 10:58:48 2022 +0300 bcrypt: Fix the non-PE build after ECDH_P384 was added. This fixes non-PE builds after 5253c8d77e8e7dc5770981e97e67348f393b99b9. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/bcrypt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index ba44c01bbc9..c9c4cb7b1fd 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -159,6 +159,7 @@ static const WCHAR BCRYPT_AES_ALGORITHM[] = {'A','E','S',0}; static const WCHAR BCRYPT_DES_ALGORITHM[] = {'D','E','S',0}; static const WCHAR BCRYPT_DSA_ALGORITHM[] = {'D','S','A',0}; static const WCHAR BCRYPT_ECDH_P256_ALGORITHM[] = {'E','C','D','H','_','P','2','5','6',0}; +static const WCHAR BCRYPT_ECDH_P384_ALGORITHM[] = {'E','C','D','H','_','P','3','8','4',0}; static const WCHAR BCRYPT_ECDSA_P256_ALGORITHM[] = {'E','C','D','S','A','_','P','2','5','6',0}; static const WCHAR BCRYPT_ECDSA_P384_ALGORITHM[] = {'E','C','D','S','A','_','P','3','8','4',0}; static const WCHAR BCRYPT_ECDSA_P521_ALGORITHM[] = {'E','C','D','S','A','_','P','5','2','1',0};

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE return values from IUri methods.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 9f47704f1ae72d3e5d806709e2682da029f2a794 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f47704f1ae72d3e5d806709e2682d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE return values from IUri methods. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/main.c | 6 ++++-- dlls/mshtml/persist.c | 3 ++- dlls/mshtml/script.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1a64bdb9b7d..26c689ea016 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -215,7 +215,7 @@ compat_mode_t get_max_compat_mode(IUri *uri) { compat_config_t *iter; size_t len, iter_len; - BSTR host; + BSTR host = NULL; HRESULT hres; static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; @@ -224,8 +224,10 @@ compat_mode_t get_max_compat_mode(IUri *uri) if(!uri) return global_max_compat_mode; hres = IUri_GetHost(uri, &host); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(host); return global_max_compat_mode; + } len = SysStringLen(host); LIST_FOR_EACH_ENTRY(iter, &compat_config, compat_config_t, entry) { diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 73f255e753d..49e78ecfbc2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -1176,7 +1176,8 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if (FAILED(hres)) return hres; - ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW); + if(hres == S_OK) + ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW); SysFreeString(uri); return S_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 769ca72db6f..44211a6e0f2 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1123,7 +1123,7 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async hres = IUri_GetScheme(uri, &bsc->scheme); IUri_Release(uri); - if(FAILED(hres)) + if(hres != S_OK) bsc->scheme = URL_SCHEME_UNKNOWN; IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface);

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods in the NSAPI interfaces.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: b75ed0395dcc776261e1ba7753b903818bae75da URL: https://gitlab.winehq.org/wine/wine/-/commit/b75ed0395dcc776261e1ba7753b903… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods in the NSAPI interfaces. Mostly by setting such strings to NULL, because the component does not exist. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsio.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f1859e2a383..1a48925ff77 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -168,6 +168,11 @@ static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int l TRACE("returning %s\n", debugstr_wn(str, len)); + if(!str) { + nsACString_SetData(ret_str, NULL); + return NS_OK; + } + if(!*str) { nsACString_SetData(ret_str, ""); return NS_OK; @@ -1255,10 +1260,10 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI return NS_ERROR_UNEXPECTED; } - if(!ensure_uri(This->uri) || FAILED(IUri_GetScheme(This->uri->uri, &channel_scheme))) + if(!ensure_uri(This->uri) || IUri_GetScheme(This->uri->uri, &channel_scheme) != S_OK) channel_scheme = INTERNET_SCHEME_UNKNOWN; - if(FAILED(IUri_GetScheme(referrer->uri, &referrer_scheme))) + if(IUri_GetScheme(referrer->uri, &referrer_scheme) != S_OK) referrer_scheme = INTERNET_SCHEME_UNKNOWN; if(referrer_scheme == INTERNET_SCHEME_HTTPS && channel_scheme != INTERNET_SCHEME_HTTPS) { @@ -2291,9 +2296,9 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r return NS_ERROR_UNEXPECTED; } - vala = heap_strdupWtoU(val); + vala = heap_strdupWtoU(hres == S_OK ? val : NULL); SysFreeString(val); - if(!vala) + if(hres == S_OK && !vala) return NS_ERROR_OUT_OF_MEMORY; TRACE("ret %s\n", debugstr_a(vala)); @@ -2652,7 +2657,7 @@ static nsresult NSAPI nsURI_SetPassword(nsIFileURL *iface, const nsACString *aPa static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort) { nsWineURI *This = impl_from_nsIFileURL(iface); - const WCHAR *ptr; + const WCHAR *ptr = NULL; char *vala; BSTR val; HRESULT hres; @@ -2668,13 +2673,14 @@ static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort return NS_ERROR_UNEXPECTED; } - ptr = wcschr(val, '@'); - if(!ptr) - ptr = val; - + if(hres == S_OK) { + ptr = wcschr(val, '@'); + if(!ptr) + ptr = val; + } vala = heap_strdupWtoU(ptr); SysFreeString(val); - if(!vala) + if(hres == S_OK && !vala) return NS_ERROR_OUT_OF_MEMORY; TRACE("ret %s\n", debugstr_a(vala)); @@ -2846,8 +2852,12 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); - *_retval = !wcscmp(scheme_name, buf); + if(hres != S_OK) + *_retval = FALSE; + else { + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); + *_retval = !wcscmp(scheme_name, buf); + } SysFreeString(scheme_name); return NS_OK; } @@ -3167,6 +3177,11 @@ static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, co hres = IUri_GetPath(This->uri, path); if(FAILED(hres)) return NS_ERROR_FAILURE; + if(hres != S_OK) { + SysFreeString(*path); + *ext = *file = *path = NULL; + return NS_OK; + } for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\\'; ptr--); if(*ptr == '/' || *ptr == '\\') @@ -3458,7 +3473,7 @@ static nsresult create_nsuri(IUri *iuri, nsWineURI **_retval) ret->uri = iuri; hres = IUri_GetScheme(iuri, &ret->scheme); - if(FAILED(hres)) + if(hres != S_OK) ret->scheme = URL_SCHEME_UNKNOWN; TRACE("retval=%p\n", ret);

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods when navigating.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: e5fe3bc0773fc218f0d4329a9aa47c7ccc6a626a URL: https://gitlab.winehq.org/wine/wine/-/commit/e5fe3bc0773fc218f0d4329a9aa47c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods when navigating. Mostly by ignoring it, since no such Uri component exists. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4cafa083b08..7b46065b9a1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2033,15 +2033,17 @@ static void navigate_javascript_proc(task_t *_task) { navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; HTMLOuterWindow *window = task->window; + BSTR code = NULL; VARIANT v; - BSTR code; HRESULT hres; task->window->readystate = READYSTATE_COMPLETE; hres = IUri_GetPath(task->uri, &code); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(code); return; + } hres = UrlUnescapeW(code, NULL, NULL, URL_UNESCAPE_INPLACE); if(FAILED(hres)) { @@ -2109,8 +2111,8 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) { nsIDOMLocation *nslocation; nsAString nsfrag_str; + BSTR frag = NULL; WCHAR *selector; - BSTR frag; nsresult nsres; HRESULT hres; static const WCHAR selector_formatW[] = L"a[id=\"%s\"]"; @@ -2122,9 +2124,10 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) return E_FAIL; hres = IUri_GetFragment(uri, &frag); - if(FAILED(hres)) { + if(hres != S_OK) { + SysFreeString(frag); nsIDOMLocation_Release(nslocation); - return hres; + return FAILED(hres) ? hres : S_OK; } nsAString_InitDepend(&nsfrag_str, frag); @@ -2236,7 +2239,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC prepare_for_binding(&window->browser->doc->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); - if(SUCCEEDED(hres) && scheme == URL_SCHEME_JAVASCRIPT) { + if(hres == S_OK && scheme == URL_SCHEME_JAVASCRIPT) { navigate_javascript_task_t *task; IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface);

1 0

Gabriel Ivăncescu : mshtml: Don't navigate if GetDisplayUri failed.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: d2daec4027a1f9263f84e0e37a3a6cf624f04f57 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2daec4027a1f9263f84e0e37a3a6c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Don't navigate if GetDisplayUri failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ef764bde58c..4cafa083b08 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1677,9 +1677,11 @@ static void handle_extern_mime_navigation(nsChannelBSC *This) hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv, (void**)&webbrowser_priv_old); if(SUCCEEDED(hres)) { V_VT(&uriv) = VT_BSTR; - IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); + V_BSTR(&uriv) = NULL; + hres = IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); - hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); + if(hres == S_OK) + hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); SysFreeString(V_BSTR(&uriv)); IWebBrowserPriv_Release(webbrowser_priv_old);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022