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

Huw Davies : riched20: Move the window procs to txthost.c .
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 732aec2af24ef73443128fdc3a73f2886b09d487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=732aec2af24ef73443128fdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:37 2021 +0000 riched20: Move the window procs to txthost.c . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 477 +----------------------------------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/txthost.c | 372 ++++++++++++++++++++++++++++++++++++- 3 files changed, 378 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=732aec2af24ef7344312…

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 816b588e0438f94a3769612739abc9d8d9980537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=816b588e0438f94a37696127… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:44 2021 +0300 kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a47abf342c..7d6ac030299 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winternl.h> @@ -60,6 +63,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis PSLIST_ENTRY last, ULONG count); static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); #ifdef __i386__ @@ -2702,6 +2706,49 @@ static void test_crit_section(void) ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } +static DWORD WINAPI thread_proc(LPVOID unused) +{ + Sleep(INFINITE); + return 0; +} + +static void CALLBACK user_apc(ULONG_PTR unused) +{ +} + +static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + PAPCFUNC func = (PAPCFUNC)arg1; + func(arg2); +} + +static void test_QueueUserAPC(void) +{ + HANDLE thread; + DWORD tid, ret; + + thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); + ok(thread != NULL, "CreateThread error %u\n", GetLastError()); + + ret = TerminateThread(thread, 0xdeadbeef); + ok(ret, "TerminateThread error %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "got %u\n", ret); + + ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); +todo_wine + ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); + + SetLastError(0xdeadbeef); + ret = QueueUserAPC(user_apc, thread, 0); + ok(!ret, "QueueUserAPC should fail\n"); +todo_wine + ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); + + CloseHandle(thread); +} + START_TEST(sync) { char **argv; @@ -2732,6 +2779,7 @@ START_TEST(sync) pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); + pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2744,6 +2792,8 @@ START_TEST(sync) } init_fastcall_thunk(); + + test_QueueUserAPC(); test_signalandwait(); test_mutex(); test_slist();

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in GetStringValue().
by Alexandre Julliard March 3, 2021

