wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Daniel Lehman : msvcp140: Add __crtWaitForThreadpoolTimerCallbacks.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5fb502b06e60ce58a6def812e1cf0b25d6d4ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb502b06e60ce58a6def812e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 14:07:03 2017 -0700 msvcp140: Add __crtWaitForThreadpoolTimerCallbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1b5bdcb..c32514a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3778,6 +3778,6 @@ @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer @ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait -@ stub __crtWaitForThreadpoolTimerCallbacks +@ cdecl __crtWaitForThreadpoolTimerCallbacks(ptr long) MSVCP__crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ac23c2b..7b97b5c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, } /********************************************************************* + * __crtWaitForThreadpoolTimerCallbacks (MSVCP140.@) + */ +VOID CDECL MSVCP__crtWaitForThreadpoolTimerCallbacks(TP_TIMER *timer, BOOL cancel) +{ + TRACE("(%p %d)\n", timer, cancel); + WaitForThreadpoolTimerCallbacks(timer, cancel); +} + +/********************************************************************* * __crtCreateThreadpoolWait (MSVCP140.@) */ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, diff --git a/include/winbase.h b/include/winbase.h index be1cb64..25e5077 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2636,6 +2636,7 @@ WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DW WINBASEAPI DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL); WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE,DWORD); WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolTimerCallbacks(PTP_TIMER,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe)

1 0

Daniel Lehman : msvcp140: Add __crtCloseThreadpoolWait.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 8104282988183cf28b41244011e76c5360cefeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8104282988183cf28b4124401… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 13:57:09 2017 -0700 msvcp140: Add __crtCloseThreadpoolWait. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 31d437e..1b5bdcb 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3753,7 +3753,7 @@ @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks @ stub __Wcrtomb_lk @ cdecl __crtCloseThreadpoolTimer(ptr) MSVCP__crtCloseThreadpoolTimer -@ stub __crtCloseThreadpoolWait +@ cdecl __crtCloseThreadpoolWait(ptr) MSVCP__crtCloseThreadpoolWait @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1098cb7..ac23c2b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1306,6 +1306,15 @@ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, } /********************************************************************* + * __crtCloseThreadpoolWait (MSVCP140.@) + */ +VOID CDECL MSVCP__crtCloseThreadpoolWait(TP_WAIT *wait) +{ + TRACE("(%p)\n", wait); + CloseThreadpoolWait(wait); +} + +/********************************************************************* * __crtSetThreadpoolWait (MSVCP140.@) */ VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *due_time)

1 0

Daniel Lehman : msvcp140: Add __crtCloseThreadpoolTimer.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: a0cf8ce9240558a54730e33e9dddd328f99b3fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0cf8ce9240558a54730e33e9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 13:50:31 2017 -0700 msvcp140: Add __crtCloseThreadpoolTimer. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ecf2b26..31d437e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3752,7 +3752,7 @@ @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks @ stub __Wcrtomb_lk -@ stub __crtCloseThreadpoolTimer +@ cdecl __crtCloseThreadpoolTimer(ptr) MSVCP__crtCloseThreadpoolTimer @ stub __crtCloseThreadpoolWait @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa5ac1d..1098cb7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1277,6 +1277,15 @@ PTP_TIMER CDECL MSVCP__crtCreateThreadpoolTimer(PTP_TIMER_CALLBACK callback, } /********************************************************************* + * __crtCloseThreadpoolTimer (MSVCP140.@) + */ +VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer) +{ + TRACE("(%p)\n", timer); + CloseThreadpoolTimer(timer); +} + +/********************************************************************* * __crtSetThreadpoolTimer (MSVCP140.@) */ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, diff --git a/include/winbase.h b/include/winbase.h index 894156c..be1cb64 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1752,6 +1752,7 @@ WINBASEAPI BOOL WINAPI CloseHandle(HANDLE); WINBASEAPI VOID WINAPI CloseThreadpool(PTP_POOL); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroup(PTP_CLEANUP_GROUP); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroupMembers(PTP_CLEANUP_GROUP,BOOL,PVOID); +WINBASEAPI VOID WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI VOID WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI VOID WINAPI CloseThreadpoolWork(PTP_WORK); WINBASEAPI BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG);

1 0

