March 2021 - Wine-commits - list.winehq.org

Arkadiusz Hiler : kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: e51ae86937c547124c906fb1d5db7a142af60686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e51ae86937c547124c906fb1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 2 19:22:38 2021 +0200 kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources. Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 58c49aa148b..d5bfa081939 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -240,7 +240,8 @@ done: * Copied from loader/pe_resource.c */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DIRECTORY *dir, - WORD id, const void *root ) + WORD id, const void *root, + DWORD root_size ) { const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; int min, max, pos; @@ -248,11 +249,19 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); min = dir->NumberOfNamedEntries; max = min + dir->NumberOfIdEntries - 1; + + if (max >= (root_size - ((INT_PTR)dir - (INT_PTR)root) - sizeof(*dir)) / sizeof(*entry)) + return NULL; + while (min <= max) { pos = (min + max) / 2; if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + { + DWORD offset = entry[pos].u2.s2.OffsetToDirectory; + if (offset > root_size - sizeof(*dir)) return NULL; + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + offset); + } if (entry[pos].u.Id > id) max = pos - 1; else min = pos + 1; } @@ -294,7 +303,8 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root, DWORD flags ) + const void *root, DWORD root_size, + DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; @@ -319,7 +329,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); } - for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root, root_size ))) return ret; return find_entry_default( dir, root ); } @@ -413,7 +423,7 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; LPBYTE resSection; - DWORD len, section_size, data_size; + DWORD len, section_size, data_size, resDirSize; const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; @@ -486,21 +496,22 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); + resDirSize = section_size - (resDataDir->VirtualAddress - sections[i].VirtualAddress); resPtr = resDir; - resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No typeid entry found\n" ); goto done; } - resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir, flags ); + resPtr = find_entry_language( resPtr, resDir, resDirSize, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" );

1 0

