December 2016 - Wine-commits

Bruno Jesus : xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: 67eec14ca00214481af8cfdf2bf56f0bd0ddfeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eec14ca00214481af8cfdf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:33 2016 -0200 xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities. Important to show that they changed between XInput versions 1.3 and 1.4. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 25126be..f08acff 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -32,6 +32,18 @@ static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE); static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*); static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); +static void dump_gamepad(XINPUT_GAMEPAD *data) +{ + trace("-- Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", data->wButtons); + trace("Gamepad.bLeftTrigger: %d\n", data->bLeftTrigger); + trace("Gamepad.bRightTrigger: %d\n", data->bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", data->sThumbLX); + trace("Gamepad.sThumbLY: %d\n", data->sThumbLY); + trace("Gamepad.sThumbRX: %d\n", data->sThumbRX); + trace("Gamepad.sThumbRY: %d\n\n", data->sThumbRY); +} + static void test_set_state(void) { XINPUT_VIBRATION vibrator; @@ -96,14 +108,7 @@ static void test_get_state(void) else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - trace("Gamepad Variables --\n"); - trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons); - trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger); - trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger); - trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX); - trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY); - trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX); - trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY); + dump_gamepad(&xinput.state.Gamepad); } } @@ -163,7 +168,11 @@ static void test_get_capabilities(void) if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + /* Important to show that the results changed between 1.3 and 1.4 XInput version */ + dump_gamepad(&capabilities.Gamepad); } ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));

1 0

Bruno Jesus : xinput1_3/tests: Explain an important test and fix remaining style issues.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: 547d9491af58a8626fafb18da9e4942911bf9155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d9491af58a8626fafb18da… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:34 2016 -0200 xinput1_3/tests: Explain an important test and fix remaining style issues. It's important to explain why the test is done like that so in the future nobody changes it without knowing the impacts. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f08acff..eb0bab3 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -50,7 +50,7 @@ static void test_set_state(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); @@ -59,6 +59,9 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + /* Disabling XInput here, queueing a vibration and then re-enabling XInput + * is used to prove that vibrations are auto enabled when resuming XInput. + * If XInputEnable is removed the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; @@ -133,7 +136,7 @@ static void test_get_keystroke(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); @@ -158,7 +161,7 @@ static void test_get_capabilities(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -188,7 +191,7 @@ static void test_get_dsoundaudiodevice(void) GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); @@ -221,7 +224,7 @@ static void test_get_batteryinformation(void) DWORD result; XINPUT_BATTERY_INFORMATION batteryInfo; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION));

1 0

Nikolay Sivov : dwrite: Use system default locale when filling LOGFONT.lfFaceName.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: bf23b8a529f5081a278c7beffc92648d6b63c87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23b8a529f5081a278c7beff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:38 2016 +0300 dwrite: Use system default locale when filling LOGFONT.lfFaceName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/tests/font.c | 2 +- include/winnls.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4a6d62c..c666275 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 987eac9..ce4145e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3544,7 +3544,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) /* Fallback to en-us if there's no string for user locale. */ exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); if (!exists) diff --git a/include/winnls.h b/include/winnls.h index 35521fd..96f60de 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -915,6 +915,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD); #define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx) WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void); +WINBASEAPI INT WINAPI GetSystemDefaultLocaleName(LPWSTR,int); WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);

1 0

Nikolay Sivov : dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: c22b2192e5710f6a4eacf39b88ece6186c995338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22b2192e5710f6a4eacf39b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:39 2016 +0300 dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 18 +++ dlls/dwrite/gdiinterop.c | 55 +------ dlls/dwrite/tests/font.c | 331 ++++++++++++++++++++++++------------------- 4 files changed, 208 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c22b2192e5710f6a4eacf…

1 0