Francois Gouget : kernel32/tests: A spelling fix in a comment.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 8a19864b0f8315b51a0019c381483d1a5d98a63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a19864b0f8315b51a0019c38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:51 2017 +0200 kernel32/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index dc4be32..0546e96 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2933,7 +2933,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) /* terminate process with pending write */ create_overlapped_pipe(create_flags, &client, &server); process = create_writepipe_process(client); - /* succesfully read part of write that is pending in child process */ + /* successfully read part of write that is pending in child process */ res = ReadFile(server, buf, 10, &read_bytes, NULL); if(!msg_read_mode) ok(res, "ReadFile failed: %u\n", GetLastError());

1 0

Nikolay Sivov : shlwapi/tests: Remove workarounds for versions we don' t test on anymore.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: e878b79549a0f00c5863bb4b981001b3f9b8a2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e878b79549a0f00c5863bb4b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 17:23:27 2017 +0300 shlwapi/tests: Remove workarounds for versions we don't test on anymore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 118 ++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e878b79549a0f00c5863b…

1 0

Piotr Caban : msvcrt: Fix wide characters handling in wscanf functions.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: e7f9b562b9da5aa1fbe369f9e57fe63d08cbb743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f9b562b9da5aa1fbe369f9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 12:45:58 2017 +0200 msvcrt: Fix wide characters handling in wscanf functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 16 ++++++++-------- dlls/msvcrt/tests/scanf.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0fa1e6f..2920b9b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -68,11 +68,11 @@ #undef _EOF_ #define _EOF_ 0 #ifdef STRING_LEN -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -90,11 +90,11 @@ #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed++, *file++) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, (unsigned char)*file++) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -685,7 +685,7 @@ _FUNCTION_ { * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - if (nch==*format) { + if ((_CHAR_)nch == *format) { suppress = 1; /* whoops no field to be read */ st = 1; /* but we got what we expected */ nch = _GETC_(file); @@ -699,7 +699,7 @@ _FUNCTION_ { * a matching non-white-space character. */ else { /* check for character match */ - if (nch == (unsigned char)*format) { + if ((_CHAR_)nch == *format) { nch = _GETC_(file); } else break; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index ecb270b..1d1f28e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -252,7 +252,7 @@ static void test_sscanf( void ) ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); - ret = sscanf("\x81test", "\x81%s", buffer); + ret = sscanf("\x81\x82test", "\x81%\x82%s", buffer); ok(ret == 1, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } @@ -303,6 +303,8 @@ static void test_swscanf( void ) wchar_t buffer[100]; int result, ret; static const WCHAR formatd[] = {'%','d',0}; + const WCHAR format2[] = {'a',0x1234,'%',0x1234,'%','c',0}; + WCHAR c; /* check WEOF */ /* WEOF is an unsigned short -1 but swscanf returns int @@ -312,6 +314,14 @@ static void test_swscanf( void ) /* msvcrt returns 0 but should return -1 (later versions do) */ ok( ret == (short)WEOF || broken(ret == 0), "swscanf returns %x instead of %x\n", ret, WEOF ); + + buffer[0] = 'a'; + buffer[1] = 0x1234; + buffer[2] = 0x1234; + buffer[3] = 'b'; + ret = swscanf(buffer, format2, &c); + ok(ret == 1, "swscanf returned %d\n", ret); + ok(c == 'b', "c = %x\n", c); } START_TEST(scanf)

1 0

Huw Davies : wbemdisp: Implement ISWbemProperty::get_Value.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: a392e14243700b4b3c0afe1490c64cb587d8cb1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a392e14243700b4b3c0afe149… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:33 2017 +0100 wbemdisp: Implement ISWbemProperty::get_Value. Signed-off-by: Huw Davies <huw(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 | 9 ++++++--- dlls/wbemdisp/tests/wbemdisp.c | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 570de5a..6fdd608 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -209,10 +209,13 @@ static HRESULT WINAPI property_Invoke( ISWbemProperty *iface, DISPID member, REF return hr; } -static HRESULT WINAPI property_get_Value( ISWbemProperty *iface, VARIANT *varValue ) +static HRESULT WINAPI property_get_Value( ISWbemProperty *iface, VARIANT *value ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct property *property = impl_from_ISWbemProperty( iface ); + + TRACE( "%p %p\n", property, value ); + + return IWbemClassObject_Get( property->object, property->name, 0, value, NULL, NULL ); } static HRESULT WINAPI property_put_Value( ISWbemProperty *iface, VARIANT *varValue ) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index bfc81f9..0c426c5 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -313,6 +313,11 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); + hr = ISWbemProperty_get_Value( prop, &var ); + ok( hr == S_OK, "got %x\n", hr ); + ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); + VariantClear( &var ); + ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object );

