February 2021 - Wine-Commits

Alexandre Julliard : ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

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 : pstorec: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 6c2e20bad4ca95925b301b74578b8d726aa16449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2e20bad4ca95925b301b74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:20 2021 +0100 pstorec: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 2 +- dlls/pstorec/pstorec.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index f8009e21a22..dd4dd616a33 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,7 +1,7 @@ MODULE = pstorec.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ pstorec.c diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 02cd803c116..65debd3e6f4 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -43,21 +43,6 @@ static inline PStore_impl *impl_from_IPStore(IPStore *iface) return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface); } -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("%p %x %p\n", hinst, fdwReason, fImpLoad); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -} - /************************************************************************** * IPStore->QueryInterface */

1 0

Alexandre Julliard : rasdlg: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: dd3164906361e4b40fcba63fa8dfb2fe4c77ab44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd3164906361e4b40fcba63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:30 2021 +0100 rasdlg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasdlg/Makefile.in | 2 +- dlls/rasdlg/rasdlg_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in index d780513fb6c..e7262be3d85 100644 --- a/dlls/rasdlg/Makefile.in +++ b/dlls/rasdlg/Makefile.in @@ -1,7 +1,7 @@ MODULE = rasdlg.dll IMPORTLIB = rasdlg -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ rasdlg_main.c diff --git a/dlls/rasdlg/rasdlg_main.c b/dlls/rasdlg/rasdlg_main.c index 255e6e6621a..149ed022314 100644 --- a/dlls/rasdlg/rasdlg_main.c +++ b/dlls/rasdlg/rasdlg_main.c @@ -27,24 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(rasdlg); -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; -} - BOOL WINAPI RasEntryDlgW(LPWSTR phonebook, LPWSTR entry, RASENTRYDLGW *lpInfo) { FIXME("(%s %s %p) stub\n", debugstr_w(phonebook), debugstr_w(entry), lpInfo);

1 0

Alexandre Julliard : sfc_os: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 18bae5248a7ef9a43715dc055af3403a3fccf5d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18bae5248a7ef9a43715dc05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:45 2021 +0100 sfc_os: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc_os/Makefile.in | 2 +- dlls/sfc_os/sfc_os.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 1329b2e7967..561b49911b3 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,6 +1,6 @@ MODULE = sfc_os.dll IMPORTLIB = sfc_os -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = sfc_os.c diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 6193dda43ef..f6163f5b4eb 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -30,25 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sfc); -/****************************************************************** - * 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; -} - /****************************************************************** * SfcGetNextProtectedFile [sfc_os.@] */

1 0