March 3, 2021

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 EnumValues().
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 045c4a5edbef85863db31d78cd62f1403a9f9633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=045c4a5edbef85863db31d78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:56 2021 +0300 wbemprox: Handle __ProviderArchitecture in EnumValues(). 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 1a963b0754b..59f94abfc4a 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -270,7 +270,8 @@ done: return hr; } -static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *types, VARIANT *retval ) +static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *types, IWbemContext *context, + VARIANT *retval ) { HKEY hkey = NULL; HRESULT hr = S_OK; @@ -281,7 +282,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI TRACE("%p, %s\n", root, debugstr_w(subkey)); - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE, &hkey ))) goto done; + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE | reg_get_access_mask( context ), &hkey ))) goto done; if ((res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, NULL, &count, &buflen, NULL, NULL, NULL ))) goto done; @@ -356,7 +357,7 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemContext *context, IWbemClas } VariantInit( &names ); VariantInit( &types ); - hr = enum_values( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, &types, &retval ); + hr = enum_values( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, &types, context, &retval ); if (hr != S_OK) goto done; if (out_params) {

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in SetStringValue().
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: bc063aaaa272d342971a1237220e07c2ba4f6f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc063aaaa272d342971a1237… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:57 2021 +0300 wbemprox: Handle __ProviderArchitecture in SetStringValue(). 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 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 59f94abfc4a..63870bfc52c 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -476,14 +476,23 @@ done: return hr; } -static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, VARIANT *retval ) +static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, + IWbemContext *context, VARIANT *retval ) { + HKEY hkey; LONG res; TRACE("%p, %s, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name), debugstr_w(value)); - res = RegSetKeyValueW( root, subkey, name, REG_SZ, value, (lstrlenW( value ) + 1) * sizeof(*value) ); + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey ))) + { + set_variant( VT_UI4, res, NULL, retval ); + return; + } + + res = RegSetKeyValueW( hkey, NULL, name, REG_SZ, value, (lstrlenW( value ) + 1) * sizeof(*value) ); set_variant( VT_UI4, res, NULL, retval ); + RegCloseKey( hkey ); } HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) @@ -524,7 +533,7 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } } - set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), &retval ); + set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), context, &retval ); if (out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Implement context object cloning.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 1be967df936b831018841119500aaa5fe546c49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be967df936b831018841119… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:49 2021 +0300 wbemprox: Implement context object cloning. 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 | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 19e03fa152b..7de97dbae64 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -1039,9 +1039,32 @@ static HRESULT WINAPI wbem_context_Clone( IWbemContext *iface, IWbemContext **newcopy ) { - FIXME("%p, %p\n", iface, newcopy); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; + IWbemContext *cloned_context; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p\n", iface, newcopy); + + if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context ))) + { + LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) + { + if (FAILED(hr = IWbemContext_SetValue( cloned_context, value->name, 0, &value->value ))) break; + } + } + + if (SUCCEEDED(hr)) + { + *newcopy = cloned_context; + } + else + { + *newcopy = NULL; + IWbemContext_Release( cloned_context ); + } + + return hr; } static HRESULT WINAPI wbem_context_GetNames(

1 0

Alexandre Julliard : kernelbase: Use the correct machine type for ARM.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 40e1000fc5cfdb002173e9380e791e4cbb8e6d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e1000fc5cfdb002173e938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:34 2021 +0100 kernelbase: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernelbase/process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ea9cde5facc..0c514f816c1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2187,9 +2187,9 @@ static void test_IsWow64Process2(void) #elif defined __x86_64__ USHORT expect_native = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARM64; #else USHORT expect_native = 0; #endif diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 98cefc717da..44bf0606c7a 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1002,7 +1002,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, *native_machine = IMAGE_FILE_MACHINE_I386; break; case PROCESSOR_ARCHITECTURE_ARM: - *native_machine = IMAGE_FILE_MACHINE_ARM; + *native_machine = IMAGE_FILE_MACHINE_ARMNT; break; case PROCESSOR_ARCHITECTURE_AMD64: *native_machine = IMAGE_FILE_MACHINE_AMD64;

1 0

Nikolay Sivov : wbemprox: Keep context object per services instance.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 4a97c6b03c68357c96fe9db6d7fcc69b8a44f3f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a97c6b03c68357c96fe9db6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:48 2021 +0300 wbemprox: Keep context object per services instance. 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 | 12 ++++++++---- dlls/wbemprox/tests/services.c | 24 ++++++++++++++++++++++++ dlls/wbemprox/wbemlocator.c | 6 +++--- dlls/wbemprox/wbemprox_private.h | 2 +- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index eff5148ef29..19e03fa152b 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -210,6 +210,7 @@ struct wbem_services CRITICAL_SECTION cs; WCHAR *namespace; struct async_header *async; + IWbemContext *context; }; static inline struct wbem_services *impl_from_IWbemServices( IWbemServices *iface ) @@ -243,6 +244,8 @@ static ULONG WINAPI wbem_services_Release( } ws->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &ws->cs ); + if (ws->context) + IWbemContext_Release( ws->context ); heap_free( ws->namespace ); heap_free( ws ); } @@ -293,7 +296,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace( if ((wcsicmp( strNamespace, L"cimv2" ) && wcsicmp( strNamespace, L"default" )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; - return WbemServices_create( L"cimv2", (void **)ppWorkingNamespace ); + return WbemServices_create( L"cimv2", NULL, (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -933,21 +936,22 @@ static const IWbemServicesVtbl wbem_services_vtbl = wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) +HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVOID *ppObj ) { struct wbem_services *ws; TRACE("(%p)\n", ppObj); - ws = heap_alloc( sizeof(*ws) ); + ws = heap_alloc_zero( sizeof(*ws) ); if (!ws) return E_OUTOFMEMORY; ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; ws->namespace = heap_strdupW( namespace ); - ws->async = NULL; InitializeCriticalSection( &ws->cs ); ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs"); + if (context) + IWbemContext_Clone( context, &ws->context ); *ppObj = &ws->IWbemServices_iface; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index ebbc766d6c5..da985de01fa 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -24,6 +24,15 @@ #include "wbemcli.h" #include "wine/test.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_IClientSecurity(void) { HRESULT hr; @@ -124,6 +133,7 @@ static void test_IWbemLocator(void) }; IWbemLocator *locator; IWbemServices *services; + IWbemContext *context; unsigned int i; HRESULT hr; BSTR resource; @@ -146,6 +156,20 @@ static void test_IWbemLocator(void) SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); } + + hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); + ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + + EXPECT_REF(context, 1); + resource = SysAllocString( L"root\\default" ); + hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, context, &services ); + ok(hr == S_OK, "Failed to connect, hr %#x.\n", hr); + SysFreeString( resource ); + EXPECT_REF(context, 1); + IWbemServices_Release( services ); + + IWbemContext_Release( context ); + IWbemLocator_Release( locator ); } diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 9b6f2cbc741..5e86f2be86d 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -161,14 +161,14 @@ static HRESULT WINAPI wbem_locator_ConnectServer( const BSTR Locale, LONG SecurityFlags, const BSTR Authority, - IWbemContext *pCtx, + IWbemContext *context, IWbemServices **ppNamespace) { HRESULT hr; WCHAR *server, *namespace; TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), - debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); + debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace); hr = parse_resource( NetworkResource, &server, &namespace ); if (hr != S_OK) return hr; @@ -187,7 +187,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( if (SecurityFlags) FIXME("unsupported flags\n"); - hr = WbemServices_create( namespace, (void **)ppNamespace ); + hr = WbemServices_create( namespace, context, (void **)ppNamespace ); heap_free( namespace ); heap_free( server ); if (SUCCEEDED( hr )) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index bae4b5d20c5..7e1efe65874 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -236,7 +236,7 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(const WCHAR *, IWbemContext *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : dbgeng: Use the correct machine type for ARM.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: fa23ffd26a91d62bd44c49ea39aa8cb15a8ab1a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa23ffd26a91d62bd44c49ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:19 2021 +0100 dbgeng: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index f24b04d0864..c857456b51c 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -3035,7 +3035,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *ifa switch (target->cpu_type) { case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: hr = S_FALSE; break; case IMAGE_FILE_MACHINE_IA64:

1 0

Alexandre Julliard : configure: Don't override the specified TARGETFLAGS.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: c08ffc6537727c3f8d0f0ddea803f5406f7b1d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08ffc6537727c3f8d0f0dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 15:38:44 2021 +0100 configure: Don't override the specified TARGETFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 ++++----- configure.ac | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 2b20133cd65..13eecaf05d7 100755 --- a/configure +++ b/configure @@ -5647,7 +5647,6 @@ case $host in ;; esac -TARGETFLAGS="" case $host in x86_64*|amd64*) @@ -5685,7 +5684,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5 host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5724,7 +5723,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5758,10 +5757,10 @@ $as_echo "$wine_cv_thumb2" >&6; } if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) diff --git a/configure.ac b/configure.ac index 24f5c8847d6..6a4e9568c40 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ case $host in ;; esac -AC_SUBST(TARGETFLAGS,"") +AC_SUBST(TARGETFLAGS) case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -152,7 +152,7 @@ case $host in test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.]) host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -169,7 +169,7 @@ case $host in CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -180,10 +180,10 @@ case $host in if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard)

1 0