wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Alexandre Julliard : prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 88313bd112ea9908e393fd5cc76c35102cbadc98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88313bd112ea9908e393fd5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:16 2021 +0100 prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 2 +- dlls/prntvpt/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 452faa4fbf5..09818bc7b74 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -2,7 +2,7 @@ MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 197fb54022c..d6ad0cff46a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -43,21 +43,6 @@ static WCHAR *heap_strdupW(const WCHAR *src) return dst; } -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %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; -} - HRESULT WINAPI PTReleaseMemory(PVOID mem) { heap_free(mem);

1 0

Alexandre Julliard : printui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 790ab8d24cc58f81870ecbac0128a56c9d7d7620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790ab8d24cc58f81870ecbac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:12 2021 +0100 printui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 2 +- dlls/printui/printui.c | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 8e76c7c29ff..263cc95ccfa 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,7 +1,7 @@ MODULE = printui.dll IMPORTS = shell32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ printui.c diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index f35107fa0b2..09f527bfb0a 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -210,26 +210,6 @@ static BOOL parse_rundll(context_t * cx) return TRUE; } -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%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; -} - - /***************************************************** * PrintUIEntryW [printui.@] * Commandline-Interface for using printui.dll with rundll32.exe

1 0

Alexandre Julliard : pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 4394b4250b2f94174b5d786ea5db218a590ac04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4394b4250b2f94174b5d786e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:08 2021 +0100 pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/Makefile.in | 2 +- dlls/pidgen/main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index 5923cb25786..d737fff8119 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -1,6 +1,6 @@ MODULE = pidgen.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 35af226ffd2..dc0c50c83ae 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -24,25 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidgen); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %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; -} - int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) { FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8);

1 0

Alexandre Julliard : pdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 918a41e4835c4b2d5351c370b16395d0c2f002fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=918a41e4835c4b2d5351c370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 20:54:50 2021 +0100 pdh: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/Makefile.in | 2 +- dlls/pdh/pdh_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index d3ce7a4e13e..59e0442a4d0 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,7 +1,7 @@ MODULE = pdh.dll IMPORTLIB = pdh -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ pdh_main.c diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index d3bf6ab8706..73d4fef2a14 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -67,25 +67,6 @@ static inline WCHAR *pdh_strdup_aw( const char *src ) return dst; } -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; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - DeleteCriticalSection(&pdh_handle_cs); - break; - } - - return TRUE; -} - union value { LONG longvalue;

1 0

Alexandre Julliard : ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 2e35f400f8b27d10a9796d458c14dfd227c49f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e35f400f8b27d10a9796d45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:05 2021 +0100 ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntprint/Makefile.in | 2 +- dlls/ntprint/ntprint.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 29edde3bc4b..55644dcfc7a 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntprint.dll IMPORTS = winspool -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ ntprint.c diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 100385725c8..6a4cb57c7f6 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -39,25 +39,6 @@ typedef struct { DWORD installed; /* Number of installed Monitors */ } monitorinfo_t; -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%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; -} - /***************************************************** * PSetupCreateMonitorInfo [NTPRINT.@] *

1 0

Alexandre Julliard : ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 9f9d1e6675c3cf102b1a345058bb926b1bfd6b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9d1e6675c3cf102b1a3450… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:01 2021 +0100 ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 2 +- dlls/ntdsapi/ntdsapi.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index afe29a38fa6..e2f1eca4865 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -2,7 +2,7 @@ MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 929b9944846..2438197a7a3 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -27,25 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %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; -} - /*********************************************************************** * DsBindA (NTDSAPI.@) */

1 0

Alexandre Julliard : ninput: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 629d4fce0feba0bee1440dbafc989e42d308bf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=629d4fce0feba0bee1440dba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:27:57 2021 +0100 ninput: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/Makefile.in | 2 +- dlls/ninput/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in index 2afd034f75d..3ebda8e9578 100644 --- a/dlls/ninput/Makefile.in +++ b/dlls/ninput/Makefile.in @@ -1,7 +1,7 @@ MODULE = ninput.dll IMPORTLIB = ninput -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 8635ffb0e94..56d82b08ac5 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -165,18 +165,3 @@ HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) FIXME("context %p: stub!\n", context); return E_NOTIMPL; } - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - TRACE("(%p, %d, %p)\n", inst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : ncrypt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: a3a0fc94e2eaf43ce2d95621a500c3045f745749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3a0fc94e2eaf43ce2d95621… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:27:53 2021 +0100 ncrypt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/Makefile.in | 2 +- dlls/ncrypt/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index c387c35d854..9e6c9f5ff9a 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,6 +1,6 @@ MODULE = ncrypt.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index a8dda3c54a0..f23b239d93f 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags)

1 0

