- Wine-Devel - list.winehq.org

[PATCH v2 2/6] include/dxgi.idl: Add missing DXGI_DISPLAY_COLOR_SPACE structure.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1

[PATCH v2 1/6] include/dxgi.idl: Fix typo in DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT member name.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1

[PATCH 1/2] winemine: Rename difficulty to avoid translation issues.
by Julian Rüger Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net> --- I changed the strings and left IDM_ADVANCED and friends as is, to keep it simple. If you want me to change them as well, please say so. (Also in that case, would IDM_INTERMED be acceptable to avoid changing the indentation of a whole bunch of other defined constants?)

1 1

[PATCH] rasapi32: Add RasSetCredentialsA/W stubs
by Oleg Dubinskiy Aug. 20, 2020

Aug. 20, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49726 Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> --- dlls/rasapi32/rasapi.c | 16 ++++++++++++++++ dlls/rasapi32/rasapi32.spec | 4 ++-- include/ras.h | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab13..7200cee4f1 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -496,6 +496,22 @@ DWORD WINAPI RasRenameEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszOldEntry, LPCWST return 0; } +DWORD WINAPI RasSetCredentialsA(LPCSTR lpszPhonebook, LPCSTR lpszOldEntry, LPRASCREDENTIALSA lprascredentials, + BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_a(lpszPhonebook), debugstr_a(lpszOldEntry), + lprascredentials, clear); + return ERROR_UNKNOWN; +} + +DWORD WINAPI RasSetCredentialsW(LPCWSTR lpszPhonebook, LPCWSTR lpszOldEntry, LPRASCREDENTIALSW lprascredentials, + BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_w(lpszPhonebook), debugstr_w(lpszOldEntry), + lprascredentials, clear); + return ERROR_UNKNOWN; +} + DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814..d917c335a7 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -64,8 +64,8 @@ @ stdcall RasSetAutodialEnableW(long long) @ stdcall RasSetAutodialParamA(long ptr long) @ stdcall RasSetAutodialParamW(long ptr long) -@ stub RasSetCredentialsA -@ stub RasSetCredentialsW +@ stdcall RasSetCredentialsA(str str ptr long) +@ stdcall RasSetCredentialsW(wstr wstr ptr long) @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) @ stdcall RasSetEntryDialParamsA(str ptr long) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6..d3a7dd8018 100644 --- a/include/ras.h +++ b/include/ras.h @@ -511,6 +511,9 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR,DWORD,LPRASAUTODIALENTRYW,DWORD,DWOR DWORD WINAPI RasSetAutodialParamA(DWORD,LPVOID,DWORD); DWORD WINAPI RasSetAutodialParamW(DWORD,LPVOID,DWORD); #define RasSetAutodialParam WINELIB_NAME_AW(RasSetAutodialParam) +DWORD WINAPI RasSetCredentialsA(LPCSTR,LPCSTR,LPRASCREDENTIALSA,BOOL) +DWORD WINAPI RasSetCredentialsW(LPCWSTR,LPCWSTR,LPRASCREDENTIALSW,BOOL) +#define RasSetCredentials WINELIB_NAME_AW(RasSetCredentials) DWORD WINAPI RasSetCustomAuthDataA(const CHAR *,const CHAR *,BYTE *,DWORD); DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *,const WCHAR *,BYTE *,DWORD); #define RasSetCustomAuthData WINELIB_NAME_AW(RasSetCustomAuthData) -- 2.28.0

2 1