Aric Stewart : hid: Initialize outgoing usages in HidP_GetUsages.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: 78a547a11ce0b15e8dde7b1b50900c36c2adf1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a547a11ce0b15e8dde7b1b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:32:20 2016 -0600 hid: Initialize outgoing usages in HidP_GetUsages. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index cac9d4e..56616b4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -278,6 +278,8 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, UsageLength, PreparsedData, Report, ReportLength); + *UsageLength = 0; + if (data->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA;

1 0

Hans Leidekker : setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: cdb72f3997174afeb9bc6a8ecafc5de7b5d25afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb72f3997174afeb9bc6a8ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:00 2016 +0100 setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 10 ++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef1a6b7..63e578c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1561,6 +1561,16 @@ BOOL WINAPI SetupDiRemoveDevice( } /*********************************************************************** + * SetupDiRemoveDeviceInterface (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +{ + FIXME("(%p, %p): stub\n", info, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index da6bf5d..0eb8359 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,7 +381,7 @@ @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) -@ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiRemoveDeviceInterface(ptr ptr) @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv

1 0

Hans Leidekker : setupapi/tests: Clean up properly after each device test.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: c84080fb5977284bfd1429ce6ea602fdd33ecab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84080fb5977284bfd1429ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:01 2016 +0100 setupapi/tests: Clean up properly after each device test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 405 +++++++++++------------------------------- 1 file changed, 100 insertions(+), 305 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c84080fb5977284bfd142…

1 0

Nikolay Sivov : scrrun: Improved tracing of IDictionary methods.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: 62cb1f8d6fea65259425363ea25fc332d403535f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cb1f8d6fea65259425363ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:57 2016 +0300 scrrun: Improved tracing of IDictionary methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 844b4d1..3c8fc82 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -240,19 +240,19 @@ static HRESULT WINAPI dict_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { list_remove(&This->notify); IDictionary_Release(&This->dict->IDictionary_iface); heap_free(This); @@ -411,20 +411,21 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, static ULONG WINAPI dictionary_AddRef(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)\n", This); + ULONG ref = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + + return ref; } static ULONG WINAPI dictionary_Release(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { IDictionary_RemoveAll(iface); heap_free(This); } @@ -436,7 +437,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -885,7 +886,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, { dictionary *This; - TRACE("(%p)\n", obj); + TRACE("(%p, %p, %s, %p)\n", factory, outer, debugstr_guid(riid), obj); *obj = NULL;

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for dictionary.
by Alexandre Julliard 07 Dec '16

07 Dec '16

Module: wine Branch: master Commit: ba2e6fb2bec63a0ecb23c29b4f0d61ba57dc8c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2e6fb2bec63a0ecb23c29b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:58 2016 +0300 scrrun: Added IProvideClassInfo support for dictionary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 8 ++++- dlls/scrrun/scrrun.c | 77 ++++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/scrrun_private.h | 8 +++++ dlls/scrrun/tests/dictionary.c | 27 +++++++++++++++ 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 3c8fc82..7ebf4a4 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -65,6 +65,7 @@ struct keyitem_pair { typedef struct { + struct provideclassinfo classinfo; IDictionary IDictionary_iface; LONG ref; @@ -386,6 +387,10 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, { *obj = &This->IDictionary_iface; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } else if ( IsEqualGUID( riid, &IID_IDispatchEx )) { TRACE("Interface IDispatchEx not supported - returning NULL\n"); @@ -404,7 +409,7 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, return E_NOINTERFACE; } - IDictionary_AddRef(iface); + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -901,6 +906,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, list_init(&This->notifier); memset(This->buckets, 0, sizeof(This->buckets)); + init_classinfo(&CLSID_Dictionary, (IUnknown *)&This->IDictionary_iface, &This->classinfo); *obj = &This->IDictionary_iface; return S_OK; diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 5201f1f..42b62b6 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include <initguid.h> @@ -35,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static HINSTANCE scrrun_instance; +static inline struct provideclassinfo *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, struct provideclassinfo, IProvideClassInfo_iface); +} + typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) @@ -118,6 +124,9 @@ static HRESULT load_typelib(void) HRESULT hres; ITypeLib *tl; + if(typelib) + return S_OK; + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); @@ -129,13 +138,21 @@ static HRESULT load_typelib(void) return hres; } +static HRESULT get_typeinfo_of_guid(const GUID *guid, ITypeInfo **tinfo) +{ + HRESULT hres; + + if(FAILED(hres = load_typelib())) + return hres; + + return ITypeLib_GetTypeInfoOfGuid(typelib, guid, tinfo); +} + HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) - hres = load_typelib(); - if (!typelib) + if (FAILED(hres = load_typelib())) return hres; if(!typeinfos[tid]) { @@ -170,6 +187,60 @@ static void release_typelib(void) ITypeLib_Release(typelib); } +static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, REFIID riid, void **obj) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IProvideClassInfo)) { + *obj = iface; + IProvideClassInfo_AddRef(iface); + return S_OK; + } + else + return IUnknown_QueryInterface(This->outer, riid, obj); + + *obj = NULL; + WARN("interface %s not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI provideclassinfo_Release(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI provideclassinfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ti) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%p)\n", This, ti); + + return get_typeinfo_of_guid(This->guid, ti); +} + +static const IProvideClassInfoVtbl provideclassinfovtbl = { + provideclassinfo_QueryInterface, + provideclassinfo_AddRef, + provideclassinfo_Release, + provideclassinfo_GetClassInfo +}; + +void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) +{ + classinfo->IProvideClassInfo_iface.lpVtbl = &provideclassinfovtbl; + classinfo->outer = outer; + classinfo->guid = guid; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 43b20a9..e2023f9 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -38,6 +38,14 @@ typedef enum tid_t HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +struct provideclassinfo { + IProvideClassInfo IProvideClassInfo_iface; + IUnknown *outer; + const GUID *guid; +}; + +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a94782f..78922b7 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -30,6 +30,31 @@ #include "scrrun.h" +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} + static void test_interfaces(void) { static const WCHAR key_add[] = {'a', 0}; @@ -60,6 +85,8 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + test_provideclassinfo(disp, &CLSID_Dictionary); + V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_add); V_VT(&value) = VT_BSTR;

1 0

Bruno Jesus : bcrypt/tests: Normalize all tests to use function pointers.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 8d8936cbb6fea3cac862e059e814527f5361f48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8936cbb6fea3cac862e059e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 2 18:36:40 2016 -0200 bcrypt/tests: Normalize all tests to use function pointers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 267 ++++++++++++++++++++++++--------------------- 1 file changed, 145 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d8936cbb6fea3cac862e…

1 0