February 2021 - Wine-commits

Alexandre Julliard : winnls32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 9bfaaea8facf87dbddb83a9568b80c37947ae1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfaaea8facf87dbddb83a95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:32 2021 +0100 winnls32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winnls32/Makefile.in | 2 +- dlls/winnls32/winnls.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in index c94375a2516..d7787abf08c 100644 --- a/dlls/winnls32/Makefile.in +++ b/dlls/winnls32/Makefile.in @@ -1,7 +1,7 @@ MODULE = winnls32.dll IMPORTLIB = winnls32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ winnls.c diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 517a53cf7cd..b89a6a8cc6b 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -22,22 +22,6 @@ #include "winbase.h" #include "winnls32.h" -/*********************************************************************** - * DllMain (WINNLS.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * WINNLS32GetEnableStatus (WINNLS32.2) */

1 0

Alexandre Julliard : winsta: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 60933c5b93a4494fa70234903386100863a121db URL: https://source.winehq.org/git/wine.git/?a=commit;h=60933c5b93a4494fa7023490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:36 2021 +0100 winsta: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/Makefile.in | 2 +- dlls/winsta/main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index 58f9ca1812d..a83405a806d 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,6 +1,6 @@ MODULE = winsta.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 7568310aeaa..9ec4d64d0b6 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -27,24 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -} - BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) {

1 0

Alexandre Julliard : wlanapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 8457f1376efafad33966f3cc609f2e9b3704857a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8457f1376efafad33966f3cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:40 2021 +0100 wlanapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/Makefile.in | 2 +- dlls/wlanapi/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index 5cc2287c2d9..ab1a04ac241 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = wlanapi.dll IMPORTLIB = wlanapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index cfffeedb110..d54cc1463ba 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -197,19 +197,3 @@ void *WINAPI WlanAllocateMemory(DWORD size) return ret; } - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *reserved) -{ - TRACE("(0x%p, %u, %p)\n", hinstDLL, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : wmvcore: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 1243c4e2c8e61ceb0fda179d3e6deffd8e043764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1243c4e2c8e61ceb0fda179d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:44 2021 +0100 wmvcore: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 +- dlls/wmvcore/wmvcore_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index c0b582775eb..e4efe0d3873 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -2,7 +2,7 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ reader.c \ diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 4dafcf8055a..7d030a0e93a 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -25,22 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - HRESULT WINAPI DllRegisterServer(void) { FIXME("(): stub\n");

1 0

Alexandre Julliard : wsnmp32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 96d1c58e7087dada6d5d9d45aff0dc07063b0625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d1c58e7087dada6d5d9d45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:48 2021 +0100 wsnmp32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsnmp32/Makefile.in | 2 +- dlls/wsnmp32/wsnmp32.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in index db01f47b298..c7b263bd964 100644 --- a/dlls/wsnmp32/Makefile.in +++ b/dlls/wsnmp32/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsnmp32.dll IMPORTLIB = wsnmp32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = wsnmp32.c diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 3dc54cb5fac..f0df30b3b4c 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsnmp32); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - SNMPAPI_STATUS WINAPI SnmpCleanup( void ) { FIXME( "\n" );

1 0

Alexandre Julliard : xolehlp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 1b826d9f563e235ea366e4599535f9844adab295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b826d9f563e235ea366e459… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:52 2021 +0100 xolehlp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/Makefile.in | 2 +- dlls/xolehlp/xolehlp.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index 37b1d0169fe..629db5e01be 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,6 +1,6 @@ MODULE = xolehlp.dll IMPORTS = adsiid uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = xolehlp.c diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 29b30244451..d3355c1c34e 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -630,21 +630,6 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) } /* DTC Proxy Core Object end */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - static BOOL is_local_machineA( const CHAR *server ) { static const CHAR dot[] = ".";

1 0

Alistair Leslie-Hughes : msado15: Semi-stub _Recordset Open.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 83cd24bb41c971d0ae0f99ddae95cd5535973e83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cd24bb41c971d0ae0f99dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 25 06:52:52 2021 +1100 msado15: Semi-stub _Recordset Open. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 12bb9680258..71df553ebb6 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1182,15 +1182,63 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { struct recordset *recordset = impl_from_Recordset( iface ); + ADOConnectionConstruction15 *construct; + IUnknown *session; + ICommandText *command_text; + DBROWCOUNT affected; + IUnknown *rowset; + HRESULT hr; - FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), + FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (recordset->fields) + { + recordset->state = adStateOpen; + return S_OK; + } + + if (V_VT(&active_connection) != VT_DISPATCH) + { + FIXME("Unsupported Active connection type %d\n", V_VT(&active_connection)); + return MAKE_ADO_HRESULT( adErrInvalidConnection ); + } + + hr = IDispatch_QueryInterface(V_DISPATCH(&active_connection), &IID_ADOConnectionConstruction15, (void**)&construct); + if (FAILED(hr)) + return E_FAIL; + + hr = ADOConnectionConstruction15_get_Session(construct, &session); + ADOConnectionConstruction15_Release(construct); + if (FAILED(hr)) + return E_FAIL; + + if (V_VT(&source) != VT_BSTR) + { + FIXME("Unsupported source type!\n"); + IUnknown_Release(session); + return E_FAIL; + } + + hr = create_command_text(session, V_BSTR(&source), &command_text); + IUnknown_Release(session); + if (FAILED(hr)) + return hr; + + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); + if (FAILED(hr)) + return hr; + + ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); + recordset->cursor_type = cursor_type; recordset->state = adStateOpen; - return S_OK; + + IUnknown_Release(rowset); + + return hr; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options )