Zebediah Figura : ntdll/tests: Avoid passing an uninitialized timeout to NtNotifyChangeKey().
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: db0fe3381310ba7613a7458f25ce5610cc6091c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db0fe3381310ba7613a7458f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 19:40:01 2021 -0600 ntdll/tests: Avoid passing an uninitialized timeout to NtNotifyChangeKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ac1dec9f2f8..7463f98aa29 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1850,7 +1850,7 @@ static void test_NtQueryKey(void) static void test_notify(void) { OBJECT_ATTRIBUTES attr; - LARGE_INTEGER timeout; + static const LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; HANDLE key, key2, events[4], subkey; @@ -1952,7 +1952,6 @@ static void test_notify(void) status = pNtNotifyChangeMultipleKeys(key, 0, NULL, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - timeout.QuadPart = 0; status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status);

1 0

Nikolay Sivov : wbemdisp: Add SWbemNamedValueSet stub.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 1922298fe3a0a0ebca788905547d99d2dc65a9e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1922298fe3a0a0ebca788905… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 24 09:40:23 2021 +0300 wbemdisp: Add SWbemNamedValueSet stub. 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 | 237 ++++++++++++++++++++++++++++++++++++++- dlls/wbemdisp/main.c | 3 + dlls/wbemdisp/tests/wbemdisp.c | 12 ++ dlls/wbemdisp/wbemdisp_private.h | 1 + include/wbemdisp.idl | 11 ++ 5 files changed, 263 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 28c8e5b4120..bbb0625f4e8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -47,6 +47,7 @@ enum type_id ISWbemPropertySet_tid, ISWbemServices_tid, ISWbemSecurity_tid, + ISWbemNamedValueSet_tid, last_tid }; @@ -61,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices, - &IID_ISWbemSecurity + &IID_ISWbemSecurity, + &IID_ISWbemNamedValueSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -2456,3 +2458,236 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; +}; + +static struct namedvalueset *impl_from_ISWbemNamedValueSet( ISWbemNamedValueSet *iface ) +{ + return CONTAINING_RECORD( iface, struct namedvalueset, ISWbemNamedValueSet_iface ); +} + +static HRESULT WINAPI namedvalueset_QueryInterface( + ISWbemNamedValueSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemNamedValueSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemNamedValueSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI namedvalueset_AddRef( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI namedvalueset_Release( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfoCount( + ISWbemNamedValueSet *iface, + UINT *count ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + TRACE( "%p, %p\n", set, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfo( + ISWbemNamedValueSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemNamedValueSet_tid, info ); +} + +static HRESULT WINAPI namedvalueset_GetIDsOfNames( + ISWbemNamedValueSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_Invoke( + ISWbemNamedValueSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemNamedValueSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_get__NewEnum( + ISWbemNamedValueSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Item( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags, + ISWbemNamedValue **value ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Count( + ISWbemNamedValueSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Add( + ISWbemNamedValueSet *iface, + BSTR name, + VARIANT *value, + LONG flags, + ISWbemNamedValue **namedvalue ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Remove( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Clone( + ISWbemNamedValueSet *iface, + ISWbemNamedValueSet **valueset ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_DeleteAll( + ISWbemNamedValueSet *iface ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = +{ + namedvalueset_QueryInterface, + namedvalueset_AddRef, + namedvalueset_Release, + namedvalueset_GetTypeInfoCount, + namedvalueset_GetTypeInfo, + namedvalueset_GetIDsOfNames, + namedvalueset_Invoke, + namedvalueset_get__NewEnum, + namedvalueset_Item, + namedvalueset_Count, + namedvalueset_Add, + namedvalueset_Remove, + namedvalueset_Clone, + namedvalueset_DeleteAll, +}; + +HRESULT SWbemNamedValueSet_create( void **obj ) +{ + struct namedvalueset *set; + + TRACE( "%p\n", obj ); + + if (!(set = heap_alloc_zero( sizeof(*set) ))) return E_OUTOFMEMORY; + set->ISWbemNamedValueSet_iface.lpVtbl = &namedvalueset_vtbl; + set->refs = 1; + + *obj = &set->ISWbemNamedValueSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index cfaf7d787eb..b0064582187 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -262,6 +262,7 @@ static const struct IClassFactoryVtbl factory_vtbl = }; static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create }; +static struct factory swbem_namedvalueset_cf = { { &factory_vtbl }, SWbemNamedValueSet_create }; static struct factory winmgmts_cf = { { &factory_vtbl }, WinMGMTS_create }; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) @@ -289,6 +290,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) cf = &swbem_locator_cf.IClassFactory_iface; else if (IsEqualGUID( rclsid, &CLSID_WinMGMTS )) cf = &winmgmts_cf.IClassFactory_iface; + else if (IsEqualGUID( rclsid, &CLSID_SWbemNamedValueSet )) + cf = &swbem_namedvalueset_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index fa51ce6d756..24225ad1ac1 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -402,12 +402,24 @@ static void test_locator(void) ISWbemLocator_Release( locator ); } +static void test_namedvalueset(void) +{ + ISWbemNamedValueSet *set; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemNamedValueSet_Release(set); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); test_ParseDisplayName(); test_locator(); + test_namedvalueset(); CoUninitialize(); } diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index b03a13e2ea0..1648843fcba 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,3 +17,4 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemNamedValueSet_create(void **) DECLSPEC_HIDDEN; diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 8ccdd0ca5e2..6f09f7ee154 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -1196,4 +1196,15 @@ coclass SWbemLocator interface ISWbemLocator; } +[ + threading(apartment), + uuid(9aed384e-ce8b-11d1-8b05-00600806d9b6), + progid("WbemScripting.SWbemNamedValueSet.1"), + vi_progid("WbemScripting.SWbemNamedValueSet") +] +coclass SWbemNamedValueSet +{ + interface ISWbemNamedValueSet; +} + } /* WbemScripting */

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021