[PATCH 1/3] combase: Move local proxy-stub registration functions.
by Nikolay Sivov Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Both internal functions will go away once relevant parts are moved to one place. InternalIsInitialized() is equivalent to combase.InternalIsProcessInitialized, that we could introduce is ole32 will need to such test. dlls/combase/combase.c | 177 ++++++++++++++++++++++++++++ dlls/combase/combase.spec | 5 +- dlls/ole32/compobj.c | 235 +++----------------------------------- dlls/ole32/ole32.spec | 5 +- 4 files changed, 197 insertions(+), 225 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 96c6a9bb817..516e8c9fd40 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -59,6 +59,18 @@ struct comclassredirect_data DWORD miscstatusdocprint; }; +struct ifacepsredirect_data +{ + ULONG size; + DWORD mask; + GUID iid; + ULONG nummethods; + GUID tlbid; + GUID base; + ULONG name_len; + ULONG name_offset; +}; + struct progidredirect_data { ULONG size; @@ -73,6 +85,26 @@ struct init_spy unsigned int id; }; +struct registered_ps +{ + struct list entry; + IID iid; + CLSID clsid; +}; + +static struct list registered_proxystubs = LIST_INIT(registered_proxystubs); + +static CRITICAL_SECTION cs_registered_ps; +static CRITICAL_SECTION_DEBUG psclsid_cs_debug = +{ + 0, 0, &cs_registered_ps, + { &psclsid_cs_debug.ProcessLocksList, &psclsid_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_registered_psclsid_list") } +}; +static CRITICAL_SECTION cs_registered_ps = { &psclsid_cs_debug, -1, 0, 0, 0, 0 }; + +extern BOOL WINAPI InternalIsInitialized(void); + static struct init_spy *get_spy_entry(struct tlsdata *tlsdata, unsigned int id) { struct init_spy *spy; @@ -1721,3 +1753,148 @@ HRESULT WINAPI CoRegisterMessageFilter(IMessageFilter *filter, IMessageFilter ** return S_OK; } + +void WINAPI InternalRevokeAllPSClsids(void) +{ + struct registered_ps *cur, *cur2; + + EnterCriticalSection(&cs_registered_ps); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &registered_proxystubs, struct registered_ps, entry) + { + list_remove(&cur->entry); + heap_free(cur); + } + + LeaveCriticalSection(&cs_registered_ps); +} + +static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) +{ + WCHAR value[CHARS_IN_GUID]; + HKEY hkey; + DWORD len; + + access |= KEY_READ; + + if (open_classes_key(HKEY_CLASSES_ROOT, path, access, &hkey)) + return REGDB_E_IIDNOTREG; + + len = sizeof(value); + if (ERROR_SUCCESS != RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)value, &len)) + return REGDB_E_IIDNOTREG; + RegCloseKey(hkey); + + if (CLSIDFromString(value, pclsid) != NOERROR) + return REGDB_E_IIDNOTREG; + + return S_OK; +} + +/***************************************************************************** + * CoGetPSClsid (combase.@) + */ +HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) +{ + static const WCHAR interfaceW[] = L"Interface\\"; + static const WCHAR psW[] = L"\\ProxyStubClsid32"; + WCHAR path[ARRAY_SIZE(interfaceW) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(psW)]; + ACTCTX_SECTION_KEYED_DATA data; + struct registered_ps *cur; + REGSAM opposite = (sizeof(void*) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; + HRESULT hr; + + TRACE("%s, %p\n", debugstr_guid(riid), pclsid); + + if (!InternalIsInitialized()) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + if (!pclsid) + return E_INVALIDARG; + + EnterCriticalSection(&cs_registered_ps); + + LIST_FOR_EACH_ENTRY(cur, &registered_proxystubs, struct registered_ps, entry) + { + if (IsEqualIID(&cur->iid, riid)) + { + *pclsid = cur->clsid; + LeaveCriticalSection(&cs_registered_ps); + return S_OK; + } + } + + LeaveCriticalSection(&cs_registered_ps); + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + riid, &data)) + { + struct ifacepsredirect_data *ifaceps = (struct ifacepsredirect_data *)data.lpData; + *pclsid = ifaceps->iid; + return S_OK; + } + + /* Interface\\{string form of riid}\\ProxyStubClsid32 */ + lstrcpyW(path, interfaceW); + StringFromGUID2(riid, path + ARRAY_SIZE(interfaceW) - 1, CHARS_IN_GUID); + lstrcpyW(path + ARRAY_SIZE(interfaceW) - 1 + CHARS_IN_GUID - 1, psW); + + hr = get_ps_clsid_from_registry(path, 0, pclsid); + if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = get_ps_clsid_from_registry(path, opposite, pclsid); + + if (hr == S_OK) + TRACE("() Returning CLSID %s\n", debugstr_guid(pclsid)); + else + WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); + + return hr; +} + +/***************************************************************************** + * CoRegisterPSClsid (combase.@) + */ +HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) +{ + struct registered_ps *cur; + + TRACE("%s, %s\n", debugstr_guid(riid), debugstr_guid(rclsid)); + + if (!InternalIsInitialized()) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + EnterCriticalSection(&cs_registered_ps); + + LIST_FOR_EACH_ENTRY(cur, &registered_proxystubs, struct registered_ps, entry) + { + if (IsEqualIID(&cur->iid, riid)) + { + cur->clsid = *rclsid; + LeaveCriticalSection(&cs_registered_ps); + return S_OK; + } + } + + cur = heap_alloc(sizeof(*cur)); + if (!cur) + { + LeaveCriticalSection(&cs_registered_ps); + return E_OUTOFMEMORY; + } + + cur->iid = *riid; + cur->clsid = *rclsid; + list_add_head(&registered_proxystubs, &cur->entry); + + LeaveCriticalSection(&cs_registered_ps); + + return S_OK; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index bb7eaf69f9d..02004852aa8 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -115,7 +115,7 @@ @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stub CoGetModuleType @ stdcall CoGetObjectContext(ptr ptr) -@ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid +@ stdcall CoGetPSClsid(ptr ptr) @ stub CoGetProcessIdentifier @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal @ stub CoGetStdMarshalEx @@ -143,7 +143,7 @@ @ stdcall CoRegisterInitializeSpy(ptr ptr) @ stdcall CoRegisterMallocSpy(ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) -@ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid +@ stdcall CoRegisterPSClsid(ptr ptr) @ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @@ -268,6 +268,7 @@ @ stub InternalNotifyDDStartOrStop @ stub InternalOleModalLoopBlockFn @ stub InternalRegisterWindowPropInterface +@ stdcall InternalRevokeAllPSClsids() @ stub InternalReleaseMarshalObjRef @ stub InternalSTAInvoke @ stub InternalServerExceptionFilter diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f02cdb8b53f..e8cc75c7de4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -164,24 +164,6 @@ struct class_reg_data } u; }; -struct registered_psclsid -{ - struct list entry; - IID iid; - CLSID clsid; -}; - -static struct list registered_psclsid_list = LIST_INIT(registered_psclsid_list); - -static CRITICAL_SECTION cs_registered_psclsid_list; -static CRITICAL_SECTION_DEBUG psclsid_cs_debug = -{ - 0, 0, &cs_registered_psclsid_list, - { &psclsid_cs_debug.ProcessLocksList, &psclsid_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_registered_psclsid_list") } -}; -static CRITICAL_SECTION cs_registered_psclsid_list = { &psclsid_cs_debug, -1, 0, 0, 0, 0 }; - /* * This is a marshallable object exposing registered local servers. * IServiceProvider is used only because it happens meet requirements @@ -236,6 +218,8 @@ static CRITICAL_SECTION_DEBUG class_cs_debug = }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; +extern void WINAPI InternalRevokeAllPSClsids(void); + static inline enum comclass_miscfields dvaspect_to_miscfields(DWORD aspect) { switch (aspect) @@ -776,21 +760,6 @@ static void COM_RevokeAllClasses(const struct apartment *apt) LeaveCriticalSection( &csRegisteredClassList ); } -static void revoke_registered_psclsids(void) -{ - struct registered_psclsid *psclsid, *psclsid2; - - EnterCriticalSection( &cs_registered_psclsid_list ); - - LIST_FOR_EACH_ENTRY_SAFE(psclsid, psclsid2, &registered_psclsid_list, struct registered_psclsid, entry) - { - list_remove(&psclsid->entry); - HeapFree(GetProcessHeap(), 0, psclsid); - } - - LeaveCriticalSection( &cs_registered_psclsid_list ); -} - /****************************************************************************** * Implementation of the manual reset event object. (CLSID_ManualResetEvent) */ @@ -1997,7 +1966,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { TRACE("() - Releasing the COM libraries\n"); - revoke_registered_psclsids(); + InternalRevokeAllPSClsids(); RunningObjectTableImpl_UnInitialize(); } else if (lCOMRefCnt<1) { @@ -2145,193 +2114,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey return S_OK; } -static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) -{ - HKEY hkey; - WCHAR value[CHARS_IN_GUID]; - DWORD len; - - access |= KEY_READ; - - if (open_classes_key(HKEY_CLASSES_ROOT, path, access, &hkey)) - return REGDB_E_IIDNOTREG; - - len = sizeof(value); - if (ERROR_SUCCESS != RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)value, &len)) - return REGDB_E_IIDNOTREG; - RegCloseKey(hkey); - - if (CLSIDFromString(value, pclsid) != NOERROR) - return REGDB_E_IIDNOTREG; - - return S_OK; -} - -/***************************************************************************** - * CoGetPSClsid [OLE32.@] - * - * Retrieves the CLSID of the proxy/stub factory that implements - * IPSFactoryBuffer for the specified interface. - * - * PARAMS - * riid [I] Interface whose proxy/stub CLSID is to be returned. - * pclsid [O] Where to store returned proxy/stub CLSID. - * - * RETURNS - * S_OK - * E_OUTOFMEMORY - * REGDB_E_IIDNOTREG if no PSFactoryBuffer is associated with the IID, or it could not be parsed - * - * NOTES - * - * The standard marshaller activates the object with the CLSID - * returned and uses the CreateProxy and CreateStub methods on its - * IPSFactoryBuffer interface to construct the proxies and stubs for a - * given object. - * - * CoGetPSClsid determines this CLSID by searching the - * HKEY_CLASSES_ROOT\Interface\{string form of riid}\ProxyStubClsid32 - * in the registry and any interface id registered by - * CoRegisterPSClsid within the current process. - * - * BUGS - * - * Native returns S_OK for interfaces with a key in HKCR\Interface, but - * without a ProxyStubClsid32 key and leaves garbage in pclsid. This should be - * considered a bug in native unless an application depends on this (unlikely). - * - * SEE ALSO - * CoRegisterPSClsid. - */ -HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) -{ - static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; - static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)]; - APARTMENT *apt; - struct registered_psclsid *registered_psclsid; - ACTCTX_SECTION_KEYED_DATA data; - HRESULT hr; - REGSAM opposite = (sizeof(void*) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - BOOL is_wow64; - - TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - - if (!pclsid) - return E_INVALIDARG; - - EnterCriticalSection(&cs_registered_psclsid_list); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) - if (IsEqualIID(&registered_psclsid->iid, riid)) - { - *pclsid = registered_psclsid->clsid; - LeaveCriticalSection(&cs_registered_psclsid_list); - return S_OK; - } - - LeaveCriticalSection(&cs_registered_psclsid_list); - - data.cbSize = sizeof(data); - if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, - riid, &data)) - { - struct ifacepsredirect_data *ifaceps = (struct ifacepsredirect_data*)data.lpData; - *pclsid = ifaceps->iid; - return S_OK; - } - - /* Interface\\{string form of riid}\\ProxyStubClsid32 */ - lstrcpyW(path, wszInterface); - StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); - lstrcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); - - hr = get_ps_clsid_from_registry(path, 0, pclsid); - if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || - (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) - hr = get_ps_clsid_from_registry(path, opposite, pclsid); - - if (hr == S_OK) - TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); - else - WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); - - return hr; -} - -/***************************************************************************** - * CoRegisterPSClsid [OLE32.@] - * - * Register a proxy/stub CLSID for the given interface in the current process - * only. - * - * PARAMS - * riid [I] Interface whose proxy/stub CLSID is to be registered. - * rclsid [I] CLSID of the proxy/stub. - * - * RETURNS - * Success: S_OK - * Failure: E_OUTOFMEMORY - * - * NOTES - * - * Unlike CoRegisterClassObject(), CLSIDs registered with CoRegisterPSClsid() - * will be returned from other apartments in the same process. - * - * This function does not add anything to the registry and the effects are - * limited to the lifetime of the current process. - * - * SEE ALSO - * CoGetPSClsid. - */ -HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) -{ - APARTMENT *apt; - struct registered_psclsid *registered_psclsid; - - TRACE("(%s, %s)\n", debugstr_guid(riid), debugstr_guid(rclsid)); - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - - EnterCriticalSection(&cs_registered_psclsid_list); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) - if (IsEqualIID(&registered_psclsid->iid, riid)) - { - registered_psclsid->clsid = *rclsid; - LeaveCriticalSection(&cs_registered_psclsid_list); - return S_OK; - } - - registered_psclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(struct registered_psclsid)); - if (!registered_psclsid) - { - LeaveCriticalSection(&cs_registered_psclsid_list); - return E_OUTOFMEMORY; - } - - registered_psclsid->iid = *riid; - registered_psclsid->clsid = *rclsid; - list_add_head(&registered_psclsid_list, &registered_psclsid->entry); - - LeaveCriticalSection(&cs_registered_psclsid_list); - - return S_OK; -} - - /*** * COM_GetRegisteredClassObject * @@ -3872,6 +3654,17 @@ HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) return E_NOTIMPL; } +BOOL WINAPI InternalIsInitialized(void) +{ + struct apartment *apt; + + if (!(apt = apartment_get_current_or_mta())) + return FALSE; + apartment_release(apt); + + return TRUE; +} + typedef struct { IGlobalOptions IGlobalOptions_iface; LONG ref; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ed5a958ce3c..02a8434d264 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -42,7 +42,7 @@ @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) combase.CoGetMarshalSizeMax @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext -@ stdcall CoGetPSClsid(ptr ptr) +@ stdcall CoGetPSClsid(ptr ptr) combase.CoGetPSClsid @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr) @ stub CoGetTIDFromIPID @@ -69,7 +69,7 @@ @ stdcall CoRegisterInitializeSpy(ptr ptr) combase.CoRegisterInitializeSpy @ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) combase.CoRegisterMessageFilter -@ stdcall CoRegisterPSClsid(ptr ptr) +@ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid @ stdcall CoRegisterSurrogate(ptr) @ stdcall CoRegisterSurrogateEx(ptr ptr) @ stdcall CoReleaseMarshalData(ptr) @@ -297,3 +297,4 @@ @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg @ stub WriteStringStream +@ stdcall InternalIsInitialized() -- 2.28.0

3 7

[PATCH] dwrite: Add IDWriteFontFace5::Equals() stub.
by Brendan Shanks Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes crash in current CEF. dlls/dwrite/font.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 19fe911420f..e1d9849a9d8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1562,6 +1562,13 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } +static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) +{ + FIXME("%p, %p.\n", iface, other); + + return E_NOTIMPL; +} + static const IDWriteFontFace5Vtbl dwritefontfacevtbl = { dwritefontface_QueryInterface, @@ -1621,6 +1628,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface5_GetFontAxisValues, dwritefontface5_HasVariations, dwritefontface5_GetFontResource, + dwritefontface5_Equals, }; static HRESULT WINAPI dwritefontface_reference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) -- 2.26.2

3 2

[PATCH v2] winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Brendan Shanks Aug. 19, 2020

Aug. 19, 2020

Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Only prefix the URL with 'http://' when URL parsing fails. Clarify error printed when URL parsing fails. programs/winebrowser/main.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..7895afae842 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -118,7 +118,7 @@ static LSTATUS get_commands( HKEY key, const WCHAR *value, WCHAR *buffer, DWORD return res; } -static int open_http_url( const WCHAR *url ) +static int open_http_url( const WCHAR *url, BOOL url_valid ) { #ifdef __APPLE__ static const WCHAR defaultbrowsers[] = @@ -136,9 +136,13 @@ static int open_http_url( const WCHAR *url ) #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; WCHAR browsers[256]; + WCHAR *url_prefixed; HKEY key; + int ret; LONG r; /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ @@ -150,7 +154,27 @@ static int open_http_url( const WCHAR *url ) if (r != ERROR_SUCCESS) memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); - return launch_app( browsers, url ); + /* If url parsing failed, prefix url with 'http://'. Required by xdg-open and macOS open. */ + if (url_valid) + { + ret = launch_app( browsers, url ); + } + else + { + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = launch_app( browsers, url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + } + return ret; } static int open_mailto_url( const WCHAR *url ) @@ -448,8 +472,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_http_url(url, FALSE); HeapFree(GetProcessHeap(), 0, ddeString); return ret; } @@ -476,7 +500,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ret = open_mailto_url(display_uri); else /* let the browser decide how to handle the given url */ - ret = open_http_url(display_uri); + ret = open_http_url(display_uri, TRUE); SysFreeString(display_uri); return ret; -- 2.26.2

