- Wine-Commits - list.winehq.org

Carlos Rodriguez : wined3d: Add GPU information for another Intel UHD 630 GPU.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b09046cd1598b53648ce7509b5f7e65afb4ff51e URL: https://gitlab.winehq.org/wine/wine/-/commit/b09046cd1598b53648ce7509b5f7e6… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Wed Mar 8 14:45:08 2023 +0000 wined3d: Add GPU information for another Intel UHD 630 GPU. (cherry picked from commit 318b0bbed60a769fe74ffc0bc7c206543f3a612c) --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b6901d25c0..1d3beb8962c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -626,7 +626,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, - {HW_VENDOR_INTEL, CARD_INTEL_UHD630, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD630_1, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD630_2, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e06a7c14d7..e2410ac88ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3288,7 +3288,8 @@ enum wined3d_pci_device CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b, - CARD_INTEL_UHD630 = 0x3e9b, + CARD_INTEL_UHD630_1 = 0x3e9b, + CARD_INTEL_UHD630_2 = 0x3e91, }; struct wined3d_fbo_ops

1 0

Eric Pouech : winedbg: Use debuggee's bitness for 'examine /a' command.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 49ca079bdeb396da0d649feaf0942cc8be8c8502 URL: https://gitlab.winehq.org/wine/wine/-/commit/49ca079bdeb396da0d649feaf0942c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 23 11:19:35 2023 +0100 winedbg: Use debuggee's bitness for 'examine /a' command. Also fixes stack dump in crash summary and 'info stack' command. (We were using debugger's bitness instead). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 5fc54e32196276228cc8422e8371fc9eb4d7b6ca) --- programs/winedbg/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c1a714626b2..8237e719dae 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -248,13 +248,13 @@ void memory_examine(const struct dbg_lvalue *lvalue, int count, char format) case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); break; case 'w': DO_DUMP(unsigned short, 8, " %04x"); break; case 'a': - if (sizeof(DWORD_PTR) == 4) + if (ADDRSIZE == 4) { - DO_DUMP(DWORD_PTR, 4, " %8.8Ix"); + DO_DUMP(DWORD, 4, " %8.8lx"); } else { - DO_DUMP(DWORD_PTR, 2, " %16.16Ix"); + DO_DUMP(DWORD64, 2, " %16.16I64x"); } break; case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); break;

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_parse_result.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 68f91a82136377f33ba3bde473e8c87d912b8306 URL: https://gitlab.winehq.org/wine/wine/-/commit/68f91a82136377f33ba3bde473e8c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_parse_result. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 (cherry picked from commit 0c1dcfd3548e29f4af9a8c7bbf02835955c90967) --- dlls/wldap32/parse.c | 2 ++ dlls/wldap32/tests/parse.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 436d38d5c42..26e8de14c85 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -148,6 +148,7 @@ ULONG CDECL ldap_parse_resultA( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW, &referralsW, &serverctrlsW, free ); @@ -177,6 +178,7 @@ ULONG CDECL ldap_parse_resultW( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = map_error( ldap_parse_result( CTX(ld), MSG(result), (int *)retcode, &matchedU, &errorU, &referralsU, &serverctrlsU, free ) ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 161a0672cdc..375acbbe776 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -68,6 +68,12 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); + ret = ldap_parse_resultA( NULL, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( NULL, res, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( ld, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "ldap_parse_resultA should fail, got %#lx\n", ret ); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( !ret, "ldap_parse_resultA failed %#lx\n", ret );

1 0

Rémi Bernon : dwrite: Statically init the system_fallback locale list.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 1004fc2587120a6e9b95a8fd94a716890a90b0eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1004fc2587120a6e9b95a8fd94a716… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:34:59 2023 +0100 dwrite: Statically init the system_fallback locale list. To avoid a crash on DLL unload if it wasn't initialized. (cherry picked from commit 17ac4059a586cdfaa7cabf734396905f04ce80af) --- dlls/dwrite/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5489efa93b8..4e503eb8b5c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -551,7 +551,10 @@ struct dwrite_fontfallback_builder size_t mappings_size; }; -static struct fallback_data system_fallback; +static struct fallback_data system_fallback = +{ + .locales = LIST_INIT(system_fallback.locales), +}; static void release_fallback_mapping(struct fallback_mapping *mapping) {

1 0

Tingzhong Luo : evr: Fix crash when clearing input type for the mixer.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 2fa2a5ccdb7ba0d1442111541d0c0c31ecb5dd2e URL: https://gitlab.winehq.org/wine/wine/-/commit/2fa2a5ccdb7ba0d1442111541d0c0c… Author: Tingzhong Luo <luotingzhong(a)uniontech.com> Date: Thu Feb 23 11:56:54 2023 +0800 evr: Fix crash when clearing input type for the mixer. Signed-off-by: Tingzhong Luo <luotingzhong(a)uniontech.com> (cherry picked from commit c56638278cecc1db682af28b16fbdba6c73bbf42) --- dlls/evr/mixer.c | 9 +++++++-- dlls/evr/tests/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 668a97da979..222fc538fec 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -240,7 +240,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); - mixer->output.media_type = NULL; + memset(&mixer->output, 0, sizeof(mixer->output)); } static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) @@ -855,12 +855,17 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags); + if (!media_type && (flags & MFT_SET_TYPE_TEST_ONLY)) + return E_INVALIDARG; + EnterCriticalSection(&mixer->cs); if (!(flags & MFT_SET_TYPE_TEST_ONLY)) video_mixer_clear_types(mixer); - if (!mixer->device_manager) + if (!media_type) + hr = S_OK; + else if (!mixer->device_manager) hr = MF_E_NOT_INITIALIZED; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index acfb92f2ea5..4f30dd28570 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1249,6 +1249,11 @@ static void test_default_mixer_type_negotiation(void) goto done; } + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1469,9 +1474,48 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); + + IMFMediaType_Release(media_type); + + /* Clear input types */ + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + /* Restore types */ + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type == video_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type2 == media_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); + /* Resetting type twice */ + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoProcessor_Release(processor); IMFMediaType_Release(video_type);

1 0

Dmitry Timoshkov : win32u: Give full access rights to the thread desktop.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: ed67f0985df2000dd2aeb081e0482cceb27bab7d URL: https://gitlab.winehq.org/wine/wine/-/commit/ed67f0985df2000dd2aeb081e0482c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:33:42 2022 +0300 win32u: Give full access rights to the thread desktop. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> (cherry picked from commit 02e3e17b4dd62eb71d867d0140d3061de683ba29) --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 40105dd0f33..e33a3252494 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -279,7 +279,6 @@ static void test_handles(void) status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a6b35090223..d7300774a56 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -628,7 +628,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, DESKTOP_ALL_ACCESS, 0 ); + handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS, 0 ); if (handle) NtUserSetThreadDesktop( handle ); } NtClose( dir );

1 0

Dmitry Timoshkov : win32u: Give full access rights to the process window station.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 047b4d0ea79c9a132fa0a869870d2867d5e51756 URL: https://gitlab.winehq.org/wine/wine/-/commit/047b4d0ea79c9a132fa0a869870d28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:11:00 2022 +0300 win32u: Give full access rights to the process window station. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> (cherry picked from commit b99c67569f8ca939fba84dc3c8d448570daa753e) --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index fc775546502..40105dd0f33 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -137,7 +137,6 @@ static void test_handles(void) status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 145e12a8e1f..a6b35090223 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -604,7 +604,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateWindowStation( &attr, WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); + handle = NtUserCreateWindowStation( &attr, STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); if (handle) { NtUserSetProcessWindowStation( handle );

1 0

Giovanni Mascellani : wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 7c0da27bd1d653ae8a29754de70eb6010c4a851e URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0da27bd1d653ae8a29754de70eb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 20 15:41:19 2022 +0100 wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance(). The Ubisoft overlay version 135 hot patches and hooks wbem_locator_Release(), but crashes if Release() is called inside CoCreateInstance(), a condition that doesn't appear to happen on Windows. So we try to exhibit the same behavior. (cherry picked from commit 798fbd420540310a8c853ec9676cf3490fc880ca) --- dlls/wbemprox/main.c | 12 ++---------- dlls/wbemprox/services.c | 8 ++++++-- dlls/wbemprox/wbemlocator.c | 6 +++++- dlls/wbemprox/wbemprox_private.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 20ca1a08530..30363658636 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -37,7 +37,7 @@ static HINSTANCE instance; struct list *table_list[WBEMPROX_NAMESPACE_LAST]; -typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj, REFIID riid ); typedef struct { @@ -77,8 +77,6 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW REFIID riid, LPVOID *ppobj ) { wbemprox_cf *This = impl_from_IClassFactory( iface ); - HRESULT r; - IUnknown *punk; TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); @@ -87,13 +85,7 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( (LPVOID *)&punk ); - if (FAILED(r)) - return r; - - r = IUnknown_QueryInterface( punk, riid, ppobj ); - IUnknown_Release( punk ); - return r; + return This->pfnCreateInstance( ppobj, riid ); } static HRESULT WINAPI wbemprox_cf_LockServer( IClassFactory *iface, BOOL dolock ) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 6fc05be9f3c..203b0e90784 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -1058,7 +1058,7 @@ static HRESULT WINAPI wbem_context_Clone( TRACE("%p, %p\n", iface, newcopy); - if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context ))) + if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context, &IID_IWbemContext ))) { LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) { @@ -1225,12 +1225,16 @@ static const IWbemContextVtbl wbem_context_vtbl = wbem_context_DeleteAll, }; -HRESULT WbemContext_create( void **obj ) +HRESULT WbemContext_create( void **obj, REFIID riid ) { struct wbem_context *context; TRACE("(%p)\n", obj); + if ( !IsEqualGUID( riid, &IID_IWbemContext ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(context = malloc( sizeof(*context) ))) return E_OUTOFMEMORY; context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 32408cf6a90..6e5bddea156 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -202,12 +202,16 @@ static const IWbemLocatorVtbl wbem_locator_vtbl = wbem_locator_ConnectServer }; -HRESULT WbemLocator_create( LPVOID *ppObj ) +HRESULT WbemLocator_create( LPVOID *ppObj, REFIID riid ) { wbem_locator *wl; TRACE("(%p)\n", ppObj); + if ( !IsEqualGUID( riid, &IID_IWbemLocator ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(wl = malloc( sizeof(*wl) ))) return E_OUTOFMEMORY; wl->IWbemLocator_iface.lpVtbl = &wbem_locator_vtbl; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 328840e9dfe..4f23a8b8451 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -246,9 +246,9 @@ void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; -HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemLocator_create(LPVOID *, REFIID) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, IWbemContext *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **, REFIID) DECLSPEC_HIDDEN; HRESULT create_class_object(enum wbm_namespace ns, const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Alex Henrie : wldap32: Add ldap_set_dbg_flags stub.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b9dfdaf051ff4c8543fed7aa6b4a7ef819e17bd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9dfdaf051ff4c8543fed7aa6b4a7e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Mar 11 15:17:18 2023 -0700 wldap32: Add ldap_set_dbg_flags stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54663 (cherry picked from commit 6ed4a2e40e6d40d0569bbd9c57e17dca5ed12007) --- dlls/wldap32/misc.c | 9 +++++++++ dlls/wldap32/wldap32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index edf1f196353..5d49c412805 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -422,6 +422,15 @@ ULONG CDECL WLDAP32_ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_time return ret; } +/*********************************************************************** + * ldap_set_dbg_flags (WLDAP32.@) + */ +ULONG CDECL ldap_set_dbg_flags( ULONG flags ) +{ + FIXME( "(0x%lx) stub\n", flags ); + return 0; +} + /*********************************************************************** * LdapUnicodeToUTF8 (WLDAP32.@) */ diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 33e630dea87..7a23a1b0f22 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -185,7 +185,7 @@ 195 cdecl ldap_search_ext_s(ptr str long str ptr long ptr ptr ptr long ptr) ldap_search_ext_sA 196 cdecl ldap_search_ext_sA(ptr str long str ptr long ptr ptr ptr long ptr) 197 cdecl ldap_escape_filter_element(str long ptr long) ldap_escape_filter_elementA -198 stub ldap_set_dbg_flags +198 cdecl ldap_set_dbg_flags(long) 199 stub ldap_set_dbg_routine 200 cdecl ldap_memfree(ptr) ldap_memfreeA 201 cdecl ldap_startup(ptr ptr)

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_count_entries.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: c807811038de7cafd1ec646742f873924fc399b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c807811038de7cafd1ec646742f873… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_count_entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 (cherry picked from commit 65323a6b967b8e214aec8d97a88c7f1dbf17cbca) --- dlls/wldap32/misc.c | 1 + dlls/wldap32/tests/parse.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 5d49c412805..bf9afcf64b7 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -98,6 +98,7 @@ ULONG CDECL WLDAP32_ldap_count_entries( LDAP *ld, WLDAP32_LDAPMessage *res ) { TRACE( "(%p, %p)\n", ld, res ); + if (!res) return 0; if (!ld) return ~0u; return ldap_count_entries( CTX(ld), MSG(res) ); } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8394d5eeeff..161a0672cdc 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -252,7 +252,13 @@ static void test_ldap_paged_search(void) ok( res != NULL, "expected res != NULL\n" ); ok( count == 0, "got %lu\n", count ); - count = ldap_count_entries( ld, res); + count = ldap_count_entries( NULL, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( ld, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( NULL, res ); + todo_wine ok( count == 1, "got %lu\n", count ); + count = ldap_count_entries( ld, res ); ok( count == 1, "got %lu\n", count ); entry = ldap_first_entry( ld, res);

1 0