Jactry Zeng : netprofm: Initialize ret value in IEnumNetworkConnections_Next().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: be41201c0a0fc166334f157a24fa3856e4f07635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be41201c0a0fc166334f157a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Mar 3 13:56:10 2021 +0800 netprofm: Initialize ret value in IEnumNetworkConnections_Next(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 2 ++ dlls/netprofm/tests/list.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f9b9e2ea312..fa94916dd9b 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1001,6 +1001,8 @@ static HRESULT WINAPI connections_enum_Next( TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + if (!ret) return E_POINTER; + *ret = NULL; if (fetched) *fetched = 0; if (!count) return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index ff7755162cc..56052ceb512 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -229,7 +229,7 @@ static void test_INetworkListManager( void ) INetworkConnection *conn; DWORD cookie; HRESULT hr; - ULONG ref1, ref2; + ULONG ref1, ref2, fetched; IID iid; hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, @@ -355,11 +355,22 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); if (conn_iter) { + fetched = 256; + hr = IEnumNetworkConnections_Next( conn_iter, 1, NULL, &fetched ); + ok( hr == E_POINTER, "got hr %#x.\n", hr ); + ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + + hr = IEnumNetworkConnections_Next( conn_iter, 0, NULL, &fetched ); + ok( hr == E_POINTER, "got hr %#x.\n", hr ); + ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + while ((hr = IEnumNetworkConnections_Next( conn_iter, 1, &conn, NULL )) == S_OK) { test_INetworkConnection( conn ); INetworkConnection_Release( conn ); + conn = (void *)0xdeadbeef; } + ok( !conn, "got wrong pointer: %p.\n", conn ); IEnumNetworkConnections_Release( conn_iter ); }

1 0

Rémi Bernon : winevulkan: Fix host command_buffers allocation size.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 2eae345d8c56b1ec92d4a5978e4832d51c0581bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eae345d8c56b1ec92d4a597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 3 16:31:55 2021 +0100 winevulkan: Fix host command_buffers allocation size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index dc3c9688df7..d24fcb2f64b 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1290,7 +1290,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); num_command_buffers = submits[i].commandBufferCount; - command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); + command_buffers = heap_calloc(num_command_buffers, sizeof(*command_buffers)); if (!command_buffers) { ERR("Unable to allocate memory for command buffers!\n");

1 0

Andrey Gusev : urlmon/tests: Fix typos in ok() messages.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 6d5659103f49db9e045087dd0093acc3b9a4b919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d5659103f49db9e045087dd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 3 20:40:14 2021 +0200 urlmon/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 2 +- dlls/urlmon/tests/url.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index bf8867290f8..ef96eb6ea15 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -212,7 +212,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR if (0) { /* FIXME: Uncomment after removing BindToStorage hack. */ - ok(pformatetc != NULL, "pformatetx == NULL\n"); + ok(pformatetc != NULL, "pformatetc == NULL\n"); if(pformatetc) { ok(pformatetc->cfFormat == 0xc02d, "clipformat=%x\n", pformatetc->cfFormat); ok(pformatetc->ptd == NULL, "ptd = %p\n", pformatetc->ptd); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6dd47732dda..ab92cbdd56e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1973,7 +1973,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW if(bind_to_object && !is_async_prot) ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION), "grfBSCF = %x\n", grfBSCF); - ok(pformatetc != NULL, "pformatetx == NULL\n"); + ok(pformatetc != NULL, "pformatetc == NULL\n"); if(pformatetc) { if (mime_type[0]) { INT ret;

1 0

Nikolay Sivov : wbemprox: Pass context object to the method.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 89f59a493a26cc86c6d37bb28166fb3345701339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f59a493a26cc86c6d37bb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:50 2021 +0300 wbemprox: Pass context object to the method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/process.c | 2 +- dlls/wbemprox/reg.c | 14 +++++++------- dlls/wbemprox/security.c | 4 ++-- dlls/wbemprox/service.c | 8 ++++---- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/sysrestore.c | 10 +++++----- dlls/wbemprox/wbemprox_private.h | 41 ++++++++++++++++++++-------------------- 7 files changed, 41 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89f59a493a26cc86c6d3…

1 0

Nikolay Sivov : wbemprox: Prioritize ExecMethod() context over services instance one.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 718ca769db6045a68b0d4ba51bf74add2ac5225d URL: https://source.winehq.org/git/wine.git/?a=commit;h=718ca769db6045a68b0d4ba5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:51 2021 +0300 wbemprox: Prioritize ExecMethod() context over services instance one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5275dd348c7..faed31b79af 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -836,11 +836,12 @@ static HRESULT WINAPI wbem_services_ExecMethod( const BSTR strObjectPath, const BSTR strMethodName, LONG lFlags, - IWbemContext *pCtx, + IWbemContext *context, IWbemClassObject *pInParams, IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { + struct wbem_services *services = impl_from_IWbemServices( iface ); IEnumWbemClassObject *result = NULL; IWbemClassObject *obj = NULL; struct query *query = NULL; @@ -851,7 +852,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( HRESULT hr; TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), - debugstr_w(strMethodName), lFlags, pCtx, pInParams, ppOutParams, ppCallResult); + debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult); if (lFlags) FIXME("flags %08x not supported\n", lFlags); @@ -882,7 +883,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( hr = get_method( table, strMethodName, &func ); if (hr != S_OK) goto done; - hr = func( obj, NULL, pInParams, ppOutParams ); + hr = func( obj, context ? context : services->context, pInParams, ppOutParams ); done: if (result) IEnumWbemClassObject_Release( result );

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in DeleteKey().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 447d3e112791f4292528a6472aa954bb13d57082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447d3e112791f4292528a647… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:52 2021 +0300 wbemprox: Handle __ProviderArchitecture in DeleteKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 41195e3e21e..cc65ef2c8d9 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -75,6 +75,30 @@ static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) return S_OK; } +static unsigned int reg_get_access_mask( IWbemContext *context ) +{ + VARIANT value; + + if (!context) return 0; + + V_VT( &value ) = VT_EMPTY; + if (FAILED(IWbemContext_GetValue( context, L"__ProviderArchitecture", 0, &value ))) + return 0; + + if (FAILED(VariantChangeType( &value, &value, 0, VT_I4 ))) + { + VariantClear( &value ); + return 0; + } + + if (V_I4( &value ) == 32) + return KEY_WOW64_32KEY; + else if (V_I4( &value ) == 64) + return KEY_WOW64_64KEY; + + return 0; +} + static HRESULT create_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) { LONG res; @@ -569,13 +593,13 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC return hr; } -static void delete_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +static void delete_key( HKEY root, const WCHAR *subkey, IWbemContext *context, VARIANT *retval ) { LONG res; TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegDeleteKeyExW( root, subkey, 0, 0 ); + res = RegDeleteKeyExW( root, subkey, reg_get_access_mask( context ), 0 ); set_variant( VT_UI4, res, NULL, retval ); } @@ -608,7 +632,7 @@ HRESULT reg_delete_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } } - delete_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + delete_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), context, &retval ); if (out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in GetStringValue().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 8bf540d67c5ca3cb36185aaed455624d2c7e9339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf540d67c5ca3cb36185aae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:53 2021 +0300 wbemprox: Handle __ProviderArchitecture in GetStringValue(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index cc65ef2c8d9..8cda101860f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -384,22 +384,30 @@ done: return hr; } -static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, VARIANT *value, VARIANT *retval ) +static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, VARIANT *value, + IWbemContext *context, VARIANT *retval ) { + DWORD size, mask, flags = RRF_RT_REG_SZ; HRESULT hr = S_OK; BSTR str = NULL; - DWORD size; LONG res; TRACE("%p, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name)); - if ((res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size ))) goto done; + mask = reg_get_access_mask( context ); + + if (mask & KEY_WOW64_64KEY) + flags |= RRF_SUBKEY_WOW6464KEY; + else if (mask & KEY_WOW64_32KEY) + flags |= RRF_SUBKEY_WOW6432KEY; + + if ((res = RegGetValueW( root, subkey, name, flags, NULL, NULL, &size ))) goto done; if (!(str = SysAllocStringLen( NULL, size / sizeof(WCHAR) - 1 ))) { hr = E_OUTOFMEMORY; goto done; } - if (!(res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, str, &size ))) + if (!(res = RegGetValueW( root, subkey, name, flags, NULL, str, &size ))) set_variant( VT_BSTR, 0, str, value ); done: @@ -442,7 +450,7 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } } VariantInit( &value ); - hr = get_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), &value, &retval ); + hr = get_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), &value, context, &retval ); if (hr != S_OK) goto done; if (out_params) {

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in CreateKey().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: aa175834a56150797965b0b232dfce35bd9c32d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa175834a56150797965b0b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:54 2021 +0300 wbemprox: Handle __ProviderArchitecture in CreateKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 8cda101860f..c1c5f4a51f0 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -99,14 +99,14 @@ static unsigned int reg_get_access_mask( IWbemContext *context ) return 0; } -static HRESULT create_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +static HRESULT create_key( HKEY root, const WCHAR *subkey, IWbemContext *context, VARIANT *retval ) { LONG res; HKEY hkey; TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegCreateKeyExW( root, subkey, 0, NULL, 0, 0, NULL, &hkey, NULL ); + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, reg_get_access_mask( context ), NULL, &hkey, NULL ); set_variant( VT_UI4, res, NULL, retval ); if (!res) { @@ -145,7 +145,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } } - hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), context, &retval ); if (hr == S_OK && out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in EnumKey().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 96d2d67308d8209babb3a1454e1d3ebeb78d42f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d2d67308d8209babb3a145… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:55 2021 +0300 wbemprox: Handle __ProviderArchitecture in EnumKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index c1c5f4a51f0..1a963b0754b 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -160,7 +160,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } -static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *retval ) +static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemContext *context, VARIANT *retval ) { HKEY hkey; HRESULT hr = S_OK; @@ -172,7 +172,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT TRACE("%p, %s\n", root, debugstr_w(subkey)); if (!(strings = heap_alloc( count * sizeof(BSTR) ))) return E_OUTOFMEMORY; - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_ENUMERATE_SUB_KEYS, &hkey ))) + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_ENUMERATE_SUB_KEYS | reg_get_access_mask( context ), &hkey ))) { set_variant( VT_UI4, res, NULL, retval ); heap_free( strings ); @@ -245,7 +245,7 @@ HRESULT reg_enum_key( IWbemClassObject *obj, IWbemContext *context, IWbemClassOb } } VariantInit( &names ); - hr = enum_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, &retval ); + hr = enum_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, context, &retval ); if (hr != S_OK) goto done; if (out_params) {

1 0