1 0

[PATCH v4] vbscript: Implement Split.
by Robert Wilhelm Aug. 19, 2020

Aug. 19, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47570 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v3: Try to address comments from Jacek's review: Fix some corner cases, avoid memory leaks and add more tests. v4: If there are two delimeters or delimeter is at front or rear, an empty string is returned. --- dlls/vbscript/global.c | 126 +++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 43 ++++++++++++ 2 files changed, 166 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 122f5c7b71..b3f4999685 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2291,10 +2291,130 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V return E_NOTIMPL; } -static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, string, delimeter = NULL; + int count, max, mode, len, start, end, ret, delimeterlen = 1; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa = NULL; + VARIANT *data, var; + HRESULT hres = S_OK; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + assert(1 <= args_cnt && args_cnt <= 4); + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(args_cnt > 1) + { + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &delimeter); + if(FAILED(hres)) + goto error; + }else { + delimeter = V_BSTR(args+1); + } + delimeterlen = SysStringLen(delimeter); + } + + if(args_cnt > 2) { + hres = to_int(args+2, &max); + if(FAILED(hres)) + goto error;; + }else { + max = -1; + } + + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + hres = E_FAIL; + goto error; + } + } + else { + mode = 0; + } + + start = 0; + bounds.lLbound = 0; + bounds.cElements = 0; + sa = SafeArrayCreate( VT_VARIANT, 1, &bounds); + if (!sa) + { + hres = E_OUTOFMEMORY; + goto error; + } + len = SysStringLen(string); + count = 0; + + while(1) { + ret = -1; + if (delimeterlen) { + ret = FindStringOrdinal(FIND_FROMSTART, string + start, len -start, + delimeter ? delimeter : L" ", delimeterlen, mode); + } + + if (ret == -1) { + end = len; + } + else { + end = start + ret; + } + + str = SysAllocStringLen(string + start, end - start); + if (!str) { + hres = E_OUTOFMEMORY; + break; + } + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + bounds.cElements++; + SafeArrayRedim(sa, &bounds); + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + break; + } + + hres = VariantCopyInd(data+count, &var); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + break; + } + + SafeArrayUnaccessData(sa); + count++; + + if (ret == -1) break; + start = start + ret + delimeterlen; + if (count == max) break; + if (start > len) break; + } + +error: + if(res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + if (sa) SafeArrayDestroy(sa); + } + + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(delimeter); + return hres; } static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6af49c849d..60ad6359dc 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -609,6 +609,49 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +x=Split("abc") +Call ok(x(0) = "abc", "Split(""abc"")(0)=" & x(0)) +x = Split("abc def") +Call ok(x(0) = "abc", "Split(""abc def"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def"")(1)=" & x(1)) +x = Split("abc def ghi") +Call ok(x(0) = "abc", "Split(""abc def ghi"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def ghi"")(1)=" & x(1)) +Call ok(x(2) = "ghi", "Split(""abc def ghi"")(2)=" & x(2)) +x = Split("abc def","") +Call ok(x(0) = "abc def", "Split(""abc def"","""")(0)=" & x(0)) +x = Split("abc-def","-") +Call ok(x(0) = "abc", "Split(""abc-def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc-def"",""-"")(1)=" & x(1)) +x = Split("abc--def","-") +Call ok(x(0) = "abc", "Split(""abc--def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "", "Split(""abc--def"",""-"")(1)=" & x(1)) +Call ok(x(2) = "def", "Split(""abc--def"",""-"")(2)=" & x(2)) +x = Split("abcdefghi","def") +Call ok(x(0) = "abc", "Split(""abcdefghi"",""def"")(0)=" & x(0)) +Call ok(x(1) = "ghi", "Split(""abcdefghi"",""def"")(1)=" & x(1)) +x = Split("12345",3) +Call ok(x(0) = "12", "Split(""12345"",3)(0)=" & x(0)) +Call ok(x(1) = "45", "Split(""12345"",3)(1)=" & x(1)) +x = Split("12345",5) +Call ok(x(0) = "1234", "Split(""12345"",5)(0)=" & x(0)) +Call ok(x(1) = "", "Split(""12345"",5)(1)=" & x(1)) +x = Split("12345",12) +Call ok(x(0) = "", "Split(""12345"",12)(0)=" & x(0)) +Call ok(x(1) = "345", "Split(""12345"",12)(1)=" & x(1)) +x = Split("abc-def-ghi","-") +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-""))=" & UBound(x)) +x = Split("abc-def-ghi","-",2) +Call ok(UBound(x) = 1, "UBound(Split(""abc-def-ghi"",""-"",2))=" & UBound(x)) +x = Split("abc-def-ghi","-",4) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",4))=" & UBound(x)) +x = Split("abcZdefZghi","Z",3,0) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""Z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,0) +Call ok(UBound(x) = 0, "UBound(Split(""abcZdefZghi"",""z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,1) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""z"",3,1))=" & UBound(x)) + Sub TestStrComp(str_left, str_right, mode, ex) x = StrComp(str_left, str_right, mode) Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) -- 2.26.2