1 0

Huw Davies : wbemdisp: Implement ISWbemPropertySet::Item.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 6721725689e5b7ae05ef501a90b56181c5d12e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6721725689e5b7ae05ef501a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:32 2017 +0100 wbemdisp: Implement ISWbemPropertySet::Item. Signed-off-by: Huw Davies <huw(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 | 213 ++++++++++++++++++++++++++++++++++++++++- dlls/wbemdisp/tests/wbemdisp.c | 16 +++- 2 files changed, 225 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 4abb80e..570de5a 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,6 +43,7 @@ enum type_id ISWbemLocator_tid, ISWbemObject_tid, ISWbemObjectSet_tid, + ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, last_tid @@ -56,6 +57,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemLocator, &IID_ISWbemObject, &IID_ISWbemObjectSet, + &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices }; @@ -95,6 +97,202 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +struct property +{ + ISWbemProperty ISWbemProperty_iface; + LONG refs; + IWbemClassObject *object; + BSTR name; +}; + +static inline struct property *impl_from_ISWbemProperty( ISWbemProperty *iface ) +{ + return CONTAINING_RECORD( iface, struct property, ISWbemProperty_iface ); +} + +static ULONG WINAPI property_AddRef( ISWbemProperty *iface ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + return InterlockedIncrement( &property->refs ); +} + +static ULONG WINAPI property_Release( ISWbemProperty *iface ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + LONG refs = InterlockedDecrement( &property->refs ); + if (!refs) + { + TRACE( "destroying %p\n", property ); + IWbemClassObject_Release( property->object ); + SysFreeString( property->name ); + heap_free( property ); + } + return refs; +} + +static HRESULT WINAPI property_QueryInterface( ISWbemProperty *iface, REFIID riid, void **obj ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + + TRACE( "%p %s %p\n", property, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_ISWbemProperty ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemProperty_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI property_GetTypeInfoCount( ISWbemProperty *iface, UINT *count ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + TRACE( "%p, %p\n", property, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI property_GetTypeInfo( ISWbemProperty *iface, UINT index, + LCID lcid, ITypeInfo **info ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + TRACE( "%p, %u, %u, %p\n", property, index, lcid, info ); + + return get_typeinfo( ISWbemProperty_tid, info ); +} + +static HRESULT WINAPI property_GetIDsOfNames( ISWbemProperty *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI property_Invoke( ISWbemProperty *iface, DISPID member, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &property->ISWbemProperty_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI property_get_Value( ISWbemProperty *iface, VARIANT *varValue ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_put_Value( ISWbemProperty *iface, VARIANT *varValue ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Name( ISWbemProperty *iface, BSTR *strName ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_IsLocal( ISWbemProperty *iface, VARIANT_BOOL *bIsLocal ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Origin( ISWbemProperty *iface, BSTR *strOrigin ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_CIMType( ISWbemProperty *iface, WbemCimtypeEnum *iCimType ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Qualifiers_( ISWbemProperty *iface, ISWbemQualifierSet **objWbemQualifierSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_IsArray( ISWbemProperty *iface, VARIANT_BOOL *bIsArray ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemPropertyVtbl property_vtbl = +{ + property_QueryInterface, + property_AddRef, + property_Release, + property_GetTypeInfoCount, + property_GetTypeInfo, + property_GetIDsOfNames, + property_Invoke, + property_get_Value, + property_put_Value, + property_get_Name, + property_get_IsLocal, + property_get_Origin, + property_get_CIMType, + property_get_Qualifiers_, + property_get_IsArray +}; + +static HRESULT SWbemProperty_create( IWbemClassObject *wbem_object, BSTR name, ISWbemProperty **obj ) +{ + struct property *property; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(property = heap_alloc( sizeof(*property) ))) return E_OUTOFMEMORY; + property->ISWbemProperty_iface.lpVtbl = &property_vtbl; + property->refs = 1; + property->object = wbem_object; + IWbemClassObject_AddRef( property->object ); + property->name = SysAllocStringLen( name, SysStringLen( name ) ); + *obj = &property->ISWbemProperty_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct propertyset { ISWbemPropertySet ISWbemPropertySet_iface; @@ -216,8 +414,19 @@ static HRESULT WINAPI propertyset_get__NewEnum( ISWbemPropertySet *iface, IUnkno static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, LONG flags, ISWbemProperty **prop ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT var; + + TRACE( "%p, %s, %08x, %p", propertyset, debugstr_w(name), flags, prop ); + + hr = IWbemClassObject_Get( propertyset->object, name, 0, &var, NULL, NULL ); + if (SUCCEEDED(hr)) + { + hr = SWbemProperty_create( propertyset->object, name, prop ); + VariantClear( &var ); + } + return hr; } static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index f88ed1a..bfc81f9 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "objidl.h" #include "wbemdisp.h" +#include "wbemcli.h" #include "wine/test.h" DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); @@ -250,18 +251,20 @@ static const WCHAR query[] = {'S','e','l','e','c','t',' ','P','r','o','c','e','s ' ','W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR lang[] = {'W','Q','L',0}; static const WCHAR props[] = {'P','r','o','p','e','r','t','i','e','s','_',0}; +static const WCHAR procid[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; static void test_locator(void) { HRESULT hr; DISPID id; - BSTR host_bstr, root_bstr, query_bstr, lang_bstr, props_bstr; + BSTR host_bstr, root_bstr, query_bstr, lang_bstr, props_bstr, procid_bstr; ISWbemLocator *locator; ISWbemServices *services; ISWbemObjectSet *object_set; IEnumVARIANT *enum_var; ISWbemObject *object; ISWbemPropertySet *prop_set; + ISWbemProperty *prop; VARIANT var; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); @@ -293,7 +296,6 @@ static void test_locator(void) hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); ok( hr == S_OK, "got %x\n", hr ); ok( id == 21, "got %d\n", id ); - SysFreeString( props_bstr ); hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); ok( hr == S_OK, "got %x\n", hr ); @@ -302,6 +304,16 @@ static void test_locator(void) hr = ISWbemObject_get_Properties_( object, &prop_set ); ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemPropertySet_Item( prop_set, props_bstr, 0, &prop ); + ok( hr == WBEM_E_NOT_FOUND, "got %x\n", hr ); + SysFreeString( props_bstr ); + + procid_bstr = SysAllocString( procid ); + hr = ISWbemPropertySet_Item( prop_set, procid_bstr, 0, &prop ); + ok( hr == S_OK, "got %x\n", hr ); + SysFreeString( procid_bstr ); + + ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); IEnumVARIANT_Release( enum_var );

1 0

Huw Davies : wbemdisp: Implement ISWbemObject::get_Properties_.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: cb2660b40da1364656fd1cc0757d5841ee0cd310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2660b40da1364656fd1cc07… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:31 2017 +0100 wbemdisp: Implement ISWbemObject::get_Properties_. Signed-off-by: Huw Davies <huw(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 | 189 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 10 +++ 2 files changed, 194 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e6ef02b..4abb80e 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,6 +43,7 @@ enum type_id ISWbemLocator_tid, ISWbemObject_tid, ISWbemObjectSet_tid, + ISWbemPropertySet_tid, ISWbemServices_tid, last_tid }; @@ -55,6 +56,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemLocator, &IID_ISWbemObject, &IID_ISWbemObjectSet, + &IID_ISWbemPropertySet, &IID_ISWbemServices }; @@ -93,6 +95,183 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +struct propertyset +{ + ISWbemPropertySet ISWbemPropertySet_iface; + LONG refs; + IWbemClassObject *object; +}; + +static inline struct propertyset *impl_from_ISWbemPropertySet( + ISWbemPropertySet *iface ) +{ + return CONTAINING_RECORD( iface, struct propertyset, ISWbemPropertySet_iface ); +} + +static ULONG WINAPI propertyset_AddRef( ISWbemPropertySet *iface ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + return InterlockedIncrement( &propertyset->refs ); +} + +static ULONG WINAPI propertyset_Release( ISWbemPropertySet *iface ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + LONG refs = InterlockedDecrement( &propertyset->refs ); + if (!refs) + { + TRACE( "destroying %p\n", propertyset ); + IWbemClassObject_Release( propertyset->object ); + heap_free( propertyset ); + } + return refs; +} + +static HRESULT WINAPI propertyset_QueryInterface( ISWbemPropertySet *iface, + REFIID riid, void **obj ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + + TRACE( "%p %s %p\n", propertyset, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_ISWbemPropertySet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemPropertySet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI propertyset_GetTypeInfoCount( ISWbemPropertySet *iface, UINT *count ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + TRACE( "%p, %p\n", propertyset, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI propertyset_GetTypeInfo( ISWbemPropertySet *iface, + UINT index, LCID lcid, ITypeInfo **info ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + TRACE( "%p, %u, %u, %p\n", propertyset, index, lcid, info ); + + return get_typeinfo( ISWbemPropertySet_tid, info ); +} + +static HRESULT WINAPI propertyset_GetIDsOfNames( ISWbemPropertySet *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI propertyset_Invoke( ISWbemPropertySet *iface, DISPID member, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &propertyset->ISWbemPropertySet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI propertyset_get__NewEnum( ISWbemPropertySet *iface, IUnknown **unk ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, + LONG flags, ISWbemProperty **prop ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, + VARIANT_BOOL is_array, LONG flags, ISWbemProperty **prop ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Remove( ISWbemPropertySet *iface, BSTR name, LONG flags ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemPropertySetVtbl propertyset_vtbl = +{ + propertyset_QueryInterface, + propertyset_AddRef, + propertyset_Release, + propertyset_GetTypeInfoCount, + propertyset_GetTypeInfo, + propertyset_GetIDsOfNames, + propertyset_Invoke, + propertyset_get__NewEnum, + propertyset_Item, + propertyset_get_Count, + propertyset_Add, + propertyset_Remove +}; + +static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPropertySet **obj ) +{ + struct propertyset *propertyset; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(propertyset = heap_alloc( sizeof(*propertyset) ))) return E_OUTOFMEMORY; + propertyset->ISWbemPropertySet_iface.lpVtbl = &propertyset_vtbl; + propertyset->refs = 1; + propertyset->object = wbem_object; + IWbemClassObject_AddRef( propertyset->object ); + *obj = &propertyset->ISWbemPropertySet_iface; + + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + #define DISPID_BASE 0x1800000 struct member @@ -559,12 +738,12 @@ static HRESULT WINAPI object_get_Qualifiers_( return E_NOTIMPL; } -static HRESULT WINAPI object_get_Properties_( - ISWbemObject *iface, - ISWbemPropertySet **objWbemPropertySet ) +static HRESULT WINAPI object_get_Properties_( ISWbemObject *iface, ISWbemPropertySet **prop_set ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, prop_set ); + return SWbemPropertySet_create( object->object, prop_set ); } static HRESULT WINAPI object_get_Methods_( diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 308dff6..f88ed1a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -260,6 +260,8 @@ static void test_locator(void) ISWbemServices *services; ISWbemObjectSet *object_set; IEnumVARIANT *enum_var; + ISWbemObject *object; + ISWbemPropertySet *prop_set; VARIANT var; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); @@ -293,7 +295,15 @@ static void test_locator(void) ok( id == 21, "got %d\n", id ); SysFreeString( props_bstr ); + hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); + ok( hr == S_OK, "got %x\n", hr ); VariantClear( &var ); + + hr = ISWbemObject_get_Properties_( object, &prop_set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemPropertySet_Release( prop_set ); + ISWbemObject_Release( object ); IEnumVARIANT_Release( enum_var ); ISWbemObjectSet_Release( object_set ); ISWbemServices_Release( services );

1 0

Huw Davies : wbemdisp: Invoke the generic methods and properties as well as the dynamic ones.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: a11aed32ca5b326baddd179a2768abd7ce03e9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11aed32ca5b326baddd179a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:30 2017 +0100 wbemdisp: Invoke the generic methods and properties as well as the dynamic ones. Signed-off-by: Huw Davies <huw(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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 74691bc..e6ef02b 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -300,10 +300,24 @@ static HRESULT WINAPI object_Invoke( { struct object *object = impl_from_ISWbemObject( iface ); BSTR name; + ITypeInfo *typeinfo; + HRESULT hr; TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); + if (member <= DISPID_BASE) + { + hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &object->ISWbemObject_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; + } + if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { FIXME( "flags %x not supported\n", flags );

1 0

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 April 2017