Alexandre Julliard : sxs: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 36e02dc7bcafb72d04aa429c9c1e16c101ecb1eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e02dc7bcafb72d04aa429c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:56 2021 +0100 sxs: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/Makefile.in | 2 +- dlls/sxs/sxs.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 05794029f2c..4e87d764a30 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -2,7 +2,7 @@ MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ cache.c \ diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index cd1d0f7bb56..2fa4dc0262b 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -28,23 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sxs); -/*********************************************************************** - * DllMain (SXS.@) - * - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -} - typedef struct _SXS_GUID_INFORMATION_CLR { DWORD cbSize;

1 0

Alexandre Julliard : t2embed: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: a8aecf946688cba1a98aa7355d904f5e9dfe8ebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8aecf946688cba1a98aa735… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:29:12 2021 +0100 t2embed: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 +- dlls/t2embed/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index f2b0583f987..faceac9b3a4 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -2,7 +2,7 @@ MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 12005640281..f79d4d69eb5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -28,20 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(t2embed); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, ULONG *pulPrivStatus, ULONG ulPrivs, ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream,

1 0

Alexandre Julliard : ninput: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

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 Feb. 24, 2021

Feb. 24, 2021

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 Feb. 24, 2021

Feb. 24, 2021

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 : wbemprox: Implement WbemContext stub.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 0eaccbb15e737aa2532d84d63b4e5991fd05b055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eaccbb15e737aa2532d84d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 23:06:33 2021 +0300 wbemprox: Implement WbemContext 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/wbemprox/main.c | 5 ++ dlls/wbemprox/services.c | 175 +++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/services.c | 12 +++ dlls/wbemprox/wbemprox.idl | 7 ++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 9 ++ 6 files changed, 209 insertions(+) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 09084414983..0ebbd55aba9 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -112,6 +112,7 @@ static const struct IClassFactoryVtbl wbemprox_cf_vtbl = }; static wbemprox_cf wbem_locator_cf = { { &wbemprox_cf_vtbl }, WbemLocator_create }; +static wbemprox_cf wbem_context_cf = { { &wbemprox_cf_vtbl }, WbemContext_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -139,6 +140,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &wbem_locator_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_WbemContext )) + { + cf = &wbem_context_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index ab7146db2d8..965f1b168f1 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -954,3 +954,178 @@ HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +struct wbem_context +{ + IWbemContext IWbemContext_iface; + LONG refs; +}; + +static struct wbem_context *impl_from_IWbemContext( IWbemContext *iface ) +{ + return CONTAINING_RECORD( iface, struct wbem_context, IWbemContext_iface ); +} + +static HRESULT WINAPI wbem_context_QueryInterface( + IWbemContext *iface, + REFIID riid, + void **obj) +{ + TRACE("%p, %s, %p\n", iface, debugstr_guid( riid ), obj ); + + if ( IsEqualGUID( riid, &IID_IWbemContext ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWbemContext_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI wbem_context_AddRef( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + return InterlockedIncrement( &context->refs ); +} + +static ULONG WINAPI wbem_context_Release( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + LONG refs = InterlockedDecrement( &context->refs ); + + if (!refs) + { + TRACE("destroying %p\n", context); + heap_free( context ); + } + return refs; +} + +static HRESULT WINAPI wbem_context_Clone( + IWbemContext *iface, + IWbemContext **newcopy ) +{ + FIXME("%p, %p\n", iface, newcopy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetNames( + IWbemContext *iface, + LONG flags, + SAFEARRAY **names ) +{ + FIXME("%p, %#x, %p\n", iface, flags, names); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_BeginEnumeration( + IWbemContext *iface, + LONG flags ) +{ + FIXME("%p, %#x\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_Next( + IWbemContext *iface, + LONG flags, + BSTR *name, + VARIANT *value ) +{ + FIXME("%p, %#x, %p, %p\n", iface, flags, name, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_EndEnumeration( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_SetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags ) +{ + FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteAll( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static const IWbemContextVtbl wbem_context_vtbl = +{ + wbem_context_QueryInterface, + wbem_context_AddRef, + wbem_context_Release, + wbem_context_Clone, + wbem_context_GetNames, + wbem_context_BeginEnumeration, + wbem_context_Next, + wbem_context_EndEnumeration, + wbem_context_SetValue, + wbem_context_GetValue, + wbem_context_DeleteValue, + wbem_context_DeleteAll, +}; + +HRESULT WbemContext_create( void **obj ) +{ + struct wbem_context *context; + + TRACE("(%p)\n", obj); + + context = heap_alloc( sizeof(*context) ); + if (!context) return E_OUTOFMEMORY; + + context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; + context->refs = 1; + + *obj = &context->IWbemContext_iface; + + TRACE("returning iface %p\n", *obj); + return S_OK; +} diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index cf45ed712b6..a60d39f1ef2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -149,10 +149,22 @@ static void test_IWbemLocator(void) IWbemLocator_Release( locator ); } +static void test_IWbemContext(void) +{ + IWbemContext *context; + HRESULT hr; + + 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); + + IWbemContext_Release( context ); +} + START_TEST(services) { CoInitialize( NULL ); test_IClientSecurity(); test_IWbemLocator(); + test_IWbemContext(); CoUninitialize(); } diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl index 5c6255a39dc..32fee800ee4 100644 --- a/dlls/wbemprox/wbemprox.idl +++ b/dlls/wbemprox/wbemprox.idl @@ -27,6 +27,13 @@ ] coclass WbemLocator { interface IWbemLocator; } +[ + helpstring("WBEM Call Context"), + threading(both), + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext { interface IWbemContext; } + [ helpstring("WBEM Administrative Locator"), threading(both), diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ff9a7f6ff82..ac857b859e8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -237,6 +237,7 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a2c1f785c9..f5c7f1bf44a 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -936,3 +936,12 @@ coclass WbemRefresher interface IWbemRefresher; interface IWbemConfigureRefresher; }; + +[ + restricted, + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext +{ + interface IWbemContext; +}

1 0