1 0

Nikolay Sivov : wbemprox: Implement GetValue()/SetValue() for context object.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 377853dc512a48971f5e3fc6a18e7f43c0c7af04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=377853dc512a48971f5e3fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 25 10:04:30 2021 +0300 wbemprox: Implement GetValue()/SetValue() for context object. 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 | 87 +++++++++++++++++++++++++++++++++++++++--- dlls/wbemprox/tests/services.c | 63 ++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 965f1b168f1..eff5148ef29 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -955,12 +955,33 @@ HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) return S_OK; } +struct wbem_context_value +{ + struct list entry; + WCHAR *name; + VARIANT value; +}; + struct wbem_context { IWbemContext IWbemContext_iface; LONG refs; + struct list values; }; +static void wbem_context_delete_values(struct wbem_context *context) +{ + struct wbem_context_value *value, *next; + + LIST_FOR_EACH_ENTRY_SAFE(value, next, &context->values, struct wbem_context_value, entry) + { + list_remove( &value->entry ); + VariantClear( &value->value ); + heap_free( value->name ); + heap_free( value ); + } +} + static struct wbem_context *impl_from_IWbemContext( IWbemContext *iface ) { return CONTAINING_RECORD( iface, struct wbem_context, IWbemContext_iface ); @@ -1004,6 +1025,7 @@ static ULONG WINAPI wbem_context_Release( if (!refs) { TRACE("destroying %p\n", context); + wbem_context_delete_values( context ); heap_free( context ); } return refs; @@ -1056,26 +1078,78 @@ static HRESULT WINAPI wbem_context_EndEnumeration( return E_NOTIMPL; } +static struct wbem_context_value *wbem_context_get_value( struct wbem_context *context, const WCHAR *name ) +{ + struct wbem_context_value *value; + + LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) + { + if (!lstrcmpiW( value->name, name )) return value; + } + + return NULL; +} + static HRESULT WINAPI wbem_context_SetValue( IWbemContext *iface, LPCWSTR name, LONG flags, - VARIANT *value ) + VARIANT *var ) { - FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %#x, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var)); + + if (!name || !var) + return WBEM_E_INVALID_PARAMETER; + + if ((value = wbem_context_get_value( context, name ))) + { + VariantClear( &value->value ); + hr = VariantCopy( &value->value, var ); + } + else + { + if (!(value = heap_alloc_zero( sizeof(*value) ))) return E_OUTOFMEMORY; + if (!(value->name = heap_strdupW( name ))) + { + heap_free( value ); + return E_OUTOFMEMORY; + } + if (FAILED(hr = VariantCopy( &value->value, var ))) + { + heap_free( value->name ); + heap_free( value ); + return hr; + } + + list_add_tail( &context->values, &value->entry ); + } + + return hr; } static HRESULT WINAPI wbem_context_GetValue( IWbemContext *iface, LPCWSTR name, LONG flags, - VARIANT *value ) + VARIANT *var ) { - FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; - return E_NOTIMPL; + TRACE("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, var); + + if (!name || !var) + return WBEM_E_INVALID_PARAMETER; + + if (!(value = wbem_context_get_value( context, name ))) + return WBEM_E_NOT_FOUND; + + V_VT(var) = VT_EMPTY; + return VariantCopy( var, &value->value ); } static HRESULT WINAPI wbem_context_DeleteValue( @@ -1123,6 +1197,7 @@ HRESULT WbemContext_create( void **obj ) context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; context->refs = 1; + list_init(&context->values); *obj = &context->IWbemContext_iface; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index a60d39f1ef2..ebbc766d6c5 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -152,11 +152,74 @@ static void test_IWbemLocator(void) static void test_IWbemContext(void) { IWbemContext *context; + VARIANT var; HRESULT hr; + BSTR str; 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); + hr = IWbemContext_SetValue(context, L"name", 0, NULL); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + V_I4(&var) = 12; + hr = IWbemContext_SetValue(context, NULL, 0, &var); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_SetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, NULL, 0, &var); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, L"name", 0, NULL); + ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_GetValue(context, L"noname", 0, &var); + ok(hr == WBEM_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IWbemContext_GetValue(context, L"NAME", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + + V_VT(&var) = VT_I4; + V_I4(&var) = 13; + hr = IWbemContext_SetValue(context, L"name2", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_Next(context, 0, &str, &var); +todo_wine + ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + + hr = IWbemContext_BeginEnumeration(context, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + str = NULL; + hr = IWbemContext_Next(context, 0, &str, &var); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(str, L"name"), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + hr = IWbemContext_EndEnumeration(context); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Overwrite */ + V_VT(&var) = VT_I4; + V_I4(&var) = 14; + hr = IWbemContext_SetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IWbemContext_GetValue(context, L"name", 0, &var); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + ok(V_I4(&var) == 14, "Unexpected value.\n"); + IWbemContext_Release( context ); }

1 0

Nikolay Sivov : wbemdisp: Use context object internally for named value set.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 7709d9b87063015b6295a6b5bcdcfc52576e4f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7709d9b87063015b6295a6b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 25 10:04:31 2021 +0300 wbemdisp: Use context object internally for named value set. 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/wbemdisp/locator.c | 241 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 76 +++++++++++++ 2 files changed, 308 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7709d9b87063015b6295…

1 0

Alexandre Julliard : ntdll: Add a separate helper for creating the initial ntdll module.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 93eb4dbde875497c9c38a79d01f6c045f92560f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eb4dbde875497c9c38a79d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 12:30:18 2021 +0100 ntdll: Add a separate helper for creating the initial ntdll module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a166a6cc071..e609a0f77d4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1937,20 +1937,23 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, /************************************************************************* - * build_builtin_module + * build_ntdll_module * - * Build the module for a builtin library. + * Build the module data for the initially-loaded ntdll. */ -static NTSTATUS build_builtin_module( const WCHAR *load_path, const UNICODE_STRING *nt_name, - void *module, DWORD flags, WINE_MODREF **pwm ) +static void build_ntdll_module(void) { - NTSTATUS status; - SECTION_IMAGE_INFORMATION image_info = { 0 }; + MEMORY_BASIC_INFORMATION meminfo; + UNICODE_STRING nt_name; + WINE_MODREF *wm; - image_info.u.s.WineBuiltin = 1; - status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); - if (status && module) unix_funcs->unload_builtin_dll( module ); - return status; + RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); + NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); + assert( wm ); + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + if (TRACE_ON(relay)) RELAY_SetupDLL( meminfo.AllocationBase ); } @@ -2348,7 +2351,14 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } else { - if ((status = build_builtin_module( load_path, &win_name, module, flags, &wm ))) return status; + SECTION_IMAGE_INFORMATION image_info = { 0 }; + + image_info.u.s.WineBuiltin = 1; + if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm ))) + { + if (module) unix_funcs->unload_builtin_dll( module ); + return status; + } TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_us(nt_name), module ); } *pwm = wm; @@ -3958,8 +3968,6 @@ static NTSTATUS process_init(void) WINE_MODREF *wm; NTSTATUS status; ANSI_STRING func_name; - UNICODE_STRING nt_name; - MEMORY_BASIC_INFORMATION meminfo; INITIAL_TEB stack; TEB *teb = NtCurrentTeb(); PEB *peb = teb->Peb; @@ -4059,11 +4067,7 @@ static NTSTATUS process_init(void) } #endif - RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - NtQueryVirtualMemory( GetCurrentProcess(), process_init, MemoryBasicInformation, - &meminfo, sizeof(meminfo), NULL ); - status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); - assert( !status ); + build_ntdll_module(); if ((status = load_dll( params->DllPath.Buffer, L"C:\\windows\\system32\\kernel32.dll", NULL, 0, &wm )) != STATUS_SUCCESS)

1 0