2 1

[PATCH] msscript.ocx: Implement the ScriptProcedure enumerator.
by Gabriel Ivăncescu Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 194 ++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 80 ++++++++++++ 2 files changed, 272 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a339e70..d493065 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -110,6 +110,15 @@ struct ScriptProcedureCollection { struct list hash_table[43]; }; +struct procedure_enum { + IEnumVARIANT IEnumVARIANT_iface; + LONG ref; + + WORD pos; + WORD count; + ScriptProcedureCollection *procedures; +}; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -532,6 +541,11 @@ static inline struct module_enum *module_enum_from_IEnumVARIANT(IEnumVARIANT *if return CONTAINING_RECORD(iface, struct module_enum, IEnumVARIANT_iface); } +static inline struct procedure_enum *procedure_enum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, struct procedure_enum, IEnumVARIANT_iface); +} + /* IActiveScriptSite */ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -976,6 +990,151 @@ done: return hr; } +static HRESULT WINAPI procedure_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumVARIANT, riid)) + { + *ppv = &This->IEnumVARIANT_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI procedure_enum_AddRef(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI procedure_enum_Release(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + IScriptProcedureCollection_Release(&This->procedures->IScriptProcedureCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI procedure_enum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + FUNCDESC *desc; + ITypeInfo *ti; + UINT i, num; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if (!rgVar) return E_POINTER; + if (!This->procedures->module->host) return E_FAIL; + + hr = start_script(This->procedures->module->host); + if (FAILED(hr)) return hr; + + hr = get_script_typeinfo(This->procedures->module, &ti); + if (FAILED(hr)) return hr; + + num = min(celt, This->count - This->pos); + for (i = 0; i < num; i++) + { + hr = ITypeInfo_GetFuncDesc(ti, This->pos + i, &desc); + if (FAILED(hr)) break; + + hr = get_script_procedure(This->procedures, ti, desc, (IScriptProcedure**)&V_DISPATCH(rgVar + i)); + if (FAILED(hr)) break; + + V_VT(rgVar + i) = VT_DISPATCH; + } + + if (FAILED(hr)) + { + while (i--) + VariantClear(rgVar + i); + if (pCeltFetched) *pCeltFetched = 0; + return hr; + } + + This->pos += i; + + if (pCeltFetched) *pCeltFetched = i; + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI procedure_enum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%u)\n", This, celt); + + if (This->count - This->pos < celt) + { + This->pos = This->count; + return S_FALSE; + } + This->pos += celt; + return S_OK; +} + +static HRESULT WINAPI procedure_enum_Reset(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)\n", This); + + This->pos = 0; + return S_OK; +} + +static HRESULT WINAPI procedure_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + struct procedure_enum *clone; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + if (!ppEnum) return E_POINTER; + + if (!(clone = heap_alloc(sizeof(*clone)))) + return E_OUTOFMEMORY; + + *clone = *This; + clone->ref = 1; + IScriptProcedureCollection_AddRef(&This->procedures->IScriptProcedureCollection_iface); + + *ppEnum = &clone->IEnumVARIANT_iface; + return S_OK; +} + +static const IEnumVARIANTVtbl procedure_enum_vtbl = { + procedure_enum_QueryInterface, + procedure_enum_AddRef, + procedure_enum_Release, + procedure_enum_Next, + procedure_enum_Skip, + procedure_enum_Reset, + procedure_enum_Clone +}; + static HRESULT WINAPI ScriptProcedureCollection_QueryInterface(IScriptProcedureCollection *iface, REFIID riid, void **ppv) { ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); @@ -1091,10 +1250,41 @@ static HRESULT WINAPI ScriptProcedureCollection_Invoke(IScriptProcedureCollectio static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCollection *iface, IUnknown **ppenumProcedures) { ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + struct procedure_enum *proc_enum; + TYPEATTR *attr; + ITypeInfo *ti; + UINT count; + HRESULT hr; - FIXME("(%p)->(%p)\n", This, ppenumProcedures); + TRACE("(%p)->(%p)\n", This, ppenumProcedures); - return E_NOTIMPL; + if (!ppenumProcedures) return E_POINTER; + if (!This->module->host) return E_FAIL; + + hr = start_script(This->module->host); + if (FAILED(hr)) return hr; + + hr = get_script_typeinfo(This->module, &ti); + if (FAILED(hr)) return hr; + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + if (FAILED(hr)) return hr; + + count = attr->cFuncs; + ITypeInfo_ReleaseTypeAttr(ti, attr); + + if (!(proc_enum = heap_alloc(sizeof(*proc_enum)))) + return E_OUTOFMEMORY; + + proc_enum->IEnumVARIANT_iface.lpVtbl = &procedure_enum_vtbl; + proc_enum->ref = 1; + proc_enum->pos = 0; + proc_enum->count = count; + proc_enum->procedures = This; + IScriptProcedureCollection_AddRef(&This->IScriptProcedureCollection_iface); + + *ppenumProcedures = (IUnknown*)&proc_enum->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollection *iface, VARIANT index, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7233af5..085913a 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3293,9 +3293,12 @@ static void test_IScriptControl_get_CodeObject(void) static void test_IScriptControl_get_Procedures(void) { IScriptProcedureCollection *procs, *procs2; + IEnumVARIANT *enumvar, *enumvar2; IScriptProcedure *proc, *proc2; IScriptControl *sc; + IUnknown *unknown; VARIANT_BOOL vbool; + ULONG fetched; VARIANT var; LONG count; HRESULT hr; @@ -3548,6 +3551,44 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == E_INVALIDARG, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); CHECK_CALLED(GetFuncDesc); + /* _NewEnum never caches the function count */ + hr = IScriptProcedureCollection_get__NewEnum(procs, NULL); + ok(hr == E_POINTER, "IScriptProcedureCollection_get__NewEnum returned: 0x%08x.\n", hr); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + CHECK_CALLED(GetTypeAttr); + CHECK_CALLED(ReleaseTypeAttr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok((char*)unknown == (char*)enumvar, "unknown and enumvar are not the same (%p vs %p).\n", unknown, enumvar); + IEnumVARIANT_Release(enumvar); + IUnknown_Release(unknown); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + CHECK_CALLED(GetTypeAttr); + CHECK_CALLED(ReleaseTypeAttr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + IUnknown_Release(unknown); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next(enumvar, 0, NULL, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Next(enumvar, 0, NULL, &fetched); + ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0xdeadbeef, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, NULL); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + for (i = 0; i < ARRAY_SIZE(custom_engine_funcs); i++) { /* Querying by index still goes through the Bind process */ @@ -3583,6 +3624,25 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); + /* Compare with the enumerator */ + SET_EXPECT(GetFuncDesc); + SET_EXPECT(GetNames); + SET_EXPECT(ReleaseFuncDesc); + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next for index %u failed: 0x%08x.\n", i, hr); + ok(fetched == 1, "got %u.\n", fetched); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var) = %d.\n", V_VT(&var)); + CHECK_CALLED(GetFuncDesc); + CHECK_CALLED(GetNames); + CHECK_CALLED(ReleaseFuncDesc); + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IScriptProcedure, (void**)&proc2); + ok(hr == S_OK, "Failed to query IScriptProcedure for index %u: 0x%08x.\n", i, hr); + VariantClear(&var); + + ok(proc == proc2, "proc and proc2 are not the same for %s and enum index %u.\n", + wine_dbgstr_w(custom_engine_funcs[i].name), i); + IScriptProcedure_Release(proc2); + /* Verify the properties */ hr = IScriptProcedure_get_Name(proc, &str); ok(hr == S_OK, "get_Name for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); @@ -3601,6 +3661,26 @@ static void test_IScriptControl_get_Procedures(void) IScriptProcedure_Release(proc); } + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "IEnumVARIANT_Reset failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, ARRAY_SIZE(custom_engine_funcs) - 1); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, &enumvar2); + ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar2, 1); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar2, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + + IEnumVARIANT_Release(enumvar2); + IEnumVARIANT_Release(enumvar); IScriptProcedureCollection_Release(procs); IActiveScriptSite_Release(site); -- 2.21.0

2 1

[PATCH] user32: Set default user preferences to enable animations
by Fabian Maurer Aug. 19, 2020

Aug. 19, 2020

This allows games like solitaire, chess titans, etc. to use animations. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0c0f8fac5d1..114ac6adfab 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1432,7 +1432,7 @@ static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); -static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00, 0x00 }; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( CAPTIONLOGFONT, FW_BOLD ); -- 2.28.0

2 1