- wine-devel - winehq.org

[PATCH 3/4] winapi_test: '* long *' is 4 bytes, not pointer size, on Windows.
by Serge Gautherie 13 Aug '20

13 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix _WIN64 case. Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- tools/winapi/winapi_test | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index e9e5fe4..8c56677 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -231,9 +231,10 @@ sub _find_align_kind_size($) { $kind = "float"; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { - $align = $pointer_size; + # 'long' is always 4 bytes on Windows. + $align = 4; $kind = defined($1) ? $1 : "signed"; - $size = $pointer_size; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; -- 2.10.0.windows.1

2 1

[PATCH 1/4] winapi_test: pshpackN.h can only be 1/2/4/8.
by Serge Gautherie 13 Aug '20

13 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to df6d37e0f219ba714d59306a166b75686469211f. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 9d016ff..1ad94a6 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -409,7 +409,7 @@ foreach my $file (@files) { my $preprocessor = shift; #print "found_preprocessor: $begin_line: [$_]\n"; - if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d+)\.h[\">]$/) { + if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d)\.h[\">]$/) { push @packs, $1 unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found pack $1 on line $begin_line\n"; } elsif($preprocessor =~ /^\#\s*include\s+[\"<]poppack\.h[\">]$/) { -- 2.10.0.windows.1

2 1

[PATCH 4/4] winapi_test: Minor $pointer_size check consistency tweak.
by Serge Gautherie 13 Aug '20

13 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8c56677..fd80157 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { - push @ifdefs, ($pointer_size == 4); + push @ifdefs, ($pointer_size != 8); } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { -- 2.10.0.windows.1

2 1

[PATCH 2/4] winapi_test: Escape parentheses in regexp, Allow spaces around them.
by Serge Gautherie 13 Aug '20

13 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix parsing related to a few *_PTR types from basetsd.h. Addendum to 6b11a3c3f81d7db3794f3320eeaef8001cc99b74. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 1ad94a6..e9e5fe4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { push @ifdefs, ($pointer_size == 4); - } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { push @ifdefs, 2; -- 2.10.0.windows.1

2 1

[PATCH] mscoree: Use builtin XNA implementation by default.
by Esme Povirk 13 Aug '20

13 Aug '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=32877 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Proton has been using this setting for a while, and I think it's shown that FNA works very well as an XNA replacement. This is clearly the best option for users, and it can still be overridden with an environment variable or registry key if a developer wants to work on supporting the XNA redist. dlls/mscoree/metahost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 77029942528..e854ec2bdfa 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1502,6 +1502,10 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) + /* XNA redist is broken in Wine Mono, use FNA instead. */ + return 0; + return ASSEMBLY_SEARCH_UNDEFINED; } -- 2.17.1

4 3

[PATCH] wbemprox: Use empty strings instead of NULL.
by Rémi Bernon 13 Aug '20

13 Aug '20

For Win32_PhysicalMemory PartNumber and Serial properties. Injustice 2 calls SysStringLen directly on the value without checking its type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The game also needs better media foundation, but it crashes on startup because of this issue. dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4edda854b58..43268221936 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2920,8 +2920,8 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ - rec->partnumber = NULL; - rec->serial = NULL; + rec->partnumber = L""; + rec->serial = L""; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; -- 2.28.0

2 1

[PATCH v2 3/6] ole32: Remove now unused helper.
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/git.c | 55 +++++++++++++++--------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 1b7aa5640ce..b64dfbf4f4a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -187,7 +187,6 @@ struct oletls /* Global Interface Table Functions */ -extern IGlobalInterfaceTable *get_std_git(void) DECLSPEC_HIDDEN; extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index e761c99b77c..fe6b5e58122 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -290,47 +290,38 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return S_OK; } -HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) -{ - IGlobalInterfaceTable *git = get_std_git(); - HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, obj); - IGlobalInterfaceTable_Release(git); - return hr; -} - -/* Virtual function table */ static const IGlobalInterfaceTableVtbl StdGlobalInterfaceTableImpl_Vtbl = { - StdGlobalInterfaceTable_QueryInterface, - StdGlobalInterfaceTable_AddRef, - StdGlobalInterfaceTable_Release, - StdGlobalInterfaceTable_RegisterInterfaceInGlobal, - StdGlobalInterfaceTable_RevokeInterfaceFromGlobal, - StdGlobalInterfaceTable_GetInterfaceFromGlobal + StdGlobalInterfaceTable_QueryInterface, + StdGlobalInterfaceTable_AddRef, + StdGlobalInterfaceTable_Release, + StdGlobalInterfaceTable_RegisterInterfaceInGlobal, + StdGlobalInterfaceTable_RevokeInterfaceFromGlobal, + StdGlobalInterfaceTable_GetInterfaceFromGlobal }; -IGlobalInterfaceTable* get_std_git(void) +HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - if (!std_git) - { - StdGlobalInterfaceTableImpl* newGIT; - - newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); - if (!newGIT) return NULL; + StdGlobalInterfaceTableImpl *git; - newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; - list_init(&newGIT->list); - newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ - - if (InterlockedCompareExchangePointer((void**)&std_git, &newGIT->IGlobalInterfaceTable_iface, NULL)) + if (!std_git) { - HeapFree(GetProcessHeap(), 0, newGIT); + git = heap_alloc(sizeof(*git)); + if (!git) return E_OUTOFMEMORY; + + git->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; + list_init(&git->list); + git->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ + + if (InterlockedCompareExchangePointer((void **)&std_git, &git->IGlobalInterfaceTable_iface, NULL)) + { + heap_free(git); + } + else + TRACE("Created the GIT %p\n", git); } - else - TRACE("Created the GIT at %p\n", newGIT); - } - return std_git; + return IGlobalInterfaceTable_QueryInterface(std_git, riid, obj); } void release_std_git(void) -- 2.23.0

2 1

[PATCH v2 1/6] ole32: Remove registration for Global Interface Table class.
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/ole32_objidl.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index d2c1a9999e6..0cc3ccea9e5 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,12 +105,6 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -[ - threading(apartment), - uuid(00000323-0000-0000-c000-000000000046) -] -coclass StdGlobalInterfaceTable { interface IGlobalInterfaceTable; } - [ helpstring("Component Categories Manager"), threading(both), -- 2.23.0

2 1

[PATCH 1/6] ole32: Remove registration for Global Interface Table class.
by Nikolay Sivov 13 Aug '20

13 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's not registered on Windows. dlls/ole32/ole32_objidl.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index d2c1a9999e6..0cc3ccea9e5 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,12 +105,6 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -[ - threading(apartment), - uuid(00000323-0000-0000-c000-000000000046) -] -coclass StdGlobalInterfaceTable { interface IGlobalInterfaceTable; } - [ helpstring("Component Categories Manager"), threading(both), -- 2.28.0

3 8

[PATCH v2 6/6] combase: Move CoFreeUnusedLibraries().
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/combase.c | 8 ++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 17 ----------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4e15bd970e8..5752d90d5cc 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1350,3 +1350,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o return return_multi_qi(unk, count, results, TRUE); } + +/*********************************************************************** + * CoFreeUnusedLibraries (combase.@) + */ +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) +{ + CoFreeUnusedLibrariesEx(INFINITE, 0); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0daf321d69b..3214f54550c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -92,7 +92,7 @@ @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) -@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dd51542af53..f983b07f20b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3006,23 +3006,6 @@ void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD apartment_freeunusedlibraries(apt, dwUnloadDelay); } -/*********************************************************************** - * CoFreeUnusedLibraries [OLE32.@] - * - * Frees any unused libraries. Unused are identified as those that return - * S_OK from their DllCanUnloadNow function. - * - * RETURNS - * Nothing. - * - * SEE ALSO - * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary - */ -void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) -{ - CoFreeUnusedLibrariesEx(INFINITE, 0); -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 57db6e38b76..a19264127f9 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -23,7 +23,7 @@ @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) -@ stdcall CoFreeUnusedLibraries() +@ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr) -- 2.23.0

1 0

[PATCH v2 5/6] combase: Move CoCreateInstanceEx().
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/combase.c | 44 ++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 94 --------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 46 insertions(+), 96 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index edd6ac0b285..4e15bd970e8 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1306,3 +1306,47 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out *obj = multi_qi.pItf; return hr; } + +/*********************************************************************** + * CoCreateInstanceEx (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +{ + IClassFactory *factory; + IUnknown *unk = NULL; + CLSID clsid; + HRESULT hr; + + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("Server info is not supported.\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + hr = CoGetTreatAsClass(rclsid, &clsid); + if (FAILED(hr)) + clsid = *rclsid; + + hr = CoGetClassObject(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory); + if (FAILED(hr)) + return hr; + + hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); + IClassFactory_Release(factory); + if (FAILED(hr)) + { + if (hr == CLASS_E_NOAGGREGATION && outer) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hr %#x.\n", + debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); + return hr; + } + + return return_multi_qi(unk, count, results, TRUE); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6698c23c76d..0daf321d69b 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) -@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stub CoCreateInstanceFromApp @ stub CoCreateObjectInContext @ stub CoDeactivateObject diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index cf1feeb3f41..dd51542af53 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2918,100 +2918,6 @@ HRESULT WINAPI CoResumeClassObjects(void) return S_OK; } -static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) -{ - ULONG i; - - for (i = 0; i < count; i++) - { - mqi[i].pItf = NULL; - mqi[i].hr = hr; - } -} - -static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi, BOOL include_unk) -{ - ULONG index = 0, fetched = 0; - - if (include_unk) - { - mqi[0].hr = S_OK; - mqi[0].pItf = unk; - index = fetched = 1; - } - - for (; index < count; index++) - { - mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void**)&mqi[index].pItf); - if (mqi[index].hr == S_OK) - fetched++; - } - - if (!include_unk) - IUnknown_Release(unk); - - if (fetched == 0) - return E_NOINTERFACE; - - return fetched == count ? S_OK : CO_S_NOTALLINTERFACES; -} - -/*********************************************************************** - * CoCreateInstanceEx [OLE32.@] - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( - REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - COSERVERINFO* pServerInfo, - ULONG cmq, - MULTI_QI* pResults) -{ - IUnknown *unk = NULL; - IClassFactory *cf; - CLSID clsid; - HRESULT hres; - - TRACE("(%s %p %x %p %u %p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, pServerInfo, cmq, pResults); - - if (!cmq || !pResults) - return E_INVALIDARG; - - if (pServerInfo) - FIXME("() non-NULL pServerInfo not supported!\n"); - - init_multi_qi(cmq, pResults, E_NOINTERFACE); - - hres = CoGetTreatAsClass(rclsid, &clsid); - if(FAILED(hres)) - clsid = *rclsid; - - /* - * Get a class factory to construct the object we want. - */ - hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, (void**)&cf); - if (FAILED(hres)) - return hres; - - /* - * Create the object and don't forget to release the factory - */ - hres = IClassFactory_CreateInstance(cf, pUnkOuter, pResults[0].pIID, (void**)&unk); - IClassFactory_Release(cf); - if (FAILED(hres)) - { - if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", - debugstr_guid(pResults[0].pIID), - debugstr_guid(&clsid),hres); - return hres; - } - - return return_multi_qi(unk, cmq, pResults, TRUE); -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a8101df80bc..57db6e38b76 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -13,7 +13,7 @@ @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) combase.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance -@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) -- 2.23.0

1 0

[PATCH v2 4/6] ole32: Remove initialized state test in CoCreateInstanceEx().
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> We only have same machine case working, CoGetClassObject() checks already cover that. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/compobj.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f84c12243f7..cf1feeb3f41 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2969,7 +2969,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( { IUnknown *unk = NULL; IClassFactory *cf; - APARTMENT *apt; CLSID clsid; HRESULT hres; @@ -2987,13 +2986,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( if(FAILED(hres)) clsid = *rclsid; - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - /* * Get a class factory to construct the object we want. */ -- 2.23.0

1 0

[PATCH v2 2/6] ole32: Move more built-in classes to CoGetClassObject().
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/compobj.c | 26 +++++--------------------- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole32.spec | 1 + dlls/ole32/oleproxy.c | 17 +++++++++++++++++ dlls/ole32/tests/marshal.c | 8 ++++++++ 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8e78519dc80..f84c12243f7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2755,13 +2755,14 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (CLSCTX_INPROC_SERVER & dwClsContext) { - if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler) || + IsEqualCLSID(rclsid, &CLSID_GlobalOptions) || + IsEqualCLSID(rclsid, &CLSID_ManualResetEvent) || + IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); - return FTMarshalCF_Create(iid, ppv); + return Ole32DllGetClassObject(rclsid, iid, ppv); } - if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) - return IClassFactory_QueryInterface(&GlobalOptionsCF, iid, ppv); } if (CLSCTX_INPROC & dwClsContext) @@ -2993,23 +2994,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( } apartment_release(apt); - /* - * The Standard Global Interface Table (GIT) object is a process-wide singleton. - */ - if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) - { - IGlobalInterfaceTable *git = get_std_git(); - TRACE("Retrieving GIT\n"); - return return_multi_qi((IUnknown*)git, cmq, pResults, FALSE); - } - - if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { - hres = ManualResetEvent_CreateInstance(&ManualResetEventCF, pUnkOuter, pResults[0].pIID, (void**)&unk); - if (FAILED(hres)) - return hres; - return return_multi_qi(unk, cmq, pResults, TRUE); - } - /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 974c230ddce..1b7aa5640ce 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -325,6 +325,7 @@ extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c83f0b27166..a8101df80bc 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -182,6 +182,7 @@ @ stdcall MkParseDisplayName(ptr wstr ptr ptr) @ stdcall MonikerCommonPrefixWith(ptr ptr ptr) @ stub MonikerRelativePathTo +@ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) @ stub OleConvertIStorageToOLESTREAMEx diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 29cd391e127..0429e0f5495 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -220,3 +220,20 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return Handler_DllGetClassObject(rclsid, iid, ppv); } + +/*********************************************************************** + * Ole32DllGetClassObject [OLE32.@] + */ +HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) + return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return IClassFactory_QueryInterface(&ManualResetEventCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&GlobalOptionsCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + return FTMarshalCF_Create(riid, obj); + else + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef608e66d01..a6811b9d241 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4000,6 +4000,10 @@ static void test_globalinterfacetable(void) ok_no_locks(); IGlobalInterfaceTable_Release(git); + + hr = CoGetClassObject(&CLSID_StdGlobalInterfaceTable, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&cf); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(cf); } static void test_manualresetevent(void) @@ -4016,6 +4020,10 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IClassFactory_Release(factory); + hr = CoGetClassObject(&CLSID_ManualResetEvent, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(factory); + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!punk, "Got NULL.\n"); -- 2.23.0

1 0

[PATCH] include/xaudio2.idl: use cpp_quote for xaudio2 error codes
by Biswapriyo Nath 13 Aug '20

13 Aug '20

1 0

[PATCH] d3dx10: Introduce get_d3dx10_dds_format().
by Ziqing Hui 13 Aug '20

13 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 21 ++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 20 insertions(+), 3 deletions(-)

2 2

[PATCH v2 5/5] kernel32/tests: Add console title tests.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

2 1

[PATCH v2 4/5] kernel32/tests: Add an option to test current console.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 136 ++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 65 deletions(-)

2 1

[PATCH v2 3/5] kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- With VT processing \t causes cursor move without filling skipped characters. It's usually not a problem because VT processing is disabled by default, but it's not necessarily true if we inherit the console (like in the next patch). dlls/kernel32/tests/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH vkd3d] vkd3d-compiler: Write to stdout if the output file is -.
by Zebediah Figura 12 Aug '20

12 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I've found this feature to be occasionally useful. programs/vkd3d-compiler/main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 68bc030b..a1adb616 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -119,7 +119,11 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil { FILE *fd; - if (!(fd = fopen(filename, "wb"))) + if (!strcmp(filename, "-")) + { + fd = stdout; + } + else if (!(fd = fopen(filename, "wb"))) { fprintf(stderr, "Cannot open file for writing: '%s'.\n", filename); return false; @@ -128,7 +132,8 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil if (fwrite(shader->code, 1, shader->size, fd) != shader->size) fprintf(stderr, "Could not write shader bytecode to file: '%s'.\n", filename); - fclose(fd); + if (fd != stdout) + fclose(fd); return true; } @@ -143,7 +148,8 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " -o, --output=<file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>. If <file> is -, write to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" -- 2.27.0

3 2

[PATCH v2 2/5] kernel32/tests: Fix ReadConsoleOutputW tests on Windows 8.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v2 1/5] include: Add missing console mode defines.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests on win2008 and additional fixes for win8 include/consoleapi.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)

1 0

[PATCH vkd3d] vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction.
by Zebediah Figura 12 Aug '20

12 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 88aab0f..ba2f2d1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -780,7 +780,6 @@ struct vkd3d_shader_primitive_type struct vkd3d_shader_instruction { - const struct vkd3d_shader_context *ctx; enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; unsigned int dst_count; -- 2.27.0

2 1

[PATCH vkd3d] vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension.
by Zebediah Figura 12 Aug '20

12 Aug '20

These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 81c1f48..89e3c0e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -96,8 +96,8 @@ #define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) -#define VKD3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define VKD3D_SM4_IMMCONST_TYPE_MASK (0x3u << VKD3D_SM4_IMMCONST_TYPE_SHIFT) +#define VKD3D_SM4_DIMENSION_SHIFT 0 +#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) #define VKD3D_SM4_WRITEMASK_SHIFT 4 #define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) @@ -396,10 +396,11 @@ enum vkd3d_sm4_swizzle_type VKD3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum vkd3d_sm4_immconst_type +enum vkd3d_sm4_dimension { - VKD3D_SM4_IMMCONST_SCALAR = 0x1, - VKD3D_SM4_IMMCONST_VEC4 = 0x2, + VKD3D_SM4_DIMENSION_NONE = 0x0, + VKD3D_SM4_DIMENSION_SCALAR = 0x1, + VKD3D_SM4_DIMENSION_VEC4 = 0x2, }; enum vkd3d_sm4_resource_type @@ -1573,12 +1574,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (register_type == VKD3D_SM4_RT_IMMCONST) { - enum vkd3d_sm4_immconst_type immconst_type = - (token & VKD3D_SM4_IMMCONST_TYPE_MASK) >> VKD3D_SM4_IMMCONST_TYPE_SHIFT; + enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case VKD3D_SM4_IMMCONST_SCALAR: + case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1589,7 +1589,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *ptr += 1; break; - case VKD3D_SM4_IMMCONST_VEC4: + case VKD3D_SM4_DIMENSION_VEC4: param->immconst_type = VKD3D_IMMCONST_VEC4; if (end - *ptr < VKD3D_VEC4_SIZE) { @@ -1601,7 +1601,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } } -- 2.27.0

2 1

[PATCH 1/9] msscript.ocx: Add IScriptProcedureCollection stub implementation.
by Gabriel Ivăncescu 12 Aug '20

12 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 203 +++++++++++++++++++++++++++++++++-- 1 file changed, 195 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3fc4aca..e986014 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl; typedef struct ConnectionPoint ConnectionPoint; +typedef struct ScriptProcedureCollection ScriptProcedureCollection; typedef struct ScriptHost ScriptHost; struct ConnectionPoint { @@ -82,8 +83,17 @@ typedef struct { BSTR name; ScriptHost *host; IDispatch *script_dispatch; + + ScriptProcedureCollection *procedures; } ScriptModule; +struct ScriptProcedureCollection { + IScriptProcedureCollection IScriptProcedureCollection_iface; + LONG ref; + + ScriptModule *module; +}; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -137,6 +147,7 @@ typedef enum tid_t { IScriptControl_tid, IScriptModuleCollection_tid, IScriptModule_tid, + IScriptProcedureCollection_tid, LAST_tid } tid_t; @@ -146,7 +157,8 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, &IID_IScriptModuleCollection, - &IID_IScriptModule + &IID_IScriptModule, + &IID_IScriptProcedureCollection, }; static HRESULT load_typelib(void) @@ -404,6 +416,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptProcedureCollection *impl_from_IScriptProcedureCollection(IScriptProcedureCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptProcedureCollection, IScriptProcedureCollection_iface); +} + static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); @@ -674,6 +691,154 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptProcedureCollection_QueryInterface(IScriptProcedureCollection *iface, REFIID riid, void **ppv) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptProcedureCollection, riid)) + { + *ppv = &This->IScriptProcedureCollection_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 ScriptProcedureCollection_AddRef(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptProcedureCollection_Release(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + This->module->procedures = NULL; + IScriptModule_Release(&This->module->IScriptModule_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfoCount(IScriptProcedureCollection *iface, UINT *pctinfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfo(IScriptProcedureCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptProcedureCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptProcedureCollection_GetIDsOfNames(IScriptProcedureCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptProcedureCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_Invoke(IScriptProcedureCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptProcedureCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCollection *iface, IUnknown **ppenumProcedures) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumProcedures); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollection *iface, VARIANT index, + IScriptProcedure **ppdispProcedure) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppdispProcedure); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollection *iface, LONG *plCount) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static const IScriptProcedureCollectionVtbl ScriptProcedureCollectionVtbl = { + ScriptProcedureCollection_QueryInterface, + ScriptProcedureCollection_AddRef, + ScriptProcedureCollection_Release, + ScriptProcedureCollection_GetTypeInfoCount, + ScriptProcedureCollection_GetTypeInfo, + ScriptProcedureCollection_GetIDsOfNames, + ScriptProcedureCollection_Invoke, + ScriptProcedureCollection_get__NewEnum, + ScriptProcedureCollection_get_Item, + ScriptProcedureCollection_get_Count +}; + static void detach_script_host(ScriptHost *host) { if (--host->module_count) @@ -848,9 +1013,29 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%p)\n", This, ppdispProcedures); + TRACE("(%p)->(%p)\n", This, ppdispProcedures); - return E_NOTIMPL; + if (!This->host) + return E_FAIL; + + if (This->procedures) + IScriptProcedureCollection_AddRef(&This->procedures->IScriptProcedureCollection_iface); + else + { + ScriptProcedureCollection *procs; + + if (!(procs = heap_alloc(sizeof(*procs)))) + return E_OUTOFMEMORY; + + procs->IScriptProcedureCollection_iface.lpVtbl = &ScriptProcedureCollectionVtbl; + procs->ref = 1; + procs->module = This; + This->procedures = procs; + IScriptModule_AddRef(&This->IScriptModule_iface); + } + + *ppdispProcedures = &This->procedures->IScriptProcedureCollection_iface; + return S_OK; } static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) @@ -1060,18 +1245,16 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) { ScriptModule *module; - if (!(module = heap_alloc(sizeof(*module)))) return NULL; + if (!(module = heap_alloc_zero(sizeof(*module)))) return NULL; module->IScriptModule_iface.lpVtbl = &ScriptModuleVtbl; module->ref = 1; - module->name = NULL; if (name && !(module->name = SysAllocString(name))) { heap_free(module); return NULL; } module->host = host; - module->script_dispatch = NULL; IActiveScriptSite_AddRef(&host->IActiveScriptSite_iface); return module; } @@ -1771,8 +1954,12 @@ static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispa static HRESULT WINAPI ScriptControl_get_Procedures(IScriptControl *iface, IScriptProcedureCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!This->host) return E_FAIL; + + return IScriptModule_get_Procedures(&This->modules[0]->IScriptModule_iface, p); } static HRESULT WINAPI ScriptControl__AboutBox(IScriptControl *iface) -- 2.21.0

2 13

[PATCH 1/2] urlmon: Remove unused flags argument from parse_host.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/uri.c | 95 +++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 53 deletions(-)

1 0

[PATCH v2 3/3] xactengine3_7: Register XACTEngine classes for xactengine2_x dlls
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/3] include: Add xact.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Differentiate interface changes between xactengine2_x dll versions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] libport: Add wine_call_on_stack_obsolete fallback for other architectures
by André Hentschel 12 Aug '20

12 Aug '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- libs/wine/port.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/wine/port.c b/libs/wine/port.c index 618b280881e..0e7dcc88d91 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -137,6 +137,11 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, "ldr x19, [sp,#16]\n\t" /* restore register from stack */ "ldp x29, x30, [sp],#32\n\t" /* restore return address */ "ret") /* return */ +#else +int wine_call_on_stack_obsolete( int (*func)(void *), void *arg, void *stack ) +{ + return 0; +} #endif /*********************************************************************** -- 2.25.1

2 2

[PATCH 2/3] include: Add xact.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/6] combase: Move CoGetInterfaceAndReleaseStream().
by Nikolay Sivov 12 Aug '20

12 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 19 +++++++++++++++++++ dlls/ole32/marshal.c | 30 ------------------------------ dlls/ole32/ole32.spec | 2 +- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 56dc63c4f72..8c471f5ef69 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -109,7 +109,7 @@ @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index dfe6426db9a..54151e21c8e 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -21,6 +21,10 @@ #define COBJMACROS #include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + /*********************************************************************** * CoMarshalHresult (combase.@) */ @@ -36,3 +40,18 @@ HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) { return IStream_Read(stream, phresult, sizeof(*phresult), NULL); } + +/*********************************************************************** + * CoGetInterfaceAndReleaseStream (combase.@) + */ +HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj) +{ + HRESULT hr; + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (!stream) return E_INVALIDARG; + hr = CoUnmarshalInterface(stream, riid, obj); + IStream_Release(stream); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 90d24805952..51db5a7e699 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2124,36 +2124,6 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( return hres; } -/*********************************************************************** - * CoGetInterfaceAndReleaseStream [OLE32.@] - * - * Unmarshalls an interface from a stream and then releases the stream. - * - * PARAMS - * pStm [I] Stream that contains the marshalled interface. - * riid [I] Interface identifier of the object to unmarshall. - * ppv [O] Address of pointer where the requested interface object will be stored. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInterface() - */ -HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID riid, - LPVOID *ppv) -{ - HRESULT hres; - - TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); - - if(!pStm) return E_INVALIDARG; - hres = CoUnmarshalInterface(pStm, riid, ppv); - IStream_Release(pStm); - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 001e7b7ad2b..d5e5607e036 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -37,7 +37,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr) -- 2.28.0

2 11

[PATCH 3/3] xactengine3_7: Register XACTEngine classes for xactengine2_x dlls
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] ntdll/tests: Fix w2008 debugger test results.
by Rémi Bernon 12 Aug '20

12 Aug '20

Changing Eip has an effect there, so offset it just a little bit so that it still falls within code. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 51 ++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7ee191469ec..0efe1898914 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -376,14 +376,16 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } /* test if context change is preserved from vectored handler to stack handlers */ @@ -411,14 +413,16 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } if(have_vectored_api) @@ -1045,8 +1049,8 @@ static void test_debugger(void) ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Eip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -1058,7 +1062,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Eip */ ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); - ctx.Eip = 0x12345; + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -1071,7 +1075,8 @@ static void test_debugger(void) if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || - broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb), + broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ @@ -1079,8 +1084,10 @@ static void test_debugger(void) ctx.Eip += 1; } else - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", - ctx.Eip, (char *)code_mem_address + 0xb); + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, + "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); /* here we handle exception */ } } @@ -2933,8 +2940,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -2946,8 +2953,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -3732,8 +3739,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -3745,7 +3752,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at 0x%x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -4110,8 +4117,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -4123,7 +4130,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ -- 2.28.0

2 3

[PATCH v2] xactengine3_7: Initial IXACT3Engine tests
by Alistair Leslie-Hughes 11 Aug '20

11 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 dlls/xactengine3_7/tests/Makefile.in create mode 100644 dlls/xactengine3_7/tests/xact3.c diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 0000000000..c32b256254 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 0000000000..9b0d3defb0 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.28.0

2 1

[PATCH 1/2] gdiplus/tests: Add metafile null frame rect GDI/GDI+ interop test case.
by Shawn M. Chapla 11 Aug '20

11 Aug '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 47978d64d8b..e047c9a4212 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1374,6 +1374,64 @@ static void test_nullframerect(void) { stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitMillimeter, + description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 20, 40, 10, 70); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + todo_wine expectf_(20.0, bounds.X, 0.05); + todo_wine expectf_(25.0, bounds.Y, 0.05); + todo_wine expectf_(55.0, bounds.Width, 1.00); + todo_wine expectf_(55.0, bounds.Width, 0.05); + todo_wine expectf_(85.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record pagetransform_records[] = { -- 2.28.0

2 3

[PATCH 4/4] kernel32/tests: Add console title tests.
by Jacek Caban 11 Aug '20

11 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)

2 1

[PATCH 3/4] kernel32/tests: Add an option to test current console.
by Jacek Caban 11 Aug '20

11 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 136 ++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 65 deletions(-)

2 1

[PATCH 2/4] kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed.
by Jacek Caban 11 Aug '20

11 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

2 1

Implementing NtSetTimerResolution() and timeBeginPeriod()
by Arkadiusz Hiler 11 Aug '20

11 Aug '20

On Windows NtDelayExecution() has the default resolution of 15.625 ms. This can be changed system-wide by NtSetTimerResolution() or timeBeginPeriod(). Each process's preference is stored in EPROCESS and the global resolution is the min(all_of_them). This gets updated each time a process exits or sets a new value. In Wine NtDelayExecution() has the resolution of select(), which is sub 1ms. Recently GetTickCount() was changed to use user_shared_data and has the update interval of 16ms - this is now (almost) the same as on Windows. The Sleep()/GetTickCount() misalignment seems to be root cause of https://bugs.winehq.org/show_bug.cgi?id=49564. I would like to implement timer resolution support, but since I am new to the project it's better to ask you folks first :-) Implementation plan: 1. Change max tick update interval to 15.625ms or as close as possible, err on the shorter side. 2. Introduce per-process timer resolution. 2. Make changes to NtDelayExecution() so it waits in multiples of process's timer resolution. 3. Implement NtQueryTimerResolution(), and NtSetTimerResolution() that sets (2nd arg = TRUE) and resets (2nd arg = FALSE) the per-process timer resoltuion with similar min, max and rounding behaviors as on Windows. 4. Implement timeBeginPeriod() and timeEndPeriod() (they will keep track of matching calls and use NtSetTimerResolution() internally). 5. Check if other "wait" calls use timer resolution - give them treatment from step 2. 6. If we ever find software that depends on timer resolution being global, then we can make NtSetTimerResolution() do a wineserver call. Requested resolution would be kept in a per-process structure. The effective timer resolution can be exposed via unused part of user_shared_data and updated each NtSetTimerResolution() call or if any process exits. Thoughts? -- Cheers, Arek

1 0

[PATCH 1/4] include: Add missing console mode defines.
by Jacek Caban 11 Aug '20

11 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/consoleapi.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)

1 0

[PATCH 1/4] dwmapi: Improve DwmGetWindowAttribute stub.
by Gabriel Ivăncescu 11 Aug '20

11 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8408a2e..3f48691 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -208,9 +208,33 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + TRACE("(%p %d %p %d)\n", hwnd, attribute, pv_attribute, size); - return E_NOTIMPL; + if (!hwnd) return E_HANDLE; + if (!pv_attribute) return E_INVALIDARG; + + switch (attribute) + { + case DWMWA_NCRENDERING_ENABLED: + if (size < sizeof(BOOL)) return E_INVALIDARG; + + WARN("DWMWA_NCRENDERING_ENABLED: always returning FALSE.\n"); + *(BOOL*)(pv_attribute) = FALSE; + break; + + case DWMWA_CLOAKED: + if (size < sizeof(DWORD)) return E_INVALIDARG; + + FIXME("DWMWA_CLOAKED: always returning 0.\n"); + *(DWORD*)(pv_attribute) = 0; + break; + + default: + FIXME("unimplemented attribute %d, size %u, for hwnd %p.\n", attribute, size, hwnd); + return E_INVALIDARG; + } + + return S_OK; } /********************************************************************** -- 2.21.0

1 3

[PATCH 5/6] winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 522ff57d7a7..9a80308e896 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -847,6 +847,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (!devname && !devmode) { + memset(&default_mode, 0, sizeof(default_mode)); default_mode.dmSize = sizeof(default_mode); if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) { -- 2.25.1

3 2

[PATCH] ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist.
by Hans Leidekker 11 Aug '20

11 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49656 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eb21e4b4b35..4d2afa946b7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6787,7 +6787,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(node, servname, punixhints, &unixaires); if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) - && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) + && node && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7a3fc44539..b523c326d60 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7778,6 +7778,10 @@ static void test_getaddrinfo(void) ok(0, "test %d: getaddrinfo failed with %d (err %d)\n", i, ret, err); } } + + memset(&hint, 0, sizeof(hint)); + ret = pgetaddrinfo(NULL, "nonexistentservice", &hint, &result); + ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); } static void test_ConnectEx(void) -- 2.20.1

2 1

[PATCH 1/2] wbemprox: Set obj to NULL on error in get_object().
by Gijs Vermeulen 11 Aug '20

11 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/services.c | 6 +++++- dlls/wbemprox/tests/query.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index c0e535b3a1..3a0963e1f6 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -463,7 +463,11 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) return hr; } hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); - if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; + if (hr == WBEM_S_FALSE) + { + hr = WBEM_E_NOT_FOUND; + *obj = NULL; + } IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d6c918c08d..df0c26aa97 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -338,19 +338,23 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); SysFreeString( empty ); SysFreeString( class ); class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); } -- 2.28.0

2 3

[PATCH] xactengine2_7: Initial IXACT3Engine tests
by Alistair Leslie-Hughes 11 Aug '20

11 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/x3daudio1_7/Makefile.in | 1 + dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 dlls/xactengine3_7/tests/Makefile.in create mode 100644 dlls/xactengine3_7/tests/xact3.c diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 267a93fd6d..5438bc6d80 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7 MODULE = x3daudio1_7.dll +IMPORTLIB = x3daudio1_7 PARENTSRC = ../xaudio2_7 EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 0000000000..492874b951 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 x3daudio1_7 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 0000000000..eb76249761 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG || hr != xact_interfaces[i].expected) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.28.0

3 2

[PATCH 1/3] ddraw: Thunk to surface1, not surface7 in blt (v2).
by Stefan Dösinger 11 Aug '20

11 Aug '20

This patch series makes FRAPS work with ddraw games. It hooks only version 1 methods of blt, unlock and flip to detect a front buffer modification. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Add a comment explaining why we thunk to ddraw1. In the past FRAPS wouldn't work in Wine because it assumed that the offset of the hooked functions inside the library is the same in every process. This wasn't the case when we used Linux .so's, but it now works with PE builds of the d3d frontend DLLs. d3d8 is already working. For d3d9, FRAPS hooks D3DPERF_*. It happens to work as-is with my build, but I have a patch in my tree that adds DECLSPEC_HOTPATCH to those. Unfortunately this nowadays runs into bug 47633, so we won't be able to upstream it anytime soon. That means using fraps with a d3d9 game puts you at the mercy of your compiler. --- dlls/ddraw/surface.c | 68 ++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a5f032eabfc..22bebffce64 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1635,27 +1635,13 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons return hr; } -/***************************************************************************** - * IDirectDrawSurface7::Blt - * - * Performs a blit on the surface - * - * Params: - * DestRect: Destination rectangle, can be NULL - * SrcSurface: Source surface, can be NULL - * SrcRect: Source rectangle, can be NULL - * Flags: Blt flags - * DDBltFx: Some extended blt parameters, connected to the flags - * - * Returns: - * D3D_OK on success, error code otherwise. - * - *****************************************************************************/ -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, - IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +/* FRAPS hooks IDirectDrawSurface::Blt and expects the version 1 method to be called when the + * game uses later interfaces. */ +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, + IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { - struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); struct wined3d_blt_fx wined3d_fx; DWORD unsupported_flags; DWORD fill_colour = 0; @@ -1834,6 +1820,19 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * } } +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, + IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +{ + struct ddraw_surface *dst = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(src_surface); + + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", + iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); + + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { @@ -1843,47 +1842,34 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 * TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src_surface); - - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", - iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); -} - -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, - IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) -{ - struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface2(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } /***************************************************************************** -- 2.26.2

2 5

[PATCH 6/6] ole32: Allow SetSize to move a fixed memory block.
by Huw Davies 11 Aug '20

11 Aug '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/tests/hglobalstream.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ee345f6293a..4590bb9c431 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -426,7 +426,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_SetSize( /* * Re allocate the HGlobal to fit the new size of the stream. */ - supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, 0); + supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, GMEM_MOVEABLE); if (supportHandle == 0) return E_OUTOFMEMORY; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 87c502dc2f4..2f386914afc 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -625,20 +625,16 @@ static void test_IStream_Clone(void) newsize.QuadPart = 0x8000; hr = IStream_SetSize(stream, newsize); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(stream, &hmem, &size, &pos); ok(hmem != 0, "unexpected %p\n", hmem); -todo_wine ok(hmem != orig_hmem, "unexpected %p\n", hmem); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); ok(pos == 0, "unexpected %d\n", pos); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); ok(pos == 0, "unexpected %d\n", pos); -- 2.23.0

2 1

[PATCH 5/6] ole32: Allow Clone to access the original memory block.
by Huw Davies 11 Aug '20

11 Aug '20

Based on a patch by Dmitry Timoshkov. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/hglobalstream.c | 21 ++++++++++++++++----- dlls/ole32/tests/hglobalstream.c | 12 ------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index e715cd89500..ee345f6293a 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -51,6 +51,11 @@ struct handle_wrapper BOOL delete_on_release; }; +static void handle_addref(struct handle_wrapper *handle) +{ + InterlockedIncrement(&handle->ref); +} + static void handle_release(struct handle_wrapper *handle) { ULONG ref = InterlockedDecrement(&handle->ref); @@ -586,15 +591,21 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( IStream* iface, IStream** ppstm) /* [out] */ { - HGLOBALStreamImpl* This = impl_from_IStream(iface); + HGLOBALStreamImpl* This = impl_from_IStream(iface), *clone; ULARGE_INTEGER dummy; LARGE_INTEGER offset; - HRESULT hr; TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->handle->delete_on_release,(long)This->currentPosition.QuadPart); - hr = CreateStreamOnHGlobal(This->handle->hglobal, FALSE, ppstm); - if(FAILED(hr)) - return hr; + + *ppstm = NULL; + + clone = hglobalstream_construct(); + if (!clone) return E_OUTOFMEMORY; + + *ppstm = &clone->IStream_iface; + handle_addref(This->handle); + clone->handle = This->handle; + offset.QuadPart = (LONGLONG)This->currentPosition.QuadPart; IStream_Seek(*ppstm, offset, STREAM_SEEK_SET, &dummy); return S_OK; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 1825fa9c1e4..87c502dc2f4 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -579,14 +579,12 @@ static void test_IStream_Clone(void) stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 13, "unexpected %d\n", size); ok(pos == 0, "unexpected %d\n", pos); buf[0] = 0; hr = IStream_Read(clone, buf, sizeof(buf), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine ok(!strcmp(buf, hello), "wrong stream contents\n"); newsize.QuadPart = 0x8000; @@ -600,9 +598,7 @@ todo_wine stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 13, "unexpected %d\n", pos); IStream_Release(clone); @@ -671,24 +667,19 @@ todo_wine newsize.QuadPart = 0x8000; hr = IStream_SetSize(clone, newsize); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); ok(pos == 0, "unexpected %d\n", pos); hr = IStream_Write(clone, hello, sizeof(hello), NULL); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 13, "unexpected %d\n", pos); offset.QuadPart = 0; @@ -698,14 +689,11 @@ todo_wine buf[0] = 0; hr = IStream_Read(clone, buf, sizeof(buf), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine ok(!strcmp(buf, hello), "wrong stream contents\n"); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 32, "unexpected %d\n", pos); ret = IStream_Release(clone); -- 2.23.0

1 0

[PATCH 4/6] ole32: Add a constructor helper.
by Huw Davies 11 Aug '20

11 Aug '20

Based on a patch by Dmitry Timoshkov. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/hglobalstream.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 8fd1e03913c..e715cd89500 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -106,6 +106,22 @@ static inline HGLOBALStreamImpl *impl_from_IStream(IStream *iface) return CONTAINING_RECORD(iface, HGLOBALStreamImpl, IStream_iface); } +static const IStreamVtbl HGLOBALStreamImplVtbl; + +static HGLOBALStreamImpl *hglobalstream_construct(void) +{ + HGLOBALStreamImpl *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + + if (This) + { + This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; + This->ref = 1; + This->handle = NULL; + This->currentPosition.QuadPart = 0; + } + return This; +} + static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( IStream* iface, REFIID riid, /* [in] */ @@ -615,12 +631,9 @@ HRESULT WINAPI CreateStreamOnHGlobal( if (!ppstm) return E_INVALIDARG; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); + This = hglobalstream_construct(); if (!This) return E_OUTOFMEMORY; - This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; - This->ref = 1; - This->handle = handle_create(hGlobal, fDeleteOnRelease); if (!This->handle) { @@ -628,10 +641,6 @@ HRESULT WINAPI CreateStreamOnHGlobal( return E_OUTOFMEMORY; } - /* start at the beginning */ - This->currentPosition.u.HighPart = 0; - This->currentPosition.u.LowPart = 0; - *ppstm = &This->IStream_iface; return S_OK; -- 2.23.0

1 0

[PATCH 3/6] ole32: Add a ref-count to the handle structure.
by Huw Davies 11 Aug '20

11 Aug '20

Based on a patch by Dmitry Timoshkov. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/hglobalstream.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 300119dcc72..8fd1e03913c 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); struct handle_wrapper { + LONG ref; HGLOBAL hglobal; ULONG size; BOOL delete_on_release; @@ -52,8 +53,13 @@ struct handle_wrapper static void handle_release(struct handle_wrapper *handle) { + ULONG ref = InterlockedDecrement(&handle->ref); + + if (!ref) + { if (handle->delete_on_release) GlobalFree(handle->hglobal); HeapFree(GetProcessHeap(), 0, handle); + } } static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_release) @@ -70,6 +76,7 @@ static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_rele HeapFree(GetProcessHeap(), 0, handle); return NULL; } + handle->ref = 1; handle->hglobal = hglobal; handle->size = GlobalSize(hglobal); handle->delete_on_release = delete_on_release; -- 2.23.0

1 0

[PATCH 2/6] ole32: Add a structure to hold memory block information.
by Huw Davies 11 Aug '20

11 Aug '20

Based on a patch by Dmitry Timoshkov which was based on a suggestion by Sebastian Lackner. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/hglobalstream.c | 102 ++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 6133690d9d1..300119dcc72 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -5,6 +5,7 @@ * for streams contained supported by an HGLOBAL pointer. * * Copyright 1999 Francis Beaudet + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,6 +43,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +struct handle_wrapper +{ + HGLOBAL hglobal; + ULONG size; + BOOL delete_on_release; +}; + +static void handle_release(struct handle_wrapper *handle) +{ + if (handle->delete_on_release) GlobalFree(handle->hglobal); + HeapFree(GetProcessHeap(), 0, handle); +} + +static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_release) +{ + struct handle_wrapper *handle; + + handle = HeapAlloc(GetProcessHeap(), 0, sizeof(*handle)); + if (!handle) return NULL; + + /* allocate a handle if one is not supplied */ + if (!hglobal) hglobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_SHARE, 0); + if (!hglobal) + { + HeapFree(GetProcessHeap(), 0, handle); + return NULL; + } + handle->hglobal = hglobal; + handle->size = GlobalSize(hglobal); + handle->delete_on_release = delete_on_release; + + return handle; +} + /**************************************************************************** * HGLOBALStreamImpl definition. * @@ -53,14 +88,7 @@ typedef struct IStream IStream_iface; LONG ref; - /* support for the stream */ - HGLOBAL supportHandle; - - /* if TRUE the HGLOBAL is destroyed when the stream is finally released */ - BOOL deleteOnRelease; - - /* size of the stream */ - ULARGE_INTEGER streamSize; + struct handle_wrapper *handle; /* current position of the cursor */ ULARGE_INTEGER currentPosition; @@ -112,12 +140,7 @@ static ULONG WINAPI HGLOBALStreamImpl_Release( if (!ref) { - if (This->deleteOnRelease) - { - GlobalFree(This->supportHandle); - This->supportHandle = NULL; - } - + handle_release(This->handle); HeapFree(GetProcessHeap(), 0, This); } @@ -159,15 +182,15 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( * Using the known size of the stream, calculate the number of bytes * to read from the block chain */ - bytesToReadFromBuffer = min( This->streamSize.u.LowPart - This->currentPosition.u.LowPart, cb); + bytesToReadFromBuffer = min( This->handle->size - This->currentPosition.u.LowPart, cb); /* * Lock the buffer in position and copy the data. */ - supportBuffer = GlobalLock(This->supportHandle); + supportBuffer = GlobalLock(This->handle->hglobal); if (!supportBuffer) { - WARN("read from invalid hglobal %p\n", This->supportHandle); + WARN("read from invalid hglobal %p\n", This->handle->hglobal); *pcbRead = 0; return S_OK; } @@ -187,7 +210,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( /* * Cleanup */ - GlobalUnlock(This->supportHandle); + GlobalUnlock(This->handle->hglobal); /* * Always returns S_OK even if the end of the stream is reached before the @@ -239,7 +262,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Verify if we need to grow the stream */ - if (newSize.u.LowPart > This->streamSize.u.LowPart) + if (newSize.u.LowPart > This->handle->size) { /* grow stream */ HRESULT hr = IStream_SetSize(iface, newSize); @@ -253,10 +276,10 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Lock the buffer in position and copy the data. */ - supportBuffer = GlobalLock(This->supportHandle); + supportBuffer = GlobalLock(This->handle->hglobal); if (!supportBuffer) { - WARN("write to invalid hglobal %p\n", This->supportHandle); + WARN("write to invalid hglobal %p\n", This->handle->hglobal); return S_OK; } @@ -270,7 +293,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Cleanup */ - GlobalUnlock(This->supportHandle); + GlobalUnlock(This->handle->hglobal); out: /* @@ -316,7 +339,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( case STREAM_SEEK_CUR: break; case STREAM_SEEK_END: - newPosition = This->streamSize; + newPosition.QuadPart = This->handle->size; break; default: hr = STG_E_SEEKERROR; @@ -369,19 +392,19 @@ static HRESULT WINAPI HGLOBALStreamImpl_SetSize( * HighPart is ignored as shown in tests */ - if (This->streamSize.u.LowPart == libNewSize.u.LowPart) + if (This->handle->size == libNewSize.u.LowPart) return S_OK; /* * Re allocate the HGlobal to fit the new size of the stream. */ - supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); + supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, 0); if (supportHandle == 0) return E_OUTOFMEMORY; - This->supportHandle = supportHandle; - This->streamSize.u.LowPart = libNewSize.u.LowPart; + This->handle->hglobal = supportHandle; + This->handle->size = libNewSize.u.LowPart; return S_OK; } @@ -531,7 +554,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Stat( pstatstg->pwcsName = NULL; pstatstg->type = STGTY_STREAM; - pstatstg->cbSize = This->streamSize; + pstatstg->cbSize.QuadPart = This->handle->size; return S_OK; } @@ -545,8 +568,8 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( LARGE_INTEGER offset; HRESULT hr; - TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->deleteOnRelease,(long)This->currentPosition.QuadPart); - hr = CreateStreamOnHGlobal(This->supportHandle, FALSE, ppstm); + TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->handle->delete_on_release,(long)This->currentPosition.QuadPart); + hr = CreateStreamOnHGlobal(This->handle->hglobal, FALSE, ppstm); if(FAILED(hr)) return hr; offset.QuadPart = (LONGLONG)This->currentPosition.QuadPart; @@ -591,22 +614,17 @@ HRESULT WINAPI CreateStreamOnHGlobal( This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; This->ref = 1; - /* initialize the support */ - This->supportHandle = hGlobal; - This->deleteOnRelease = fDeleteOnRelease; - - /* allocate a handle if one is not supplied */ - if (!This->supportHandle) - This->supportHandle = GlobalAlloc(GMEM_MOVEABLE|GMEM_NODISCARD|GMEM_SHARE, 0); + This->handle = handle_create(hGlobal, fDeleteOnRelease); + if (!This->handle) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } /* start at the beginning */ This->currentPosition.u.HighPart = 0; This->currentPosition.u.LowPart = 0; - /* initialize the size of the stream to the size of the handle */ - This->streamSize.u.HighPart = 0; - This->streamSize.u.LowPart = GlobalSize(This->supportHandle); - *ppstm = &This->IStream_iface; return S_OK; @@ -628,7 +646,7 @@ HRESULT WINAPI GetHGlobalFromStream(IStream* pstm, HGLOBAL* phglobal) * Verify that the stream object was created with CreateStreamOnHGlobal. */ if (pStream->IStream_iface.lpVtbl == &HGLOBALStreamImplVtbl) - *phglobal = pStream->supportHandle; + *phglobal = pStream->handle->hglobal; else { *phglobal = 0; -- 2.23.0

1 0

[PATCH 1/6] ole32/tests: Add tests for HGLOBAL based IStream::Clone.
by Huw Davies 11 Aug '20

11 Aug '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 199 +++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6a0498aa60b..1825fa9c1e4 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -2,6 +2,7 @@ * Stream on HGLOBAL Tests * * Copyright 2006 Robert Shearman (for CodeWeavers) + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -514,9 +515,207 @@ static void test_freed_hglobal(void) IStream_Release(pStream); } +static void stream_info(IStream *stream, HGLOBAL *hmem, int *size, int *pos) +{ + HRESULT hr; + STATSTG stat; + LARGE_INTEGER offset; + ULARGE_INTEGER newpos; + + *hmem = 0; + *size = *pos = -1; + + hr = GetHGlobalFromStream(stream, hmem); + ok(hr == S_OK, "unexpected %#x\n", hr); + + memset(&stat, 0x55, sizeof(stat)); + hr = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(stat.type == STGTY_STREAM, "unexpected %#x\n", stat.type); + ok(!stat.pwcsName, "unexpected %p\n", stat.pwcsName); + ok(IsEqualIID(&stat.clsid, &GUID_NULL), "unexpected %s\n", wine_dbgstr_guid(&stat.clsid)); + ok(!stat.cbSize.HighPart, "unexpected %#x\n", stat.cbSize.HighPart); + *size = stat.cbSize.LowPart; + + offset.QuadPart = 0; + hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &newpos); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(!newpos.HighPart, "unexpected %#x\n", newpos.HighPart); + *pos = newpos.LowPart; +} + +static void test_IStream_Clone(void) +{ + static const char hello[] = "Hello World!"; + char buf[32]; + HRESULT hr; + IStream *stream, *clone; + HGLOBAL orig_hmem, hmem, hmem_clone; + ULARGE_INTEGER newsize; + LARGE_INTEGER offset; + int size, pos, ret; + + /* test simple case for Clone */ + orig_hmem = GlobalAlloc(GMEM_MOVEABLE, 0); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Write(stream, hello, sizeof(hello), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 13, "unexpected %d\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 13, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + buf[0] = 0; + hr = IStream_Read(clone, buf, sizeof(buf), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); +todo_wine + ok(!strcmp(buf, hello), "wrong stream contents\n"); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(stream, newsize); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 13, "unexpected %d\n", pos); + + IStream_Release(clone); + IStream_Release(stream); + + /* exploit GMEM_FIXED forced move for the same base streams */ + orig_hmem = GlobalAlloc(GMEM_FIXED, 1); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(stream, newsize); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); +todo_wine + ok(hmem != orig_hmem, "unexpected %p\n", hmem); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + IStream_Release(stream); + IStream_Release(clone); + + /* test Release of cloned stream */ + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 0, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + ret = IStream_Release(stream); + ok(ret == 0, "unexpected %d\n", ret); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(clone, newsize); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + hr = IStream_Write(clone, hello, sizeof(hello), NULL); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 13, "unexpected %d\n", pos); + + offset.QuadPart = 0; + hr = IStream_Seek(clone, offset, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + buf[0] = 0; + hr = IStream_Read(clone, buf, sizeof(buf), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); +todo_wine + ok(!strcmp(buf, hello), "wrong stream contents\n"); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 32, "unexpected %d\n", pos); + + ret = IStream_Release(clone); + ok(ret == 0, "unexpected %d\n", ret); +} + START_TEST(hglobalstream) { test_streamonhglobal(); test_copyto(); test_freed_hglobal(); + test_IStream_Clone(); } -- 2.23.0

1 0

[PATCH vkd3d 3/5] vkd3d-compiler: Add an option to specify the target type.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5baaf8a..ed4b0ee 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -131,6 +131,8 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " -b <type> Specify the target type. Currently the only valid value\n" + " is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -153,6 +155,7 @@ struct options const char *filename; const char *output_filename; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; bool print_version; bool print_source_types; bool print_target_types; @@ -222,6 +225,19 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) return VKD3D_SHADER_SOURCE_NONE; } +static enum vkd3d_shader_target_type parse_target_type(const char *target) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + { + if (!strcmp(target, target_type_info[i].name)) + return target_type_info[i].type; + } + + return VKD3D_SHADER_TARGET_NONE; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -241,14 +257,23 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; for (;;) { - if ((option = getopt_long(argc, argv, "ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) break; switch (option) { + case 'b': + if ((options->target_type = parse_target_type(optarg)) == VKD3D_SHADER_TARGET_NONE) + { + fprintf(stderr, "Invalid target type '%s' specified.\n", optarg); + return false; + } + break; + case OPTION_BUFFER_UAV: if (!parse_buffer_uav(&buffer_uav, optarg)) { @@ -391,7 +416,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; - info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + info.target_type = options.target_type; info.options = options.compile_options; info.option_count = options.compile_option_count; info.log_level = VKD3D_SHADER_LOG_INFO; -- 2.11.0

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Add an option to list the supported target types.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4a889f0..5baaf8a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2020 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,7 @@ enum OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, + OPTION_PRINT_TARGET_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -52,6 +54,19 @@ source_type_info[] = " This is the format used for Direct3D shader model 4 and 5 shaders."}, }; +static const struct +{ + enum vkd3d_shader_target_type type; + const char *name; + const char *description; +} +target_type_info[] = +{ + {VKD3D_SHADER_TARGET_SPIRV_BINARY, + "spirv-binary", "A SPIR-V shader in binary form.\n" + " This is the format used for Vulkan shaders.\n"}, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -121,6 +136,8 @@ static void print_usage(const char *program_name) " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --print-source-types Display the supported source types and exit.\n" + " --print-target-types Display the supported target types for the specified\n" + " source type and exit.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Valid values are\n" @@ -138,6 +155,7 @@ struct options enum vkd3d_shader_source_type source_type; bool print_version; bool print_source_types; + bool print_target_types; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -215,6 +233,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -248,6 +267,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_source_types = true; return true; + case OPTION_PRINT_TARGET_TYPES: + options->print_target_types = true; + break; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -270,6 +293,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (optind >= argc) return false; @@ -298,6 +324,36 @@ static void print_source_types(void) } } +static void print_target_types(enum vkd3d_shader_source_type source_type) +{ + const enum vkd3d_shader_target_type *target_types; + const char *source_type_name; + unsigned int count, i, j; + + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + { + if (source_type == source_type_info[i].type) + { + source_type_name = source_type_info[i].name; + break; + } + } + + target_types = vkd3d_shader_get_supported_target_types(source_type, &count); + fprintf(stdout, "Supported target types for source type '%s':\n", source_type_name); + for (i = 0; i < count; ++i) + { + for (j = 0; j < ARRAY_SIZE(target_type_info); ++j) + { + if (target_types[i] == target_type_info[j].type) + { + fprintf(stdout, " %s %s", target_type_info[j].name, target_type_info[j].description); + break; + } + } + } +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; @@ -326,6 +382,12 @@ int main(int argc, char **argv) return 0; } + if (options.print_target_types) + { + print_target_types(options.source_type); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; -- 2.11.0

2 1

[PATCH vkd3d 1/5] vkd3d-compiler: Add an option to list the supported source types.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 91 +++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 18 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e2f9ae5..4a889f0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -34,10 +34,24 @@ enum OPTION_HELP = CHAR_MAX + 1, OPTION_BUFFER_UAV, OPTION_OUTPUT, + OPTION_PRINT_SOURCE_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, }; +static const struct +{ + enum vkd3d_shader_source_type type; + const char *name; + const char *description; +} +source_type_info[] = +{ + {VKD3D_SHADER_SOURCE_DXBC_TPF, + "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 4 and 5 shaders."}, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -101,17 +115,18 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" - " -h, --help Display this information and exit.\n" - " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" - " Valid values are 'buffer-texture' (default) and\n" - " 'storage-buffer'.\n" - " -o, --output=<file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n" - " -V, --version Display version information and exit.\n" - " -x <type> Specify the type of the source. Valid values are\n" - " 'dxbc-tpf' and 'none'.\n" - " -- Stop option processing. Any subsequent argument is\n" - " interpreted as a filename.\n"; + " -h, --help Display this information and exit.\n" + " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" + " Valid values are 'buffer-texture' (default) and\n" + " 'storage-buffer'.\n" + " -o, --output=<file> Write the output to <file>.\n" + " --print-source-types Display the supported source types and exit.\n" + " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" + " -x <type> Specify the type of the source. Valid values are\n" + " 'dxbc-tpf' and 'none'.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -122,6 +137,7 @@ struct options const char *output_filename; enum vkd3d_shader_source_type source_type; bool print_version; + bool print_source_types; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -174,9 +190,17 @@ static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer static enum vkd3d_shader_source_type parse_source_type(const char *source) { - if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) + unsigned int i; + + if (!strcmp(source, "none")) return VKD3D_SHADER_SOURCE_DXBC_TPF; + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + { + if (!strcmp(source, source_type_info[i].name)) + return source_type_info[i].type; + } + return VKD3D_SHADER_SOURCE_NONE; } @@ -187,12 +211,13 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, - {"output", required_argument, NULL, OPTION_OUTPUT}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -219,6 +244,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break; + case OPTION_PRINT_SOURCE_TYPES: + options->print_source_types = true; + return true; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -249,6 +278,26 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return true; } +static void print_source_types(void) +{ + const enum vkd3d_shader_source_type *source_types; + unsigned int count, i, j; + + source_types = vkd3d_shader_get_supported_source_types(&count); + fputs("Supported source types:\n", stdout); + for (i = 0; i < count; ++i) + { + for (j = 0; j < ARRAY_SIZE(source_type_info); ++j) + { + if (source_types[i] == source_type_info[j].type) + { + fprintf(stdout, " %s %s\n", source_type_info[j].name, source_type_info[j].description); + break; + } + } + } +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; @@ -271,6 +320,12 @@ int main(int argc, char **argv) return 0; } + if (options.print_source_types) + { + print_source_types(); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; -- 2.11.0

2 1

[PATCH 6/6] explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 691db5c8bda..6f1ff54c143 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -889,6 +889,7 @@ static void initialize_display_settings(void) /* Store current display mode in the registry */ ddW.cb = sizeof(ddW); + memset(&dmW, 0, sizeof(dmW)); dmW.dmSize = sizeof(dmW); while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) { -- 2.25.1

2 1

[PATCH vkd3d 5/5] build: Link vkd3d-utils with PTHREAD_LIBS.
by Henri Verbeet 11 Aug '20

11 Aug '20

Since it uses pthread functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fc10ba6..58b3174 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 -libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Support register spaces for combined samplers.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a7adc82..e4d8a50 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -175,7 +175,9 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_combined_resource_sampler { + unsigned int resource_space; unsigned int resource_index; + unsigned int sampler_space; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; unsigned int flags; /* vkd3d_shader_binding_flag */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9ef0430..70bcf95 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1841,10 +1841,17 @@ struct vkd3d_symbol_resource unsigned int idx; }; +struct vkd3d_symbol_sampler +{ + unsigned int id; +}; + struct vkd3d_symbol_combined_sampler { - unsigned int resource_idx; - unsigned int sampler_idx; + enum vkd3d_shader_register_type resource_type; + unsigned int resource_id; + unsigned int sampler_space; + unsigned int sampler_index; }; struct vkd3d_symbol_register_data @@ -1870,6 +1877,12 @@ struct vkd3d_symbol_resource_data uint32_t uav_counter_id; }; +struct vkd3d_symbol_sampler_data +{ + unsigned int register_space; + unsigned int register_index; +}; + struct vkd3d_symbol { struct rb_entry entry; @@ -1878,6 +1891,7 @@ struct vkd3d_symbol { VKD3D_SYMBOL_REGISTER, VKD3D_SYMBOL_RESOURCE, + VKD3D_SYMBOL_SAMPLER, VKD3D_SYMBOL_COMBINED_SAMPLER, } type; @@ -1885,6 +1899,7 @@ struct vkd3d_symbol { struct vkd3d_symbol_register reg; struct vkd3d_symbol_resource resource; + struct vkd3d_symbol_sampler sampler; struct vkd3d_symbol_combined_sampler combined_sampler; } key; @@ -1893,6 +1908,7 @@ struct vkd3d_symbol { struct vkd3d_symbol_register_data reg; struct vkd3d_symbol_resource_data resource; + struct vkd3d_symbol_sampler_data sampler; } info; }; @@ -1948,13 +1964,23 @@ static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, symbol->key.resource.idx = reg->idx[0].offset; } +static void vkd3d_symbol_make_sampler(struct vkd3d_symbol *symbol, + const struct vkd3d_shader_register *reg) +{ + symbol->type = VKD3D_SYMBOL_SAMPLER; + memset(&symbol->key, 0, sizeof(symbol->key)); + symbol->key.sampler.id = reg->idx[0].offset; +} + static void vkd3d_symbol_make_combined_sampler(struct vkd3d_symbol *symbol, - unsigned int resource_index, unsigned int sampler_index) + const struct vkd3d_shader_register *resource_reg, unsigned int sampler_space, unsigned int sampler_index) { symbol->type = VKD3D_SYMBOL_COMBINED_SAMPLER; memset(&symbol->key, 0, sizeof(symbol->key)); - symbol->key.combined_sampler.resource_idx = resource_index; - symbol->key.combined_sampler.sampler_idx = sampler_index; + symbol->key.combined_sampler.resource_type = resource_reg->type; + symbol->key.combined_sampler.resource_id = resource_reg->idx[0].offset; + symbol->key.combined_sampler.sampler_space = sampler_space; + symbol->key.combined_sampler.sampler_index = sampler_index; } static struct vkd3d_symbol *vkd3d_symbol_dup(const struct vkd3d_symbol *symbol) @@ -1977,6 +2003,9 @@ static const char *debug_vkd3d_symbol(const struct vkd3d_symbol *symbol) case VKD3D_SYMBOL_RESOURCE: return vkd3d_dbg_sprintf("resource %#x, %u", symbol->key.resource.type, symbol->key.resource.idx); + case VKD3D_SYMBOL_SAMPLER: + return vkd3d_dbg_sprintf("sampler %u", + symbol->key.sampler.id); default: return vkd3d_dbg_sprintf("type %#x", symbol->type); } @@ -2316,7 +2345,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ } static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) + const struct vkd3d_shader_resource *resource, const struct vkd3d_shader_sampler *sampler) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; @@ -2325,7 +2354,7 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!shader_interface->combined_sampler_count) return false; - if (resource && resource->type == VKD3DSPR_UAV) + if (resource && resource->reg.reg.type == VKD3DSPR_UAV) return false; for (i = 0; i < shader_interface->combined_sampler_count; ++i) @@ -2335,8 +2364,10 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) - && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) + if ((!resource || (combined_sampler->resource_space == resource->register_space + && combined_sampler->resource_index == resource->register_index)) + && (!sampler || (combined_sampler->sampler_space == sampler->register_space + && combined_sampler->sampler_index == sampler->register_index))) return true; } @@ -5160,7 +5191,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; - if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) + vkd3d_symbol_make_sampler(&reg_symbol, reg); + reg_symbol.info.sampler.register_space = sampler->register_space; + reg_symbol.info.sampler.register_index = sampler->register_index; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); @@ -5282,7 +5318,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ { current = &shader_interface->combined_samplers[i]; - if (current->resource_index != resource_index) + if (current->resource_space != resource_space || current->resource_index != resource_index) continue; if (!(current->flags & resource_type_flag)) @@ -5292,7 +5328,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ continue; d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, current->sampler_space, current->sampler_index); depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); @@ -5307,11 +5343,14 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) - vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_space, resource_index); else - vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_space, resource_index, + current->sampler_space, current->sampler_index); - vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); + vkd3d_symbol_make_combined_sampler(&symbol, resource, + current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, + current->sampler_index); symbol.id = var_id; symbol.info.resource.register_space = resource_space; symbol.info.resource.register_index = resource_index; @@ -5350,7 +5389,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); - if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, resource, NULL)) { vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); @@ -7294,17 +7333,31 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - unsigned int resource_index, sampler_index; + unsigned int sampler_space, sampler_index; struct vkd3d_symbol key; struct rb_entry *entry; if (!shader_interface->combined_sampler_count) return NULL; - resource_index = resource_reg->idx[0].offset; - sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_SHADER_DUMMY_SAMPLER_INDEX; + if (sampler_reg) + { + const struct vkd3d_symbol *sampler_symbol; + + vkd3d_symbol_make_sampler(&key, sampler_reg); + if (!(entry = rb_get(&compiler->symbol_table, &key))) + return NULL; + sampler_symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + sampler_space = sampler_symbol->info.sampler.register_space; + sampler_index = sampler_symbol->info.sampler.register_index; + } + else + { + sampler_space = 0; + sampler_index = VKD3D_SHADER_DUMMY_SAMPLER_INDEX; + } - vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); + vkd3d_symbol_make_combined_sampler(&key, resource_reg, sampler_space, sampler_index); if ((entry = rb_get(&compiler->symbol_table, &key))) return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); return NULL; -- 2.11.0

1 0

[PATCH 4/6] winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a64d1de6500..2d1fc7220de 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -501,6 +501,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (!dev_mode) { + memset(&registry_mode, 0, sizeof(registry_mode)); registry_mode.dmSize = sizeof(registry_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) goto done; @@ -512,6 +513,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; @@ -522,6 +524,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, } else { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; -- 2.25.1

2 1

[PATCH] ws2_32: Use kernelbase directly
by Alistair Leslie-Hughes 11 Aug '20

11 Aug '20

There is no need to go through kernel32 for these functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/ws2_32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 87e0bdfa2f..5b5d323a51 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -102,19 +102,19 @@ @ stdcall WSARecvDisconnect(long ptr) @ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) @ stdcall WSARemoveServiceClass(ptr) -@ stdcall WSAResetEvent(long) kernel32.ResetEvent +@ stdcall WSAResetEvent(long) kernelbase.ResetEvent @ stdcall WSASend(long ptr long ptr long ptr ptr) @ stdcall WSASendDisconnect(long ptr) @ stdcall WSASendMsg(long ptr long ptr ptr ptr) @ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) -@ stdcall WSASetEvent(long) kernel32.SetEvent +@ stdcall WSASetEvent(long) kernelbase.SetEvent @ stdcall WSASetServiceA(ptr long long) @ stdcall WSASetServiceW(ptr long long) @ stdcall WSASocketA(long long long ptr long long) @ stdcall WSASocketW(long long long ptr long long) @ stdcall WSAStringToAddressA(str long ptr ptr ptr) @ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) -@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernelbase.WaitForMultipleObjectsEx @ stdcall WSCDeinstallProvider(ptr ptr) @ stdcall WSCEnableNSProvider(ptr long) @ stdcall WSCEnumProtocols(ptr ptr ptr ptr) -- 2.28.0

3 4

[PATCH vkd3d v2] vkd3d-shader: Make VKD3D_SHADER_SWIZZLE more legible.
by Zebediah Figura 11 Aug '20

11 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++-------- libs/vkd3d-shader/dxbc.c | 3 +-- libs/vkd3d/state.c | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index af97b04..a7adc82 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -738,14 +738,12 @@ struct vkd3d_shader_signature #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ - (((x & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ - | ((y & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ - | ((z & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ - | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) - -#define VKD3D_SHADER_NO_SWIZZLE \ - VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_Y, \ - VKD3D_SHADER_SWIZZLE_Z, VKD3D_SHADER_SWIZZLE_W) + (((VKD3D_SHADER_SWIZZLE_ ## x) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## y) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## z) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## w) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) + +#define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) #ifndef VKD3D_SHADER_NO_PROTOTYPES diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1aa8a5c..81c1f48 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1669,8 +1669,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * { case VKD3D_SM4_SWIZZLE_NONE: if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X); + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); else src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; break; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 449f242..a64d17f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1971,8 +1971,7 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) { if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) - return VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_W, VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_Y, VKD3D_SHADER_SWIZZLE_Z); + return VKD3D_SHADER_SWIZZLE(W, X, Y, Z); return VKD3D_SHADER_NO_SWIZZLE; } -- 2.27.0

2 1

[PATCH 3/6] user32: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 79f938a3c20..0c0f8fac5d1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3369,6 +3369,7 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (def_mode) { + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) { @@ -3428,6 +3429,8 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, if (lpszDeviceName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszDeviceName); else nameW.Buffer = NULL; + memset(&devmodeW, 0, sizeof(devmodeW)); + devmodeW.dmSize = sizeof(devmodeW); ret = EnumDisplaySettingsExW(nameW.Buffer,iModeNum,&devmodeW,dwFlags); if (ret) { @@ -4808,6 +4811,7 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) goto done; + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); if (!EnumDisplaySettingsW(device_name, ENUM_CURRENT_SETTINGS, &devmode)) goto done; -- 2.25.1

2 1

[PATCH 2/6] user32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

Zero initialize DEVMODE before passing it to EnumDisplaySettings(), which may write beyond the end of the DEVMODE structure on Windows because the dmDriverExtra field is uninitialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 85fb2f080a7..57d2ec0008c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -514,6 +514,7 @@ static void test_ChangeDisplaySettingsEx(void) devices[device_count].index = device; lstrcpyA(devices[device_count].name, dd.DeviceName); + memset(&devices[device_count].original_mode, 0, sizeof(devices[device_count].original_mode)); devices[device_count].original_mode.dmSize = sizeof(devices[device_count].original_mode); res = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devices[device_count].original_mode); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", dd.DeviceName, GetLastError()); -- 2.25.1

1 0

[PATCH 1/6] gdi32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

Zero initialize DEVMODE before passing it to EnumDisplaySettings(), which may write beyond the end of the DEVMODE structure on Windows because the dmDriverExtra field is uninitialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/dc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 6640134d1fa..b4a89b213d2 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -242,6 +242,8 @@ static void test_GdiConvertToDevmodeW(void) return; } + memset(&dmA, 0, sizeof(dmA)); + dmA.dmSize = sizeof(dmA); ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA); ok(ret, "EnumDisplaySettingsExA error %u\n", GetLastError()); ok(dmA.dmSize >= FIELD_OFFSET(DEVMODEA, dmICMMethod), "dmSize is too small: %04x\n", dmA.dmSize); @@ -591,6 +593,8 @@ static void test_CreateCompatibleDC(void) bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); bRet = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(bRet, "EnumDisplaySettingsEx failed\n"); dm.u1.s1.dmScale = 200; -- 2.25.1

1 0

[PATCH v2 1/5] d3dcompiler: Rename ID3D11ShaderReflection functions to d3d11_... from d3dcompiler_...
by Paul Gofman 11 Aug '20

11 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - no changes. dlls/d3dcompiler_43/reflection.c | 578 +++++++++++++++---------------- 1 file changed, 287 insertions(+), 291 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 729501dbddc..9a1e869f0a5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -145,9 +145,9 @@ struct d3dcompiler_shader_reflection static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl; +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl; +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl; static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl; static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl; @@ -156,17 +156,17 @@ static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_ /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = { - {&d3dcompiler_shader_reflection_constant_buffer_vtbl}, + {&d3d11_shader_reflection_constant_buffer_vtbl}, {&d3d10_shader_reflection_constant_buffer_vtbl} }; static struct d3dcompiler_shader_reflection_type null_type = { - {&d3dcompiler_shader_reflection_type_vtbl}, + {&d3d11_shader_reflection_type_vtbl}, {&d3d10_shader_reflection_type_vtbl} }; static struct d3dcompiler_shader_reflection_variable null_variable = { - {&d3dcompiler_shader_reflection_variable_vtbl}, + {&d3d11_shader_reflection_variable_vtbl}, {&d3d10_shader_reflection_variable_vtbl}, &null_constant_buffer, &null_type @@ -327,9 +327,9 @@ static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflec return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) || IsEqualGUID(riid, &IID_IUnknown)) @@ -339,33 +339,33 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_AddRef(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", reflection, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_Release(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", reflection, refcount); if (!refcount) { - reflection_cleanup(This); - HeapFree(GetProcessHeap(), 0, This); + reflection_cleanup(reflection); + HeapFree(GetProcessHeap(), 0, reflection); } return refcount; @@ -373,53 +373,53 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade /* ID3D11ShaderReflection methods */ -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Version = This->version; - desc->Creator = This->creator; - desc->Flags = This->flags; - desc->ConstantBuffers = This->constant_buffer_count; - desc->BoundResources = This->bound_resource_count; - desc->InputParameters = This->isgn ? This->isgn->element_count : 0; - desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; - desc->InstructionCount = This->instruction_count; - desc->TempRegisterCount = This->temp_register_count; - desc->TempArrayCount = This->temp_array_count; + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; desc->DefCount = 0; - desc->DclCount = This->dcl_count; - desc->TextureNormalInstructions = This->texture_normal_instructions; - desc->TextureLoadInstructions = This->texture_load_instructions; - desc->TextureCompInstructions = This->texture_comp_instructions; - desc->TextureBiasInstructions = This->texture_bias_instructions; - desc->TextureGradientInstructions = This->texture_gradient_instructions; - desc->FloatInstructionCount = This->float_instruction_count; - desc->IntInstructionCount = This->int_instruction_count; - desc->UintInstructionCount = This->uint_instruction_count; - desc->StaticFlowControlCount = This->static_flow_control_count; - desc->DynamicFlowControlCount = This->dynamic_flow_control_count; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; desc->MacroInstructionCount = 0; - desc->ArrayInstructionCount = This->array_instruction_count; - desc->CutInstructionCount = This->cut_instruction_count; - desc->EmitInstructionCount = This->emit_instruction_count; - desc->GSOutputTopology = This->gs_output_topology; - desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; - desc->InputPrimitive = This->input_primitive; - desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + desc->InputPrimitive = reflection->input_primitive; + desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0; desc->cGSInstanceCount = 0; - desc->cControlPoints = This->c_control_points; - desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_prtitioning; - desc->TessellatorDomain = This->tessellator_domain; + desc->cControlPoints = reflection->c_control_points; + desc->HSOutputPrimitive = reflection->hs_output_primitive; + desc->HSPartitioning = reflection->hs_prtitioning; + desc->TessellatorDomain = reflection->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; desc->cTextureStoreInstructions = 0; @@ -427,39 +427,39 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha return S_OK; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex( - ID3D11ShaderReflection *iface, UINT index) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByIndex + (ID3D11ShaderReflection *iface, UINT index) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->constant_buffer_count) + if (index >= reflection->constant_buffer_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; + return &reflection->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *d = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *d = &reflection->constant_buffers[i]; if (!strcmp(d->name, name)) { @@ -468,21 +468,21 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || index >= reflection->bound_resource_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -491,16 +491,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetInputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -509,16 +509,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetOutputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -527,16 +527,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetPatchConstantParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->pcsg || index >= reflection->pcsg->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -545,23 +545,23 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP return S_OK; } -static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_GetVariableByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i, k; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *cb = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *cb = &reflection->constant_buffers[i]; for (k = 0; k < cb->variable_count; ++k) { @@ -575,28 +575,28 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( - ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDescByName(ID3D11ShaderReflection *iface, + const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); + TRACE("iface %p, name %s, desc %p.\n", iface, debugstr_a(name), desc); if (!desc || !name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { @@ -606,191 +606,185 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return E_INVALIDARG; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->mov_instruction_count; + return reflection->mov_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovcInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConversionInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetConversionInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->conversion_instruction_count; + return reflection->conversion_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetBitwiseInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetBitwiseInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static D3D_PRIMITIVE STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetGSInputPrimitive( - ID3D11ShaderReflection *iface) +static D3D_PRIMITIVE STDMETHODCALLTYPE d3d11_shader_reflection_GetGSInputPrimitive(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static BOOL STDMETHODCALLTYPE d3dcompiler_shader_reflection_IsSampleFrequencyShader( - ID3D11ShaderReflection *iface) +static BOOL STDMETHODCALLTYPE d3d11_shader_reflection_IsSampleFrequencyShader(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return FALSE; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetNumInterfaceSlots(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLevel( - ID3D11ShaderReflection *iface, D3D_FEATURE_LEVEL *level) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetMinFeatureLevel(ID3D11ShaderReflection *iface, + D3D_FEATURE_LEVEL *level) { - FIXME("iface %p, level %p stub!\n", iface, level); + FIXME("iface %p, level %p stub.\n", iface, level); return E_NOTIMPL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( - ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetThreadGroupSize(ID3D11ShaderReflection *iface, + UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + FIXME("iface %p, sizex %p, sizey %p, sizez %p stub.\n", iface, sizex, sizey, sizez); return 0; } -static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( - ID3D11ShaderReflection *iface) +static UINT64 STDMETHODCALLTYPE d3d11_shader_reflection_GetRequiresFlags(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = +static const struct ID3D11ShaderReflectionVtbl d3d11_shader_reflection_vtbl = { /* IUnknown methods */ - d3dcompiler_shader_reflection_QueryInterface, - d3dcompiler_shader_reflection_AddRef, - d3dcompiler_shader_reflection_Release, + d3d11_shader_reflection_QueryInterface, + d3d11_shader_reflection_AddRef, + d3d11_shader_reflection_Release, /* ID3D11ShaderReflection methods */ - d3dcompiler_shader_reflection_GetDesc, - d3dcompiler_shader_reflection_GetConstantBufferByIndex, - d3dcompiler_shader_reflection_GetConstantBufferByName, - d3dcompiler_shader_reflection_GetResourceBindingDesc, - d3dcompiler_shader_reflection_GetInputParameterDesc, - d3dcompiler_shader_reflection_GetOutputParameterDesc, - d3dcompiler_shader_reflection_GetPatchConstantParameterDesc, - d3dcompiler_shader_reflection_GetVariableByName, - d3dcompiler_shader_reflection_GetResourceBindingDescByName, - d3dcompiler_shader_reflection_GetMovInstructionCount, - d3dcompiler_shader_reflection_GetMovcInstructionCount, - d3dcompiler_shader_reflection_GetConversionInstructionCount, - d3dcompiler_shader_reflection_GetBitwiseInstructionCount, - d3dcompiler_shader_reflection_GetGSInputPrimitive, - d3dcompiler_shader_reflection_IsSampleFrequencyShader, - d3dcompiler_shader_reflection_GetNumInterfaceSlots, - d3dcompiler_shader_reflection_GetMinFeatureLevel, - d3dcompiler_shader_reflection_GetThreadGroupSize, - d3dcompiler_shader_reflection_GetRequiresFlags, + d3d11_shader_reflection_GetDesc, + d3d11_shader_reflection_GetConstantBufferByIndex, + d3d11_shader_reflection_GetConstantBufferByName, + d3d11_shader_reflection_GetResourceBindingDesc, + d3d11_shader_reflection_GetInputParameterDesc, + d3d11_shader_reflection_GetOutputParameterDesc, + d3d11_shader_reflection_GetPatchConstantParameterDesc, + d3d11_shader_reflection_GetVariableByName, + d3d11_shader_reflection_GetResourceBindingDescByName, + d3d11_shader_reflection_GetMovInstructionCount, + d3d11_shader_reflection_GetMovcInstructionCount, + d3d11_shader_reflection_GetConversionInstructionCount, + d3d11_shader_reflection_GetBitwiseInstructionCount, + d3d11_shader_reflection_GetGSInputPrimitive, + d3d11_shader_reflection_IsSampleFrequencyShader, + d3d11_shader_reflection_GetNumInterfaceSlots, + d3d11_shader_reflection_GetMinFeatureLevel, + d3d11_shader_reflection_GetThreadGroupSize, + d3d11_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ -static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface) +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer + (ID3D11ShaderReflectionConstantBuffer *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, + ID3D11ShaderReflectionConstantBuffer_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( - ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetDesc + (ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_constant_buffer) + if (cb == &null_constant_buffer) { - WARN("Null constant buffer specified\n"); + WARN("Null constant buffer specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->Type = This->type; - desc->Variables = This->variable_count; - desc->Size = This->size; - desc->uFlags = This->flags; + desc->Name = cb->name; + desc->Type = cb->type; + desc->Variables = cb->variable_count; + desc->Size = cb->size; + desc->uFlags = cb->flags; return S_OK; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( - ID3D11ShaderReflectionConstantBuffer *iface, UINT index) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByIndex + (ID3D11ShaderReflectionConstantBuffer *iface, UINT index) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->variable_count) + if (index >= cb->variable_count) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - return &This->variables[index].ID3D11ShaderReflectionVariable_iface; + return &cb->variables[index].ID3D11ShaderReflectionVariable_iface; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( - ID3D11ShaderReflectionConstantBuffer *iface, const char *name) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByName + (ID3D11ShaderReflectionConstantBuffer *iface, const char *name) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->variable_count; ++i) + for (i = 0; i < cb->variable_count; ++i) { - struct d3dcompiler_shader_reflection_variable *v = &This->variables[i]; + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; if (!strcmp(v->name, name)) { @@ -799,155 +793,158 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl = { /* ID3D11ShaderReflectionConstantBuffer methods */ - d3dcompiler_shader_reflection_constant_buffer_GetDesc, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, + d3d11_shader_reflection_constant_buffer_GetDesc, + d3d11_shader_reflection_constant_buffer_GetVariableByIndex, + d3d11_shader_reflection_constant_buffer_GetVariableByName, }; /* ID3D11ShaderReflectionVariable methods */ -static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariable *iface) +static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable + (ID3D11ShaderReflectionVariable *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, ID3D11ShaderReflectionVariable_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, + ID3D11ShaderReflectionVariable_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( - ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetDesc + (ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_variable) + if (cb == &null_variable) { - WARN("Null variable specified\n"); + WARN("Null variable specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->StartOffset = This->start_offset; - desc->Size = This->size; - desc->uFlags = This->flags; - desc->DefaultValue = This->default_value; + desc->Name = cb->name; + desc->StartOffset = cb->start_offset; + desc->Size = cb->size; + desc->uFlags = cb->flags; + desc->DefaultValue = cb->default_value; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetType + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->type->ID3D11ShaderReflectionType_iface; + return &cb->type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetBuffer + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; + return &cb->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( - ID3D11ShaderReflectionVariable *iface, UINT index) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetInterfaceSlot + (ID3D11ShaderReflectionVariable *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %u stub.\n", iface, index); return 0; } -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl = { /* ID3D11ShaderReflectionVariable methods */ - d3dcompiler_shader_reflection_variable_GetDesc, - d3dcompiler_shader_reflection_variable_GetType, - d3dcompiler_shader_reflection_variable_GetBuffer, - d3dcompiler_shader_reflection_variable_GetInterfaceSlot, + d3d11_shader_reflection_variable_GetDesc, + d3d11_shader_reflection_variable_GetType, + d3d11_shader_reflection_variable_GetBuffer, + d3d11_shader_reflection_variable_GetInterfaceSlot, }; /* ID3D11ShaderReflectionType methods */ -static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType(ID3D11ShaderReflectionType *iface) +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType + (ID3D11ShaderReflectionType *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D11ShaderReflectionType_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( - ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetDesc + (ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - *desc = This->desc; + *desc = type->desc; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - return &This->members[index].type->ID3D11ShaderReflectionType_iface; + return &type->members[index].type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( - ID3D11ShaderReflectionType *iface, const char *name) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByName + (ID3D11ShaderReflectionType *iface, const char *name) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - for (i = 0; i < This->desc.Members; ++i) + for (i = 0; i < type->desc.Members; ++i) { - struct d3dcompiler_shader_reflection_type_member *member = &This->members[i]; + struct d3dcompiler_shader_reflection_type_member *member = &type->members[i]; if (!strcmp(member->name, name)) { @@ -956,43 +953,43 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } -static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( - ID3D11ShaderReflectionType *iface, UINT index) +static const char * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeName + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return "$Invalid"; } - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return NULL; } - return This->members[index].name; + return type->members[index].name; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsEqual + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *reflection_type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, type %p\n", iface, type); + TRACE("iface %p, type %p.\n", iface, type); - if (This == &null_type) + if (reflection_type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } @@ -1002,68 +999,67 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( return S_FALSE; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetSubType + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetBaseClass( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetBaseClass + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetNumInterfaces( - ID3D11ShaderReflectionType *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetNumInterfaces(ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetInterfaceByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetInterfaceByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { FIXME("iface %p, index %u stub!\n", iface, index); return NULL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsOfType( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsOfType + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { FIXME("iface %p, type %p stub!\n", iface, type); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_ImplementsInterface( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_ImplementsInterface + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) { FIXME("iface %p, base %p stub!\n", iface, base); return E_NOTIMPL; } -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl = +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl = { /* ID3D11ShaderReflectionType methods */ - d3dcompiler_shader_reflection_type_GetDesc, - d3dcompiler_shader_reflection_type_GetMemberTypeByIndex, - d3dcompiler_shader_reflection_type_GetMemberTypeByName, - d3dcompiler_shader_reflection_type_GetMemberTypeName, - d3dcompiler_shader_reflection_type_IsEqual, - d3dcompiler_shader_reflection_type_GetSubType, - d3dcompiler_shader_reflection_type_GetBaseClass, - d3dcompiler_shader_reflection_type_GetNumInterfaces, - d3dcompiler_shader_reflection_type_GetInterfaceByIndex, - d3dcompiler_shader_reflection_type_IsOfType, - d3dcompiler_shader_reflection_type_ImplementsInterface, + d3d11_shader_reflection_type_GetDesc, + d3d11_shader_reflection_type_GetMemberTypeByIndex, + d3d11_shader_reflection_type_GetMemberTypeByName, + d3d11_shader_reflection_type_GetMemberTypeName, + d3d11_shader_reflection_type_IsEqual, + d3d11_shader_reflection_type_GetSubType, + d3d11_shader_reflection_type_GetBaseClass, + d3d11_shader_reflection_type_GetNumInterfaces, + d3d11_shader_reflection_type_GetInterfaceByIndex, + d3d11_shader_reflection_type_IsOfType, + d3d11_shader_reflection_type_ImplementsInterface, }; static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) @@ -1310,7 +1306,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d if (!type) return NULL; - type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; + type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3d11_shader_reflection_type_vtbl; type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl; type->id = offset; type->reflection = reflection; @@ -1352,7 +1348,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ struct d3dcompiler_shader_reflection_variable *v = &variables[i]; DWORD offset; - v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3d11_shader_reflection_variable_vtbl; v->ID3D10ShaderReflectionVariable_iface.lpVtbl = &d3d10_shader_reflection_variable_vtbl; v->constant_buffer = cb; @@ -1551,7 +1547,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c { struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; - cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d11_shader_reflection_constant_buffer_vtbl; cb->ID3D10ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d10_shader_reflection_constant_buffer_vtbl; cb->reflection = r; @@ -2375,7 +2371,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void if (!object) return E_OUTOFMEMORY; - object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; + object->ID3D11ShaderReflection_iface.lpVtbl = &d3d11_shader_reflection_vtbl; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); -- 2.26.2

1 4

[PATCH 2/2] include: fix the spelling of XACT_WAVE_STREAMING_PARAMETERS in xact3.h
by Vijay Kiran Kamuju 11 Aug '20

11 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h
by Vijay Kiran Kamuju 11 Aug '20

11 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/6] combase: Move IIDFromString().
by Nikolay Sivov 11 Aug '20

11 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 23 ++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 108 -------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 25 insertions(+), 110 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 2bfd1d79a7d..205a27b8115 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1075,6 +1075,29 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR str, LPCLSID clsid) return hr; } +/****************************************************************************** + * IIDFromString (combase.@) + */ +HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid) +{ + TRACE("%s, %p\n", debugstr_w(str), iid); + + if (!str) + { + memset(iid, 0, sizeof(*iid)); + return S_OK; + } + + /* length mismatch is a special case */ + if (lstrlenW(str) + 1 != CHARS_IN_GUID) + return E_INVALIDARG; + + if (str[0] != '{') + return CO_E_IIDSTRING; + + return guid_from_string(str, iid) ? S_OK : CO_E_IIDSTRING; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 97e8f254dcb..c0c1f2ada6a 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -231,7 +231,7 @@ @ stdcall HWND_UserSize(ptr long ptr) @ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stub HkOleRegisterObject -@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall IIDFromString(wstr ptr) @ stub InternalAppInvokeExceptionFilter @ stub InternalCCFreeUnused @ stub InternalCCGetClassInformationForDde diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ff0c352c645..97158685845 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,114 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -/* conversion helper for CLSIDFromString/IIDFromString */ -static BOOL guid_from_string(LPCWSTR s, GUID *id) -{ - int i; - - if (!s || s[0]!='{') { - memset( id, 0, sizeof (CLSID) ); - if(!s) return TRUE; - return FALSE; - } - - TRACE("%s -> %p\n", debugstr_w(s), id); - - /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ - - id->Data1 = 0; - for (i = 1; i < 9; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9]!='-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14]!='-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19]!='-') return FALSE; - - for (i = 20; i < 37; i+=2) { - if (i == 24) { - if (s[i]!='-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}' && s[38] == '\0') - return TRUE; - - return FALSE; -} - -/****************************************************************************** - * IIDFromString [OLE32.@] - * - * Converts an interface identifier from its string representation to - * the IID struct. - * - * PARAMS - * idstr [I] The string representation of the GUID. - * id [O] IID converted from the string. - * - * RETURNS - * S_OK on success - * CO_E_IIDSTRING if idstr is not a valid IID - * - * SEE ALSO - * StringFromIID - */ -HRESULT WINAPI IIDFromString(LPCOLESTR s, IID *iid) -{ - TRACE("%s -> %p\n", debugstr_w(s), iid); - - if (!s) - { - memset(iid, 0, sizeof(*iid)); - return S_OK; - } - - /* length mismatch is a special case */ - if (lstrlenW(s) + 1 != CHARS_IN_GUID) - return E_INVALIDARG; - - if (s[0] != '{') - return CO_E_IIDSTRING; - - return guid_from_string(s, iid) ? S_OK : CO_E_IIDSTRING; -} - /****************************************************************************** * StringFromCLSID [OLE32.@] * StringFromIID [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index f71fd52032b..cd530763c2c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -171,7 +171,7 @@ @ stdcall HWND_UserMarshal(ptr ptr ptr) combase.HWND_UserMarshal @ stdcall HWND_UserSize(ptr long ptr) combase.HWND_UserSize @ stdcall HWND_UserUnmarshal(ptr ptr ptr) combase.HWND_UserUnmarshal -@ stdcall IIDFromString(wstr ptr) +@ stdcall IIDFromString(wstr ptr) combase.IIDFromString @ stub I_RemoteMain @ stdcall IsAccelerator(long long ptr ptr) @ stdcall IsEqualGUID(ptr ptr) -- 2.28.0

3 12

0001-comdlg32-Fix-the-wrong-popup-when-saving-the-same-fi
by 陈江仪 11 Aug '20

11 Aug '20

2 1

[PATCH 1/5] d3dcompiler: Rename ID3D11ShaderReflection functions to d3d11_... from d3dcompiler_...
by Paul Gofman 11 Aug '20

11 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 578 +++++++++++++++---------------- 1 file changed, 287 insertions(+), 291 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 729501dbddc..9a1e869f0a5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -145,9 +145,9 @@ struct d3dcompiler_shader_reflection static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl; +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl; +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl; static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl; static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl; @@ -156,17 +156,17 @@ static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_ /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = { - {&d3dcompiler_shader_reflection_constant_buffer_vtbl}, + {&d3d11_shader_reflection_constant_buffer_vtbl}, {&d3d10_shader_reflection_constant_buffer_vtbl} }; static struct d3dcompiler_shader_reflection_type null_type = { - {&d3dcompiler_shader_reflection_type_vtbl}, + {&d3d11_shader_reflection_type_vtbl}, {&d3d10_shader_reflection_type_vtbl} }; static struct d3dcompiler_shader_reflection_variable null_variable = { - {&d3dcompiler_shader_reflection_variable_vtbl}, + {&d3d11_shader_reflection_variable_vtbl}, {&d3d10_shader_reflection_variable_vtbl}, &null_constant_buffer, &null_type @@ -327,9 +327,9 @@ static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflec return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) || IsEqualGUID(riid, &IID_IUnknown)) @@ -339,33 +339,33 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_AddRef(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", reflection, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_Release(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", reflection, refcount); if (!refcount) { - reflection_cleanup(This); - HeapFree(GetProcessHeap(), 0, This); + reflection_cleanup(reflection); + HeapFree(GetProcessHeap(), 0, reflection); } return refcount; @@ -373,53 +373,53 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade /* ID3D11ShaderReflection methods */ -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Version = This->version; - desc->Creator = This->creator; - desc->Flags = This->flags; - desc->ConstantBuffers = This->constant_buffer_count; - desc->BoundResources = This->bound_resource_count; - desc->InputParameters = This->isgn ? This->isgn->element_count : 0; - desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; - desc->InstructionCount = This->instruction_count; - desc->TempRegisterCount = This->temp_register_count; - desc->TempArrayCount = This->temp_array_count; + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; desc->DefCount = 0; - desc->DclCount = This->dcl_count; - desc->TextureNormalInstructions = This->texture_normal_instructions; - desc->TextureLoadInstructions = This->texture_load_instructions; - desc->TextureCompInstructions = This->texture_comp_instructions; - desc->TextureBiasInstructions = This->texture_bias_instructions; - desc->TextureGradientInstructions = This->texture_gradient_instructions; - desc->FloatInstructionCount = This->float_instruction_count; - desc->IntInstructionCount = This->int_instruction_count; - desc->UintInstructionCount = This->uint_instruction_count; - desc->StaticFlowControlCount = This->static_flow_control_count; - desc->DynamicFlowControlCount = This->dynamic_flow_control_count; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; desc->MacroInstructionCount = 0; - desc->ArrayInstructionCount = This->array_instruction_count; - desc->CutInstructionCount = This->cut_instruction_count; - desc->EmitInstructionCount = This->emit_instruction_count; - desc->GSOutputTopology = This->gs_output_topology; - desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; - desc->InputPrimitive = This->input_primitive; - desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + desc->InputPrimitive = reflection->input_primitive; + desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0; desc->cGSInstanceCount = 0; - desc->cControlPoints = This->c_control_points; - desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_prtitioning; - desc->TessellatorDomain = This->tessellator_domain; + desc->cControlPoints = reflection->c_control_points; + desc->HSOutputPrimitive = reflection->hs_output_primitive; + desc->HSPartitioning = reflection->hs_prtitioning; + desc->TessellatorDomain = reflection->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; desc->cTextureStoreInstructions = 0; @@ -427,39 +427,39 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha return S_OK; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex( - ID3D11ShaderReflection *iface, UINT index) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByIndex + (ID3D11ShaderReflection *iface, UINT index) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->constant_buffer_count) + if (index >= reflection->constant_buffer_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; + return &reflection->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *d = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *d = &reflection->constant_buffers[i]; if (!strcmp(d->name, name)) { @@ -468,21 +468,21 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || index >= reflection->bound_resource_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -491,16 +491,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetInputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -509,16 +509,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetOutputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -527,16 +527,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetPatchConstantParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->pcsg || index >= reflection->pcsg->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -545,23 +545,23 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP return S_OK; } -static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_GetVariableByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i, k; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *cb = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *cb = &reflection->constant_buffers[i]; for (k = 0; k < cb->variable_count; ++k) { @@ -575,28 +575,28 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( - ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDescByName(ID3D11ShaderReflection *iface, + const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); + TRACE("iface %p, name %s, desc %p.\n", iface, debugstr_a(name), desc); if (!desc || !name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { @@ -606,191 +606,185 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return E_INVALIDARG; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->mov_instruction_count; + return reflection->mov_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovcInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConversionInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetConversionInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->conversion_instruction_count; + return reflection->conversion_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetBitwiseInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetBitwiseInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static D3D_PRIMITIVE STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetGSInputPrimitive( - ID3D11ShaderReflection *iface) +static D3D_PRIMITIVE STDMETHODCALLTYPE d3d11_shader_reflection_GetGSInputPrimitive(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static BOOL STDMETHODCALLTYPE d3dcompiler_shader_reflection_IsSampleFrequencyShader( - ID3D11ShaderReflection *iface) +static BOOL STDMETHODCALLTYPE d3d11_shader_reflection_IsSampleFrequencyShader(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return FALSE; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetNumInterfaceSlots(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLevel( - ID3D11ShaderReflection *iface, D3D_FEATURE_LEVEL *level) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetMinFeatureLevel(ID3D11ShaderReflection *iface, + D3D_FEATURE_LEVEL *level) { - FIXME("iface %p, level %p stub!\n", iface, level); + FIXME("iface %p, level %p stub.\n", iface, level); return E_NOTIMPL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( - ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetThreadGroupSize(ID3D11ShaderReflection *iface, + UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + FIXME("iface %p, sizex %p, sizey %p, sizez %p stub.\n", iface, sizex, sizey, sizez); return 0; } -static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( - ID3D11ShaderReflection *iface) +static UINT64 STDMETHODCALLTYPE d3d11_shader_reflection_GetRequiresFlags(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = +static const struct ID3D11ShaderReflectionVtbl d3d11_shader_reflection_vtbl = { /* IUnknown methods */ - d3dcompiler_shader_reflection_QueryInterface, - d3dcompiler_shader_reflection_AddRef, - d3dcompiler_shader_reflection_Release, + d3d11_shader_reflection_QueryInterface, + d3d11_shader_reflection_AddRef, + d3d11_shader_reflection_Release, /* ID3D11ShaderReflection methods */ - d3dcompiler_shader_reflection_GetDesc, - d3dcompiler_shader_reflection_GetConstantBufferByIndex, - d3dcompiler_shader_reflection_GetConstantBufferByName, - d3dcompiler_shader_reflection_GetResourceBindingDesc, - d3dcompiler_shader_reflection_GetInputParameterDesc, - d3dcompiler_shader_reflection_GetOutputParameterDesc, - d3dcompiler_shader_reflection_GetPatchConstantParameterDesc, - d3dcompiler_shader_reflection_GetVariableByName, - d3dcompiler_shader_reflection_GetResourceBindingDescByName, - d3dcompiler_shader_reflection_GetMovInstructionCount, - d3dcompiler_shader_reflection_GetMovcInstructionCount, - d3dcompiler_shader_reflection_GetConversionInstructionCount, - d3dcompiler_shader_reflection_GetBitwiseInstructionCount, - d3dcompiler_shader_reflection_GetGSInputPrimitive, - d3dcompiler_shader_reflection_IsSampleFrequencyShader, - d3dcompiler_shader_reflection_GetNumInterfaceSlots, - d3dcompiler_shader_reflection_GetMinFeatureLevel, - d3dcompiler_shader_reflection_GetThreadGroupSize, - d3dcompiler_shader_reflection_GetRequiresFlags, + d3d11_shader_reflection_GetDesc, + d3d11_shader_reflection_GetConstantBufferByIndex, + d3d11_shader_reflection_GetConstantBufferByName, + d3d11_shader_reflection_GetResourceBindingDesc, + d3d11_shader_reflection_GetInputParameterDesc, + d3d11_shader_reflection_GetOutputParameterDesc, + d3d11_shader_reflection_GetPatchConstantParameterDesc, + d3d11_shader_reflection_GetVariableByName, + d3d11_shader_reflection_GetResourceBindingDescByName, + d3d11_shader_reflection_GetMovInstructionCount, + d3d11_shader_reflection_GetMovcInstructionCount, + d3d11_shader_reflection_GetConversionInstructionCount, + d3d11_shader_reflection_GetBitwiseInstructionCount, + d3d11_shader_reflection_GetGSInputPrimitive, + d3d11_shader_reflection_IsSampleFrequencyShader, + d3d11_shader_reflection_GetNumInterfaceSlots, + d3d11_shader_reflection_GetMinFeatureLevel, + d3d11_shader_reflection_GetThreadGroupSize, + d3d11_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ -static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface) +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer + (ID3D11ShaderReflectionConstantBuffer *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, + ID3D11ShaderReflectionConstantBuffer_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( - ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetDesc + (ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_constant_buffer) + if (cb == &null_constant_buffer) { - WARN("Null constant buffer specified\n"); + WARN("Null constant buffer specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->Type = This->type; - desc->Variables = This->variable_count; - desc->Size = This->size; - desc->uFlags = This->flags; + desc->Name = cb->name; + desc->Type = cb->type; + desc->Variables = cb->variable_count; + desc->Size = cb->size; + desc->uFlags = cb->flags; return S_OK; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( - ID3D11ShaderReflectionConstantBuffer *iface, UINT index) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByIndex + (ID3D11ShaderReflectionConstantBuffer *iface, UINT index) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->variable_count) + if (index >= cb->variable_count) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - return &This->variables[index].ID3D11ShaderReflectionVariable_iface; + return &cb->variables[index].ID3D11ShaderReflectionVariable_iface; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( - ID3D11ShaderReflectionConstantBuffer *iface, const char *name) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByName + (ID3D11ShaderReflectionConstantBuffer *iface, const char *name) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->variable_count; ++i) + for (i = 0; i < cb->variable_count; ++i) { - struct d3dcompiler_shader_reflection_variable *v = &This->variables[i]; + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; if (!strcmp(v->name, name)) { @@ -799,155 +793,158 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl = { /* ID3D11ShaderReflectionConstantBuffer methods */ - d3dcompiler_shader_reflection_constant_buffer_GetDesc, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, + d3d11_shader_reflection_constant_buffer_GetDesc, + d3d11_shader_reflection_constant_buffer_GetVariableByIndex, + d3d11_shader_reflection_constant_buffer_GetVariableByName, }; /* ID3D11ShaderReflectionVariable methods */ -static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariable *iface) +static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable + (ID3D11ShaderReflectionVariable *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, ID3D11ShaderReflectionVariable_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, + ID3D11ShaderReflectionVariable_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( - ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetDesc + (ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_variable) + if (cb == &null_variable) { - WARN("Null variable specified\n"); + WARN("Null variable specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->StartOffset = This->start_offset; - desc->Size = This->size; - desc->uFlags = This->flags; - desc->DefaultValue = This->default_value; + desc->Name = cb->name; + desc->StartOffset = cb->start_offset; + desc->Size = cb->size; + desc->uFlags = cb->flags; + desc->DefaultValue = cb->default_value; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetType + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->type->ID3D11ShaderReflectionType_iface; + return &cb->type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetBuffer + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; + return &cb->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( - ID3D11ShaderReflectionVariable *iface, UINT index) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetInterfaceSlot + (ID3D11ShaderReflectionVariable *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %u stub.\n", iface, index); return 0; } -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl = { /* ID3D11ShaderReflectionVariable methods */ - d3dcompiler_shader_reflection_variable_GetDesc, - d3dcompiler_shader_reflection_variable_GetType, - d3dcompiler_shader_reflection_variable_GetBuffer, - d3dcompiler_shader_reflection_variable_GetInterfaceSlot, + d3d11_shader_reflection_variable_GetDesc, + d3d11_shader_reflection_variable_GetType, + d3d11_shader_reflection_variable_GetBuffer, + d3d11_shader_reflection_variable_GetInterfaceSlot, }; /* ID3D11ShaderReflectionType methods */ -static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType(ID3D11ShaderReflectionType *iface) +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType + (ID3D11ShaderReflectionType *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D11ShaderReflectionType_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( - ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetDesc + (ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - *desc = This->desc; + *desc = type->desc; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - return &This->members[index].type->ID3D11ShaderReflectionType_iface; + return &type->members[index].type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( - ID3D11ShaderReflectionType *iface, const char *name) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByName + (ID3D11ShaderReflectionType *iface, const char *name) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - for (i = 0; i < This->desc.Members; ++i) + for (i = 0; i < type->desc.Members; ++i) { - struct d3dcompiler_shader_reflection_type_member *member = &This->members[i]; + struct d3dcompiler_shader_reflection_type_member *member = &type->members[i]; if (!strcmp(member->name, name)) { @@ -956,43 +953,43 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } -static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( - ID3D11ShaderReflectionType *iface, UINT index) +static const char * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeName + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return "$Invalid"; } - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return NULL; } - return This->members[index].name; + return type->members[index].name; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsEqual + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *reflection_type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, type %p\n", iface, type); + TRACE("iface %p, type %p.\n", iface, type); - if (This == &null_type) + if (reflection_type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } @@ -1002,68 +999,67 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( return S_FALSE; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetSubType + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetBaseClass( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetBaseClass + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetNumInterfaces( - ID3D11ShaderReflectionType *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetNumInterfaces(ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetInterfaceByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetInterfaceByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { FIXME("iface %p, index %u stub!\n", iface, index); return NULL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsOfType( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsOfType + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { FIXME("iface %p, type %p stub!\n", iface, type); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_ImplementsInterface( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_ImplementsInterface + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) { FIXME("iface %p, base %p stub!\n", iface, base); return E_NOTIMPL; } -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl = +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl = { /* ID3D11ShaderReflectionType methods */ - d3dcompiler_shader_reflection_type_GetDesc, - d3dcompiler_shader_reflection_type_GetMemberTypeByIndex, - d3dcompiler_shader_reflection_type_GetMemberTypeByName, - d3dcompiler_shader_reflection_type_GetMemberTypeName, - d3dcompiler_shader_reflection_type_IsEqual, - d3dcompiler_shader_reflection_type_GetSubType, - d3dcompiler_shader_reflection_type_GetBaseClass, - d3dcompiler_shader_reflection_type_GetNumInterfaces, - d3dcompiler_shader_reflection_type_GetInterfaceByIndex, - d3dcompiler_shader_reflection_type_IsOfType, - d3dcompiler_shader_reflection_type_ImplementsInterface, + d3d11_shader_reflection_type_GetDesc, + d3d11_shader_reflection_type_GetMemberTypeByIndex, + d3d11_shader_reflection_type_GetMemberTypeByName, + d3d11_shader_reflection_type_GetMemberTypeName, + d3d11_shader_reflection_type_IsEqual, + d3d11_shader_reflection_type_GetSubType, + d3d11_shader_reflection_type_GetBaseClass, + d3d11_shader_reflection_type_GetNumInterfaces, + d3d11_shader_reflection_type_GetInterfaceByIndex, + d3d11_shader_reflection_type_IsOfType, + d3d11_shader_reflection_type_ImplementsInterface, }; static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) @@ -1310,7 +1306,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d if (!type) return NULL; - type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; + type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3d11_shader_reflection_type_vtbl; type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl; type->id = offset; type->reflection = reflection; @@ -1352,7 +1348,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ struct d3dcompiler_shader_reflection_variable *v = &variables[i]; DWORD offset; - v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3d11_shader_reflection_variable_vtbl; v->ID3D10ShaderReflectionVariable_iface.lpVtbl = &d3d10_shader_reflection_variable_vtbl; v->constant_buffer = cb; @@ -1551,7 +1547,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c { struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; - cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d11_shader_reflection_constant_buffer_vtbl; cb->ID3D10ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d10_shader_reflection_constant_buffer_vtbl; cb->reflection = r; @@ -2375,7 +2371,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void if (!object) return E_OUTOFMEMORY; - object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; + object->ID3D11ShaderReflection_iface.lpVtbl = &d3d11_shader_reflection_vtbl; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); -- 2.26.2

2 8

[PATCH v2] ws2_32: Use kernelbase directly
by Alistair Leslie-Hughes 10 Aug '20

10 Aug '20

Windows 10 links only to kernelbase but the functions reside in ws2_32. v2: Use -import Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/ws2_32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 87e0bdfa2f..f43939ea46 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -102,19 +102,19 @@ @ stdcall WSARecvDisconnect(long ptr) @ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) @ stdcall WSARemoveServiceClass(ptr) -@ stdcall WSAResetEvent(long) kernel32.ResetEvent +@ stdcall -import WSAResetEvent(long) kernelbase.ResetEvent @ stdcall WSASend(long ptr long ptr long ptr ptr) @ stdcall WSASendDisconnect(long ptr) @ stdcall WSASendMsg(long ptr long ptr ptr ptr) @ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) -@ stdcall WSASetEvent(long) kernel32.SetEvent +@ stdcall -import WSASetEvent(long) kernelbase.SetEvent @ stdcall WSASetServiceA(ptr long long) @ stdcall WSASetServiceW(ptr long long) @ stdcall WSASocketA(long long long ptr long long) @ stdcall WSASocketW(long long long ptr long long) @ stdcall WSAStringToAddressA(str long ptr ptr ptr) @ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) -@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall -import WSAWaitForMultipleEvents(long ptr long long long) kernelbase.WaitForMultipleObjectsEx @ stdcall WSCDeinstallProvider(ptr ptr) @ stdcall WSCEnableNSProvider(ptr long) @ stdcall WSCEnumProtocols(ptr ptr ptr ptr) -- 2.28.0

1 0

[PATCH] wine.inf: Map the Intl section of win.ini to the registry
by Fabian Maurer 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49653 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01df..8777377002 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -568,6 +568,7 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"intl",,"USR:Control Panel\International" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" -- 2.28.0

1 0

[PATCH] include: Add xact2wb.h
by Vijay Kiran Kamuju 10 Aug '20

10 Aug '20

Based on DirectX SDK August 2007 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h
by Vijay Kiran Kamuju 10 Aug '20

10 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2] d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind).
by Zebediah Figura 10 Aug '20

10 Aug '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dcompiler_43/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 336bf0d9bcf..df39716b495 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2113,7 +2113,9 @@ void free_instr_list(struct list *list) if (!list) return; - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, list, struct hlsl_ir_node, entry) + /* Iterate in reverse, to avoid use-after-free when unlinking sources from + * the "uses" list. */ + LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) free_instr(node); d3dcompiler_free(list); } -- 2.27.0

2 1

[RFC PATCH v2 1/3] dxva2: Introduce DXVAHD_CreateDevice() stub.
by Jeff Smith 10 Aug '20

10 Aug '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/dxva2/Makefile.in | 3 +- dlls/dxva2/dxva2.spec | 1 + dlls/dxva2/dxvahd.c | 65 ++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/dxvahd.idl | 65 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 dlls/dxva2/dxvahd.c create mode 100644 include/dxvahd.idl diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index e3fc2fd6c3..0248c7f20b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -5,4 +5,5 @@ IMPORTLIB = dxva2 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + dxvahd.c diff --git a/dlls/dxva2/dxva2.spec b/dlls/dxva2/dxva2.spec index 024a972697..ea7a98718b 100644 --- a/dlls/dxva2/dxva2.spec +++ b/dlls/dxva2/dxva2.spec @@ -1,6 +1,7 @@ @ stdcall CapabilitiesRequestAndCapabilitiesReply(ptr ptr long) @ stdcall DXVA2CreateDirect3DDeviceManager9(ptr ptr) @ stdcall DXVA2CreateVideoService(ptr ptr ptr) +@ stdcall DXVAHD_CreateDevice(ptr ptr long ptr ptr) @ stdcall DegaussMonitor(ptr) @ stdcall DestroyPhysicalMonitor(ptr) @ stdcall DestroyPhysicalMonitors(long ptr) diff --git a/dlls/dxva2/dxvahd.c b/dlls/dxva2/dxvahd.c new file mode 100644 index 0000000000..ac67f9e5a7 --- /dev/null +++ b/dlls/dxva2/dxvahd.c @@ -0,0 +1,65 @@ +/* + * Copyright 2020 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3d9.h" +#include "dxvahd.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxva2); + + +/******************************************** + * Utility functions + */ + +static const char *debug_dxvahd_device_usage(DXVAHD_DEVICE_USAGE usage) +{ + switch (usage) + { +#define USAGE_TO_STR(e) case e: return #e + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL); + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_OPTIMAL_SPEED); + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_OPTIMAL_QUALITY); +#undef USAGE_TO_STR + default: + FIXME("Unrecognized device usage %#x.\n", usage); + return "unrecognized"; + } +} + + +/******************************************** + * DXVA-HD device creation function + */ + +HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *d3d_device, const DXVAHD_CONTENT_DESC *desc, + DXVAHD_DEVICE_USAGE usage, PDXVAHDSW_Plugin plugin, IDXVAHD_Device **device) +{ + FIXME("%p, %p, %s, %p, %p. stub.\n", d3d_device, desc, debug_dxvahd_device_usage(usage), plugin, device); + + TRACE("Frame Format %d Input %ux%u @%.2f Output %ux%u @%.2f\n", + desc->InputFrameFormat, desc->InputWidth, desc->InputHeight, + (double)desc->InputFrameRate.Numerator / desc->InputFrameRate.Denominator, + desc->OutputWidth, desc->OutputHeight, + (double)desc->OutputFrameRate.Numerator / desc->OutputFrameRate.Denominator); + + *device = NULL; + + return E_NOINTERFACE; +} diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7a..f986ef42dd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -268,6 +268,7 @@ SOURCES = \ dxgitype.idl \ dxva.h \ dxva2api.idl \ + dxvahd.idl \ dyngraph.idl \ endpointvolume.idl \ errorrep.h \ diff --git a/include/dxvahd.idl b/include/dxvahd.idl new file mode 100644 index 0000000000..cd6de6eab3 --- /dev/null +++ b/include/dxvahd.idl @@ -0,0 +1,65 @@ +/* + * Copyright 2020 Jeff Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +cpp_quote("#if 0") +interface IDirect3DDevice9Ex; +cpp_quote("#endif") + + +typedef enum _DXVAHD_FRAME_FORMAT +{ + DXVAHD_FRAME_FORMAT_PROGRESSIVE = 0, + DXVAHD_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST = 1, + DXVAHD_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2 +} DXVAHD_FRAME_FORMAT; + +typedef enum _DXVAHD_DEVICE_USAGE +{ + DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL = 0, + DXVAHD_DEVICE_USAGE_OPTIMAL_SPEED = 1, + DXVAHD_DEVICE_USAGE_OPTIMAL_QUALITY = 2 +} DXVAHD_DEVICE_USAGE; + + +typedef struct _DXVAHD_RATIONAL +{ + UINT Numerator; + UINT Denominator; +} DXVAHD_RATIONAL; + +typedef struct _DXVAHD_CONTENT_DESC +{ + DXVAHD_FRAME_FORMAT InputFrameFormat; + DXVAHD_RATIONAL InputFrameRate; + UINT InputWidth; + UINT InputHeight; + DXVAHD_RATIONAL OutputFrameRate; + UINT OutputWidth; + UINT OutputHeight; +} DXVAHD_CONTENT_DESC; + + +/* FIXME */ +typedef void* PDXVAHDSW_Plugin; + + +interface IDXVAHD_Device; + +cpp_quote("HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *d3d_device, const DXVAHD_CONTENT_DESC *desc, DXVAHD_DEVICE_USAGE usage, PDXVAHDSW_Plugin plugin, IDXVAHD_Device **device);") -- 2.23.0

2 4

[PATCH 4/4] kernelbase: Add pseudoconsole stubs.
by Jacek Caban 10 Aug '20

10 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 3 +++ dlls/kernelbase/console.c | 26 ++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +++ 3 files changed, 32 insertions(+)

2 1

[PATCH] d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind).
by Zebediah Figura 10 Aug '20

10 Aug '20

To avoid heap corruption when unlinking the instruction from the "uses" list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Alternatively, we could make unlinking into a separate operation. dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e8bdbea7e13..ac5722e11aa 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1937,7 +1937,7 @@ void free_instr_list(struct list *list) if (!list) return; - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, list, struct hlsl_ir_node, entry) + LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) free_instr(node); d3dcompiler_free(list); } -- 2.27.0

3 2

[PATCH 1/3] d3dcompiler: Parse register space and range id for sm51 in d3dcompiler_parse_rdef().
by Paul Gofman 10 Aug '20

10 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 40 ++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7a8af39b07d..4d3d988b2ad 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -138,7 +138,7 @@ struct d3dcompiler_shader_reflection struct d3dcompiler_shader_signature *osgn; struct d3dcompiler_shader_signature *pcsg; char *resource_string; - D3D11_SHADER_INPUT_BIND_DESC *bound_resources; + D3D12_SHADER_INPUT_BIND_DESC *bound_resources; struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers; struct wine_rb_tree types; }; @@ -476,17 +476,17 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); TRACE("iface %p, index %u, desc %p\n", iface, index, desc); - if (!desc || index >= This->bound_resource_count) + if (!desc || index >= reflection->bound_resource_count) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } - *desc = This->bound_resources[index]; + memcpy(desc, &reflection->bound_resources[index], sizeof(*desc)); return S_OK; } @@ -596,12 +596,12 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin for (i = 0; i < This->bound_resource_count; ++i) { - D3D11_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; if (!strcmp(d->Name, name)) { TRACE("Returning D3D11_SHADER_INPUT_BIND_DESC %p.\n", d); - *desc = *d; + memcpy(desc, d, sizeof(*desc)); return S_OK; } } @@ -1412,13 +1412,14 @@ err_out: static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { - const char *ptr = data; - DWORD size = data_size >> 2; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers = NULL; DWORD offset, cbuffer_offset, resource_offset, creator_offset; unsigned int i, string_data_offset, string_data_size; + D3D12_SHADER_INPUT_BIND_DESC *bound_resources = NULL; char *string_data = NULL, *creator = NULL; - D3D11_SHADER_INPUT_BIND_DESC *bound_resources = NULL; - struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers = NULL; + DWORD size = data_size >> 2; + const char *ptr = data; + DWORD target_version; HRESULT hr; TRACE("Size %u\n", size); @@ -1438,6 +1439,8 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &r->target); TRACE("Target: %#x\n", r->target); + target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; + read_dword(&ptr, &r->flags); TRACE("Flags: %u\n", r->flags); @@ -1452,7 +1455,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Creator: %s.\n", debugstr_a(creator)); /* todo: Parse RD11 */ - if ((r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) + if (target_version >= 0x500) { skip_dword_unknown(&ptr, 8); } @@ -1483,7 +1486,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c ptr = data + resource_offset; for (i = 0; i < r->bound_resource_count; i++) { - D3D11_SHADER_INPUT_BIND_DESC *desc = &bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *desc = &bound_resources[i]; read_dword(&ptr, &offset); desc->Name = string_data + (offset - string_data_offset); @@ -1509,6 +1512,19 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &desc->uFlags); TRACE("Input bind uFlags: %u\n", desc->uFlags); + + if (target_version >= 0x501) + { + read_dword(&ptr, &desc->Space); + TRACE("Input bind Space %u.\n", desc->Space); + read_dword(&ptr, &desc->uID); + TRACE("Input bind uID %u.\n", desc->uID); + } + else + { + desc->Space = 0; + desc->uID = 0; + } } } -- 2.26.2

2 5

[PATCH v2 1/3] d3dcompiler: Add D3D_COMPILE_STANDARD_FILE_INCLUDE support for D3DCompile2().
by Matteo Bruni 10 Aug '20

10 Aug '20

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix up style a bit. dlls/d3dcompiler_43/compiler.c | 82 +++++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 249 ++++++++++++++++++++++++++ include/d3dcompiler.h | 2 + 3 files changed, 333 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index c400b83d8d1a..02e74198e93a 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -829,12 +829,88 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return hr; } +static HRESULT WINAPI d3dcompiler_include_from_file_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + char *fullpath, *buffer = NULL, current_dir[MAX_PATH + 1]; + const char *initial_dir; + SIZE_T size; + HANDLE file; + ULONG read; + DWORD len; + + if ((initial_dir = strrchr(initial_filename, '\\'))) + { + len = initial_dir - initial_filename + 1; + initial_dir = initial_filename; + } + else + { + len = GetCurrentDirectoryA(MAX_PATH, current_dir); + current_dir[len] = '\\'; + len++; + initial_dir = current_dir; + } + fullpath = heap_alloc(len + strlen(filename) + 1); + if (!fullpath) + return E_OUTOFMEMORY; + memcpy(fullpath, initial_dir, len); + strcpy(fullpath + len, filename); + + file = CreateFileA(fullpath, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + goto error; + + TRACE("Include file found at %s.\n", debugstr_a(fullpath)); + + size = GetFileSize(file, NULL); + if (size == INVALID_FILE_SIZE) + goto error; + buffer = heap_alloc(size); + if (!buffer) + goto error; + if (!ReadFile(file, buffer, size, &read, NULL) || read != size) + goto error; + + *bytes = size; + *data = buffer; + + heap_free(fullpath); + CloseHandle(file); + return S_OK; + +error: + heap_free(fullpath); + heap_free(buffer); + CloseHandle(file); + WARN("Returning E_FAIL.\n"); + return E_FAIL; +} + +static HRESULT WINAPI d3dcompiler_include_from_file_close(ID3DInclude *iface, const void *data) +{ + heap_free((void *)data); + return S_OK; +} + +const struct ID3DIncludeVtbl d3dcompiler_include_from_file_vtbl = +{ + d3dcompiler_include_from_file_open, + d3dcompiler_include_from_file_close +}; + +struct d3dcompiler_include_from_file +{ + ID3DInclude ID3DInclude_iface; +}; + HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages) { + struct d3dcompiler_include_from_file include_from_file; HRESULT hr; TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " @@ -850,6 +926,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; + if (include == D3D_COMPILE_STANDARD_FILE_INCLUDE) + { + include_from_file.ID3DInclude_iface.lpVtbl = &d3dcompiler_include_from_file_vtbl; + include = &include_from_file.ID3DInclude_iface; + } + EnterCriticalSection(&wpp_mutex); hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index ed148ff112a1..f6b389ccdf30 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -18,6 +18,7 @@ */ #define COBJMACROS #include "wine/test.h" +#include "wine/heap.h" #include "d3dx9.h" #include "d3dcompiler.h" @@ -25,6 +26,9 @@ static pD3DCompile ppD3DCompile; +static HRESULT (WINAPI *pD3DCompile2)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, + ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); struct vec2 @@ -37,6 +41,63 @@ struct vec4 float x, y, z, w; }; +static WCHAR temp_dir[MAX_PATH]; + +static BOOL create_file(const WCHAR *filename, const char *data, unsigned int size, WCHAR *out_path) +{ + WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (WriteFile(file, data, size, &written, NULL)) + { + CloseHandle(file); + + if (out_path) + lstrcpyW(out_path, path); + return TRUE; + } + + CloseHandle(file); + return FALSE; +} + +static void delete_file(const WCHAR *filename) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + +static BOOL create_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + return CreateDirectoryW(path, NULL); +} + +static void delete_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + RemoveDirectoryW(path); +} + #define compile_shader(a, b) compile_shader_(__LINE__, a, b) static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { @@ -1269,6 +1330,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + pD3DCompile2 = (void*)GetProcAddress(module, "D3DCompile2"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1277,6 +1339,192 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + char *buffer; + + trace("filename %s.\n", filename); + trace("parent_data %p: %s.\n", parent_data, parent_data ? (char *)parent_data : "(null)"); + + if (!strcmp(filename, "include1.h")) + { + buffer = heap_alloc(strlen(include1)); + CopyMemory(buffer, include1, strlen(include1)); + *bytes = strlen(include1); + ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); + ok(!strncmp(include2, parent_data, strlen(include2)), + "Unexpected parent_data value.\n"); + } + else if (!strcmp(filename, "include\\include2.h")) + { + buffer = heap_alloc(strlen(include2)); + CopyMemory(buffer, include2, strlen(include2)); + *bytes = strlen(include2); + ok(!parent_data, "Unexpected parent_data value.\n"); + ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); + } + else + { + ok(0, "Unexpected #include for file %s.\n", filename); + return D3DERR_INVALIDCALL; + } + + *data = buffer; + return S_OK; +} + +static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) +{ + heap_free((void *)data); + return S_OK; +} + +static const struct ID3DIncludeVtbl test_d3dinclude_vtbl = +{ + test_d3dinclude_open, + test_d3dinclude_close +}; + +struct test_d3dinclude +{ + ID3DInclude ID3DInclude_iface; +}; + +static void test_d3dcompile(void) +{ + struct test_d3dinclude include = {{&test_d3dinclude_vtbl}}; + WCHAR filename[MAX_PATH], directory[MAX_PATH]; + ID3D10Blob *blob = NULL, *errors = NULL; + CHAR filename_a[MAX_PATH]; + HRESULT hr; + DWORD len; + static const char ps_code[] = + "#include \"include\\include2.h\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include1_wrong[] = + "#define LIGHT nope\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + + create_file(L"source.ps", ps_code, strlen(ps_code), filename); + create_directory(L"include"); + create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); + create_file(L"include1.h", include1, strlen(include1), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), NULL); + + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = ppD3DCompile(ps_code, sizeof(ps_code), filename_a, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + /* Also skip D3DCompile() D3D_COMPILE_STANDARD_FILE_INCLUDE tests from + * d3dcompiler_43 or earlier since they crash on Windows. */ + if (!pD3DCompile2) + { + skip("D3DCompile2() isn't supported.\n"); + goto cleanup; + } + + hr = ppD3DCompile(ps_code, sizeof(ps_code), NULL, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!!errors, "Got unexpected errors.\n"); + ID3D10Blob_Release(errors); + errors = NULL; + + /* Windows always seems to resolve includes from the initial file location + * instead of using the immediate parent, as it would be the case for + * standard C preprocessor includes. */ + hr = ppD3DCompile(ps_code, sizeof(ps_code), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), filename_a, NULL, &include.ID3DInclude_iface, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + GetCurrentDirectoryW(MAX_PATH, directory); + SetCurrentDirectoryW(temp_dir); + + hr = ppD3DCompile(ps_code, sizeof(ps_code), "source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), "source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + SetCurrentDirectoryW(directory); + +cleanup: + delete_file(L"source.ps"); + delete_file(L"include\\include1.h"); + delete_file(L"include1.h"); + delete_file(L"include\\include2.h"); + delete_directory(L"include"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1309,4 +1557,5 @@ START_TEST(hlsl_d3d9) test_constant_table(); test_fail(); + test_d3dcompile(); } diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index f11251e9dbf0..f897a7859923 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -82,6 +82,8 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3D_DISASM_INSTRUCTION_ONLY 0x00000040 #define D3D_DISASM_PRINT_HEX_LITERALS 0x00000080 +#define D3D_COMPILE_STANDARD_FILE_INCLUDE ((ID3DInclude *)(UINT_PTR)1) + HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); -- 2.26.2

1 2

[PATCH] combase: Fix the trailing linefeed of a TRACE().
by Francois Gouget 10 Aug '20

10 Aug '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/combase/usrmarshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 8bea32cdd54..48a6c2de4be 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -163,7 +163,7 @@ IMPL_WIREM_HANDLE(HWND) */ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) { - TRACE("%s, %u, %p.n", debugstr_user_flags(pFlags), size, pCF); + TRACE("%s, %u, %p\n", debugstr_user_flags(pFlags), size, pCF); ALIGN_LENGTH(size, 3); -- 2.20.1

1 0

[PATCH 3/4] include: Add pseudoconsole declarations.
by Jacek Caban 10 Aug '20

10 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/consoleapi.h | 5 +++++ include/wincontypes.h | 2 ++ 2 files changed, 7 insertions(+)

1 0

[PATCH 2/4] include: Introduce consoleapi.h.
by Jacek Caban 10 Aug '20

10 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/consoleapi.h | 85 ++++++++++++++++++++++++++++++++++++++++++++ include/wincon.h | 54 +--------------------------- 2 files changed, 86 insertions(+), 53 deletions(-) create mode 100644 include/consoleapi.h

1 0

[PATCH 1/4] include: Introduce wincontypes.h.
by Jacek Caban 10 Aug '20

10 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wincon.h | 112 +---------------------------------- include/wincontypes.h | 133 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 110 deletions(-) create mode 100644 include/wincontypes.h

1 0

[PATCH] xaudio2_9: Use new FAudioCreateReverb9 interface.
by Rémi Bernon 10 Aug '20

10 Aug '20

XAudio 2.9 and Windows 10 introduced a new SideDelay field in the middle of the XAUDIO2FX_REVERB_PARAMETERS structure, which causes other fields to be offseted and incorrectly read from the parameter buffer. FAudio 20.08 introduces this new interface to create reverb effects that use the new parameter structure layout. This fixes audio glitches in Dragon Quest Builders 2. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 3 ++- dlls/xaudio2_7/xapo.c | 11 +++++++++++ include/config.h.in | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 65a7c5d6252..0573cb65e20 100644 --- a/configure.ac +++ b/configure.ac @@ -1778,7 +1778,8 @@ then [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ F3DAudioInitialize8 \ - FAudioLinkedVersion], [$FAUDIO_LIBS]) + FAudioLinkedVersion \ + FAudioCreateReverb9WithCustomAllocatorEXT], [$FAUDIO_LIBS]) ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index e64523ea199..e47442959d3 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -313,6 +313,16 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#if XAUDIO2_VER >= 9 && HAVE_FAUDIOCREATEREVERB9WITHCUSTOMALLOCATOREXT + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverb9WithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#else if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) return FAudioCreateReverbWithCustomAllocatorEXT( fapo, @@ -322,6 +332,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Realloc ); #endif +#endif #if XAUDIO2_VER >= 8 || defined XAPOFX1_VER if(IsEqualGUID(clsid, &CLSID_FXReverb) || IsEqualGUID(clsid, &CLSID_FXEQ) || diff --git a/include/config.h.in b/include/config.h.in index 4d479a6cb3d..292ac55eeb8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,6 +152,9 @@ /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE +/* Define to 1 if you have the `FAudioCreateReverb9WithCustomAllocatorEXT' function. */ +#undef HAVE_FAUDIOCREATEREVERB9WITHCUSTOMALLOCATOREXT + /* Define to 1 if you have the `FAudioLinkedVersion' function. */ #undef HAVE_FAUDIOLINKEDVERSION -- 2.27.0

2 1

[PATCH] kernelbase: Fix relationship between Sleep() and GetTickCount()
by Arkadiusz Hiler 10 Aug '20

10 Aug '20

Sleep() and GetTickCount() work on Windows in 15.6ms increments. Some programs (DOSBox) are depending on this behavior and are assuming that the return value of GetTickCount() will change during sleeping. Currently we are updating shared counters used by GetTickCount() every 16ms + on each server request, and our Sleep() implementation has resolution of 1ms, which causes DOSBox to hang. This patch changes Sleep() (and SleepEx()) to behave the same way as on Windows and makes sure that GetTickCount() will be updated during sleeping by decreasing the update interval to 15ms (worst case, without any server calls). This fixes Doom II from Steam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/kernelbase/sync.c | 20 ++++++++++++++++---- dlls/ntdll/tests/time.c | 2 +- server/fd.c | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 13a9938e7c..673c5b60d9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -51,13 +51,25 @@ static inline BOOL is_version_nt(void) } /* helper for kernel32->ntdll timeout format conversion */ -static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout ) +static inline LARGE_INTEGER *get_aligned_nt_timeout( LARGE_INTEGER *time, DWORD timeout, DWORD alignment ) { + ULONGLONG quad ; + if (timeout == INFINITE) return NULL; - time->QuadPart = (ULONGLONG)timeout * -10000; + + quad = (ULONGLONG)timeout * 10000; + quad = ((quad + alignment - 1) / alignment) * alignment; + + time->QuadPart = quad * -1; + return time; } +static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout) +{ + return get_aligned_nt_timeout(time, timeout, 10000); +} + /*********************************************************************** * BaseGetNamedObjectDirectory (kernelbase.@) @@ -269,7 +281,7 @@ void WINAPI DECLSPEC_HOTPATCH Sleep( DWORD timeout ) { LARGE_INTEGER time; - NtDelayExecution( FALSE, get_nt_timeout( &time, timeout ) ); + NtDelayExecution( FALSE, get_aligned_nt_timeout( &time, timeout, 156000 ) ); } @@ -281,7 +293,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH SleepEx( DWORD timeout, BOOL alertable ) NTSTATUS status; LARGE_INTEGER time; - status = NtDelayExecution( alertable, get_nt_timeout( &time, timeout ) ); + status = NtDelayExecution( alertable, get_aligned_nt_timeout( &time, timeout, 156000 ) ); if (status == STATUS_USER_APC) return WAIT_IO_COMPLETION; return 0; } diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index a00d507e4e..0e0efe6384 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -261,7 +261,7 @@ static void test_user_shared_data_time(void) t2 = GetTickCount(); if (t1 != t2) changed++; } - todo_wine ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); + ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); } START_TEST(time) diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e..1bdce6c70c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -377,7 +377,7 @@ timeout_t current_time; timeout_t monotonic_time; struct _KUSER_SHARED_DATA *user_shared_data = NULL; -static const int user_shared_data_timeout = 16; +static const int user_shared_data_timeout = 15; static void set_user_shared_data_time(void) { -- 2.28.0

3 7

[PATCH] urlmon: Fix null pointer dereference in process_hook_section (Coverity)
by Alex Henrie 10 Aug '20

10 Aug '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/urlmon/axinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9d6f9a0f15..3f10902ddd 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -202,7 +202,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) cmd = heap_alloc(size*sizeof(WCHAR)); if(!cmd) - heap_free(cmd); + return E_OUTOFMEMORY; expand_command(ctx, val, cmd, &size); hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL); -- 2.27.0

2 1

[PATCH v2] vbscript: Implement case insensitive search in InStrRev function
by Dmitry Kislyuk 10 Aug '20

10 Aug '20

2 1

[PATCH v2] kernelbase/tests: Add test for Sleep(1).
by Myah Caron 10 Aug '20

10 Aug '20

Sleep(1) should sleep until the next kernel tick, not necessarily one millisecond. Thanks to Henri Verbeet for pointing this out. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Relax the upper bound, improve wording for commit details dlls/kernelbase/tests/sync.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 9f57cf7a95..50ce62602b 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -172,6 +172,31 @@ static void test_WaitOnAddress(void) ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } +static void test_Sleep(void) +{ + LARGE_INTEGER frequency; + LARGE_INTEGER t1, t2; + double elapsed_time; + BOOL ret; + int i; + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "QueryPerformanceFrequency failed\n"); + + ret = QueryPerformanceCounter(&t1); + ok(ret, "QueryPerformanceCounter failed\n"); + + for (i = 0; i < 100; i++) { + Sleep(1); + } + + ret = QueryPerformanceCounter(&t2); + ok(ret, "QueryPerformanceCounter failed\n"); + + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; + todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); +} + START_TEST(sync) { HMODULE hmod; @@ -186,4 +211,5 @@ START_TEST(sync) pWakeByAddressSingle = (void *)GetProcAddress(hmod, "WakeByAddressSingle"); test_WaitOnAddress(); + test_Sleep(); } -- 2.27.0

2 1

[PATCH v2] wbemprox: Accept 0 and WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN as flags in IWbemClassObject::GetNames().
by Gijs Vermeulen 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34770 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 190437 dlls/wbemprox/class.c | 12 ++++++++++-- dlls/wbemprox/tests/query.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index db6017e0c9..1a00cfc40a 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -484,13 +484,21 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (lFlags != WBEM_FLAG_ALWAYS && + if (!pNames) + return WBEM_E_INVALID_PARAMETER; + + /* Combination used in a handful of broken apps */ + if (lFlags == (WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN)) + lFlags = WBEM_FLAG_ALWAYS; + + if (lFlags && (lFlags != WBEM_FLAG_ALWAYS && lFlags != WBEM_FLAG_NONSYSTEM_ONLY && - lFlags != WBEM_FLAG_SYSTEM_ONLY) + lFlags != WBEM_FLAG_SYSTEM_ONLY)) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } + if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc..476840fbc3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1009,6 +1009,21 @@ static void test_GetNames( IWbemServices *services ) IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (!count) break; + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.28.0

2 1

[PATCH resend 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 10 Aug '20

10 Aug '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 79 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d4b0e34fa91..92457af01cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1766,11 +1766,15 @@ static void test_GetRawInputData(void) static void test_RegisterRawInputDevices(void) { HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; + RAWINPUTDEVICE raw_devices[2]; + UINT count, raw_devices_count; BOOL res; + memset(raw_devices, 0, sizeof(raw_devices)); raw_devices[0].usUsagePage = 0x01; raw_devices[0].usUsage = 0x05; + raw_devices[1].usUsagePage = 0x01; + raw_devices[1].usUsage = 0x04; hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowExA failed\n"); @@ -1780,9 +1784,6 @@ static void test_RegisterRawInputDevices(void) ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); @@ -1793,10 +1794,76 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + if (broken(count == 0) /* depends on windows versions */) + win_skip("Ignoring GetRegisteredRawInputDevices success\n"); + else + { + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + raw_devices_count = 1; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 2, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x04, "Unexpected usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[1].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[1].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[1].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1804,6 +1871,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1814,6 +1882,8 @@ static void test_RegisterRawInputDevices(void) /* RIDEV_INPUTSINK requires hwndTarget != NULL */ raw_devices[0].dwFlags = RIDEV_INPUTSINK; raw_devices[0].hwndTarget = 0; + raw_devices[1].dwFlags = RIDEV_INPUTSINK; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1821,6 +1891,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); -- 2.28.0

2 10

[PATCH v3 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 10 Aug '20

10 Aug '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add some more error case tests with insufficient buffer sizes. dlls/user32/tests/input.c | 79 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index bab0fd97536..4310ad1f296 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1764,11 +1764,15 @@ static void test_GetRawInputData(void) static void test_RegisterRawInputDevices(void) { HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; + RAWINPUTDEVICE raw_devices[2]; + UINT count, raw_devices_count; BOOL res; + memset(raw_devices, 0, sizeof(raw_devices)); raw_devices[0].usUsagePage = 0x01; raw_devices[0].usUsage = 0x05; + raw_devices[1].usUsagePage = 0x01; + raw_devices[1].usUsage = 0x04; hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowExA failed\n"); @@ -1778,9 +1782,6 @@ static void test_RegisterRawInputDevices(void) ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); @@ -1791,10 +1792,76 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + if (broken(count == 0) /* depends on windows versions */) + win_skip("Ignoring GetRegisteredRawInputDevices success\n"); + else + { + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + raw_devices_count = 1; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 2, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x04, "Unexpected usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[1].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[1].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[1].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1802,6 +1869,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1812,6 +1880,8 @@ static void test_RegisterRawInputDevices(void) /* RIDEV_INPUTSINK requires hwndTarget != NULL */ raw_devices[0].dwFlags = RIDEV_INPUTSINK; raw_devices[0].hwndTarget = 0; + raw_devices[1].dwFlags = RIDEV_INPUTSINK; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1819,6 +1889,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); -- 2.27.0

5 26

[PATCH] wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available.
by Zebediah Figura 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49685 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wbemprox/services.c | 4 +++- dlls/wbemprox/tests/query.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e2b452e217e..c0e535b3a11 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -450,6 +450,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; struct path *path; + ULONG count; HRESULT hr; hr = parse_path( object_path, &path ); @@ -461,7 +462,8 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = create_class_object( path->class, iter, 0, NULL, obj ); + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); + if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc9..a50002e1baf 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -267,7 +267,9 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - goto out; + SysFreeString( empty ); + SysFreeString( class ); + return; } check_property( service, L"ProcessID", VT_I4, CIM_UINT32 ); @@ -343,9 +345,13 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); -out: SysFreeString( empty ); SysFreeString( class ); + + class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + SysFreeString( class ); } static void test_Win32_Bios( IWbemServices *services ) -- 2.28.0

2 1

[PATCH] wbemprox: Don't fail when given invalid flag combinations in IWbemClassObject::GetNames().
by Gijs Vermeulen 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34770 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/class.c | 15 ++++++++++----- dlls/wbemprox/tests/query.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index db6017e0c9..b146b04df8 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -484,13 +484,18 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (lFlags != WBEM_FLAG_ALWAYS && + if (!pNames) + return WBEM_E_INVALID_PARAMETER; + + /* Combination used in a handful of broken apps */ + if (lFlags == (WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN)) + lFlags = WBEM_FLAG_ALWAYS; + + if (!!lFlags && (lFlags != WBEM_FLAG_ALWAYS && lFlags != WBEM_FLAG_NONSYSTEM_ONLY && - lFlags != WBEM_FLAG_SYSTEM_ONLY) - { + lFlags != WBEM_FLAG_SYSTEM_ONLY)) FIXME("flags %08x not supported\n", lFlags); - return E_NOTIMPL; - } + if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc..476840fbc3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1009,6 +1009,21 @@ static void test_GetNames( IWbemServices *services ) IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (!count) break; + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.28.0

2 1

[PATCH 1/6] combase: Move CoGetInstanceFromIStorage().
by Nikolay Sivov 10 Aug '20

10 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 50 +++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 63 --------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 52 insertions(+), 65 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 06fc97e17d4..88da5fb888e 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -725,3 +725,53 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile(COSERVERINFO *server_info return hr; } } + +/*********************************************************************** + * CoGetInstanceFromIStorage (combase.@) + */ +HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO *server_info, CLSID *rclsid, + IUnknown *outer, DWORD cls_context, IStorage *storage, DWORD count, MULTI_QI *results) +{ + IPersistStorage *ps = NULL; + IUnknown *obj = NULL; + STATSTG stat; + HRESULT hr; + + if (!count || !results || !storage) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + if (!rclsid) + { + memset(&stat.clsid, 0, sizeof(stat.clsid)); + hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); + if (FAILED(hr)) + { + ERR("Failed to get CLSID from a storage.\n"); + return hr; + } + + rclsid = &stat.clsid; + } + + hr = CoCreateInstance(rclsid, outer, cls_context, &IID_IUnknown, (void **)&obj); + if (hr != S_OK) + return hr; + + /* Init from IStorage */ + hr = IUnknown_QueryInterface(obj, &IID_IPersistStorage, (void **)&ps); + if (FAILED(hr)) + ERR("failed to get IPersistStorage\n"); + + if (ps) + { + IPersistStorage_Load(ps, storage); + IPersistStorage_Release(ps); + } + + return return_multi_qi(obj, count, results, FALSE); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e90df05446e..de0ebe7cd31 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -108,7 +108,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1ad8a4b1d1d..e63759c0609 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3434,69 +3434,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( return return_multi_qi(unk, cmq, pResults, TRUE); } -/*********************************************************************** - * CoGetInstanceFromIStorage [OLE32.@] - */ -HRESULT WINAPI CoGetInstanceFromIStorage( - COSERVERINFO *server_info, - CLSID *rclsid, - IUnknown *outer, - DWORD cls_context, - IStorage *storage, - DWORD count, - MULTI_QI *results -) -{ - IPersistStorage *ps = NULL; - IUnknown* unk = NULL; - STATSTG stat; - HRESULT hr; - - if (count == 0 || !results || !storage) - return E_INVALIDARG; - - if (server_info) - FIXME("() non-NULL server_info not supported\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - /* optionally get CLSID from a file */ - if (!rclsid) - { - memset(&stat.clsid, 0, sizeof(stat.clsid)); - hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); - if (FAILED(hr)) - { - ERR("failed to get CLSID from a file\n"); - return hr; - } - - rclsid = &stat.clsid; - } - - hr = CoCreateInstance(rclsid, - outer, - cls_context, - &IID_IUnknown, - (void**)&unk); - - if (hr != S_OK) - return hr; - - /* init from IStorage */ - hr = IUnknown_QueryInterface(unk, &IID_IPersistStorage, (void**)&ps); - if (FAILED(hr)) - ERR("failed to get IPersistStorage\n"); - - if (ps) - { - IPersistStorage_Load(ps, storage); - IPersistStorage_Release(ps); - } - - return return_multi_qi(unk, count, results, FALSE); -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b1949eec8ec..6f44e298af8 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -36,7 +36,7 @@ @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) -- 2.28.0

3 12

[PATCH] urlmon: Fix spelling of "hierpart"
by Alex Henrie 09 Aug '20

09 Aug '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/urlmon/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b09e78839f..f490fc0302 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3398,7 +3398,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); + ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); return E_INVALIDARG; } -- 2.27.0

1 1

[PATCH] kernelbase/tests: Add test for Sleep(1).
by Myah Caron 09 Aug '20

09 Aug '20

Sleep(1) does not sleep for a millisecond, but rather a kernel tick. Thanks to Henri Verbeet for pointing this out. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I've tested it under Windows 10, but when testing shortly after the machine booted, it appears to sleep for ~1.6ms on average (rather than ~16ms). I'm not sure what is the reason, but my guess is that the kernel tick was possibly shorter when it booted? dlls/kernelbase/tests/sync.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 9f57cf7a95..f89e93261b 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -172,6 +172,31 @@ static void test_WaitOnAddress(void) ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } +static void test_Sleep(void) +{ + LARGE_INTEGER frequency; + LARGE_INTEGER t1, t2; + double elapsed_time; + BOOL ret; + int i; + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "QueryPerformanceFrequency failed\n"); + + ret = QueryPerformanceCounter(&t1); + ok(ret, "QueryPerformanceCounter failed\n"); + + for (i = 0; i < 100; i++) { + Sleep(1); + } + + ret = QueryPerformanceCounter(&t2); + ok(ret, "QueryPerformanceCounter failed\n"); + + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; + todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 2.1, "got %f\n", elapsed_time); +} + START_TEST(sync) { HMODULE hmod; @@ -186,4 +211,5 @@ START_TEST(sync) pWakeByAddressSingle = (void *)GetProcAddress(hmod, "WakeByAddressSingle"); test_WaitOnAddress(); + test_Sleep(); } -- 2.27.0

2 1

[PATCH v2] CMD: Always keep drive letter uppercase.
by Gareth Poole 08 Aug '20

08 Aug '20

Windows and DOS before it has always kept the drive letter in uppercase at the command line, regardless of what input it is given. Since drive letters are case-insensitive this should not affect path resolution, but it is more consistent with both the behaviour of Windows, and the behaviour that Wine CMD already displays with directory names, which it shows in their canonical case. Signed-off-by: Gareth Poole <girpoole(a)gmail.com> --- programs/cmd/wcmdmain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 97cc607a64..a442046cea 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -392,12 +392,14 @@ static void WCMD_show_prompt (BOOL newLine) { break; case 'N': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + curdir[0] = toupper(curdir[0]); if (status) { *q++ = curdir[0]; } break; case 'P': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + curdir[0] = toupper(curdir[0]); if (status) { lstrcatW (q, curdir); while (*q) q++; @@ -1384,6 +1386,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCHAR envvar[5]; WCHAR dir[MAX_PATH]; + cmd[0] = toupper(cmd[0]); /* Ignore potential garbage on the same line */ cmd[2]=0x00; -- 2.27.0

1 0

[PATCH] CMD: Always keep drive letter uppercase.
by Gareth Poole 08 Aug '20

08 Aug '20

Windows and DOS before it has always kept the drive letter in uppercase at the command line, regardless of what input it is given. Since paths are case-insensitive this should not affect path resolution, but it is more consistent with bothe behaviour of Windows, and the behaviour that Wine CMD already displays with directory names. Signed-off-by: Gareth Poole <girpoole(a)gmail.com> --- programs/cmd/wcmdmain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 97cc607a64..5f5f65fe34 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -392,12 +392,20 @@ static void WCMD_show_prompt (BOOL newLine) { break; case 'N': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + /* No need to worry about surrogates here, because all possible */ + /* drive letters are in the BMP. */ + if (IsCharAlphaW(curdir[0])) { /* Check if the path begins with a drive letter. */ + curdir[0] = toupper(curdir[0]); /* Ensure that the drive letter is shown in uppercase. */ + } if (status) { *q++ = curdir[0]; } break; case 'P': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + if (IsCharAlphaW(curdir[0])) { + curdir[0] = toupper(curdir[0]); + } if (status) { lstrcatW (q, curdir); while (*q) q++; @@ -1383,7 +1391,9 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, (!cmd[2] || cmd[2] == ' ' || cmd[2] == '\t')) { WCHAR envvar[5]; WCHAR dir[MAX_PATH]; - + /* Make sure that the working directory is set to the */ + /* canonical uppercase version of the drive letter. */ + cmd[0] = toupper(cmd[0]); /* Ignore potential garbage on the same line */ cmd[2]=0x00; -- 2.27.0

2 1

[PATCH vkd3d] vkd3d-shader: Make VKD3D_SHADER_SWIZZLE more legible.
by Zebediah Figura 08 Aug '20

08 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++-------- libs/vkd3d-shader/dxbc.c | 3 +-- libs/vkd3d/state.c | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7c7b727..88eca85 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -818,14 +818,12 @@ struct vkd3d_shader_signature #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ - (((x & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ - | ((y & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ - | ((z & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ - | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) - -#define VKD3D_SHADER_NO_SWIZZLE \ - VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_Y, \ - VKD3D_SHADER_SWIZZLE_Z, VKD3D_SHADER_SWIZZLE_W) + (((VKD3D_SHADER_SWIZZLE_ ## x) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## y) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## z) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## w) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) + +#define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) typedef void (*PFN_vkd3d_shader_free_blob_data)(void *); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1aa8a5c..81c1f48 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1669,8 +1669,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * { case VKD3D_SM4_SWIZZLE_NONE: if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X); + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); else src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; break; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 449f242..a64d17f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1971,8 +1971,7 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) { if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) - return VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_W, VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_Y, VKD3D_SHADER_SWIZZLE_Z); + return VKD3D_SHADER_SWIZZLE(W, X, Y, Z); return VKD3D_SHADER_NO_SWIZZLE; } -- 2.27.0

2 1

RE: Re: dispinterface/custdata typelib conformance
by Puetz Kevin A 07 Aug '20

07 Aug '20

> > Kind of a long series, but with the generated code in tests/typelib.c > > I found squashing much more made it difficult to keep straight, which > > presumably would make reviewing it hard too. > > Generally it's better just to send a few patches at a time (5 is a good > number), in particular just by waiting to send the rest rather than trying to > squash anything. Yeah, but if I just withheld the conclusion a reviewer couldn't see the conformance tests which demonstrate the changes match windows. Or, in v1, pointed out it didn't on x64 (oops!). I agree a series this long is not ideal and won't make a habit of it. It's perfectly fine if the review/merge is taken in smaller chunks, and that's why I included a cover letter pointing out 6/13 and 11/13 as reasonable spots to pause/split it at. The fixes are pretty independent, but the for-loop shape of test_dump_typelib doesn't lend itself to using todo_wine to suppress individual failures. And you said failing tests first, followed by subsequent fixes to make them pass, was not OK because it breaks bisecting (a reasonable objection). Which added up to a long series fixing multiple gaps in oleaut32/widl that all had to work before there could be coverage added to test_tlb.idl

1 0

dispinterface/custdata typelib conformance
by Kevin Puetz 07 Aug '20

07 Aug '20

v3 should hopefully make Marvin happier. Thanks to zf on IRC for pointing out he won't understand just a two updated (v2) patches... Changes from v1: - Fix a misplaced hunk (rebase error in splitting things for review) that caused build failures with patches 07/13 to 12/13 Changes from v2: - additional fix in widl: set oInst=0 (offset in instance) for union fields (existing bug exposed now that test_dump_typelib tests GetVarDesc) - skip verification of struct field VARDESC::oInst when test_tlb is a different syskind than the info[] dump in tests/typelib.c Such differences are real, but plausibly legitimate. - Fix a few tabs and // comments that I missed (sorry!) Kind of a long series, but with the generated code in tests/typelib.c I found squashing much more made it difficult to keep straight, which presumably would make reviewing it hard too. Kevin Puetz (13): oleaut32/tests: reformat test_dump_typelib. oleaut32/tests: Fix expect_wstr_acpval(...,NULL). widl: all VARDESC fields of TKIND_UNION should have oInst=0. oleaut32/tests: Cover GetVarDesc in test_dump_typelib. oleaut32/tests: Include [dual] interface in test_dump_typelib oleaut32: Fix rewriting FUNCDESC to FUNC_DISPATCH. (reasonable stopping point, if you'd prefer to review/apply in steps) At this point VARDESC and FUNCDESC should work correctly oleaut32/tests: Cover Get*CustData in test_dump_typelib. widl: remove duplicate '\n\n' in midl_info_guid. widl: parse attribute custom(guid,expr). widl: write ATTR_CUSTOM into typelib. widl: Allow adding the same custdata GUID multiple times in a typelib. (reasonable stopping point, though the widl stuff isn't being tested yet) oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. oleaut32: Load GetVarCustData from MSFT-format typelib. (complete!) dlls/oleaut32/tests/test_tlb.idl | 86 +- dlls/oleaut32/tests/typelib.c | 1867 +++++++++++++++++++++++++++--- dlls/oleaut32/typelib.c | 106 +- tools/widl/parser.l | 2 +- tools/widl/parser.y | 18 + tools/widl/widltypes.h | 7 + tools/widl/write_msft.c | 101 +- 7 files changed, 1978 insertions(+), 209 deletions(-) Range-diff: 1: 254a899e9f = 1: 2fee51637f oleaut32/tests: reformat test_dump_typelib. 2: 9976043e87 = 2: e4aae946f6 oleaut32/tests: Fix expect_wstr_acpval(...,NULL). 3: 60e1f39d8c ! 3: 37e95834fb widl: fix uninitialized field in VARDESC. @@ Metadata Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> ## Commit message ## - widl: fix uninitialized field in VARDESC. + widl: all VARDESC fields of TKIND_UNION should have oInst=0. + + Also fix uninitialized value in this field for TKIND_DISPATCH. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- - This was just writing the 0x55555555 from xmalloc + TKIND_UNION previously wrote var_datawidth like TKIND_STRUCT does. + But a union's datawidth is the max of the fields, not the sum-so-far, + so this described each field as starting just past the end of the union, + + TKIND_DISPATCH was just writing the 0x55555555 from xmalloc The field seems to be unused for VAR_DISPATCH, - but was 0 in the typelibs I had to check (which seems reasonable) + but was 0 in other (non-widl) typelib files I checked, + which seems like a reasonable "reserved" value. ## tools/widl/write_msft.c ## @@ tools/widl/write_msft.c: static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) + typeinfo->datawidth += var_datawidth; + break; + case TKIND_UNION: +- typedata[4] = typeinfo->datawidth; ++ typedata[4] = 0; + typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth); break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ 4: 54ab34c62a ! 4: 93cb7fc54a oleaut32/tests: Cover GetVarDesc in test_dump_typelib. @@ dlls/oleaut32/tests/typelib.c: typedef struct _type_info + var_info vars[20]; } type_info; ++static const SYSKIND info_syskind = SYS_WIN32; static const type_info info[] = { -@@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + /*** Autogenerated data. Do not edit, change the generator above instead. ***/ + { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + }, + { + /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, -+ { .oInst = 4 }, ++ { .oInst = 0 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + }, + { + /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, -+ { .oInst = 4 }, ++ { .oInst = 0 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + int iface, func, var; VARIANT v; HRESULT hr; ++ TLIBATTR *libattr; + ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); ++ ++ ole_check(ITypeLib_GetLibAttr(typelib, &libattr)); ++ if(libattr->syskind != info_syskind) { ++ /* struct VARDESC::oInst may vary from changes in sizeof(void *) affecting the offset of later fields*/ ++ skip("ignoring VARDESC::oInst, (libattr->syskind expected %d got %d)\n", info_syskind, libattr->syskind); ++ } ++ + expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); + for (iface = 0; iface < ticount; iface++) + { @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version); expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + expect_null(desc->lpstrSchema); /* Reserved */ + expect_int(desc->wVarFlags, var_info->wVarFlags); + expect_int(desc->varkind, var_info->varkind); -+ if(desc->varkind == VAR_PERINSTANCE) { -+ expect_int(desc->DUMMYUNIONNAME.oInst, var_info->DUMMYUNIONNAME.oInst); ++ if (desc->varkind == VAR_PERINSTANCE) { ++ /* oInst depends on preceding field data sizes (except for unions), ++ * so it may not be valid to expect it to match info[] on other platforms */ ++ if ((libattr->syskind == info_syskind) || (typeattr->typekind == TKIND_UNION)) { ++ expect_int(desc->DUMMYUNIONNAME.oInst, var_info->DUMMYUNIONNAME.oInst); ++ } + } else if(desc->varkind == VAR_CONST) { + check_variant_info(desc->DUMMYUNIONNAME.lpvarValue, &var_info->DUMMYUNIONNAME.varValue); + } else { @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo2_Release(typeinfo2); + ITypeInfo_Release(typeinfo); + } ++ ITypeLib_ReleaseTLibAttr(typelib, libattr); + ITypeLib_Release(typelib); + } + 5: 5f81559d20 ! 5: 9ae38e1a9c oleaut32/tests: Include [dual] interface in test_dump_typelib @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) " \"%s\",\n", dump_string(name)); OLE_CHECK(ITypeLib_GetTypeInfo(lib, i, &info)); -+ if(hRefType) { -+ ITypeInfo *refInfo; -+ OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); -+ ITypeInfo_Release(info); -+ info = refInfo; -+ } ++ if(hRefType) { ++ ITypeInfo *refInfo; ++ OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); ++ ITypeInfo_Release(info); ++ info = refInfo; ++ } OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; + TLIBATTR *libattr; +@@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + skip("ignoring VARDESC::oInst, (libattr->syskind expected %d got %d)\n", info_syskind, libattr->syskind); + } - ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); - expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); - for (iface = 0; iface < ticount; iface++) + for (const type_info *ti = info; ti != info + ARRAY_SIZE(info); ++ti) @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) trace("Interface %s\n", ti->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); -+ if(hRefType) { -+ ITypeInfo *refInfo; -+ ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); -+ ITypeInfo_Release(typeinfo); -+ typeinfo = refInfo; -+ } ++ if(hRefType) { ++ ITypeInfo *refInfo; ++ ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); ++ ITypeInfo_Release(typeinfo); ++ typeinfo = refInfo; ++ } ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, &help_ctx, NULL)); expect_wstr_acpval(bstrIfName, ti->name); SysFreeString(bstrIfName); @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) ITypeInfo_Release(typeinfo); } + expect_eq(ITypeLib_GetTypeInfoCount(typelib), iface, UINT, "%d"); + ITypeLib_ReleaseTLibAttr(typelib, libattr); ITypeLib_Release(typelib); } - 6: 377c3ca32e = 6: b38819f3e2 oleaut32: Fix rewriting FUNCDESC to FUNC_DISPATCH. 7: 380f9fe194 ! 7: 5f22c13651 oleaut32/tests: Cover Get*CustData in test_dump_typelib. @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx, NULL)); printf("{\n" @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) - ITypeInfo_Release(info); - info = refInfo; - } + ITypeInfo_Release(info); + info = refInfo; + } + OLE_CHECK(ITypeInfo_QueryInterface(info, &IID_ITypeInfo2, (void**)&info2)); + OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { }, { /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, - { .oInst = 4 }, + { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { }, { /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, - { .oInst = 4 }, + { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, 8: f1c1d50ddf = 8: 1cff646dae widl: remove duplicate '\n\n' in midl_info_guid. 9: 4996692943 = 9: 67032edfaf widl: parse attribute custom(guid,expr). 10: ead252cc9e ! 10: d2bb899aa3 widl: write ATTR_CUSTOM into typelib. @@ Commit message ## tools/widl/write_msft.c ## @@ tools/widl/write_msft.c: static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, + + guidoffset = ctl2_alloc_guid(typelib, &guidentry); + if(vt == VT_BSTR) ++ /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ + write_string_value(typelib, &data_out, value); + else + write_int_value(typelib, &data_out, vt, *(int*)value); +@@ tools/widl/write_msft.c: static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } 11: 25e45884c5 ! 11: e9966f7f9f widl: Allow adding the same custdata GUID multiple times in a typelib. @@ tools/widl/write_msft.c: static void write_default_value(msft_typelib_t *typelib + hash_key = ctl2_hash_guid(guid); + guidoffset = ctl2_find_guid(typelib, hash_key, guid); + if(guidoffset == -1) { -+ // add GUID that was not already present ++ /* add GUID that was not already present */ + MSFT_GuidEntry guidentry; + guidentry.guid = *guid; @@ tools/widl/write_msft.c: static void write_default_value(msft_typelib_t *typelib - guidoffset = ctl2_alloc_guid(typelib, &guidentry); if(vt == VT_BSTR) + /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ write_string_value(typelib, &data_out, value); - else 12: c81690d967 = 12: 26fa308be5 oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. 13: 67037eec6a ! 13: 62ea698002 oleaut32: Load GetVarCustData from MSFT-format typelib. @@ dlls/oleaut32/tests/test_tlb.idl: library Test + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] -+ // FIXME: if the custom strings were identical, midl would de-duplicate them; widl writes them twice. + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } }

3 15

[PATCH] kernel32/tests: Add more GetEnvironmentVariableA/W tests.
by Gijs Vermeulen 07 Aug '20

07 Aug '20

From: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/environ.c | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3c1563a331..1f69594fcd 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -320,6 +320,68 @@ static void test_GetSetEnvironmentVariableW(void) } } +static void test_GetSetEnvironmentVariableAW(void) +{ + static const WCHAR nameW[] = {0x540D, 0x524D, 0}; + static const char name[] = "\x96\xBC\x91\x4F"; + static const WCHAR valueW[] = {0x5024, 0}; + static const char value[] = "\x92\x6C"; + WCHAR bufW[256]; + char buf[256]; + DWORD ret_size; + BOOL ret; + + if (GetACP() != 932) + { + skip("GetACP() == %d, need 932 for A/W tests\n", GetACP()); + return; + } + + /* Write W, read A */ + ret = SetEnvironmentVariableW(nameW, valueW); + ok(ret == TRUE, "SetEnvironmentVariableW failed, last error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + todo_wine ok(ret_size == lstrlenA(value) + 1, "expected ret_size %d, got %d\n", lstrlenA(value) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + todo_wine ok(lstrcmpA(buf, value) == 0, "expected %s, got %s\n", debugstr_a(value), debugstr_a(buf)); + todo_wine ok(ret_size == lstrlenA(value), "expected ret_size %d, got %d\n", lstrlenA(value), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + /* Write A, read A/W */ + ret = SetEnvironmentVariableA(name, value); + ok(ret == TRUE, "SetEnvironmentVariableW failed, last error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + todo_wine ok(ret_size == lstrlenA(value) + 1, "expected ret_size %d, got %d\n", lstrlenA(value) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + todo_wine ok(lstrcmpA(buf, value) == 0, "expected %s, got %s\n", debugstr_a(value), debugstr_a(buf)); + todo_wine ok(ret_size == lstrlenA(value), "expected ret_size %d, got %d\n", lstrlenA(value), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, NULL, 0); + ok(ret_size == lstrlenW(valueW) + 1, "expected ret_size %d, got %d\n", lstrlenW(valueW) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyW(bufW, L"foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, bufW, lstrlenW(valueW) + 1); + ok(ret_size == lstrlenW(valueW), "expected ret_size %d, got %d\n", lstrlenW(valueW), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrcmpW(bufW, valueW) == 0, "expected %s, got %s\n", debugstr_w(valueW), debugstr_w(bufW)); +} + static void test_ExpandEnvironmentStringsA(void) { const char* value="Long long value"; @@ -720,6 +782,7 @@ START_TEST(environ) test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); + test_GetSetEnvironmentVariableAW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); test_GetComputerNameExA(); -- 2.28.0

1 0

[PATCH] ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.
by Brendan Shanks 07 Aug '20

07 Aug '20

Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f3c76cc82b0..1ac0cb24806 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -145,7 +145,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ -- 2.26.2

1 0

[PATCH] include/msvcrt: Add stdbool.h header.
by Brendan Shanks 07 Aug '20

07 Aug '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is used by an out-of-tree patch (Proton's amd_ags_x64.dll implementation). include/msvcrt/stdbool.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/msvcrt/stdbool.h diff --git a/include/msvcrt/stdbool.h b/include/msvcrt/stdbool.h new file mode 100644 index 00000000000..7f19f374c6e --- /dev/null +++ b/include/msvcrt/stdbool.h @@ -0,0 +1,31 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_STDBOOL_H +#define __WINE_STDBOOL_H + +#ifndef __cplusplus + +#define bool _Bool +#define true 1 +#define false 0 + +#endif + +#define __bool_true_false_are_defined 1 + +#endif /* __WINE_STDBOOL_H */ -- 2.26.2

1 0

[PATCH] kernelbase: Fix GetEnvironmentVariableA with multi-byte strings.
by Gijs Vermeulen 07 Aug '20

07 Aug '20

From: Vladimir Panteleev <git(a)vladimir.panteleev.md> The previous implementation of GetEnvironmentVariableA incorrectly assumed that, after WideCharToMultiByte conversion, the resulting A string will have the same number of CHARs as the number of WCHARs in the W string. This assumption resulted in failures when querying environment variables with non-ASCII values in locales with multi-byte character pages. Address this by always retrieving the Unicode value of the variable, then measuring its length after code page conversion, and only then deciding whether it fits into the user-supplied buffer. Since we are no longer preallocating a buffer with a user-specified size, the 32767 character limit on the size parameter is removed, as it should be enforced naturally by the size of the environment block. Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/environ.c | 62 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 49 +++++++++++++++++++-------- 2 files changed, 97 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3c1563a331..de6db899c9 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -320,6 +320,67 @@ static void test_GetSetEnvironmentVariableW(void) } } +static void test_GetSetEnvironmentVariableAW(void) +{ + static const WCHAR nameW[] = {0x540D, 0x524D, 0}; + static const char name[] = "\x96\xBC\x91\x4F"; + static const WCHAR valueW[] = {0x5024, 0}; + static const char value[] = "\x92\x6C"; + WCHAR bufW[256]; + char buf[256]; + DWORD ret_size; + BOOL ret; + + if (GetACP() != 932) + { + skip("GetACP() == %d, need 932 for A/W tests\n", GetACP()); + return; + } + + /* Write W, read A */ + ret = SetEnvironmentVariableW(nameW, valueW); + ok(ret == TRUE, "unexpected error in SetEnvironmentVariableW, GetLastError=%d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) + 1, + "should return length for Shift JIS string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) && lstrcmpA(buf, value) == 0, + "should return Shift JIS string but ret_size=%d GetLastError=%d and buf=%s\n", ret_size, GetLastError(), buf); + + /* Write A, read A/W */ + ret = SetEnvironmentVariableA(name, value); + ok(ret == TRUE, "unexpected error in SetEnvironmentVariableA, GetLastError=%d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) + 1, + "should return length for Shift JIS string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) && lstrcmpA(buf, value) == 0, + "should return Shift JIS string but ret_size=%d GetLastError=%d and buf=%s\n", ret_size, GetLastError(), buf); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW) + 1, + "should return length for UTF-16 string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyW(bufW, L"foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, bufW, lstrlenW(valueW) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW), + "should return UTF-16 string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + ok_w(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW) && lstrcmpW(bufW, valueW) == 0, + "should return UTF-16 string but bufW=%s\n", bufW); +} + static void test_ExpandEnvironmentStringsA(void) { const char* value="Long long value"; @@ -720,6 +781,7 @@ START_TEST(environ) test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); + test_GetSetEnvironmentVariableAW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); test_GetComputerNameExA(); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 58fba52415..3bb309e988 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1460,33 +1460,54 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( WCHAR *env ) DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) { UNICODE_STRING us_name, us_value; - PWSTR valueW; NTSTATUS status; DWORD len, ret; - /* limit the size to sane values */ - size = min( size, 32767 ); - if (!(valueW = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return 0; + if (!RtlCreateUnicodeStringFromAsciiz( &us_name, name )) + return 0; - RtlCreateUnicodeStringFromAsciiz( &us_name, name ); + ret = 0; us_value.Length = 0; - us_value.MaximumLength = (size ? size - 1 : 0) * sizeof(WCHAR); - us_value.Buffer = valueW; - + us_value.MaximumLength = 0; + us_value.Buffer = NULL; status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); - len = us_value.Length / sizeof(WCHAR); - if (status == STATUS_BUFFER_TOO_SMALL) ret = len + 1; - else if (!set_ntstatus( status )) ret = 0; - else if (!size) ret = len + 1; + if (status != STATUS_BUFFER_TOO_SMALL && !set_ntstatus(status)) + goto cleanup; + + if (us_value.Length) + { + if (!(us_value.Buffer = HeapAlloc( GetProcessHeap(), 0, us_value.Length ))) + goto cleanup; + us_value.MaximumLength = us_value.Length; + status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); + if (!set_ntstatus( status )) + goto cleanup; + + len = WideCharToMultiByte( CP_ACP, 0, us_value.Buffer, us_value.Length / sizeof(WCHAR), + NULL, 0, NULL, NULL ); + if (!len) + goto cleanup; + } else + len = 0; /* an empty W string is always an empty A string */ + + if (len + 1 <= size) { - if (len) WideCharToMultiByte( CP_ACP, 0, valueW, len + 1, value, size, NULL, NULL ); + if (len) + { + if (!WideCharToMultiByte( CP_ACP, 0, us_value.Buffer, us_value.Length / sizeof(WCHAR), + value, len, NULL, NULL )) + goto cleanup; + } value[len] = 0; ret = len; } + else + ret = len + 1; +cleanup: + if (us_value.Buffer) HeapFree( GetProcessHeap(), 0, us_value.Buffer ); RtlFreeUnicodeString( &us_name ); - HeapFree( GetProcessHeap(), 0, valueW ); return ret; } -- 2.28.0

3 2

[PATCH] makedep: Allow system stdbool.h to be used with msvcrt.
by Brendan Shanks 07 Aug '20

07 Aug '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is used by an out-of-tree patch (Proton's amd_ags_x64.dll implementation). Also, is this correct or should an stdbool.h be added to include/msvcrt/? tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 825458156fb..179dae718cd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1560,6 +1560,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + if (!strcmp( pFile->name, "stdbool.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1); -- 2.26.2

2 1

[PATCH] dwmapi: Fix NULL access in DwmIsCompositionEnabled.
by Myah Caron 07 Aug '20

07 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/dwmapi/dwmapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0..72ff6df874 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -52,6 +52,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { static int once; + + if (!enabled) + return E_POINTER; + if (!once) { FIXME("%p\n", enabled); -- 2.27.0

2 1

[PATCH] dwmapi: Check NULL parameter in DwmIsCompositionEnabled().
by Zhiyi Zhang 07 Aug '20

07 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 190398 configure.ac | 1 + dlls/dwmapi/dwmapi_main.c | 3 +++ dlls/dwmapi/tests/Makefile.in | 5 +++++ dlls/dwmapi/tests/dwmapi.c | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 dlls/dwmapi/tests/Makefile.in create mode 100644 dlls/dwmapi/tests/dwmapi.c diff --git a/configure.ac b/configure.ac index 4ff0f9c81f7..a2a808d5ea9 100644 --- a/configure.ac +++ b/configure.ac @@ -3273,6 +3273,7 @@ WINE_CONFIG_MAKEFILE(dlls/dsuiext) WINE_CONFIG_MAKEFILE(dlls/dswave) WINE_CONFIG_MAKEFILE(dlls/dswave/tests) WINE_CONFIG_MAKEFILE(dlls/dwmapi) +WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0b..8408a2efed1 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -60,6 +60,9 @@ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) else TRACE("%p\n", enabled); + if (!enabled) + return E_INVALIDARG; + *enabled = FALSE; return S_OK; } diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in new file mode 100644 index 00000000000..5893c5e60a5 --- /dev/null +++ b/dlls/dwmapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dwmapi.dll +IMPORTS = dwmapi + +C_SRCS = \ + dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c new file mode 100644 index 00000000000..1904e283bba --- /dev/null +++ b/dlls/dwmapi/tests/dwmapi.c @@ -0,0 +1,39 @@ +/* + * Copyright 2020 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dwmapi.h" +#include "wine/test.h" + +static void test_DwmIsCompositionEnabled(void) +{ + BOOL enabled; + HRESULT hr; + + hr = DwmIsCompositionEnabled(NULL); + ok(hr == E_INVALIDARG, "Expected %#x, got %#x.\n", E_INVALIDARG, hr); + + enabled = -1; + hr = DwmIsCompositionEnabled(&enabled); + ok(hr == S_OK, "Expected %#x, got %#x.\n", S_OK, hr); + ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); +} + +START_TEST(dwmapi) +{ + test_DwmIsCompositionEnabled(); +} -- 2.25.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 07 Aug '20

07 Aug '20

1 0

[PATCH] user32/tests: Skip monitor tests with modes larger than original.
by Rémi Bernon 07 Aug '20

07 Aug '20

This seems to cause a lot of timeouts on the testbot, for some reason. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Clearly this is not ideal, but it looks like the timeouts weren't completely fixed by the update. In particular the 32bit runs are still failing. dlls/user32/tests/monitor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 85fb2f080a7..3809221f76c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -627,6 +627,12 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + if (dm.dmPelsWidth > devices[0].original_mode.dmPelsWidth || dm.dmPelsHeight > devices[0].original_mode.dmPelsHeight) + { + trace("skipping display mode %s %dx%d@%d\n", devices[device].name, dm.dmPelsWidth, dm.dmPelsHeight, dm.dmDisplayFrequency); + continue; + } + dm.dmPosition = position; dm.dmFields |= DM_POSITION; res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); -- 2.27.0

2 3

[PATCH v5] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 64 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..30432378cfa 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -19,6 +19,7 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -29,6 +30,9 @@ typedef struct IDirectMusicTimeSigTrack { IDirectMusicTrack IDirectMusicTrack_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + DMUS_IO_TIMESIGNATURE_ITEM *items; + unsigned int count; } IDirectMusicTimeSigTrack; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ @@ -37,6 +41,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -77,6 +86,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + heap_free(This->items); HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -207,10 +217,60 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + int i; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TIMESIGNATURE_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) + { + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); + TRACE(" - bBeat %d\n", This->items[i].bBeat); + TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); + } + + return S_OK; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

2 1

[PATCH] configure: Add an option to disable QuickTime support.
by Gijs Vermeulen 07 Aug '20

07 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 4ff0f9c81f..0f4b0b817a 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) +AC_ARG_WITH(quicktime, AS_HELP_STRING([--without-quicktime],[do not use QuickTime support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) @@ -830,24 +831,28 @@ case $host_os in AC_CHECK_FUNCS(IOHIDManagerCreate) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" - then - dnl Make sure we can actually use the QuickTime framework - ac_save_LIBS="$LIBS" - LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" - AC_MSG_CHECKING([for the QuickTime framework]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], - [AC_MSG_RESULT([yes]) - AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") - enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], - [AC_MSG_RESULT([no]) - ac_cv_header_QuickTime_ImageCompression_h=no]) - LIBS="$ac_save_LIBS" - fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + + dnl *** Check for QuickTime *** + if test "x$with_quicktime" != "xno" then - WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) + if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + then + dnl Make sure we can actually use the QuickTime framework + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + AC_MSG_CHECKING([for the QuickTime framework]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], + [AC_MSG_RESULT([yes]) + AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], + [AC_MSG_RESULT([no]) + ac_cv_header_QuickTime_ImageCompression_h=no]) + LIBS="$ac_save_LIBS" + fi fi + WINE_NOTICE_WITH(quicktime,[test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"], + [QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) + if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBON_LIBS,"-framework Carbon") -- 2.28.0

1 0

[PATCH v3 1/2] include: Add d3d12 reflection structures.
by Paul Gofman 07 Aug '20

07 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - fix D3D_PF_FORCE_DWORD. include/Makefile.in | 1 + include/d3d12shader.idl | 185 ++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 20 +++++ include/d3dcompiler.h | 1 + 4 files changed, 207 insertions(+) create mode 100644 include/d3d12shader.idl diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7ae..1713f0b6279 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -109,6 +109,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12shader.idl \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl new file mode 100644 index 00000000000..2ec49c058d8 --- /dev/null +++ b/include/d3d12shader.idl @@ -0,0 +1,185 @@ +/* + * Copyright 2020 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "d3dcommon.idl"; + +typedef struct _D3D12_SHADER_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D12_SHADER_DESC; + +typedef struct _D3D12_SHADER_VARIABLE_DESC +{ + const char *Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + void *DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D12_SHADER_VARIABLE_DESC; + +typedef struct _D3D12_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + const char *Name; +} D3D12_SHADER_TYPE_DESC; + +typedef struct _D3D12_SHADER_BUFFER_DESC +{ + const char *Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D12_SHADER_BUFFER_DESC; + +typedef struct _D3D12_SHADER_INPUT_BIND_DESC +{ + const char *Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; + UINT Space; + UINT uID; +} D3D12_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D12_SIGNATURE_PARAMETER_DESC +{ + const char *SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; + D3D_MIN_PRECISION MinPrecision; +} D3D12_SIGNATURE_PARAMETER_DESC; + +typedef struct _D3D12_PARAMETER_DESC +{ + const char *Name; + const char *SemanticName; + D3D_SHADER_VARIABLE_TYPE Type; + D3D_SHADER_VARIABLE_CLASS Class; + UINT Rows; + UINT Columns; + D3D_INTERPOLATION_MODE InterpolationMode; + D3D_PARAMETER_FLAGS Flags; + UINT FirstInRegister; + UINT FirstInComponent; + UINT FirstOutRegister; + UINT FirstOutComponent; +} D3D12_PARAMETER_DESC; + +typedef struct _D3D12_FUNCTION_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT MovInstructionCount; + UINT MovcInstructionCount; + UINT ConversionInstructionCount; + UINT BitwiseInstructionCount; + D3D_FEATURE_LEVEL MinFeatureLevel; + UINT64 RequiredFeatureFlags; + const char *Name; + INT FunctionParameterCount; + BOOL HasReturn; + BOOL Has10Level9VertexShader; + BOOL Has10Level9PixelShader; +} D3D12_FUNCTION_DESC; + +typedef struct _D3D12_LIBRARY_DESC +{ + const char *Creator; + UINT Flags; + UINT FunctionCount; +} D3D12_LIBRARY_DESC; + diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 29404efd69d..7d1c0d25cf3 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -686,4 +686,24 @@ typedef enum _D3D_SHADER_CBUFFER_FLAGS D3D_CBF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_CBUFFER_FLAGS; +typedef enum _D3D_PARAMETER_FLAGS +{ + D3D_PF_NONE, + D3D_PF_IN, + D3D_PF_OUT, + D3D_PF_FORCE_DWORD = 0x7fffffff +} D3D_PARAMETER_FLAGS; + +typedef enum _D3D_INTERPOLATION_MODE +{ + D3D_INTERPOLATION_UNDEFINED, + D3D_INTERPOLATION_CONSTANT, + D3D_INTERPOLATION_LINEAR, + D3D_INTERPOLATION_LINEAR_CENTROID, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID, + D3D_INTERPOLATION_LINEAR_SAMPLE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE, +} D3D_INTERPOLATION_MODE; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);") diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index bd1b3d1d44d..f11251e9dbf 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -20,6 +20,7 @@ #define __D3DCOMPILER_H__ #include "d3d11shader.h" +#include "d3d12shader.h" #ifdef __cplusplus extern "C" { -- 2.26.2

2 3

[PATCH vkd3d v2] build: Clean widl generated headers if building with widl.
by Zebediah Figura 07 Aug '20

07 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix the patch to actually work... This patch can be easily ignored... Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 8b8bfca..76483d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -214,6 +214,9 @@ vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@) vkd3d_v_widl_0 = @echo " WIDL " $@; vkd3d_v_widl_1 = +if HAVE_WIDL +CLEANFILES += $(widl_headers) +endif EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL -- 2.27.0

2 1

[PATCH v2 1/2] include: Add d3d12 reflection structures.
by Paul Gofman 07 Aug '20

07 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - convert to IDL; - fix _D3D_INTERPOLATION_MODE style issue. include/Makefile.in | 1 + include/d3d12shader.idl | 185 ++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 20 +++++ include/d3dcompiler.h | 1 + 4 files changed, 207 insertions(+) create mode 100644 include/d3d12shader.idl diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7ae..1713f0b6279 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -109,6 +109,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12shader.idl \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl new file mode 100644 index 00000000000..2ec49c058d8 --- /dev/null +++ b/include/d3d12shader.idl @@ -0,0 +1,185 @@ +/* + * Copyright 2020 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "d3dcommon.idl"; + +typedef struct _D3D12_SHADER_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D12_SHADER_DESC; + +typedef struct _D3D12_SHADER_VARIABLE_DESC +{ + const char *Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + void *DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D12_SHADER_VARIABLE_DESC; + +typedef struct _D3D12_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + const char *Name; +} D3D12_SHADER_TYPE_DESC; + +typedef struct _D3D12_SHADER_BUFFER_DESC +{ + const char *Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D12_SHADER_BUFFER_DESC; + +typedef struct _D3D12_SHADER_INPUT_BIND_DESC +{ + const char *Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; + UINT Space; + UINT uID; +} D3D12_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D12_SIGNATURE_PARAMETER_DESC +{ + const char *SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; + D3D_MIN_PRECISION MinPrecision; +} D3D12_SIGNATURE_PARAMETER_DESC; + +typedef struct _D3D12_PARAMETER_DESC +{ + const char *Name; + const char *SemanticName; + D3D_SHADER_VARIABLE_TYPE Type; + D3D_SHADER_VARIABLE_CLASS Class; + UINT Rows; + UINT Columns; + D3D_INTERPOLATION_MODE InterpolationMode; + D3D_PARAMETER_FLAGS Flags; + UINT FirstInRegister; + UINT FirstInComponent; + UINT FirstOutRegister; + UINT FirstOutComponent; +} D3D12_PARAMETER_DESC; + +typedef struct _D3D12_FUNCTION_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT MovInstructionCount; + UINT MovcInstructionCount; + UINT ConversionInstructionCount; + UINT BitwiseInstructionCount; + D3D_FEATURE_LEVEL MinFeatureLevel; + UINT64 RequiredFeatureFlags; + const char *Name; + INT FunctionParameterCount; + BOOL HasReturn; + BOOL Has10Level9VertexShader; + BOOL Has10Level9PixelShader; +} D3D12_FUNCTION_DESC; + +typedef struct _D3D12_LIBRARY_DESC +{ + const char *Creator; + UINT Flags; + UINT FunctionCount; +} D3D12_LIBRARY_DESC; + diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 29404efd69d..198f971bdbf 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -686,4 +686,24 @@ typedef enum _D3D_SHADER_CBUFFER_FLAGS D3D_CBF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_CBUFFER_FLAGS; +typedef enum _D3D_PARAMETER_FLAGS +{ + D3D_PF_NONE, + D3D_PF_IN, + D3D_PF_OUT, + D3D_PF_FORCE_DWORD, +} D3D_PARAMETER_FLAGS; + +typedef enum _D3D_INTERPOLATION_MODE +{ + D3D_INTERPOLATION_UNDEFINED, + D3D_INTERPOLATION_CONSTANT, + D3D_INTERPOLATION_LINEAR, + D3D_INTERPOLATION_LINEAR_CENTROID, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID, + D3D_INTERPOLATION_LINEAR_SAMPLE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE, +} D3D_INTERPOLATION_MODE; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);") diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index bd1b3d1d44d..f11251e9dbf 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -20,6 +20,7 @@ #define __D3DCOMPILER_H__ #include "d3d11shader.h" +#include "d3d12shader.h" #ifdef __cplusplus extern "C" { -- 2.26.2

2 2

[PATCH 7/7] winapi_test: Minor $pointer_size check consistency tweak.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 12e35cf..749319c 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -418,7 +418,7 @@ foreach my $file (@files) { } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { - push @ifdefs, ($pointer_size == 4); + push @ifdefs, ($pointer_size != 8); } elsif ($preprocessor =~ /^\#\s*elif\s+defined$_WIN64$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { -- 2.10.0.windows.1

2 1

[PATCH 6/7] winapi_test: Restore horizontal alignment of macro defines.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- dlls/gdi32/tests/generated.c | 10 +++++----- dlls/kernel32/tests/generated.c | 10 +++++----- dlls/ntdll/tests/generated.c | 10 +++++----- dlls/rpcrt4/tests/generated.c | 10 +++++----- dlls/shell32/tests/generated.c | 10 +++++----- dlls/shlwapi/tests/generated.c | 10 +++++----- dlls/urlmon/tests/generated.c | 10 +++++----- dlls/user32/tests/generated.c | 10 +++++----- dlls/wininet/tests/generated.c | 10 +++++----- dlls/winmm/tests/generated.c | 10 +++++----- tools/winapi/winapi_test | 10 +++++----- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index fe3ecd9..6b00060 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -47,23 +47,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 7606580..9c83ec6 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -47,23 +47,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index e51ce27..bf705a4 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -47,23 +47,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 7dd5968..fe8bc4b 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -53,23 +53,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 4a1a5b9..34626c2 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -54,23 +54,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index 3a8e426..0b9f109 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -52,23 +52,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 45fd5d8..6495949 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -50,23 +50,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index be1b698..7f6325f 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -47,23 +47,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index aec942c..39a34f7 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -51,23 +51,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index 78051c6..ccc0d20 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -49,23 +49,23 @@ * Test helper macros */ -#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); +#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size); #ifdef TYPE_ALIGNMENT -# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); +# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align); #else # define TEST_TYPE_ALIGN(type, align) #endif #ifdef _TYPE_ALIGNMENT -# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); -# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); +# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align); +# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align); #else # define TEST_TARGET_ALIGN(type, align) # define TEST_FIELD_ALIGN(type, field, align) #endif -#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); +#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset); #define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size) #define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 05fdace..12e35cf 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -566,23 +566,23 @@ sub output_header($$$) { print OUT " * Test helper macros\n"; print OUT " */\n"; print OUT "\n"; - print OUT "#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size);\n"; + print OUT "#define TEST_TYPE_SIZE(type, size) C_ASSERT(sizeof(type) == size);\n"; print OUT "\n"; print OUT "#ifdef TYPE_ALIGNMENT\n"; - print OUT "# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align);\n"; + print OUT "# define TEST_TYPE_ALIGN(type, align) C_ASSERT(TYPE_ALIGNMENT(type) == align);\n"; print OUT "#else\n"; print OUT "# define TEST_TYPE_ALIGN(type, align)\n"; print OUT "#endif\n"; print OUT "\n"; print OUT "#ifdef _TYPE_ALIGNMENT\n"; - print OUT "# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align);\n"; - print OUT "# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align);\n"; + print OUT "# define TEST_TARGET_ALIGN(type, align) C_ASSERT(_TYPE_ALIGNMENT(*(type)0) == align);\n"; + print OUT "# define TEST_FIELD_ALIGN(type, field, align) C_ASSERT(_TYPE_ALIGNMENT(((type*)0)->field) == align);\n"; print OUT "#else\n"; print OUT "# define TEST_TARGET_ALIGN(type, align)\n"; print OUT "# define TEST_FIELD_ALIGN(type, field, align)\n"; print OUT "#endif\n"; print OUT "\n"; - print OUT "#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset);\n"; + print OUT "#define TEST_FIELD_OFFSET(type, field, offset) C_ASSERT(FIELD_OFFSET(type, field) == offset);\n"; print OUT "\n"; print OUT "#define TEST_TARGET_SIZE(type, size) TEST_TYPE_SIZE(*(type)0, size)\n"; print OUT "#define TEST_FIELD_SIZE(type, field, size) TEST_TYPE_SIZE((((type*)0)->field), size)\n"; -- 2.10.0.windows.1

2 1

[PATCH 5/7] winapi_test: '* long *' is 4 bytes, not pointer size.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix _WIN64 case. Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- tools/winapi/winapi_test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 09c6614..05fdace 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -231,9 +231,9 @@ sub _find_align_kind_size($) { $kind = "float"; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { - $align = $pointer_size; + $align = 4; $kind = defined($1) ? $1 : "signed"; - $size = $pointer_size; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; -- 2.10.0.windows.1

2 1

[PATCH 4/7] winapi_test: Escape parentheses in regexp.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix parsing related to a few *_PTR types from basetsd.h. Addendum to 6b11a3c3f81d7db3794f3320eeaef8001cc99b74. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 4a0a396..09c6614 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { push @ifdefs, ($pointer_size == 4); - } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + } elsif ($preprocessor =~ /^\#\s*elif\s+defined$_WIN64$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { push @ifdefs, 2; -- 2.10.0.windows.1

2 1

[PATCH 3/7] winapi_test: Horizontally align TEST_TYPE_SIGNED() parameter.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> --- Addendum to 5554838292c0c4eb34158e570bc8509e66f6a428. --- dlls/ntdll/tests/generated.c | 60 +++++++++++++++++++++--------------------- dlls/shell32/tests/generated.c | 4 +-- dlls/wininet/tests/generated.c | 4 +-- tools/winapi/winapi_test | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index d277e02..e51ce27 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -101,7 +101,7 @@ static void test_pack_HALF_PTR(void) /* HALF_PTR */ TEST_TYPE_SIZE (HALF_PTR, 4) TEST_TYPE_ALIGN (HALF_PTR, 4) - TEST_TYPE_SIGNED(HALF_PTR) + TEST_TYPE_SIGNED (HALF_PTR) } static void test_pack_INT16(void) @@ -109,7 +109,7 @@ static void test_pack_INT16(void) /* INT16 */ TEST_TYPE_SIZE (INT16, 2) TEST_TYPE_ALIGN (INT16, 2) - TEST_TYPE_SIGNED(INT16) + TEST_TYPE_SIGNED (INT16) } static void test_pack_INT32(void) @@ -117,7 +117,7 @@ static void test_pack_INT32(void) /* INT32 */ TEST_TYPE_SIZE (INT32, 4) TEST_TYPE_ALIGN (INT32, 4) - TEST_TYPE_SIGNED(INT32) + TEST_TYPE_SIGNED (INT32) } static void test_pack_INT64(void) @@ -125,7 +125,7 @@ static void test_pack_INT64(void) /* INT64 */ TEST_TYPE_SIZE (INT64, 8) TEST_TYPE_ALIGN (INT64, 8) - TEST_TYPE_SIGNED(INT64) + TEST_TYPE_SIGNED (INT64) } static void test_pack_INT8(void) @@ -133,7 +133,7 @@ static void test_pack_INT8(void) /* INT8 */ TEST_TYPE_SIZE (INT8, 1) TEST_TYPE_ALIGN (INT8, 1) - TEST_TYPE_SIGNED(INT8) + TEST_TYPE_SIGNED (INT8) } static void test_pack_INT_PTR(void) @@ -141,7 +141,7 @@ static void test_pack_INT_PTR(void) /* INT_PTR */ TEST_TYPE_SIZE (INT_PTR, 8) TEST_TYPE_ALIGN (INT_PTR, 8) - TEST_TYPE_SIGNED(INT_PTR) + TEST_TYPE_SIGNED (INT_PTR) } static void test_pack_LONG32(void) @@ -149,7 +149,7 @@ static void test_pack_LONG32(void) /* LONG32 */ TEST_TYPE_SIZE (LONG32, 4) TEST_TYPE_ALIGN (LONG32, 4) - TEST_TYPE_SIGNED(LONG32) + TEST_TYPE_SIGNED (LONG32) } static void test_pack_LONG64(void) @@ -157,7 +157,7 @@ static void test_pack_LONG64(void) /* LONG64 */ TEST_TYPE_SIZE (LONG64, 8) TEST_TYPE_ALIGN (LONG64, 8) - TEST_TYPE_SIGNED(LONG64) + TEST_TYPE_SIGNED (LONG64) } static void test_pack_LONG_PTR(void) @@ -165,7 +165,7 @@ static void test_pack_LONG_PTR(void) /* LONG_PTR */ TEST_TYPE_SIZE (LONG_PTR, 8) TEST_TYPE_ALIGN (LONG_PTR, 8) - TEST_TYPE_SIGNED(LONG_PTR) + TEST_TYPE_SIGNED (LONG_PTR) } static void test_pack_SIZE_T(void) @@ -1738,7 +1738,7 @@ static void test_pack_LONG(void) /* LONG */ TEST_TYPE_SIZE (LONG, 4) TEST_TYPE_ALIGN (LONG, 4) - TEST_TYPE_SIGNED(LONG) + TEST_TYPE_SIGNED (LONG) } static void test_pack_LONGLONG(void) @@ -1746,7 +1746,7 @@ static void test_pack_LONGLONG(void) /* LONGLONG */ TEST_TYPE_SIZE (LONGLONG, 8) TEST_TYPE_ALIGN (LONGLONG, 8) - TEST_TYPE_SIGNED(LONGLONG) + TEST_TYPE_SIGNED (LONGLONG) } static void test_pack_LUID(void) @@ -2896,7 +2896,7 @@ static void test_pack_SHORT(void) /* SHORT */ TEST_TYPE_SIZE (SHORT, 2) TEST_TYPE_ALIGN (SHORT, 2) - TEST_TYPE_SIGNED(SHORT) + TEST_TYPE_SIGNED (SHORT) } static void test_pack_SID(void) @@ -3117,7 +3117,7 @@ static void test_pack_BOOL(void) /* BOOL */ TEST_TYPE_SIZE (BOOL, 4) TEST_TYPE_ALIGN (BOOL, 4) - TEST_TYPE_SIGNED(BOOL) + TEST_TYPE_SIGNED (BOOL) } static void test_pack_BYTE(void) @@ -3177,7 +3177,7 @@ static void test_pack_HFILE(void) /* HFILE */ TEST_TYPE_SIZE (HFILE, 4) TEST_TYPE_ALIGN (HFILE, 4) - TEST_TYPE_SIGNED(HFILE) + TEST_TYPE_SIGNED (HFILE) } static void test_pack_HGDIOBJ(void) @@ -3213,7 +3213,7 @@ static void test_pack_INT(void) /* INT */ TEST_TYPE_SIZE (INT, 4) TEST_TYPE_ALIGN (INT, 4) - TEST_TYPE_SIGNED(INT) + TEST_TYPE_SIGNED (INT) } static void test_pack_LOCALHANDLE(void) @@ -3518,7 +3518,7 @@ static void test_pack_HALF_PTR(void) /* HALF_PTR */ TEST_TYPE_SIZE (HALF_PTR, 2) TEST_TYPE_ALIGN (HALF_PTR, 2) - TEST_TYPE_SIGNED(HALF_PTR) + TEST_TYPE_SIGNED (HALF_PTR) } static void test_pack_INT16(void) @@ -3526,7 +3526,7 @@ static void test_pack_INT16(void) /* INT16 */ TEST_TYPE_SIZE (INT16, 2) TEST_TYPE_ALIGN (INT16, 2) - TEST_TYPE_SIGNED(INT16) + TEST_TYPE_SIGNED (INT16) } static void test_pack_INT32(void) @@ -3534,7 +3534,7 @@ static void test_pack_INT32(void) /* INT32 */ TEST_TYPE_SIZE (INT32, 4) TEST_TYPE_ALIGN (INT32, 4) - TEST_TYPE_SIGNED(INT32) + TEST_TYPE_SIGNED (INT32) } static void test_pack_INT64(void) @@ -3542,7 +3542,7 @@ static void test_pack_INT64(void) /* INT64 */ TEST_TYPE_SIZE (INT64, 8) TEST_TYPE_ALIGN (INT64, 8) - TEST_TYPE_SIGNED(INT64) + TEST_TYPE_SIGNED (INT64) } static void test_pack_INT8(void) @@ -3550,7 +3550,7 @@ static void test_pack_INT8(void) /* INT8 */ TEST_TYPE_SIZE (INT8, 1) TEST_TYPE_ALIGN (INT8, 1) - TEST_TYPE_SIGNED(INT8) + TEST_TYPE_SIGNED (INT8) } static void test_pack_INT_PTR(void) @@ -3558,7 +3558,7 @@ static void test_pack_INT_PTR(void) /* INT_PTR */ TEST_TYPE_SIZE (INT_PTR, 4) TEST_TYPE_ALIGN (INT_PTR, 4) - TEST_TYPE_SIGNED(INT_PTR) + TEST_TYPE_SIGNED (INT_PTR) } static void test_pack_LONG32(void) @@ -3566,7 +3566,7 @@ static void test_pack_LONG32(void) /* LONG32 */ TEST_TYPE_SIZE (LONG32, 4) TEST_TYPE_ALIGN (LONG32, 4) - TEST_TYPE_SIGNED(LONG32) + TEST_TYPE_SIGNED (LONG32) } static void test_pack_LONG64(void) @@ -3574,7 +3574,7 @@ static void test_pack_LONG64(void) /* LONG64 */ TEST_TYPE_SIZE (LONG64, 8) TEST_TYPE_ALIGN (LONG64, 8) - TEST_TYPE_SIGNED(LONG64) + TEST_TYPE_SIGNED (LONG64) } static void test_pack_LONG_PTR(void) @@ -3582,7 +3582,7 @@ static void test_pack_LONG_PTR(void) /* LONG_PTR */ TEST_TYPE_SIZE (LONG_PTR, 4) TEST_TYPE_ALIGN (LONG_PTR, 4) - TEST_TYPE_SIGNED(LONG_PTR) + TEST_TYPE_SIGNED (LONG_PTR) } static void test_pack_SIZE_T(void) @@ -5155,7 +5155,7 @@ static void test_pack_LONG(void) /* LONG */ TEST_TYPE_SIZE (LONG, 4) TEST_TYPE_ALIGN (LONG, 4) - TEST_TYPE_SIGNED(LONG) + TEST_TYPE_SIGNED (LONG) } static void test_pack_LONGLONG(void) @@ -5163,7 +5163,7 @@ static void test_pack_LONGLONG(void) /* LONGLONG */ TEST_TYPE_SIZE (LONGLONG, 8) TEST_TYPE_ALIGN (LONGLONG, 8) - TEST_TYPE_SIGNED(LONGLONG) + TEST_TYPE_SIGNED (LONGLONG) } static void test_pack_LUID(void) @@ -6313,7 +6313,7 @@ static void test_pack_SHORT(void) /* SHORT */ TEST_TYPE_SIZE (SHORT, 2) TEST_TYPE_ALIGN (SHORT, 2) - TEST_TYPE_SIGNED(SHORT) + TEST_TYPE_SIGNED (SHORT) } static void test_pack_SID(void) @@ -6534,7 +6534,7 @@ static void test_pack_BOOL(void) /* BOOL */ TEST_TYPE_SIZE (BOOL, 4) TEST_TYPE_ALIGN (BOOL, 4) - TEST_TYPE_SIGNED(BOOL) + TEST_TYPE_SIGNED (BOOL) } static void test_pack_BYTE(void) @@ -6594,7 +6594,7 @@ static void test_pack_HFILE(void) /* HFILE */ TEST_TYPE_SIZE (HFILE, 4) TEST_TYPE_ALIGN (HFILE, 4) - TEST_TYPE_SIGNED(HFILE) + TEST_TYPE_SIGNED (HFILE) } static void test_pack_HGDIOBJ(void) @@ -6630,7 +6630,7 @@ static void test_pack_INT(void) /* INT */ TEST_TYPE_SIZE (INT, 4) TEST_TYPE_ALIGN (INT, 4) - TEST_TYPE_SIGNED(INT) + TEST_TYPE_SIGNED (INT) } static void test_pack_LOCALHANDLE(void) diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 55f4eab..4a1a5b9 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -485,7 +485,7 @@ static void test_pack_VARIANT_BOOL(void) /* VARIANT_BOOL */ TEST_TYPE_SIZE (VARIANT_BOOL, 2) TEST_TYPE_ALIGN (VARIANT_BOOL, 2) - TEST_TYPE_SIGNED(VARIANT_BOOL) + TEST_TYPE_SIGNED (VARIANT_BOOL) } static void test_pack_VARTYPE(void) @@ -2303,7 +2303,7 @@ static void test_pack_VARIANT_BOOL(void) /* VARIANT_BOOL */ TEST_TYPE_SIZE (VARIANT_BOOL, 2) TEST_TYPE_ALIGN (VARIANT_BOOL, 2) - TEST_TYPE_SIGNED(VARIANT_BOOL) + TEST_TYPE_SIGNED (VARIANT_BOOL) } static void test_pack_VARTYPE(void) diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index f88834a..aec942c 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -486,7 +486,7 @@ static void test_pack_GROUPID(void) /* GROUPID */ TEST_TYPE_SIZE (GROUPID, 8) TEST_TYPE_ALIGN (GROUPID, 8) - TEST_TYPE_SIGNED(GROUPID) + TEST_TYPE_SIGNED (GROUPID) } static void test_pack_HINTERNET(void) @@ -1723,7 +1723,7 @@ static void test_pack_GROUPID(void) /* GROUPID */ TEST_TYPE_SIZE (GROUPID, 8) TEST_TYPE_ALIGN (GROUPID, 8) - TEST_TYPE_SIGNED(GROUPID) + TEST_TYPE_SIGNED (GROUPID) } static void test_pack_HINTERNET(void) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index a700cfc..4a0a396 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -692,7 +692,7 @@ sub output_test_pack_type($$$$$$) { } } } elsif ($type_kind eq "signed") { - print OUT " TEST_TYPE_SIGNED($type_name)\n"; + print OUT " TEST_TYPE_SIGNED ($type_name)\n"; } elsif ($type_kind eq "unsigned") { print OUT " TEST_TYPE_UNSIGNED($type_name)\n"; } -- 2.10.0.windows.1

2 1

[PATCH 2/7] winapi_test: pshpackN.h can only be 1/2/4/8.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to df6d37e0f219ba714d59306a166b75686469211f. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 762d7af..a700cfc 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -409,7 +409,7 @@ foreach my $file (@files) { my $preprocessor = shift; #print "found_preprocessor: $begin_line: [$_]\n"; - if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d+)\.h[\">]$/) { + if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d)\.h[\">]$/) { push @packs, $1 unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found pack $1 on line $begin_line\n"; } elsif($preprocessor =~ /^\#\s*include\s+[\"<]poppack\.h[\">]$/) { -- 2.10.0.windows.1

2 1

[PATCH 1/7] winapi: Use $cwd variable instead of pwd command.
by Serge Gautherie 07 Aug '20

07 Aug '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix to run on Windows. Addendum to 5bc9a0b62388d22b48ca2abdc2f1cd9b2a496221. --- tools/winapi/setup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index ed08460..f23bba1 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -54,7 +54,7 @@ BEGIN { if($wine_dir =~ /^\./) { $current_dir = "."; - my $pwd; chomp($pwd = `pwd`); + my $pwd; chomp($pwd = $cwd); foreach my $n (1..((length($wine_dir) + 1) / 3)) { $pwd =~ s/\/([^\/]*)$//; $current_dir = "$1/$current_dir"; -- 2.10.0.windows.1

2 1

[PATCH 13/13] oleaut32: Load GetVarCustData from MSFT-format typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/tests/test_tlb.idl | 51 +++++++++- dlls/oleaut32/tests/typelib.c | 168 +++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 3 + 3 files changed, 221 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index b8fecc9a01..251897c91e 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -26,7 +26,17 @@ import "oaidl.idl"; /* needed by widl */ midl_pragma warning ( disable : 2368 ) -[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] +#define CUSTDATA_BSTR c8768723-e6d2-4442-b039-92e9c82429c4 + +#define CUSTDATA_STRLIT c8768723-e6d2-4442-b039-92e9c82429c4 +#define CUSTDATA_NUM b481b478-a181-4eb6-b6e0-df63069e8c80 +#define CUSTDATA_HEXNUM a09d7c06-cf38-4db3-9450-10641651c35b + +[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784), +custom(CUSTDATA_STRLIT,"ITypeLib2::GetCustData"), +custom(CUSTDATA_NUM,42), +custom(CUSTDATA_HEXNUM,0x1337C0D3), +] library Test { importlib("stdole2.tlb"); @@ -170,4 +180,43 @@ library Test { interface ITestDispDual; } + + [uuid(786ee4ff-c5dd-4bf4-9578-0d22fb5369cc),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData interface")] + interface custdata_interface : IDispatch + { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData custdata_interface::test_method")] + HRESULT test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData custdata_interface::test_method(x)")] int x); + } + + [uuid(6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData enum")] + enum custdata_enum { + One, Two + }; + + [uuid(62fabe17-f733-4b09-b859-3f455dcda450),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData struct")] + struct custdata_struct { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData struct")] + int test_field; + }; + + [/* uuid(...) not allowed on union */ custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData union")] + union custdata_union { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData union")] + int test_field; + }; + + [public,uuid(d58744d6-63f9-467c-87e5-c95158098b18),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData typedef")] + typedef custdata_interface * custdata_typedef; + + [uuid(bffc216e-2159-465a-80df-b85fd4f4f122),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData dispinterface")] + dispinterface custdata_dispatch + { +properties: + [id(0),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData dispinterface property")] + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] + // FIXME: if the custom strings were identical, midl would de-duplicate them; widl writes them twice. + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2891e75689..66b9f7f25a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4909,11 +4909,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5551,11 +5553,13 @@ static const type_info info[] = { "{79ca07f9-ac22-44ac-9aaf-811f45412293}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -5572,6 +5576,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5584,6 +5589,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5596,6 +5602,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -5610,6 +5617,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -5628,6 +5636,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5650,6 +5659,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5678,6 +5688,7 @@ static const type_info info[] = { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5690,6 +5701,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5702,6 +5714,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5714,6 +5727,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5726,6 +5740,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5738,6 +5753,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5750,6 +5766,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -5768,6 +5785,7 @@ static const type_info info[] = { "{79ca07f9-ac22-44ac-9aaf-811f45412293}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 14, /*#func*/ 7, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x1, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -5929,6 +5947,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -5943,6 +5962,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -5961,6 +5981,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5983,6 +6004,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -6102,6 +6124,152 @@ static const type_info info[] = { }, }, { /* vars */ }, +}, +{ + "custdata_interface", + "{786ee4ff-c5dd-4bf4-9578-0d22fb5369cc}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_interface*), /*size*/ sizeof(custdata_interface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData interface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData custdata_interface::test_method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData custdata_interface::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "custdata_enum", + "{6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData enum" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "One", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "Two", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_struct", + "{62fabe17-f733-4b09-b859-3f455dcda450}", + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct custdata_struct), /*size*/ sizeof(struct custdata_struct), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData struct" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData struct" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_union", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_UNION, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(union custdata_union), /*size*/ sizeof(union custdata_union), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData union" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData union" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_typedef", + "{d58744d6-63f9-467c-87e5-c95158098b18}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(custdata_typedef), /*size*/ sizeof(custdata_typedef), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData typedef" } } }, + }, + { /* funcs */ }, + { /* vars */ }, +}, +{ + "custdata_dispatch", + "{bffc216e-2159-465a-80df-b85fd4f4f122}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_dispatch*), /*size*/ sizeof(custdata_dispatch*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 1, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData dispinterface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData dispinterface method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData test_dispatch::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ + { + /*id*/ 0x0, /*name*/ "test_property", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData dispinterface property" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, } }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6dbd8c39b2..99181e206e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2600,6 +2600,9 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpString)) ptvd->HelpString = MSFT_ReadString(pcx, pVarRec->HelpString); + if (reclength > FIELD_OFFSET(MSFT_VarRecord, oCustData)) + MSFT_CustData(pcx, pVarRec->oCustData, &ptvd->custdata_list); + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) ptvd->HelpStringContext = pVarRec->HelpStringContext;

2 1

[PATCH 1/6] combase: Move CoRevertToSelf().
by Nikolay Sivov 07 Aug '20

07 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 20 ++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 33 --------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index e63cce00dda..7f1d6a63201 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -567,3 +567,23 @@ HRESULT WINAPI CoImpersonateClient(void) return hr; } + +/*********************************************************************** + * CoRevertToSelf (combase.@) + */ +HRESULT WINAPI CoRevertToSelf(void) +{ + IServerSecurity *server_security; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&server_security); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_RevertToSelf(server_security); + IServerSecurity_Release(server_security); + } + + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3122588d7e3..83a3d32aa65 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -149,7 +149,7 @@ @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer -@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 507cc451e20..06dd4aefc72 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4250,39 +4250,6 @@ HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) return S_OK; } -/*********************************************************************** - * CoRevertToSelf [OLE32.@] - * - * Ends the impersonation of the client of the currently executing server - * call in the current thread. - * - * PARAMS - * None. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoImpersonateClient, CoQueryClientBlanket, CoGetCallContext. - */ -HRESULT WINAPI CoRevertToSelf(void) -{ - IServerSecurity *pSrvSec; - HRESULT hr; - - TRACE("\n"); - - hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); - if (SUCCEEDED(hr)) - { - hr = IServerSecurity_RevertToSelf(pSrvSec); - IServerSecurity_Release(pSrvSec); - } - - return hr; -} - static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 049dd0ad616..e23c57b4041 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -75,7 +75,7 @@ @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() -@ stdcall CoRevertToSelf() +@ stdcall CoRevertToSelf() combase.CoRevertToSelf @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy -- 2.28.0

3 14

[PATCH 06/13] oleaut32: Fix rewriting FUNCDESC to FUNC_DISPATCH.
by Puetz Kevin A 07 Aug '20

07 Aug '20

A [retval] parameter overwrites any return type, not just HRESULT. But HRESULT is special even without a [retval] to replace it; it's translated into pExcepInfo and so the return type becomes void. [lcid] parameters are supplied from IDispatch::Invoke's parameters, rather than via DISPPARAMS::rgvargs[] and should also be removed from the FUNC_DISPATCH translation. This rewriting should occur only for functions not originally defined as FUNC_DISPACH (e.g. inherited or [dual]). A FUNCDESC originally declared as a dispinterface is left as-is, and might e.g. return HRESULT. When GetFuncDesc removes parameters in this fashion, GetNames must also omit their names to match cParams. FUNC_DISPATCH from dispinterface should have oVft == 0 (a dispinterface has no vtbl beyond IDispatch itself) Add examples in test_tlb which exercise FUNCDESC rewriting in: 1. dispinterface FUNC_DISPATCH declarations 2. dual interface 3. dispinterface which implements another interface Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/tests/test_tlb.idl | 36 ++ dlls/oleaut32/tests/typelib.c | 653 +++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 96 +++-- 3 files changed, 757 insertions(+), 28 deletions(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index ad35af40c3..b8fecc9a01 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -134,4 +134,40 @@ library Test HRESULT test5(e value); HRESULT test6(f value); } + + [uuid(2d4430d5-99ea-4645-85f0-c5814b72804b)] + dispinterface ITestDispatch + { + properties: + [id(10)] int property_int; + [id(11)] HRESULT property_HRESULT; + + methods: + [id(1)] void test_void(); + [id(2)] void test_void_retval([out,retval] double* ret); + [id(3)] HRESULT test_HRESULT(); + [id(4)] HRESULT test_HRESULT_retval([out,retval] double* ret); + [id(5)] int test_int(); + [id(6)] int test_int_retval([out,retval] double* ret); + [id(7)] double parse_lcid([in] BSTR x, [lcid] long lcid); + + } + + [uuid(79ca07f9-ac22-44ac-9aaf-811f45412293), dual] + interface ITestDispDual : IDispatch + { + [id(1)] void test_void(); + [id(2)] void test_void_retval([out,retval] double* ret); + [id(3)] HRESULT test_HRESULT(); + [id(4)] HRESULT test_HRESULT_retval([out,retval] double* ret); + [id(5)] int test_int(); + [id(6)] int test_int_retval([out,retval] double* ret); + [id(7)] HRESULT parse_lcid([in] BSTR x, [lcid] long lcid, [out,retval] double *ret); + } + + [uuid(cdb105e3-24fb-4ae6-b826-801b7b2a0a07)] + dispinterface ITestDispInherit + { + interface ITestDispDual; + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2f23949c7d..d4b573eb7a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5277,6 +5277,659 @@ static const type_info info[] = { }, }, { /* vars */ }, +}, +{ + "ITestDispatch", + "{2d4430d5-99ea-4645-85f0-c5814b72804b}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispatch*), /*size*/ sizeof(ITestDispatch*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 7, /*#var*/ 2, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void", + NULL, + }, + }, + { + /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_void_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT", + NULL, + }, + }, + { + /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int", + NULL, + }, + }, + { + /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_int_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_BSTR, -1, PARAMFLAG_FIN}, + {VT_I4, -1, PARAMFLAG_FLCID}, + {-1, 0, 0} + }, + { /* names */ + "parse_lcid", + "x", + "lcid", + NULL, + }, + }, + }, + { /* vars */ + { + /*id*/ 0xa, /*name*/ "property_int", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0xb, /*name*/ "property_HRESULT", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "ITestDispDual", + "{79ca07f9-ac22-44ac-9aaf-811f45412293}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + { /* funcs */ + { + /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "QueryInterface", + "riid", + "ppvObj", + NULL, + }, + }, + { + /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "AddRef", + NULL, + }, + }, + { + /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "Release", + NULL, + }, + }, + { + /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetTypeInfoCount", + "pctinfo", + NULL, + }, + }, + { + /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetTypeInfo", + "itinfo", + "lcid", + "pptinfo", + NULL, + }, + }, + { + /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetIDsOfNames", + "riid", + "rgszNames", + "cNames", + "lcid", + "rgdispid", + NULL, + }, + }, + { + /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_I4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_UI2, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "Invoke", + "dispidMember", + "riid", + "lcid", + "wFlags", + "pdispparams", + "pvarResult", + "pexcepinfo", + "puArgErr", + NULL, + }, + }, + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void", + NULL, + }, + }, + { + /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void_retval", + NULL, + }, + }, + { + /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT", + NULL, + }, + }, + { + /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT_retval", + NULL, + }, + }, + { + /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int", + NULL, + }, + }, + { + /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int_retval", + NULL, + }, + }, + { + /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_BSTR, -1, PARAMFLAG_FIN}, + {-1, 0, 0} + }, + { /* names */ + "parse_lcid", + "x", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "ITestDispDual", + "{79ca07f9-ac22-44ac-9aaf-811f45412293}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 14, /*#func*/ 7, /*#var*/ 0, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void", + NULL, + }, + }, + { + /*id*/ 0x2, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_void_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x3, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT", + NULL, + }, + }, + { + /*id*/ 0x4, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x5, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int", + NULL, + }, + }, + { + /*id*/ 0x6, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "test_int_retval", + "ret", + NULL, + }, + }, + { + /*id*/ 0x7, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_BSTR, -1, PARAMFLAG_FIN}, + {VT_I4, -1, PARAMFLAG_FLCID}, + {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, + {-1, 0, 0} + }, + { /* names */ + "parse_lcid", + "x", + "lcid", + "ret", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "ITestDispInherit", + "{cdb105e3-24fb-4ae6-b826-801b7b2a0a07}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispInherit*), /*size*/ sizeof(ITestDispInherit*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + { /* funcs */ + { + /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "QueryInterface", + "riid", + "ppvObj", + NULL, + }, + }, + { + /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "AddRef", + NULL, + }, + }, + { + /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "Release", + NULL, + }, + }, + { + /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetTypeInfoCount", + "pctinfo", + NULL, + }, + }, + { + /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetTypeInfo", + "itinfo", + "lcid", + "pptinfo", + NULL, + }, + }, + { + /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "GetIDsOfNames", + "riid", + "rgszNames", + "cNames", + "lcid", + "rgdispid", + NULL, + }, + }, + { + /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_I4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_UI2, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} + }, + { /* names */ + "Invoke", + "dispidMember", + "riid", + "lcid", + "wFlags", + "pdispparams", + "pvarResult", + "pexcepinfo", + "puArgErr", + NULL, + }, + }, + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void", + NULL, + }, + }, + { + /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_void_retval", + NULL, + }, + }, + { + /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT", + NULL, + }, + }, + { + /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_HRESULT_retval", + NULL, + }, + }, + { + /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int", + NULL, + }, + }, + { + /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "test_int_retval", + NULL, + }, + }, + { + /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, + {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_BSTR, -1, PARAMFLAG_FIN}, + {-1, 0, 0} + }, + { /* names */ + "parse_lcid", + "x", + NULL, + }, + }, + }, + { /* vars */ }, } }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 06667850a3..2f7ce53b1c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2465,7 +2465,11 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; ptfd->funcdesc.cParams = pFuncRec->nrargs ; ptfd->funcdesc.cParamsOpt = pFuncRec->nroargs ; - ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if(ptfd->funcdesc.funckind == FUNC_DISPATCH) { + ptfd->funcdesc.oVft = 0; + } else { + ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + } ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -4179,7 +4183,11 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, pFuncDesc->funcdesc.callconv = pFunc->nacc & 0x7; pFuncDesc->funcdesc.cParams = pFunc->nacc >> 3; pFuncDesc->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if (pFuncDesc->funcdesc.funckind == FUNC_DISPATCH) { + pFuncDesc->funcdesc.oVft = 0; + } else { + pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + } if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags; @@ -5849,11 +5857,13 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt } else dest->lprgelemdescParam = NULL; - /* special treatment for dispinterfaces: this makes functions appear - * to return their [retval] value when it is really returning an - * HRESULT */ - if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + /* special treatment for dispinterface FUNCDESC based on an interface FUNCDESC. + * This accounts for several arguments that are seperate in the signature of + * IDispatch::Invoke, rather than passed in DISPPARAMS::rgvarg[] */ + if (dispinterface && (src->funckind != FUNC_DISPATCH)) { + /* functions that have a [retval] parameter return this value into pVarResult. + * [retval] is always the last parameter (if present) */ if (dest->cParams && (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) { @@ -5866,19 +5876,28 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return E_UNEXPECTED; } - /* copy last parameter to the return value. we are using a flat - * buffer so there is no danger of leaking memory in - * elemdescFunc */ + /* the type pointed to by this [retval] becomes elemdescFunc, + * i.e. functions signature's return type (replacing HRESULT/void/anything else) + * We are using a flat buffer so there is no danger of leaking memory */ dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; /* remove the last parameter */ dest->cParams--; } - else - /* otherwise this function is made to appear to have no return - * value */ + else if (dest->elemdescFunc.tdesc.vt == VT_HRESULT) + /* Even if not otherwise replaced (by [retval], + * HRESULT is returned in pExcepInfo->scode, not pVarResult. + * So the function signature should show no return value. */ dest->elemdescFunc.tdesc.vt = VT_VOID; + /* The now-last (except [retval], removed above) parameter might be labeled [lcid]. + * If so it will be supplied from Invoke(lcid), so also not via DISPPARAMS::rgvarg */ + if (dest->cParams && + (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FLCID)) + { + /* remove the last parameter */ + dest->cParams--; + } } *dest_ptr = dest; @@ -6105,36 +6124,38 @@ static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, return TLB_AllocAndInitVarDesc(&pVDesc->vardesc, ppVarDesc); } -/* ITypeInfo_GetNames - * - * Retrieves the variable with the specified member ID (or the name of the - * property or method and its parameters) that correspond to the specified - * function ID. - */ -static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, - BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) +/* internal function to make the inherited interfaces' methods appear + * part of the interface, remembering if the top-level was dispinterface */ +static HRESULT ITypeInfoImpl_GetNames( ITypeInfo *iface, + MEMBERID memid, BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames, + BOOL dispinterface) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + ITypeInfoImpl *This = impl_from_ITypeInfo(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; int i; - TRACE("(%p) memid=0x%08x Maxname=%d\n", This, memid, cMaxNames); - - if(!rgBstrNames) - return E_INVALIDARG; *pcNames = 0; pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc) { + UINT cParams = pFDesc->funcdesc.cParams; if(!cMaxNames || !pFDesc->Name) return S_OK; *rgBstrNames = SysAllocString(TLB_get_bstr(pFDesc->Name)); ++(*pcNames); - for(i = 0; i < pFDesc->funcdesc.cParams; ++i){ + if(dispinterface && (pFDesc->funcdesc.funckind != FUNC_DISPATCH)) { + /* match the rewriting of special trailing parameters in TLB_AllocAndInitFuncDesc; */ + if ((cParams > 0) && (pFDesc->funcdesc.lprgelemdescParam[cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + --cParams; /* Invoke(pVarResult) supplies the [retval] parameter, so its hidden from DISPPARAMS*/ + if ((cParams > 0) && (pFDesc->funcdesc.lprgelemdescParam[cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FLCID)) + --cParams; /* Invoke(lcid) supplies the [lcid] parameter, so its hidden from DISPPARAMS */ + } + + for(i = 0; i < cParams; ++i) { if(*pcNames >= cMaxNames || !pFDesc->pParamDesc[i].Name) return S_OK; rgBstrNames[*pcNames] = SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i].Name)); @@ -6156,10 +6177,10 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, /* recursive search */ ITypeInfo *pTInfo; HRESULT result; - result = ITypeInfo2_GetRefTypeInfo(iface, This->impltypes[0].hRef, &pTInfo); + result = ITypeInfo_GetRefTypeInfo(iface, This->impltypes[0].hRef, &pTInfo); if(SUCCEEDED(result)) { - result=ITypeInfo_GetNames(pTInfo, memid, rgBstrNames, cMaxNames, pcNames); + result=ITypeInfoImpl_GetNames(pTInfo, memid, rgBstrNames, cMaxNames, pcNames, dispinterface); ITypeInfo_Release(pTInfo); return result; } @@ -6175,6 +6196,25 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, return S_OK; } +/* ITypeInfo_GetNames + * + * Retrieves the variable with the specified member ID (or the name of the + * property or method and its parameters) that correspond to the specified + * function ID. + */ +static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, + BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) +{ + ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + TRACE("(%p) memid=0x%08x Maxname=%d\n", This, memid, cMaxNames); + + if(!rgBstrNames) + return E_INVALIDARG; + + return ITypeInfoImpl_GetNames((ITypeInfo *)iface, + memid, rgBstrNames, cMaxNames, pcNames, + This->typeattr.typekind == TKIND_DISPATCH); +} /* ITypeInfo::GetRefTypeOfImplType *

2 1

[PATCH v4] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 63 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..0ea48613fab 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -29,6 +29,9 @@ typedef struct IDirectMusicTimeSigTrack { IDirectMusicTrack IDirectMusicTrack_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + DMUS_IO_TIMESIGNATURE_ITEM *items; + unsigned int count; } IDirectMusicTimeSigTrack; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ @@ -37,6 +40,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -77,6 +85,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + heap_free(This->items); HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -207,10 +216,60 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + int i; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TIMESIGNATURE_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) + { + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); + TRACE(" - bBeat %d\n", This->items[i].bBeat); + TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); + } + + return S_OK; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

2 1

[PATCH v3] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 62 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..e7df30c67dc 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -29,6 +29,9 @@ typedef struct IDirectMusicTimeSigTrack { IDirectMusicTrack IDirectMusicTrack_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + DMUS_IO_TIMESIGNATURE_ITEM *items; + unsigned int count; } IDirectMusicTimeSigTrack; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ @@ -37,6 +40,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -207,10 +215,60 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + int i; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TIMESIGNATURE_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) + { + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); + TRACE(" - bBeat %d\n", This->items[i].bBeat); + TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); + } + + return S_OK; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

1 0

[PATCH 3/3] xactengine3_7: Correct callback to windows function.
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index bd14fc1de73..0ac0d914b3a 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -634,6 +634,7 @@ typedef struct _XACT3EngineImpl { XACT_READFILE_CALLBACK pReadFile; XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; } XACT3EngineImpl; typedef struct wrap_readfile_struct { @@ -745,6 +746,25 @@ static HRESULT WINAPI IXACT3EngineImpl_GetFinalMixFormat(IXACT3Engine *iface, (FAudioWaveFormatExtensible*) pFinalMixFormat); } +static void FACTCALL fact_notification_cb(const FACTNotification *notification) +{ + XACT3EngineImpl *engine = (XACT3EngineImpl *)notification->pvContext; + + /* Older versions of FAudio don't pass through the context */ + if (!engine) + { + WARN("Notification context is NULL\n"); + return; + } + + if (notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + { + FIXME("Callback XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED\n"); + } + else + FIXME("Unsupported callback type %d\n", notification->type); +} + static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, const XACT_RUNTIME_PARAMETERS *pParams) { @@ -788,6 +808,9 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, GetOverlappedResult; params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; + params.fnNotificationCallback = fact_notification_cb; + + This->notification_callback = (XACT_NOTIFICATION_CALLBACK)pParams->fnNotificationCallback; ret = FACTAudioEngine_Initialize(This->fact_engine, &params); if (ret != 0) @@ -1062,6 +1085,7 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc); } @@ -1074,6 +1098,7 @@ static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *ifac TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc); } -- 2.27.0

1 0

[PATCH 2/3] xactengine3_7: Dont cast interface pointers
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 9f1d905b5eb..bd14fc1de73 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; TRACE("Created Wave: %p\n", wave); @@ -589,7 +589,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; } return hr; @@ -844,7 +844,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, sb->IXACT3SoundBank_iface.lpVtbl = &XACT3SoundBank_Vtbl; sb->fact_soundbank = fsb; - *ppSoundBank = (IXACT3SoundBank*)sb; + *ppSoundBank = &sb->IXACT3SoundBank_iface; TRACE("Created SoundBank: %p\n", sb); @@ -881,7 +881,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created in-memory WaveBank: %p\n", wb); @@ -929,7 +929,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created streaming WaveBank: %p\n", wb); -- 2.27.0

1 0

[PATCH 1/3] xactengine3_7: Trace FAudio version being used
by Alistair Leslie-Hughes 07 Aug '20

07 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index cb8aed5f3aa..9f1d905b5eb 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1277,6 +1277,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); + +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif + break; } return TRUE; -- 2.27.0

1 0

Re: [PATCH 04/13] oleaut32/tests: Cover GetVarDesc in test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

> -----Original Message----- > From: Marvin <testbot(a)winehq.org> > Subject: Re: [PATCH 04/13] oleaut32/tests: Cover GetVarDesc in test_dump_typelib. > > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=76622 > > Your paranoid android. > > === w1064v1809 (64 bit report) === > > oleaut32: > typelib.c:5290: Interface test_struct > typelib.c:5402: Variable hr > typelib.c:5402: Variable b > typelib.c:5402: Variable disp > typelib.c:5402: Variable bstr > typelib.c:5416: Test failed: desc->u.oInst expected 12 got 16 The failures in test_struct are because the field offsets really are different in a 64-bit typelib; the pointers for IDispatch *disp gets bigger, so BSTR bstr moved. I'm not sure how best to fix that; I could easily #ifdef the expected .oInst values, but then it will be a pain to regenerate the info[] stuff that's inlined into typelib.c. Function pointers normalize this checking the index (divided by offset/sizeof(void*) but that doesn't work for var since fields aren't all pointers, just (maybe) some of them. I suppose one could build test_tlb.tlb with --win32 (or --win64) so that it's a consistent set of input data, not architecture-dependent? Suggestions welcome if anyone has a good idea... Or I could just skip verifying oInst; it's not really related to the custdata or FUNC_DISPATCH bug fixes that were the point of this series, it just wasn't covered before because the whole VARDESC was ignored before, so I tried to fill in some conformance-test coverage, not just narrowly check the fix. Which paid off because I found several more bugs in the FUNC_DISPATCH stuff than the one I started working on... > typelib.c:5290: Interface _f > typelib.c:5402: Variable f1 > typelib.c:5402: Variable f2 > typelib.c:5416: Test failed: desc->u.oInst expected 4 got 8 > typelib.c:5290: Interface ff > typelib.c:5402: Variable ff1 > typelib.c:5402: Variable ff2 > typelib.c:5416: Test failed: desc->u.oInst expected 4 got 8 These look look like Marvin actually found a latent widl bug (on x86 too), that just happened to show up in the new coverage. _f and ff are unions, so the offsets should all be 0, but it apparently counted them like a struct. And since that's what the typelib actually says, windows oleaut32 agrees (on x86, where these info[] came from). So these would clear up (and not be architecture-dependent) if I can find the right spot in widl to fix oInst for unions - will check into it tomorrow.

1 0

[PATCH 05/13] oleaut32/tests: Include [dual] interface in test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/tests/typelib.c | 61 +++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ecd6bf09b8..2f23949c7d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4345,13 +4345,14 @@ static void test_dump_typelib(const WCHAR *name) ITypeLib *lib; int count; int i; + HREFTYPE hRefType = 0; OLE_CHECK(LoadTypeLib(name, &lib)); printf("/*** Autogenerated data. Do not edit, change the generator above instead. ***/\n"); count = ITypeLib_GetTypeInfoCount(lib); - for (i = 0; i < count; i++) + for (i = 0; i < count;) { TYPEATTR *attr; BSTR name; @@ -4363,6 +4364,12 @@ static void test_dump_typelib(const WCHAR *name) " \"%s\",\n", dump_string(name)); OLE_CHECK(ITypeLib_GetTypeInfo(lib, i, &info)); + if(hRefType) { + ITypeInfo *refInfo; + OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); + ITypeInfo_Release(info); + info = refInfo; + } OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ -4446,6 +4453,14 @@ static void test_dump_typelib(const WCHAR *name) if (attr->cVars) printf(" },\n"); printf("},\n"); + if ((attr->typekind == TKIND_DISPATCH) && (attr->wTypeFlags & TYPEFLAG_FDUAL) + && SUCCEEDED(ITypeInfo_GetRefTypeOfImplType(info, -1, &hRefType))) { + /* next iteration dumps hRefType, the TKIND_INTERFACE reference underneath this [dual] TKIND_DISPATCH */ + } else { + ++i; /* move to the next item in lib */ + hRefType = 0; + } + ITypeInfo_ReleaseTypeAttr(info, attr); ITypeInfo_Release(info); SysFreeString(name); @@ -4804,6 +4819,27 @@ static const type_info info[] = { }, { /* vars */ }, }, +{ + "IDualIface", + "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "Test", + NULL, + }, + }, + }, + { /* vars */ }, +}, { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", @@ -5270,17 +5306,15 @@ static const type_info info[] = { static void test_dump_typelib(const WCHAR *name) { ITypeLib *typelib; - int ticount = ARRAY_SIZE(info); CUSTDATA cust_data; - int iface, func, var; + int iface = 0, func, var; + HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); - expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); - for (iface = 0; iface < ticount; iface++) + for (const type_info *ti = info; ti != info + ARRAY_SIZE(info); ++ti) { - const type_info *ti = &info[iface]; ITypeInfo2 *typeinfo2; ITypeInfo *typeinfo; TYPEATTR *typeattr; @@ -5289,6 +5323,12 @@ static void test_dump_typelib(const WCHAR *name) trace("Interface %s\n", ti->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); + if(hRefType) { + ITypeInfo *refInfo; + ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); + ITypeInfo_Release(typeinfo); + typeinfo = refInfo; + } ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, &help_ctx, NULL)); expect_wstr_acpval(bstrIfName, ti->name); SysFreeString(bstrIfName); @@ -5425,11 +5465,20 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo_ReleaseVarDesc(typeinfo, desc); } + if ((typeattr->typekind == TKIND_DISPATCH) && (typeattr->wTypeFlags & TYPEFLAG_FDUAL) + && SUCCEEDED(ITypeInfo_GetRefTypeOfImplType(typeinfo, -1, &hRefType))) { + /* next iteration dumps hRefType, the TKIND_INTERFACE reference underneath this [dual] TKIND_DISPATCH */ + } else { + ++iface; /* move to the next item in typelib */ + hRefType = 0; + } + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo2_Release(typeinfo2); ITypeInfo_Release(typeinfo); } + expect_eq(ITypeLib_GetTypeInfoCount(typelib), iface, UINT, "%d"); ITypeLib_Release(typelib); }

2 1

[PATCH 04/13] oleaut32/tests: Cover GetVarDesc in test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

>From 54ab34c62adfdbf618872bbd7f86b20553ead862 Mon Sep 17 00:00:00 2001 From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri, 31 Jul 2020 21:21:38 -0500 Subject: [PATCH 04/13] oleaut32/tests: Cover GetVarDesc in test_dump_typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/tests/typelib.c | 477 ++++++++++++++++++++++++++++++---- 1 file changed, 433 insertions(+), 44 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6f68a201ba..ecd6bf09b8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3978,6 +3978,14 @@ static const struct map_entry funckind_map[] = { {0, NULL} }; +static const struct map_entry varkind_map[] = { + MAP_ENTRY(VAR_PERINSTANCE), + MAP_ENTRY(VAR_STATIC), + MAP_ENTRY(VAR_CONST), + MAP_ENTRY(VAR_DISPATCH), + {0, NULL} +}; + static const struct map_entry invkind_map[] = { MAP_ENTRY(INVOKE_FUNC), MAP_ENTRY(INVOKE_PROPERTYGET), @@ -4248,6 +4256,65 @@ static const char *dump_func_flags(DWORD flags) return buf; } +static const char *dump_var_flags(DWORD flags) +{ + static char buf[256]; + + if (!flags) return "0"; + + buf[0] = 0; + +#define ADD_FLAG(x) if (flags & x) { if (buf[0]) strcat(buf, "|"); strcat(buf, #x); flags &= ~x; } + ADD_FLAG(VARFLAG_FREADONLY) + ADD_FLAG(VARFLAG_FSOURCE) + ADD_FLAG(VARFLAG_FBINDABLE) + ADD_FLAG(VARFLAG_FREQUESTEDIT) + ADD_FLAG(VARFLAG_FDISPLAYBIND) + ADD_FLAG(VARFLAG_FDEFAULTBIND) + ADD_FLAG(VARFLAG_FHIDDEN) + ADD_FLAG(VARFLAG_FRESTRICTED) + ADD_FLAG(VARFLAG_FDEFAULTCOLLELEM) + ADD_FLAG(VARFLAG_FUIDEFAULT) + ADD_FLAG(VARFLAG_FNONBROWSABLE) + ADD_FLAG(VARFLAG_FREPLACEABLE) + ADD_FLAG(VARFLAG_FIMMEDIATEBIND) +#undef ADD_FLAG + + assert(!flags); + assert(strlen(buf) < sizeof(buf)); + + return buf; +} + +static const char *dump_variant_info(const VARIANT *v) +{ + const char *vt_str = map_value(V_VT(v), vt_map); + static char buf[256]; + switch(V_VT(v)) { + case VT_I1: sprintf(buf, "{ %s, { .value_int = %d } }", vt_str, V_I1(v)); break; + case VT_I2: sprintf(buf, "{ %s, { .value_int = %d } }", vt_str, V_I2(v)); break; + case VT_I4: sprintf(buf, "{ %s, { .value_int = %d } }", vt_str, V_I4(v)); break; + case VT_I8: sprintf(buf, "{ %s, { .value_int = %s } }", vt_str, wine_dbgstr_longlong(V_I8(v))); break; + case VT_INT: sprintf(buf, "{ %s, { .value_int = %d } }", vt_str, V_UINT(v)); break; + case VT_BOOL: sprintf(buf, "{ %s, { .value_int = %d } }", vt_str, V_BOOL(v)); break; + + case VT_UI1: sprintf(buf, "{ %s, { .value_uint = %u } }", vt_str, V_UI1(v)); break; + case VT_UI2: sprintf(buf, "{ %s, { .value_uint = %u } }", vt_str, V_UI2(v)); break; + case VT_UI4: sprintf(buf, "{ %s, { .value_uint = %u } }", vt_str, V_UI4(v)); break; + case VT_UI8: sprintf(buf, "{ %s, { .value_uint = %u } }", vt_str, wine_dbgstr_longlong(V_UI8(v))); break; + case VT_UINT: sprintf(buf, "{ %s, { .value_uint = %u } }", vt_str, V_UINT(v)); break; + + case VT_R4: sprintf(buf, "{ %s, { .value_float = %0.9g } }", vt_str, V_R4(v)); break; + case VT_R8: sprintf(buf, "{ %s, { .value_float = %0.17g } }", vt_str, V_R8(v)); break; + + case VT_BSTR: sprintf(buf, "{ %s, { .value_str = \"%s\" } }", vt_str, dump_string(V_BSTR(v))); break; + default: + printf("failed - dump_variant_info: cannot serialize %s\n", vt_str); + sprintf(buf, "{ %s, { /* cannot dump */ } }", vt_str); + } + return buf; +} + static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) { int href_type = -1; @@ -4289,7 +4356,7 @@ static void test_dump_typelib(const WCHAR *name) TYPEATTR *attr; BSTR name; DWORD help_ctx; - int f = 0; + int f = 0, v = 0; OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx, NULL)); printf("{\n" @@ -4301,11 +4368,11 @@ static void test_dump_typelib(const WCHAR *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" - " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d,\n", + " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d, /*#var*/ %d,\n", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), - attr->cbSizeVft/sizeof(void*), attr->cFuncs); + attr->cbSizeVft/sizeof(void*), attr->cFuncs, attr->cVars); printf(" { /* funcs */%s", attr->cFuncs ? "\n" : " },\n"); while (1) @@ -4347,7 +4414,37 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo_ReleaseFuncDesc(info, desc); f++; } - if (attr->cFuncs) printf(" }\n"); + if (attr->cFuncs) printf(" },\n"); + + printf(" { /* vars */%s", attr->cVars ? "\n" : " },\n"); + while (1) + { + VARDESC *desc; + BSTR varname; + UINT cNames; + if (FAILED(ITypeInfo_GetVarDesc(info, v, &desc))) + break; + OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, &varname, 1, &cNames)); + if(cNames!=1) { printf("GetNames failed - VARDESC should have one name, got %d\n", cNames); return; } + printf(" {\n" + " /*id*/ 0x%x, /*name*/ \"%s\", /*flags*/ %s, /*kind*/ %s,\n", + desc->memid, dump_string(varname), dump_var_flags(desc->wVarFlags), map_value(desc->varkind, varkind_map)); + SysFreeString(varname); + if (desc->varkind == VAR_PERINSTANCE) { + printf(" { .oInst = %d },\n", desc->DUMMYUNIONNAME.oInst); + } else if (desc->varkind == VAR_CONST) { + printf(" { .varValue = %s },\n", dump_variant_info(desc->DUMMYUNIONNAME.lpvarValue)); + } else { + printf(" { /* DUMMYUNIONNAME unused*/ },\n"); + } + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescVar.tdesc.vt, vt_map), + map_value(get_href_type(info, &desc->elemdescVar.tdesc), tkind_map), dump_param_flags(U(desc->elemdescVar).paramdesc.wParamFlags)); + printf(" },\n"); + ITypeInfo_ReleaseVarDesc(info, desc); + v++; + } + if (attr->cVars) printf(" },\n"); + printf("},\n"); ITypeInfo_ReleaseTypeAttr(info, attr); ITypeInfo_Release(info); @@ -4358,6 +4455,16 @@ static void test_dump_typelib(const WCHAR *name) #else +typedef struct _variant_info { + VARTYPE vt; + union { + INT64 value_int; + UINT64 value_uint; + double value_float; + const char * value_str; + }; +} variant_info; + typedef struct _element_info { VARTYPE vt; @@ -4381,6 +4488,19 @@ typedef struct _function_info LPCSTR names[15]; } function_info; +typedef struct _var_info +{ + MEMBERID memid; + LPCSTR name; + WORD wVarFlags; + VARKIND varkind; + union { + ULONG oInst; /* VAR_PERINSTANCE */ + variant_info varValue; /* VAR_CONST */ + } DUMMYUNIONNAME; + element_info elemdescVar; +} var_info; + typedef struct _type_info { LPCSTR name; @@ -4393,7 +4513,9 @@ typedef struct _type_info DWORD version; USHORT cbSizeVft; USHORT cFuncs; + USHORT cVars; function_info funcs[20]; + var_info vars[20]; } type_info; static const type_info info[] = { @@ -4402,14 +4524,21 @@ static const type_info info[] = { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "g1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4425,13 +4554,14 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, }, { "parent_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4447,13 +4577,14 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, }, { "child_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4467,55 +4598,74 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, }, { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), - /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "n1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "n", "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "nn", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), - /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), - /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "m1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "m", "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), - /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "mm", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), - /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4651,13 +4801,14 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, }, { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4671,153 +4822,338 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, }, { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 4 }, + {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 8 }, + {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 12 }, + {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 4 }, + {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 8 }, + {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 12 }, + {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "t_INT", "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "a", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_a", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "a1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "a2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "aa", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "aa1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "aa2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "_b", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "b1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "b2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "bb", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "bb1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "bb2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "c", "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_c", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "c1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "c2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "cc", "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "cc1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "cc2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "d", "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_d", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "d1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "d2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "dd", "{016fe2ec-b2c8-45f8-b23b-39e53a75396e}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "dd1", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "dd2", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "e", "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_e", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "e1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "ee1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "f", "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, { /* funcs */ }, + { /* vars */ }, }, { "_f", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "f1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 4 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "ff1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 4 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, /*#var*/ 0, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, @@ -4903,10 +5239,29 @@ static const type_info info[] = { NULL, }, }, - } + }, + { /* vars */ }, } }; +#define check_variant_info(value, expected) { \ + expect_int(V_VT(value), (expected)->vt); \ + switch(V_VT(value)) { \ + case VT_I1: expect_int(V_I1(value), (expected)->value_int); break; \ + case VT_I2: expect_int(V_I2(value), (expected)->value_int); break; \ + case VT_I4: expect_int(V_I4(value), (expected)->value_int); break; \ + case VT_I8: expect_int(V_I8(value), (expected)->value_int); break; \ + case VT_BOOL: expect_int(V_BOOL(value), (expected)->value_int); break; \ + case VT_INT: expect_int(V_INT(value), (expected)->value_int); break; \ + case VT_UI1: expect_int(V_UI1(value), (expected)->value_uint); break; \ + case VT_UI2: expect_int(V_UI2(value), (expected)->value_uint); break; \ + case VT_UI4: expect_int(V_UI4(value), (expected)->value_uint); break; \ + case VT_UI8: expect_int(V_UI8(value), (expected)->value_uint); break; \ + case VT_UINT: expect_int(V_UINT(value), (expected)->value_uint); break; \ + case VT_BSTR: expect_wstr_acpval(V_BSTR(value), (expected)->value_str); break; \ + default: skip("check_variant_info: comparing value not implemented for VARTYPE %d\n",V_VT(value)); \ + } } + #define check_type(elem, info) { \ expect_int((elem)->tdesc.vt, (info)->vt); \ expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \ @@ -4917,7 +5272,7 @@ static void test_dump_typelib(const WCHAR *name) ITypeLib *typelib; int ticount = ARRAY_SIZE(info); CUSTDATA cust_data; - int iface, func; + int iface, func, var; VARIANT v; HRESULT hr; @@ -4947,6 +5302,7 @@ static void test_dump_typelib(const WCHAR *name) expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version); expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); expect_int(typeattr->cFuncs, ti->cFuncs); + expect_int(typeattr->cVars, ti->cVars); /* compare type uuid */ if (ti->uuid && *ti->uuid) @@ -5036,6 +5392,39 @@ static void test_dump_typelib(const WCHAR *name) ClearCustData(&cust_data); } + for (var = 0; var < typeattr->cVars; var++) + { + const var_info *var_info = &ti->vars[var]; + VARDESC *desc; + BSTR varname; + UINT cNames; + + trace("Variable %s\n", var_info->name); + ole_check(ITypeInfo_GetVarDesc(typeinfo, var, &desc)); + + expect_int(desc->memid, var_info->memid); + + ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, &varname, 1, &cNames)); + expect_int(cNames, 1); + expect_wstr_acpval(varname, var_info->name); + SysFreeString(varname); + + expect_null(desc->lpstrSchema); /* Reserved */ + expect_int(desc->wVarFlags, var_info->wVarFlags); + expect_int(desc->varkind, var_info->varkind); + if(desc->varkind == VAR_PERINSTANCE) { + expect_int(desc->DUMMYUNIONNAME.oInst, var_info->DUMMYUNIONNAME.oInst); + } else if(desc->varkind == VAR_CONST) { + check_variant_info(desc->DUMMYUNIONNAME.lpvarValue, &var_info->DUMMYUNIONNAME.varValue); + } else { + expect_null(desc->DUMMYUNIONNAME.lpvarValue); + } + + check_type(&desc->elemdescVar, &var_info->elemdescVar); + + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo2_Release(typeinfo2);

2 1

[PATCH v2 13/13] oleaut32: Load GetVarCustData from MSFT-format typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- Drop the hunk that moved into v2 07/13 (where it belongs) --- dlls/oleaut32/tests/test_tlb.idl | 51 ++++++++++- dlls/oleaut32/tests/typelib.c | 146 +++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 3 + 3 files changed, 199 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index b8fecc9a01..251897c91e 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -26,7 +26,17 @@ import "oaidl.idl"; /* needed by widl */ midl_pragma warning ( disable : 2368 ) -[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] +#define CUSTDATA_BSTR c8768723-e6d2-4442-b039-92e9c82429c4 + +#define CUSTDATA_STRLIT c8768723-e6d2-4442-b039-92e9c82429c4 +#define CUSTDATA_NUM b481b478-a181-4eb6-b6e0-df63069e8c80 +#define CUSTDATA_HEXNUM a09d7c06-cf38-4db3-9450-10641651c35b + +[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784), +custom(CUSTDATA_STRLIT,"ITypeLib2::GetCustData"), +custom(CUSTDATA_NUM,42), +custom(CUSTDATA_HEXNUM,0x1337C0D3), +] library Test { importlib("stdole2.tlb"); @@ -170,4 +180,43 @@ library Test { interface ITestDispDual; } + + [uuid(786ee4ff-c5dd-4bf4-9578-0d22fb5369cc),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData interface")] + interface custdata_interface : IDispatch + { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData custdata_interface::test_method")] + HRESULT test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData custdata_interface::test_method(x)")] int x); + } + + [uuid(6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData enum")] + enum custdata_enum { + One, Two + }; + + [uuid(62fabe17-f733-4b09-b859-3f455dcda450),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData struct")] + struct custdata_struct { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData struct")] + int test_field; + }; + + [/* uuid(...) not allowed on union */ custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData union")] + union custdata_union { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData union")] + int test_field; + }; + + [public,uuid(d58744d6-63f9-467c-87e5-c95158098b18),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData typedef")] + typedef custdata_interface * custdata_typedef; + + [uuid(bffc216e-2159-465a-80df-b85fd4f4f122),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData dispinterface")] + dispinterface custdata_dispatch + { +properties: + [id(0),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData dispinterface property")] + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] + // FIXME: if the custom strings were identical, midl would de-duplicate them; widl writes them twice. + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8ecdec4c13..66b9f7f25a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6124,6 +6124,152 @@ static const type_info info[] = { }, }, { /* vars */ }, +}, +{ + "custdata_interface", + "{786ee4ff-c5dd-4bf4-9578-0d22fb5369cc}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_interface*), /*size*/ sizeof(custdata_interface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData interface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData custdata_interface::test_method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData custdata_interface::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "custdata_enum", + "{6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData enum" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "One", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "Two", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_struct", + "{62fabe17-f733-4b09-b859-3f455dcda450}", + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct custdata_struct), /*size*/ sizeof(struct custdata_struct), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData struct" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData struct" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_union", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_UNION, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(union custdata_union), /*size*/ sizeof(union custdata_union), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData union" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData union" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_typedef", + "{d58744d6-63f9-467c-87e5-c95158098b18}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(custdata_typedef), /*size*/ sizeof(custdata_typedef), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData typedef" } } }, + }, + { /* funcs */ }, + { /* vars */ }, +}, +{ + "custdata_dispatch", + "{bffc216e-2159-465a-80df-b85fd4f4f122}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_dispatch*), /*size*/ sizeof(custdata_dispatch*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 1, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData dispinterface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData dispinterface method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData test_dispatch::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ + { + /*id*/ 0x0, /*name*/ "test_property", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData dispinterface property" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, } }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6dbd8c39b2..99181e206e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2600,6 +2600,9 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpString)) ptvd->HelpString = MSFT_ReadString(pcx, pVarRec->HelpString); + if (reclength > FIELD_OFFSET(MSFT_VarRecord, oCustData)) + MSFT_CustData(pcx, pVarRec->oCustData, &ptvd->custdata_list); + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) ptvd->HelpStringContext = pVarRec->HelpStringContext; -- 2.27.0.windows.1

1 0

[PATCH] vbscript: Implement case insensitive search in InStrRev function
by Dmitry Kislyuk 07 Aug '20

07 Aug '20

2 1

[PATCH 07/13] oleaut32/tests: Cover Get*CustData in test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/tests/typelib.c | 253 ++++++++++++++++++++++++++++++++-- 1 file changed, 245 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d4b573eb7a..2891e75689 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4315,6 +4315,12 @@ static const char *dump_variant_info(const VARIANT *v) return buf; } +static const char *dump_custdata_info(LPCUSTDATAITEM item) { + static char buf[256]; + sprintf(buf, "{ \"%s\", %s }", wine_dbgstr_guid(&item->guid), dump_variant_info(&item->varValue)); + return buf; +} + static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) { int href_type = -1; @@ -4342,10 +4348,12 @@ static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) static void test_dump_typelib(const WCHAR *name) { ITypeInfo *info; + ITypeInfo2 *info2; ITypeLib *lib; int count; int i; HREFTYPE hRefType = 0; + CUSTDATA cust_data; OLE_CHECK(LoadTypeLib(name, &lib)); @@ -4357,7 +4365,7 @@ static void test_dump_typelib(const WCHAR *name) TYPEATTR *attr; BSTR name; DWORD help_ctx; - int f = 0, v = 0; + int f = 0, v = 0, c = 0; OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx, NULL)); printf("{\n" @@ -4370,7 +4378,10 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo_Release(info); info = refInfo; } + OLE_CHECK(ITypeInfo_QueryInterface(info, &IID_ITypeInfo2, (void**)&info2)); + OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); + OLE_CHECK(ITypeInfo2_GetAllCustData(info2,&cust_data)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ -4381,6 +4392,13 @@ static void test_dump_typelib(const WCHAR *name) help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs, attr->cVars); + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" { /* funcs */%s", attr->cFuncs ? "\n" : " },\n"); while (1) { @@ -4391,6 +4409,7 @@ static void test_dump_typelib(const WCHAR *name) if (FAILED(ITypeInfo_GetFuncDesc(info, f, &desc))) break; + OLE_CHECK(ITypeInfo2_GetAllFuncCustData(info2,f,&cust_data)); printf(" {\n" " /*id*/ 0x%x, /*func*/ %s, /*inv*/ %s, /*call*/ %s,\n", desc->memid, map_value(desc->funckind, funckind_map), map_value(desc->invkind, invkind_map), @@ -4399,12 +4418,30 @@ static void test_dump_typelib(const WCHAR *name) desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*), desc->cScodes, dump_func_flags(desc->wFuncFlags)); printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), map_value(get_href_type(info, &desc->elemdescFunc.tdesc), tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt, vt_map), + OLE_CHECK(ITypeInfo2_GetAllParamCustData(info2,f,p,&cust_data)); + printf(" {%s, %s, %s", map_value(e.tdesc.vt, vt_map), map_value(get_href_type(info, &e.tdesc), tkind_map), dump_param_flags(U(e).paramdesc.wParamFlags)); + if (cust_data.cCustData) { + printf(", /*#custdata*/ %d, {\n", cust_data.cCustData); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + printf(" } },\n"); + } else { + printf("},\n"); + } + ClearCustData(&cust_data); } printf(" {-1, 0, 0}\n"); printf(" },\n"); @@ -4431,6 +4468,7 @@ static void test_dump_typelib(const WCHAR *name) UINT cNames; if (FAILED(ITypeInfo_GetVarDesc(info, v, &desc))) break; + OLE_CHECK(ITypeInfo2_GetAllVarCustData(info2,v,&cust_data)); OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, &varname, 1, &cNames)); if(cNames!=1) { printf("GetNames failed - VARDESC should have one name, got %d\n", cNames); return; } printf(" {\n" @@ -4444,6 +4482,14 @@ static void test_dump_typelib(const WCHAR *name) } else { printf(" { /* DUMMYUNIONNAME unused*/ },\n"); } + + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescVar.tdesc.vt, vt_map), map_value(get_href_type(info, &desc->elemdescVar.tdesc), tkind_map), dump_param_flags(U(desc->elemdescVar).paramdesc.wParamFlags)); printf(" },\n"); @@ -4462,6 +4508,7 @@ static void test_dump_typelib(const WCHAR *name) } ITypeInfo_ReleaseTypeAttr(info, attr); + ITypeInfo2_Release(info2); ITypeInfo_Release(info); SysFreeString(name); } @@ -4480,11 +4527,18 @@ typedef struct _variant_info { }; } variant_info; +typedef struct _custdata_info { + LPCSTR uuid; + variant_info value; +} custdata_info; + typedef struct _element_info { VARTYPE vt; TYPEKIND type; USHORT wParamFlags; + DWORD cCustData; + custdata_info custdata[5]; } element_info; typedef struct _function_info @@ -4499,6 +4553,8 @@ typedef struct _function_info short cScodes; WORD wFuncFlags; element_info ret_type; + DWORD cCustData; + custdata_info custdata[5]; element_info params[15]; LPCSTR names[15]; } function_info; @@ -4513,6 +4569,8 @@ typedef struct _var_info ULONG oInst; /* VAR_PERINSTANCE */ variant_info varValue; /* VAR_CONST */ } DUMMYUNIONNAME; + DWORD cCustData; + custdata_info custdata[5]; element_info elemdescVar; } var_info; @@ -4529,6 +4587,8 @@ typedef struct _type_info USHORT cbSizeVft; USHORT cFuncs; USHORT cVars; + DWORD cCustData; + custdata_info custdata[5]; function_info funcs[20]; var_info vars[20]; } type_info; @@ -4540,11 +4600,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "g1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4554,11 +4616,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -4577,11 +4641,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -4600,11 +4666,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4621,11 +4689,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "n1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4635,6 +4705,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4643,6 +4714,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4651,11 +4723,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "m1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4665,6 +4739,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4673,6 +4748,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4681,11 +4757,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -4702,6 +4780,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4714,6 +4793,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4726,6 +4806,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -4740,6 +4821,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -4758,6 +4840,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -4780,6 +4863,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -4808,6 +4892,7 @@ static const type_info info[] = { /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4845,11 +4930,13 @@ static const type_info info[] = { "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4866,26 +4953,31 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96dd}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 8 }, + /*#custdata*/ 0, {}, {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 12 }, + /*#custdata*/ 0, {}, {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4895,26 +4987,31 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 8 }, + /*#custdata*/ 0, {}, {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 12 }, + /*#custdata*/ 0, {}, {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4924,6 +5021,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4932,6 +5030,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4940,16 +5039,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "a1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "a2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4959,16 +5061,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "aa1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "aa2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4978,16 +5083,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "b1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4997,16 +5105,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "bb1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "bb2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5016,6 +5127,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5024,16 +5136,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "c1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "c2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5043,16 +5158,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "cc1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "cc2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5062,6 +5180,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5070,16 +5189,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "d1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "d2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5089,16 +5211,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396e}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "dd1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "dd2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5108,6 +5233,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5116,11 +5242,13 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "e1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5130,11 +5258,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "ee1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5144,6 +5274,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5152,16 +5283,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "f1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5171,16 +5305,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "ff1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5190,11 +5327,13 @@ static const type_info info[] = { "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5209,6 +5348,7 @@ static const type_info info[] = { /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5223,6 +5363,7 @@ static const type_info info[] = { /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5237,6 +5378,7 @@ static const type_info info[] = { /*id*/ 0x60020003, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5251,6 +5393,7 @@ static const type_info info[] = { /*id*/ 0x60020004, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5265,6 +5408,7 @@ static const type_info info[] = { /*id*/ 0x60020005, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5283,11 +5427,13 @@ static const type_info info[] = { "{2d4430d5-99ea-4645-85f0-c5814b72804b}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispatch*), /*size*/ sizeof(ITestDispatch*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 7, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5300,6 +5446,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5314,6 +5461,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5326,6 +5474,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5340,6 +5489,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5352,6 +5502,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5366,6 +5517,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {VT_I4, -1, PARAMFLAG_FLCID}, @@ -5383,11 +5535,13 @@ static const type_info info[] = { { /*id*/ 0xa, /*name*/ "property_int", /*flags*/ 0, /*kind*/ VAR_DISPATCH, { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0xb, /*name*/ "property_HRESULT", /*flags*/ 0, /*kind*/ VAR_DISPATCH, { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5619,6 +5773,7 @@ static const type_info info[] = { /*id*/ 0x1, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5631,6 +5786,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5645,6 +5801,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5657,6 +5814,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5671,6 +5829,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5683,6 +5842,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5697,6 +5857,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {VT_I4, -1, PARAMFLAG_FLCID}, @@ -5719,11 +5880,13 @@ static const type_info info[] = { "{cdb105e3-24fb-4ae6-b826-801b7b2a0a07}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispInherit*), /*size*/ sizeof(ITestDispInherit*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -5740,6 +5903,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5752,6 +5916,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5846,6 +6011,7 @@ static const type_info info[] = { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5858,6 +6024,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5870,6 +6037,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5882,6 +6050,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5894,6 +6063,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5906,6 +6076,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5918,6 +6089,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -5956,11 +6128,18 @@ static const type_info info[] = { expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \ } +static void parse_guid(LPCSTR strGuid, GUID *guid) +{ + WCHAR guidW[39]; + MultiByteToWideChar(CP_ACP, 0, strGuid, -1, guidW, ARRAY_SIZE(guidW)); + ole_check(IIDFromString(guidW, guid)); +} + static void test_dump_typelib(const WCHAR *name) { ITypeLib *typelib; CUSTDATA cust_data; - int iface = 0, func, var; + int iface = 0, func, var, cust; HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; @@ -6000,13 +6179,11 @@ static void test_dump_typelib(const WCHAR *name) /* compare type uuid */ if (ti->uuid && *ti->uuid) { - WCHAR guidW[39]; ITypeInfo *typeinfo2; HRESULT hr; GUID guid; - MultiByteToWideChar(CP_ACP, 0, ti->uuid, -1, guidW, ARRAY_SIZE(guidW)); - IIDFromString(guidW, &guid); + parse_guid(ti->uuid,&guid); expect_guid(&guid, &typeattr->guid); /* check that it's possible to search using this uuid */ @@ -6016,9 +6193,26 @@ static void test_dump_typelib(const WCHAR *name) if (hr == S_OK) ITypeInfo_Release(typeinfo2); } + ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); + hr = ITypeInfo_QueryInterface(typeinfo, &IID_ITypeInfo2, (void**)&typeinfo2); ok(hr == S_OK, "Could not get ITypeInfo2: %08x\n", hr); + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllCustData(typeinfo2,&cust_data)); + expect_int(cust_data.cCustData, ti->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < ti->cCustData; cust++) + { + GUID guid; + parse_guid(ti->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetCustData(typeinfo2,&guid,&v); + ok(hr == S_OK, "GetCustDatafailed: %08x\n", hr); + check_variant_info(&v,&ti->custdata[cust].value); + VariantClear(&v); + } + for (func = 0; func < typeattr->cFuncs; func++) { const function_info *fn_info = &ti->funcs[func]; @@ -6038,6 +6232,22 @@ static void test_dump_typelib(const WCHAR *name) expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*)); expect_int(desc->cScodes, fn_info->cScodes); expect_int(desc->wFuncFlags, fn_info->wFuncFlags); + + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllFuncCustData(typeinfo2,func,&cust_data)); + expect_int(cust_data.cCustData, fn_info->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < fn_info->cCustData; cust++) + { + GUID guid; + parse_guid(fn_info->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetFuncCustData(typeinfo2,func,&guid,&v); + ok(hr == S_OK, "GetCustDatafailed: %08x\n", hr); + check_variant_info(&v,&fn_info->custdata[cust].value); + VariantClear(&v); + } + ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames)); for (i = 0; i < cNames; i++) { @@ -6051,6 +6261,21 @@ static void test_dump_typelib(const WCHAR *name) { check_type(&desc->lprgelemdescParam[i], &fn_info->params[i]); + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllParamCustData(typeinfo2,func,i,&cust_data)); + expect_int(cust_data.cCustData, fn_info->params[i].cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < fn_info->params[i].cCustData; cust++) + { + GUID guid; + parse_guid(fn_info->params[i].custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetParamCustData(typeinfo2,func,i,&guid,&v); + ok(hr == S_OK, "GetParamCustDatafailed: %08x\n", hr); + check_variant_info(&v,&fn_info->params[i].custdata[cust].value); + VariantClear(&v); + } + if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED) { ITypeInfo *param; @@ -6080,9 +6305,7 @@ static void test_dump_typelib(const WCHAR *name) VariantClear(&v); memset(&cust_data, 0, sizeof(cust_data)); - hr = ITypeInfo2_GetAllCustData(typeinfo2, &cust_data); ITypeInfo_ReleaseFuncDesc(typeinfo, desc); - ClearCustData(&cust_data); } for (var = 0; var < typeattr->cVars; var++) @@ -6112,6 +6335,20 @@ static void test_dump_typelib(const WCHAR *name) } else { expect_null(desc->DUMMYUNIONNAME.lpvarValue); } + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllVarCustData(typeinfo2,var,&cust_data)); + expect_int(cust_data.cCustData, var_info->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < var_info->cCustData; cust++) + { + GUID guid; + parse_guid(var_info->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetVarCustData(typeinfo2,var,&guid,&v); + ok(hr == S_OK, "GetVarCustData failed: %08x\n", hr); + check_variant_info(&v,&var_info->custdata[cust].value); + VariantClear(&v); + } check_type(&desc->elemdescVar, &var_info->elemdescVar);

2 1

[PATCH v2 07/13] oleaut32/tests: Cover Get*CustData in test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> -- Misplaced a hunk into 13/13 that belonged here. --- dlls/oleaut32/tests/typelib.c | 275 +++++++++++++++++++++++++++++++++- 1 file changed, 267 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d4b573eb7a..8ecdec4c13 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4315,6 +4315,12 @@ static const char *dump_variant_info(const VARIANT *v) return buf; } +static const char *dump_custdata_info(LPCUSTDATAITEM item) { + static char buf[256]; + sprintf(buf, "{ \"%s\", %s }", wine_dbgstr_guid(&item->guid), dump_variant_info(&item->varValue)); + return buf; +} + static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) { int href_type = -1; @@ -4342,10 +4348,12 @@ static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) static void test_dump_typelib(const WCHAR *name) { ITypeInfo *info; + ITypeInfo2 *info2; ITypeLib *lib; int count; int i; HREFTYPE hRefType = 0; + CUSTDATA cust_data; OLE_CHECK(LoadTypeLib(name, &lib)); @@ -4357,7 +4365,7 @@ static void test_dump_typelib(const WCHAR *name) TYPEATTR *attr; BSTR name; DWORD help_ctx; - int f = 0, v = 0; + int f = 0, v = 0, c = 0; OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx, NULL)); printf("{\n" @@ -4370,7 +4378,10 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo_Release(info); info = refInfo; } + OLE_CHECK(ITypeInfo_QueryInterface(info, &IID_ITypeInfo2, (void**)&info2)); + OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); + OLE_CHECK(ITypeInfo2_GetAllCustData(info2,&cust_data)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ -4381,6 +4392,13 @@ static void test_dump_typelib(const WCHAR *name) help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs, attr->cVars); + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" { /* funcs */%s", attr->cFuncs ? "\n" : " },\n"); while (1) { @@ -4391,6 +4409,7 @@ static void test_dump_typelib(const WCHAR *name) if (FAILED(ITypeInfo_GetFuncDesc(info, f, &desc))) break; + OLE_CHECK(ITypeInfo2_GetAllFuncCustData(info2,f,&cust_data)); printf(" {\n" " /*id*/ 0x%x, /*func*/ %s, /*inv*/ %s, /*call*/ %s,\n", desc->memid, map_value(desc->funckind, funckind_map), map_value(desc->invkind, invkind_map), @@ -4399,12 +4418,30 @@ static void test_dump_typelib(const WCHAR *name) desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*), desc->cScodes, dump_func_flags(desc->wFuncFlags)); printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), map_value(get_href_type(info, &desc->elemdescFunc.tdesc), tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt, vt_map), + OLE_CHECK(ITypeInfo2_GetAllParamCustData(info2,f,p,&cust_data)); + printf(" {%s, %s, %s", map_value(e.tdesc.vt, vt_map), map_value(get_href_type(info, &e.tdesc), tkind_map), dump_param_flags(U(e).paramdesc.wParamFlags)); + if (cust_data.cCustData) { + printf(", /*#custdata*/ %d, {\n", cust_data.cCustData); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + printf(" } },\n"); + } else { + printf("},\n"); + } + ClearCustData(&cust_data); } printf(" {-1, 0, 0}\n"); printf(" },\n"); @@ -4431,6 +4468,7 @@ static void test_dump_typelib(const WCHAR *name) UINT cNames; if (FAILED(ITypeInfo_GetVarDesc(info, v, &desc))) break; + OLE_CHECK(ITypeInfo2_GetAllVarCustData(info2,v,&cust_data)); OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, &varname, 1, &cNames)); if(cNames!=1) { printf("GetNames failed - VARDESC should have one name, got %d\n", cNames); return; } printf(" {\n" @@ -4444,6 +4482,14 @@ static void test_dump_typelib(const WCHAR *name) } else { printf(" { /* DUMMYUNIONNAME unused*/ },\n"); } + + printf(" /*#custdata*/ %d, %s\n", cust_data.cCustData, cust_data.cCustData ? "{" : "{},"); + for (c = 0; c < cust_data.cCustData; ++c) { + printf(" %s,\n", dump_custdata_info(&cust_data.prgCustData[c])); + } + if (cust_data.cCustData) printf(" },\n"); + ClearCustData(&cust_data); + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescVar.tdesc.vt, vt_map), map_value(get_href_type(info, &desc->elemdescVar.tdesc), tkind_map), dump_param_flags(U(desc->elemdescVar).paramdesc.wParamFlags)); printf(" },\n"); @@ -4462,6 +4508,7 @@ static void test_dump_typelib(const WCHAR *name) } ITypeInfo_ReleaseTypeAttr(info, attr); + ITypeInfo2_Release(info2); ITypeInfo_Release(info); SysFreeString(name); } @@ -4480,11 +4527,18 @@ typedef struct _variant_info { }; } variant_info; +typedef struct _custdata_info { + LPCSTR uuid; + variant_info value; +} custdata_info; + typedef struct _element_info { VARTYPE vt; TYPEKIND type; USHORT wParamFlags; + DWORD cCustData; + custdata_info custdata[5]; } element_info; typedef struct _function_info @@ -4499,6 +4553,8 @@ typedef struct _function_info short cScodes; WORD wFuncFlags; element_info ret_type; + DWORD cCustData; + custdata_info custdata[5]; element_info params[15]; LPCSTR names[15]; } function_info; @@ -4513,6 +4569,8 @@ typedef struct _var_info ULONG oInst; /* VAR_PERINSTANCE */ variant_info varValue; /* VAR_CONST */ } DUMMYUNIONNAME; + DWORD cCustData; + custdata_info custdata[5]; element_info elemdescVar; } var_info; @@ -4529,6 +4587,8 @@ typedef struct _type_info USHORT cbSizeVft; USHORT cFuncs; USHORT cVars; + DWORD cCustData; + custdata_info custdata[5]; function_info funcs[20]; var_info vars[20]; } type_info; @@ -4540,11 +4600,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "g1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4554,11 +4616,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -4577,11 +4641,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -4600,11 +4666,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4621,11 +4689,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "n1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4635,6 +4705,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4643,6 +4714,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4651,11 +4723,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "m1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4665,6 +4739,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4673,6 +4748,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4681,11 +4757,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -4702,6 +4780,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4714,6 +4793,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4726,6 +4806,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -4740,6 +4821,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -4758,6 +4840,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -4780,6 +4863,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -4808,6 +4892,7 @@ static const type_info info[] = { /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4824,11 +4909,13 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4845,11 +4932,13 @@ static const type_info info[] = { "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -4866,26 +4955,31 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96dd}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 8 }, + /*#custdata*/ 0, {}, {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 12 }, + /*#custdata*/ 0, {}, {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4895,26 +4989,31 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 4, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "hr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_BOOL, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000002, /*name*/ "disp", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 8 }, + /*#custdata*/ 0, {}, {VT_DISPATCH, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000003, /*name*/ "bstr", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 12 }, + /*#custdata*/ 0, {}, {VT_BSTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4924,6 +5023,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4932,6 +5032,7 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -4940,16 +5041,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "a1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "a2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4959,16 +5063,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "aa1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "aa2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4978,16 +5085,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "b1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "b2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -4997,16 +5107,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "bb1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "bb2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5016,6 +5129,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5024,16 +5138,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "c1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "c2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5043,16 +5160,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "cc1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "cc2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5062,6 +5182,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5070,16 +5191,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "d1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "d2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5089,16 +5213,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a75396e}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "dd1", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "dd2", /*flags*/ 0, /*kind*/ VAR_CONST, { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5108,6 +5235,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5116,11 +5244,13 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "e1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5130,11 +5260,13 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "ee1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5144,6 +5276,7 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ }, }, @@ -5152,16 +5285,19 @@ static const type_info info[] = { "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "f1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5171,16 +5307,19 @@ static const type_info info[] = { "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ }, { /* vars */ { /*id*/ 0x40000000, /*name*/ "ff1", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, { .oInst = 4 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5190,11 +5329,13 @@ static const type_info info[] = { "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5209,6 +5350,7 @@ static const type_info info[] = { /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5223,6 +5365,7 @@ static const type_info info[] = { /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5237,6 +5380,7 @@ static const type_info info[] = { /*id*/ 0x60020003, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5251,6 +5395,7 @@ static const type_info info[] = { /*id*/ 0x60020004, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5265,6 +5410,7 @@ static const type_info info[] = { /*id*/ 0x60020005, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, {-1, 0, 0} @@ -5283,11 +5429,13 @@ static const type_info info[] = { "{2d4430d5-99ea-4645-85f0-c5814b72804b}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispatch*), /*size*/ sizeof(ITestDispatch*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 7, /*#var*/ 2, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5300,6 +5448,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5314,6 +5463,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5326,6 +5476,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5340,6 +5491,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5352,6 +5504,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5366,6 +5519,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {VT_I4, -1, PARAMFLAG_FLCID}, @@ -5383,11 +5537,13 @@ static const type_info info[] = { { /*id*/ 0xa, /*name*/ "property_int", /*flags*/ 0, /*kind*/ VAR_DISPATCH, { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 0, {}, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ }, { /*id*/ 0xb, /*name*/ "property_HRESULT", /*flags*/ 0, /*kind*/ VAR_DISPATCH, { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 0, {}, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ }, }, @@ -5397,11 +5553,13 @@ static const type_info info[] = { "{79ca07f9-ac22-44ac-9aaf-811f45412293}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -5418,6 +5576,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5430,6 +5589,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5442,6 +5602,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -5456,6 +5617,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -5474,6 +5636,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5496,6 +5659,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5524,6 +5688,7 @@ static const type_info info[] = { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5536,6 +5701,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5548,6 +5714,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5560,6 +5727,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5572,6 +5740,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5584,6 +5753,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5596,6 +5766,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -5614,11 +5785,13 @@ static const type_info info[] = { "{79ca07f9-ac22-44ac-9aaf-811f45412293}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(ITestDispDual*), /*size*/ sizeof(ITestDispDual*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 14, /*#func*/ 7, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x1, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5631,6 +5804,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5645,6 +5819,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5657,6 +5832,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5671,6 +5847,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5683,6 +5860,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL}, {-1, 0, 0} @@ -5697,6 +5875,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {VT_I4, -1, PARAMFLAG_FLCID}, @@ -5719,11 +5898,13 @@ static const type_info info[] = { "{cdb105e3-24fb-4ae6-b826-801b7b2a0a07}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestDispInherit*), /*size*/ sizeof(ITestDispInherit*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 14, /*#var*/ 0, + /*#custdata*/ 0, {}, { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FOUT}, @@ -5740,6 +5921,7 @@ static const type_info info[] = { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5752,6 +5934,7 @@ static const type_info info[] = { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5764,6 +5947,7 @@ static const type_info info[] = { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FOUT}, {-1, 0, 0} @@ -5778,6 +5962,7 @@ static const type_info info[] = { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_UINT, -1, PARAMFLAG_FIN}, {VT_UI4, -1, PARAMFLAG_FIN}, @@ -5796,6 +5981,7 @@ static const type_info info[] = { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_PTR, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5818,6 +6004,7 @@ static const type_info info[] = { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_I4, -1, PARAMFLAG_FIN}, {VT_PTR, -1, PARAMFLAG_FIN}, @@ -5846,6 +6033,7 @@ static const type_info info[] = { /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5858,6 +6046,7 @@ static const type_info info[] = { /*id*/ 0x2, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5870,6 +6059,7 @@ static const type_info info[] = { /*id*/ 0x3, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5882,6 +6072,7 @@ static const type_info info[] = { /*id*/ 0x4, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5894,6 +6085,7 @@ static const type_info info[] = { /*id*/ 0x5, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0, {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5906,6 +6098,7 @@ static const type_info info[] = { /*id*/ 0x6, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {-1, 0, 0} }, @@ -5918,6 +6111,7 @@ static const type_info info[] = { /*id*/ 0x7, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 13, /*#scodes*/ 0, /*flags*/ 0, {VT_R8, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 0, {}, { /* params */ {VT_BSTR, -1, PARAMFLAG_FIN}, {-1, 0, 0} @@ -5956,11 +6150,18 @@ static const type_info info[] = { expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \ } +static void parse_guid(LPCSTR strGuid, GUID *guid) +{ + WCHAR guidW[39]; + MultiByteToWideChar(CP_ACP, 0, strGuid, -1, guidW, ARRAY_SIZE(guidW)); + ole_check(IIDFromString(guidW, guid)); +} + static void test_dump_typelib(const WCHAR *name) { ITypeLib *typelib; CUSTDATA cust_data; - int iface = 0, func, var; + int iface = 0, func, var, cust; HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; @@ -6000,13 +6201,11 @@ static void test_dump_typelib(const WCHAR *name) /* compare type uuid */ if (ti->uuid && *ti->uuid) { - WCHAR guidW[39]; ITypeInfo *typeinfo2; HRESULT hr; GUID guid; - MultiByteToWideChar(CP_ACP, 0, ti->uuid, -1, guidW, ARRAY_SIZE(guidW)); - IIDFromString(guidW, &guid); + parse_guid(ti->uuid,&guid); expect_guid(&guid, &typeattr->guid); /* check that it's possible to search using this uuid */ @@ -6016,9 +6215,26 @@ static void test_dump_typelib(const WCHAR *name) if (hr == S_OK) ITypeInfo_Release(typeinfo2); } + ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); + hr = ITypeInfo_QueryInterface(typeinfo, &IID_ITypeInfo2, (void**)&typeinfo2); ok(hr == S_OK, "Could not get ITypeInfo2: %08x\n", hr); + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllCustData(typeinfo2,&cust_data)); + expect_int(cust_data.cCustData, ti->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < ti->cCustData; cust++) + { + GUID guid; + parse_guid(ti->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetCustData(typeinfo2,&guid,&v); + ok(hr == S_OK, "GetCustDatafailed: %08x\n", hr); + check_variant_info(&v,&ti->custdata[cust].value); + VariantClear(&v); + } + for (func = 0; func < typeattr->cFuncs; func++) { const function_info *fn_info = &ti->funcs[func]; @@ -6038,6 +6254,22 @@ static void test_dump_typelib(const WCHAR *name) expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*)); expect_int(desc->cScodes, fn_info->cScodes); expect_int(desc->wFuncFlags, fn_info->wFuncFlags); + + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllFuncCustData(typeinfo2,func,&cust_data)); + expect_int(cust_data.cCustData, fn_info->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < fn_info->cCustData; cust++) + { + GUID guid; + parse_guid(fn_info->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetFuncCustData(typeinfo2,func,&guid,&v); + ok(hr == S_OK, "GetCustDatafailed: %08x\n", hr); + check_variant_info(&v,&fn_info->custdata[cust].value); + VariantClear(&v); + } + ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames)); for (i = 0; i < cNames; i++) { @@ -6051,6 +6283,21 @@ static void test_dump_typelib(const WCHAR *name) { check_type(&desc->lprgelemdescParam[i], &fn_info->params[i]); + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllParamCustData(typeinfo2,func,i,&cust_data)); + expect_int(cust_data.cCustData, fn_info->params[i].cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < fn_info->params[i].cCustData; cust++) + { + GUID guid; + parse_guid(fn_info->params[i].custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetParamCustData(typeinfo2,func,i,&guid,&v); + ok(hr == S_OK, "GetParamCustDatafailed: %08x\n", hr); + check_variant_info(&v,&fn_info->params[i].custdata[cust].value); + VariantClear(&v); + } + if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED) { ITypeInfo *param; @@ -6080,9 +6327,7 @@ static void test_dump_typelib(const WCHAR *name) VariantClear(&v); memset(&cust_data, 0, sizeof(cust_data)); - hr = ITypeInfo2_GetAllCustData(typeinfo2, &cust_data); ITypeInfo_ReleaseFuncDesc(typeinfo, desc); - ClearCustData(&cust_data); } for (var = 0; var < typeattr->cVars; var++) @@ -6112,6 +6357,20 @@ static void test_dump_typelib(const WCHAR *name) } else { expect_null(desc->DUMMYUNIONNAME.lpvarValue); } + memset(&cust_data, 0, sizeof(cust_data)); + ole_check(ITypeInfo2_GetAllVarCustData(typeinfo2,var,&cust_data)); + expect_int(cust_data.cCustData, var_info->cCustData); + ClearCustData(&cust_data); + for (cust = 0; cust < var_info->cCustData; cust++) + { + GUID guid; + parse_guid(var_info->custdata[cust].uuid,&guid); + /* check that it's possible to search using this uuid */ + hr = ITypeInfo2_GetVarCustData(typeinfo2,var,&guid,&v); + ok(hr == S_OK, "GetVarCustData failed: %08x\n", hr); + check_variant_info(&v,&var_info->custdata[cust].value); + VariantClear(&v); + } check_type(&desc->elemdescVar, &var_info->elemdescVar);

1 0

[PATCH 12/13] oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.
by Puetz Kevin A 07 Aug '20

07 Aug '20

VariantCopy clears existing contents of pvargDest and thus requires it contain a valid (possibly-empty) VARIANT, not uninitialized garbage. If a failure still occurs, propagate the HRESULT to GetAll*CustData. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/typelib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2f7ce53b1c..6dbd8c39b2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5290,6 +5290,7 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA TLBCustData *pCData; unsigned int ct; CUSTDATAITEM *cdi; + HRESULT hr = S_OK; ct = list_count(custdata_list); @@ -5302,11 +5303,13 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA cdi = pCustData->prgCustData; LIST_FOR_EACH_ENTRY(pCData, custdata_list, TLBCustData, entry){ cdi->guid = *TLB_get_guid_null(pCData->guid); - VariantCopy(&cdi->varValue, &pCData->data); + VariantInit(&cdi->varValue); + hr = VariantCopy(&cdi->varValue, &pCData->data); + if(FAILED(hr)) break; ++cdi; } - return S_OK; + return hr; }

2 1

[PATCH 11/13] widl: Allow adding the same custdata GUID multiple times in a typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

e.g. using the same kind of custdata in multiple interfaces Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- tools/widl/write_msft.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 87863e25fb..70d123813f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1263,18 +1263,25 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, int vt, const void *value, int *offset) { - MSFT_GuidEntry guidentry; int guidoffset; int custoffset; int *custdata; int data_out; + int hash_key; - guidentry.guid = *guid; + hash_key = ctl2_hash_guid(guid); + guidoffset = ctl2_find_guid(typelib, hash_key, guid); + if(guidoffset == -1) { + // add GUID that was not already present + MSFT_GuidEntry guidentry; + guidentry.guid = *guid; - guidentry.hreftype = -1; - guidentry.next_hash = -1; + guidentry.hreftype = -1; + guidentry.next_hash = -1; + + guidoffset = ctl2_alloc_guid(typelib, &guidentry); + } - guidoffset = ctl2_alloc_guid(typelib, &guidentry); if(vt == VT_BSTR) write_string_value(typelib, &data_out, value); else

2 1

[PATCH 10/13] widl: write ATTR_CUSTOM into typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- tools/widl/write_msft.c | 78 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4a3caea0bb..87863e25fb 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1291,6 +1291,25 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } +static HRESULT set_custdata_attr(msft_typelib_t *typelib, attr_custdata_t *custdata, int *offset) +{ + switch(custdata->pval->type) { + case EXPR_STRLIT: + case EXPR_WSTRLIT: + set_custdata(typelib, &custdata->id, VT_BSTR, custdata->pval->u.sval, offset); + break; + case EXPR_HEXNUM: + case EXPR_NUM: + set_custdata(typelib, &custdata->id, VT_I4, &custdata->pval->u.lval, offset); + break; + default: + error("custom() attribute with unknown type\n"); + break; + } + + return S_OK; +} + static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int offset, name_offset; @@ -1298,12 +1317,14 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) int i, id, next_idx; int decoded_size, extra_attr = 0; int num_params = 0, num_optional = 0, num_defaults = 0; + int has_arg_custdata = 0; var_t *arg; unsigned char *namedata; const attr_t *attr; unsigned int funcflags = 0, callconv = 4 /* CC_STDCALL */; unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; int help_context = 0, help_string_context = 0, help_string_offset = -1; + int func_custdata_offset = -1; int entry = -1, entry_is_ord = 0; int lcid_retval_count = 0; @@ -1337,6 +1358,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) num_defaults++; else if(attr->type == ATTR_OPTIONAL) num_optional++; + else if(attr->type == ATTR_CUSTOM) + has_arg_custdata = 1; } } @@ -1350,6 +1373,9 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_BINDABLE: funcflags |= 0x4; /* FUNCFLAG_FBINDABLE */ break; + case ATTR_CUSTOM: + set_custdata_attr(typeinfo->typelib, attr->u.pval, &func_custdata_offset); + break; case ATTR_DEFAULTBIND: funcflags |= 0x20; /* FUNCFLAG_FDEFAULTBIND */ break; @@ -1430,6 +1456,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) } } + if(has_arg_custdata || func_custdata_offset != -1) { + extra_attr = max(extra_attr, 7 + num_params); + } + /* allocate type data space for us */ typedata_size = 0x18 + extra_attr * sizeof(int) + (num_params * (num_defaults ? 16 : 12)); @@ -1476,6 +1506,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) typedata[2] = funcflags; typedata[3] = ((52 /*sizeof(FUNCDESC)*/ + decoded_size) << 16) | typeinfo->typeinfo->cbSizeVft; typedata[4] = (next_idx << 16) | (callconv << 8) | (invokekind << 3) | funckind; + if(has_arg_custdata || func_custdata_offset != -1) typedata[4] |= 0x0080; if(num_defaults) typedata[4] |= 0x1000; if(entry_is_ord) typedata[4] |= 0x2000; typedata[5] = (num_optional << 16) | num_params; @@ -1486,6 +1517,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) typedata[3] += (24 /*sizeof(PARAMDESCEX)*/ * num_defaults) << 16; switch(extra_attr) { + default: + if(extra_attr > 7 + num_params) warning("unknown number of optional attrs\n"); + /* typedata[13..+num_params] = arg_custdata_offset handled in below loop */ + case 7: typedata[12] = func_custdata_offset; case 6: typedata[11] = help_string_context; case 5: typedata[10] = -1; case 4: typedata[9] = -1; @@ -1494,8 +1529,6 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case 1: typedata[6] = help_context; case 0: break; - default: - warning("unknown number of optional attrs\n"); } if (type_function_get_args(func->declspec.type)) @@ -1506,12 +1539,16 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) int paramflags = 0; int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; int *defaultdata = num_defaults ? typedata + 6 + extra_attr + i : NULL; + int arg_custdata_offset = -1; if(defaultdata) *defaultdata = -1; encode_var(typeinfo->typelib, arg->declspec.type, arg, paramdata, &decoded_size); if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { switch(attr->type) { + case ATTR_CUSTOM: + set_custdata_attr(typeinfo->typelib, attr->u.pval, &arg_custdata_offset); + break; case ATTR_DEFAULTVALUE: { paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ @@ -1539,6 +1576,9 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) chat("unhandled param attr %d\n", attr->type); break; } + if(extra_attr > 7 + i) { + typedata[13+i] = arg_custdata_offset; + } } paramdata[1] = -1; paramdata[2] = paramflags; @@ -1621,6 +1661,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) { int offset, id; unsigned int typedata_size; + int extra_attr = 0; INT *typedata; unsigned int var_datawidth, var_alignment = 0; int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; @@ -1629,6 +1670,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) const attr_t *attr; unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; + int var_custdata_offset = -1; if (!var->name) var->name = gen_name(); @@ -1643,6 +1685,10 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case ATTR_BINDABLE: varflags |= 0x04; /* VARFLAG_FBINDABLE */ break; + case ATTR_CUSTOM: + extra_attr = max(extra_attr,4); + set_custdata_attr(typeinfo->typelib, attr->u.pval, &var_custdata_offset); + break; case ATTR_DEFAULTBIND: varflags |= 0x20; /* VARFLAG_FDEFAULTBIND */ break; @@ -1686,7 +1732,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) } /* allocate type data space for us */ - typedata_size = 0x14; + typedata_size = 0x14 + extra_attr * sizeof(int); if (!typeinfo->var_data) { typeinfo->var_data = xmalloc(0x100); @@ -1762,6 +1808,17 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) /* add type description size to total required allocation */ typedata[3] += var_type_size << 16 | var_kind; + switch(extra_attr) { + case 5: typedata[9] = -1 /*help_context*/; + case 4: typedata[8] = var_custdata_offset; + case 3: typedata[7] = -1; + case 2: typedata[6] = -1 /*help_string_offset*/; + case 1: typedata[5] = -1 /*help_context*/; + break; + default: + warning("unknown number of optional attrs\n"); + } + /* fix type alignment */ alignment = (typeinfo->typeinfo->typekind >> 11) & 0x1f; if (alignment < var_alignment) { @@ -1871,7 +1928,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ if (kind == TKIND_COCLASS) typeinfo->flags |= 0x20; /* TYPEFLAG_FCONTROL */ break; - + case ATTR_CUSTOM: + set_custdata_attr(typelib, attr->u.pval, &typeinfo->oCustData); + break; case ATTR_DLLNAME: { int offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -2699,6 +2758,7 @@ int create_msft_typelib(typelib_t *typelib) msft_typelib_t *msft; int failed = 0; const statement_t *stmt; + const attr_t *attr; time_t cur_time; char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ @@ -2746,6 +2806,16 @@ int create_msft_typelib(typelib_t *typelib) set_help_string_dll(msft); set_help_string_context(msft); + if (typelib->attrs) LIST_FOR_EACH_ENTRY( attr, typelib->attrs, const attr_t, entry ) { + switch(attr->type) { + case ATTR_CUSTOM: + set_custdata_attr(msft, attr->u.pval, &msft->typelib_header.CustomDataOffset); + break; + default: + break; + } + } + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE");

2 1

[PATCH 09/13] widl: parse attribute custom(guid,expr).
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- tools/widl/parser.l | 2 +- tools/widl/parser.y | 18 ++++++++++++++++++ tools/widl/widltypes.h | 7 +++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3cbf4ff2d2..e163bd5d6f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -337,6 +337,7 @@ static const struct keyword attr_keywords[] = {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, {"control", tCONTROL}, + {"custom", tCUSTOM}, {"decode", tDECODE}, {"defaultbind", tDEFAULTBIND}, {"defaultcollelem", tDEFAULTCOLLELEM}, @@ -427,7 +428,6 @@ static const struct keyword attr_keywords[] = }; /* attributes TODO: - custom first_is last_is max_is diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1..c50880a7f1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -58,6 +58,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); static attr_t *make_attrp(enum attr_type type, void *val); +static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); @@ -173,6 +174,7 @@ static typelib_t *current_typelib; %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE +%token tCUSTOM %token tDECODE tDEFAULT tDEFAULTBIND %token tDEFAULTCOLLELEM %token tDEFAULTVALUE @@ -501,6 +503,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } + | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTBIND { $$ = make_attr(ATTR_DEFAULTBIND); } @@ -1211,6 +1214,8 @@ static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) list = xmalloc( sizeof(*list) ); list_init( list ); } + if(attr->type != ATTR_CUSTOM) + { LIST_FOR_EACH_ENTRY(attr_existing, list, attr_t, entry) if (attr_existing->type == attr->type) { @@ -1219,6 +1224,7 @@ static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) list_remove(&attr_existing->entry); break; } + } list_add_tail( list, &attr->entry ); return list; } @@ -1343,6 +1349,17 @@ static attr_t *make_attrp(enum attr_type type, void *val) return a; } +static attr_t *make_custom_attr(UUID *id, expr_t *pval) +{ + attr_t *a = xmalloc(sizeof(attr_t)); + attr_custdata_t *cstdata = xmalloc(sizeof(attr_custdata_t)); + a->type = ATTR_CUSTOM; + cstdata->id = *id; + cstdata->pval = pval; + a->u.pval = cstdata; + return a; +} + static expr_list_t *append_expr(expr_list_t *list, expr_t *expr) { if (!expr) return list; @@ -2091,6 +2108,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_COMMSTATUS */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, + /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, /* ATTR_DEFAULT */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, "default" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f..6b67538594 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -37,6 +37,7 @@ typedef GUID UUID; typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; +typedef struct _attr_custdata_t attr_custdata_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; typedef struct _var_t var_t; @@ -83,6 +84,7 @@ enum attr_type ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, ATTR_CONTROL, + ATTR_CUSTOM, ATTR_DECODE, ATTR_DEFAULT, ATTR_DEFAULTBIND, @@ -337,6 +339,11 @@ struct _expr_t { struct list entry; }; +struct _attr_custdata_t { + GUID id; + expr_t *pval; +}; + struct struct_details { var_list_t *fields;

2 1

[PATCH 08/13] widl: remove duplicate '\n\n' in midl_info_guid.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Per standard, ctime already ends with '\n\0', so this doubled it. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This patch should not be essential to the series It's only that the doubled '\n' changed the size of the string, when then also changed all of the offsets of following custdata. Which made comparisons to existing .tlb files annoying, so I fixed it. --- tools/widl/write_msft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5e21155761..4a3caea0bb 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2750,7 +2750,7 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

2 1

[PATCH 03/13] widl: fix uninitialized field in VARDESC.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This was just writing the 0x55555555 from xmalloc The field seems to be unused for VAR_DISPATCH, but was 0 in the typelibs I had to check (which seems reasonable) --- tools/widl/write_msft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7cfe9e146c..5e21155761 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1751,6 +1751,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ + typedata[4] = 0; typeinfo->datawidth = pointer_size; break; default:

1 0

[PATCH 02/13] oleaut32/tests: Fix expect_wstr_acpval(...,NULL).
by Puetz Kevin A 07 Aug '20

07 Aug '20

A NULL expected value is always a test failure, but printing the unexpected "wrong" value is more helpful than crashing. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- I hit this when I had broken the info[] generator, which is of course fixed, but but it seems worth fixing to not just crash (strcmp doesn't like NULL) --- dlls/oleaut32/tests/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3d5aeb0a26..6f68a201ba 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -53,7 +53,7 @@ { \ CHAR buf[260]; \ expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ - ok(strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ + ok(value && strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ } #define ole_expect(expr, expect) { \

1 0

[PATCH 01/13] oleaut32/tests: reformat test_dump_typelib.
by Puetz Kevin A 07 Aug '20

07 Aug '20

Always print initializer for funcs[] array, even when empty Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This is preparation for having additional arrays (e.g. vars[], custdata[]) which can each independently be empty (or not) --- dlls/oleaut32/tests/typelib.c | 99 ++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a8cb966f33..3d5aeb0a26 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4301,15 +4301,13 @@ static void test_dump_typelib(const WCHAR *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" - " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d", + " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d,\n", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs); - if (attr->cFuncs) printf(",\n {\n"); - else printf("\n"); - + printf(" { /* funcs */%s", attr->cFuncs ? "\n" : " },\n"); while (1) { FUNCDESC *desc; @@ -4404,14 +4402,15 @@ static const type_info info[] = { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, - { + { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, @@ -4433,7 +4432,7 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, - { + { /* funcs */ { /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0, @@ -4455,7 +4454,7 @@ static const type_info info[] = { "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, - { + { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0, @@ -4474,44 +4473,50 @@ static const type_info info[] = { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), - /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "n", "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "nn", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), - /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), - /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "m", "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), - /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "mm", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), - /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, - { + { /* funcs */ { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, @@ -4653,7 +4658,7 @@ static const type_info info[] = { "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, - { + { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, @@ -4672,128 +4677,148 @@ static const type_info info[] = { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "t_INT", "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "a", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_a", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "aa", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_b", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "bb", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "c", "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_c", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "cc", "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "d", "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_d", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "dd", "{016fe2ec-b2c8-45f8-b23b-39e53a75396e}", /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "e", "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_e", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "f", "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "_f", "{00000000-0000-0000-0000-000000000000}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), - /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, + { /* funcs */ }, }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, - { + { /* funcs */ { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0,

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.149.
by Liam Middlebrook 06 Aug '20

06 Aug '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Erik Kurzinger <ekurzinger(a)nvidia.com> Signed-off-by: Jeff Bolz <jbolz(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fc0e2182dd..e3126f9c8a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.148" +VK_XML_VERSION = "1.2.149" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

2 2

[PATCH 1/2] amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when stream is not initialized and AMMSF_NORENDER is not specified.
by Gijs Vermeulen 06 Aug '20

06 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/multimedia.c | 2 ++ dlls/amstream/tests/amstream.c | 38 ++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 414a903cf2..72af67f36f 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -428,6 +428,8 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); if (SUCCEEDED(ret)) ret = create_graph(This, NULL); + if (!(flags & AMMSF_NORENDER)) + return SUCCEEDED(ret) ? VFW_E_CANNOT_CONNECT : ret; } if (SUCCEEDED(ret)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 910ab11f52..6a72f3ed89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -283,13 +283,47 @@ static void test_openfile(const WCHAR *test_avi_path) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!graph, "Expected NULL graph.\n"); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!graph, "Expected non-NULL graph.\n"); IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -389,12 +423,12 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); - todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.28.0

2 2

[PATCH vkd3d] build: Clean widl-generated headers if building with widl.
by Zebediah Figura 06 Aug '20

06 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This patch can be easily ignored... Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 8b8bfca..aaaa5e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -214,6 +214,9 @@ vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@) vkd3d_v_widl_0 = @echo " WIDL " $@; vkd3d_v_widl_1 = +if HAVE_WIDL + CLEANFILES += $(widl_headers) +endif EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL -- 2.27.0

1 0

[PATCH 1/2] include: Add d3d12 reflection structures.
by Paul Gofman 06 Aug '20

06 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/Makefile.in | 1 + include/d3d12shader.h | 187 ++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 19 +++++ include/d3dcompiler.h | 1 + 4 files changed, 208 insertions(+) create mode 100644 include/d3d12shader.h diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7ae..0c31eb8cc12 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -108,6 +108,7 @@ SOURCES = \ d3d11on12.idl \ d3d11sdklayers.idl \ d3d11shader.h \ + d3d12shader.h \ d3d12.idl \ d3d8.h \ d3d8caps.h \ diff --git a/include/d3d12shader.h b/include/d3d12shader.h new file mode 100644 index 00000000000..a5ef054e806 --- /dev/null +++ b/include/d3d12shader.h @@ -0,0 +1,187 @@ +/* + * Copyright 2020 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3D12SHADER_H__ +#define __D3D12SHADER_H__ + +#include "d3dcommon.h" + +typedef struct _D3D12_SHADER_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D12_SHADER_DESC; + +typedef struct _D3D12_SHADER_VARIABLE_DESC +{ + const char *Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + void *DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D12_SHADER_VARIABLE_DESC; + +typedef struct _D3D12_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + const char *Name; +} D3D12_SHADER_TYPE_DESC; + +typedef struct _D3D12_SHADER_BUFFER_DESC +{ + const char *Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D12_SHADER_BUFFER_DESC; + +typedef struct _D3D12_SHADER_INPUT_BIND_DESC +{ + const char *Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; + UINT Space; + UINT uID; +} D3D12_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D12_SIGNATURE_PARAMETER_DESC +{ + const char *SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; + D3D_MIN_PRECISION MinPrecision; +} D3D12_SIGNATURE_PARAMETER_DESC; + +typedef struct _D3D12_PARAMETER_DESC +{ + const char *Name; + const char *SemanticName; + D3D_SHADER_VARIABLE_TYPE Type; + D3D_SHADER_VARIABLE_CLASS Class; + UINT Rows; + UINT Columns; + D3D_INTERPOLATION_MODE InterpolationMode; + D3D_PARAMETER_FLAGS Flags; + UINT FirstInRegister; + UINT FirstInComponent; + UINT FirstOutRegister; + UINT FirstOutComponent; +} D3D12_PARAMETER_DESC; + +typedef struct _D3D12_FUNCTION_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT MovInstructionCount; + UINT MovcInstructionCount; + UINT ConversionInstructionCount; + UINT BitwiseInstructionCount; + D3D_FEATURE_LEVEL MinFeatureLevel; + UINT64 RequiredFeatureFlags; + const char *Name; + INT FunctionParameterCount; + BOOL HasReturn; + BOOL Has10Level9VertexShader; + BOOL Has10Level9PixelShader; +} D3D12_FUNCTION_DESC; + +typedef struct _D3D12_LIBRARY_DESC +{ + const char *Creator; + UINT Flags; + UINT FunctionCount; +} D3D12_LIBRARY_DESC; + +#endif diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 29404efd69d..b0c3fe2b693 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -686,4 +686,23 @@ typedef enum _D3D_SHADER_CBUFFER_FLAGS D3D_CBF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_CBUFFER_FLAGS; +typedef enum _D3D_PARAMETER_FLAGS +{ + D3D_PF_NONE, + D3D_PF_IN, + D3D_PF_OUT, + D3D_PF_FORCE_DWORD, +} D3D_PARAMETER_FLAGS; + +typedef enum _D3D_INTERPOLATION_MODE { + D3D_INTERPOLATION_UNDEFINED, + D3D_INTERPOLATION_CONSTANT, + D3D_INTERPOLATION_LINEAR, + D3D_INTERPOLATION_LINEAR_CENTROID, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID, + D3D_INTERPOLATION_LINEAR_SAMPLE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE, +} D3D_INTERPOLATION_MODE; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);") diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index bd1b3d1d44d..f11251e9dbf 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -20,6 +20,7 @@ #define __D3DCOMPILER_H__ #include "d3d11shader.h" +#include "d3d12shader.h" #ifdef __cplusplus extern "C" { -- 2.26.2

2 3

[PATCH 6/6] msvcrt: Import atan from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 98 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 8 deletions(-)

1 0

[PATCH 5/6] msvcrt: Import atanf from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 85 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-)

1 0

[PATCH 4/6] msvcrt: Import atan2 from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 71 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-)

1 0

[PATCH 3/6] msvcrt: Import atan2f from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 69 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import asin from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-)

1 0

[PATCH 1/6] msvcrt: Import asinf from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 47 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] xactengine3_6: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_6/Makefile.in | 11 +++++++++++ dlls/xactengine3_6/xactengine3_6.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_6/Makefile.in create mode 100644 dlls/xactengine3_6/xactengine3_6.spec diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in new file mode 100644 index 00000000000..fad71a2fd57 --- /dev/null +++ b/dlls/xactengine3_6/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_6.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0306 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_6/xactengine3_6.spec b/dlls/xactengine3_6/xactengine3_6.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_6/xactengine3_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 24c792e2f05..a6abeb773ca 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,9 +20,18 @@ #pragma makedep register +#if XACT3_VER == 0x0306 [ - helpstring("XACT3 Class"), + helpstring("XACT3.6 Class"), + threading(both), + uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) +] +coclass XACTEngine36 { interface IXACT37Engine; } +#else /* XACT3_VER == 0x0307 or not defined */ +[ + helpstring("XACT3.7 Class"), threading(both), uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] coclass XACTEngine37 { interface IXACT37Engine; } +#endif -- 2.27.0

2 1

[PATCH] winex11.drv: Send WM_SYSKEYDOWN if the Alt+F4 shortcut was used to close the window.
by Gabriel Ivăncescu 06 Aug '20

06 Aug '20

Some applications (e.g. Brothers - A Tale of Two Sons) are sensitive to the difference between Alt+F4 and a normal close of the window. Window Managers typically have the Alt+F4 configured to send the WM_DELETE_WINDOW message, which won't even send a F4 key press at all to the window. So we have to distinguish between that and another source of that message (for example, clicking the X button) while handling it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/event.c | 2 ++ dlls/winex11.drv/keyboard.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 52 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1a..99077ad 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -688,6 +688,8 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) break; } } + else if (X11DRV_HandleKeyCloseShortcut( hwnd, event->display, event_time )) + return; PostMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c..4efee15 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1417,6 +1417,55 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_HandleKeyCloseShortcut + * + * Handle the close shortcut (Alt+F4) on a delete window message. + */ +BOOL X11DRV_HandleKeyCloseShortcut(HWND hwnd, Display *display, Time event_time) +{ + unsigned int pressed = 0, i; + BYTE keystate[256]; + char keys[32]; + WORD scan = 0; + + /* WMs handle this shortcut and not send it to the window at all, + so we have to query the keymap and see whether it is pressed. */ + XQueryKeymap(display, keys); + + /* The minimum keycode is always greater or equal to 8. */ + for (i = 8; i < 256; i++) + { + switch (keyc2vkey[i]) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + if (keys[i / 8] & (1 << (i % 8))) + pressed |= 1; + break; + case VK_F4: + if (keys[i / 8] & (1 << (i % 8))) + { + scan = keyc2scan[i] & 0xFF; + pressed |= 2; + } + break; + } + } + if (pressed != 3) return FALSE; + + /* In this case, the Alt keystate must match, but not the VK_F4. */ + if (!get_async_key_state(keystate)) return FALSE; + if (!(keystate[VK_MENU] & 0x80) || (keystate[VK_F4] & 0x80)) return FALSE; + + /* Simulate the VK_F4 press, since it's eaten by the WM (the release is not). */ + update_user_time(event_time); + X11DRV_send_keyboard_input(hwnd, VK_F4, scan, 0, EVENT_x11_time_to_win32_time(event_time)); + + return TRUE; +} + /********************************************************************** * X11DRV_KEYBOARD_DetectLayout * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375fd14..f294c10 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -632,6 +632,7 @@ extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_HandleKeyCloseShortcut( HWND hwnd, Display *display, Time event_time ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; -- 2.21.0

1 0

[PATCH] preloader: Extend low memory area a bit
by Arkadiusz Hiler 06 Aug '20

06 Aug '20

SDL.dll which is shipped with Doom II on Steam has one of the fixup records broken which causes relocation to fail on some Linux systems. On Windows if we reserve that memory area before loading the DLL we experience similar crash, and yet there are no bug reports for this dosbox.exe + SDL combo. The change here extends the low memory area over the DLL's base address (+ some) to make sure that range is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49660 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- loader/preloader.c | 4 ++-- loader/preloader_mac.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index bb16ecd96a..fe7e005320 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -114,11 +114,11 @@ static struct wine_preload_info preload_info[] = #ifdef __i386__ { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00110000, 0x68160000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ #else { (void *)0x000000010000, 0x00100000 }, /* DOS area */ - { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x000000110000, 0x68160000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e..6bd88882c6 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -73,11 +73,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00000000, 0x00001000 }, /* first page */ { (void *)0x00001000, 0x0000f000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00110000, 0x68160000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ #else /* __i386__ */ { (void *)0x000000010000, 0x00100000 }, /* DOS area */ - { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x000000110000, 0x68160000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ -- 2.28.0

1 0

[PATCH 3/3] ucrtbase: Support _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING flag in printf.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/printf.h | 78 +++++++++++++++++++++++---- dlls/ucrtbase/tests/printf.c | 10 +++- include/msvcrt/corecrt_stdio_config.h | 1 + 4 files changed, 78 insertions(+), 14 deletions(-)

1 0

[PATCH 2/3] ucrtbase: Fix away from 0 rounding in %a format.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- We were duplicating bug in native implementation that is fixed in newest ucrtbase version. dlls/msvcrt/printf.h | 4 ++-- dlls/ucrtbase/tests/printf.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[PATCH 1/3] ucrtbase: Fix precision handling in %#g when printing 0.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- We were duplicating bug in native implementation that is fixed in newest ucrtbase version. dlls/msvcrt/printf.h | 5 +---- dlls/ucrtbase/tests/printf.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-)

1 0

[PATCH] vbscript: Return correct error for null start in InStr and more tests
by Dmitry Kislyuk 06 Aug '20

06 Aug '20

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Also print the vkd3d-shader version when printing the vkd3d-compiler version.
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9b50c10..e2f9ae5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -265,7 +265,9 @@ int main(int argc, char **argv) if (options.print_version) { - fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + const char *version = vkd3d_shader_get_version(NULL, NULL); + + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION " using %s\n", version); return 0; } -- 2.11.0

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Introduce vkd3d_shader_get_supported_target_types().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 36 ++++++++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 24 +++++++++++++++-------- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3dc3bb0..af97b04 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -751,6 +751,8 @@ struct vkd3d_shader_signature const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -784,6 +786,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); +typedef const enum vkd3d_shader_target_type *(*PFN_vkd3d_shader_get_supported_target_types)( + enum vkd3d_shader_source_type source_type, unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 15a1403..1937131 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -10,6 +10,7 @@ global: vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_get_supported_source_types; + vkd3d_shader_get_supported_target_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7a5c405..3e7b6cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -256,6 +256,7 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; unsigned int count, i; if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) @@ -276,13 +277,16 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->target_type) + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_TARGET_SPIRV_BINARY: + if (target_types[i] == compile_info->target_type) break; - default: - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } return VKD3D_OK; @@ -1056,3 +1060,25 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns *count = ARRAY_SIZE(types); return types; } + +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count) +{ + static const enum vkd3d_shader_target_type dxbc_tpf_types[] = + { + VKD3D_SHADER_TARGET_SPIRV_BINARY, + }; + + TRACE("source_type %#x, count %p.\n", source_type, count); + + switch (source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + *count = ARRAY_SIZE(dxbc_tpf_types); + return dxbc_tpf_types; + + default: + *count = 0; + return NULL; + } +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index df2a4f2..d0f3f5d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -76,6 +76,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; + PFN_vkd3d_shader_get_supported_target_types pfn_vkd3d_shader_get_supported_target_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -92,12 +93,13 @@ static void test_vkd3d_shader_pfns(void) unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; + unsigned int i, j, source_count, target_count; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; - unsigned int i, count; bool b; int rc; @@ -124,6 +126,7 @@ static void test_vkd3d_shader_pfns(void) static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; + pfn_vkd3d_shader_get_supported_target_types = vkd3d_shader_get_supported_target_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -143,20 +146,25 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); - source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + source_types = pfn_vkd3d_shader_get_supported_source_types(&source_count); ok(source_types, "Got unexpected source types array %p.\n", source_types); - ok(count, "Got unexpected source type count %u.\n", count); + ok(source_count, "Got unexpected source type count %u.\n", source_count); b = false; - for (i = 0; i < count; ++i) + for (i = 0; i < source_count; ++i) { - if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + target_types = pfn_vkd3d_shader_get_supported_target_types(source_types[i], &target_count); + ok(target_types, "Got unexpected target types array %p.\n", target_types); + ok(target_count, "Got unexpected target type count %u.\n", target_count); + + for (j = 0; j < target_count; ++j) { - b = true; - break; + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF + && target_types[j] == VKD3D_SHADER_TARGET_SPIRV_BINARY) + b = true; } } - ok(b, "The dxbc-tpf source type is not supported.\n"); + ok(b, "The dxbc-tpf source type with spirv-binary target type is not supported.\n"); rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Introduce vkd3d_shader_get_supported_source_types().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 29 ++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 92ce9b9..3dc3bb0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -750,6 +750,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -782,6 +783,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); +typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index eca7278..15a1403 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_supported_source_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ab08620..7a5c405 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -255,19 +255,25 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { + const enum vkd3d_shader_source_type *source_types; + unsigned int count, i; + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { WARN("Invalid structure type %#x.\n", compile_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->source_type) + source_types = vkd3d_shader_get_supported_source_types(&count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_SOURCE_DXBC_TPF: + if (source_types[i] == compile_info->source_type) break; - default: - WARN("Invalid shader source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader source type %#x.\n", compile_info->source_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } switch (compile_info->target_type) @@ -1037,3 +1043,16 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; } + +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count) +{ + static const enum vkd3d_shader_source_type types[] = + { + VKD3D_SHADER_SOURCE_DXBC_TPF, + }; + + TRACE("count %p.\n", count); + + *count = ARRAY_SIZE(types); + return types; +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index fab17ad..df2a4f2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -75,6 +75,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -90,11 +91,14 @@ static void test_vkd3d_shader_pfns(void) struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; + const enum vkd3d_shader_source_type *source_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; + unsigned int i, count; + bool b; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -119,6 +123,7 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -138,6 +143,21 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + ok(source_types, "Got unexpected source types array %p.\n", source_types); + ok(count, "Got unexpected source type count %u.\n", count); + + b = false; + for (i = 0; i < count; ++i) + { + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + { + b = true; + break; + } + } + ok(b, "The dxbc-tpf source type is not supported.\n"); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Use vkd3d_shader_validate_compile_info() in vkd3d_shader_scan().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 140bdd4..ab08620 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -839,17 +839,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) - { - WARN("Invalid structure type %#x.\n", compile_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - if (compile_info->source_type != VKD3D_SHADER_SOURCE_DXBC_TPF) - { - WARN("Unsupported source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) { -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Introduce vkd3d_shader_get_version().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 21 ++++++++++++-------- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 19 ++++++++++++++++++ libs/vkd3d/device.c | 3 ++- tests/vkd3d_shader_api.c | 37 +++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 00a5f58..b172517 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ -AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include/private AM_LDFLAGS = -no-undefined widl_headers = \ @@ -58,7 +58,8 @@ vkd3d_demos_headers = \ demos/demo_win32.h \ demos/demo_xcb.h -BUILT_SOURCES = $(widl_headers) +BUILT_SOURCES = $(widl_headers) \ + include/private/vkd3d_version.h noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ @@ -109,8 +110,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_shaders.h \ - libs/vkd3d/vulkan_procs.h \ - libs/vkd3d_version.c + libs/vkd3d/vulkan_procs.h libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -208,10 +208,15 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in Makefile -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -libs/vkd3d_version.c: dummy-vkd3d-version - $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -.SILENT: libs/vkd3d_version.c -CLEANFILES += libs/vkd3d_version.c +include/private/vkd3d_version.h: dummy-vkd3d-version + @$(MKDIR_P) include/private + version=`(GIT_DIR=$(top_srcdir)/.git git rev-parse --short HEAD 2>/dev/null || echo '') \ + | $(SED) -e 's!$..*$! (git \1)!' \ + | $(SED) -n -e '$$s!$.*$!#define VKD3D_VCS_ID "\1"!p'` \ + && (echo $$version | cmp -s - $@) \ + || echo $$version >$@ || ($(RM) $@ && exit 1) +.SILENT: include/private/vkd3d_version.h +CLEANFILES += include/private/vkd3d_version.h .PHONY: dummy-vkd3d-version dummy-vkd3d-version: diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index de2c0c7..92ce9b9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -749,6 +749,8 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); + int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); void vkd3d_shader_free_messages(char *messages); @@ -779,6 +781,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature /* * Function pointer typedefs for vkd3d-shader functions. */ +typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); + typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 9c9f0a5..eca7278 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; vkd3d_shader_scan; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index cfac8e2..140bdd4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -17,6 +17,7 @@ */ #include "vkd3d_shader_private.h" +#include "vkd3d_version.h" #include <stdio.h> @@ -1027,3 +1028,21 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature vkd3d_free(signature->elements); signature->elements = NULL; } + +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) +{ + int x, y; + + TRACE("major %p, minor %p.\n", major, minor); + + if (major || minor) + { + vkd3d_parse_version(PACKAGE_VERSION, &x, &y); + if (major) + *major = x; + if (minor) + *minor = y; + } + + return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d88fde9..bef6477 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -17,6 +17,7 @@ */ #include "vkd3d_private.h" +#include "vkd3d_version.h" #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -460,7 +461,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; - TRACE("Build: %s.\n", vkd3d_build); + TRACE("Build: " PACKAGE_STRING VKD3D_VCS_ID ".\n"); if (!create_info->pfn_signal_event) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index e25dd20..fab17ad 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -83,15 +83,18 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_get_version pfn_vkd3d_shader_get_version; PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; PFN_vkd3d_shader_scan pfn_vkd3d_shader_scan; struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; + unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; + const char *version, *p; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -124,9 +127,17 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_get_version = vkd3d_shader_get_version; pfn_vkd3d_shader_compile = vkd3d_shader_compile; pfn_vkd3d_shader_scan = vkd3d_shader_scan; + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + version = pfn_vkd3d_shader_get_version(&major, &minor); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); @@ -163,10 +174,36 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_scan_descriptor_info(&descriptor_info); } +static void test_version(void) +{ + unsigned int major, minor, expected_major, expected_minor; + const char *version, *p; + + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + + version = vkd3d_shader_get_version(NULL, NULL); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + + major = ~0u; + vkd3d_shader_get_version(&major, NULL); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + + minor = ~0u; + vkd3d_shader_get_version(NULL, &minor); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + + major = minor = ~0u; + vkd3d_shader_get_version(&major, &minor); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); + run_test(test_version); } -- 2.11.0

1 0

[PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer functions.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/6] combase: Move CoCreateGuid().
by Nikolay Sivov 06 Aug '20

06 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.c | 14 ++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 26 -------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 87bb149b594..71537f699b1 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,6 @@ MODULE = combase.dll IMPORTLIB = combase -IMPORTS = advapi32 ole32 user32 gdi32 uuid +IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 DELAYIMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index bf1228a1f24..9bf2252fb85 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -440,3 +440,17 @@ HRESULT WINAPI CoFileTimeNow(FILETIME *filetime) GetSystemTimeAsFileTime(filetime); return S_OK; } + +/****************************************************************************** + * CoCreateGuid (combase.@) + */ +HRESULT WINAPI CoCreateGuid(GUID *guid) +{ + RPC_STATUS status; + + if (!guid) return E_INVALIDARG; + + status = UuidCreate(guid); + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; + return HRESULT_FROM_WIN32(status); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9940229c46f..ddfe5c5ca2e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -78,7 +78,7 @@ @ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy @ stub CoCreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler -@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 29c8ca6e13a..f96d69c198c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,32 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -/****************************************************************************** - * CoCreateGuid [OLE32.@] - * - * Simply forwards to UuidCreate in RPCRT4. - * - * PARAMS - * pguid [O] Points to the GUID to initialize. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * UuidCreate - */ -HRESULT WINAPI CoCreateGuid(GUID *pguid) -{ - DWORD status; - - if(!pguid) return E_INVALIDARG; - - status = UuidCreate(pguid); - if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; - return HRESULT_FROM_WIN32( status ); -} - static inline BOOL is_valid_hex(WCHAR c) { if (!(((c >= '0') && (c <= '9')) || diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 87c950cf438..0713a989eed 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -11,7 +11,7 @@ @ stdcall CoBuildVersion() @ stdcall CoCopyProxy(ptr ptr) @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) -@ stdcall CoCreateGuid(ptr) +@ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDecrementMTAUsage(ptr) -- 2.27.0

3 13

[PATCH v2 6/6] xactengine3_7: Implement IXACT3Engine::RegisterNotification and IXACT3Engine::UnRegisterNotification functions.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patches from Ethan Lee and Alistair Leslie-Hughes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 5/6] xactengine3_7: Implement IXACT3WaveBank::Play function.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 4/6] xactengine3_7: Implement IXACT3SoundBank::Play function.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 3/6] xactengine3_7: Implement IXACT3Wave interface.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 2/6] xactengine3_7: Implement IXACT3Engine::CreateStreamingWaveBank.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 1/6] xactengine3_7: Implement IXACT3WaveBank Interface.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 7/7] xactengine3_0: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_0/Makefile.in | 11 +++++++++++ dlls/xactengine3_0/xactengine3_0.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_0/Makefile.in create mode 100644 dlls/xactengine3_0/xactengine3_0.spec diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in new file mode 100644 index 00000000000..e5c77dcccd7 --- /dev/null +++ b/dlls/xactengine3_0/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_0.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0300 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_0/xactengine3_0.spec b/dlls/xactengine3_0/xactengine3_0.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_0/xactengine3_0.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index aeac5d4cd37..2ed8d337ac8 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0301 +#if XACT3_VER == 0x0300 +[ + helpstring("XACT3.0 Class"), + threading(both), + uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) +] +coclass XACTEngine30 { interface IXACT30Engine; } +#elif XACT3_VER == 0x0301 [ helpstring("XACT3.1 Class"), threading(both), -- 2.27.0

1 0

[PATCH 6/7] xactengine3_1: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_1/Makefile.in | 11 +++++++++++ dlls/xactengine3_1/xactengine3_1.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_1/Makefile.in create mode 100644 dlls/xactengine3_1/xactengine3_1.spec diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in new file mode 100644 index 00000000000..f95ea04624c --- /dev/null +++ b/dlls/xactengine3_1/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_1.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0301 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_1/xactengine3_1.spec b/dlls/xactengine3_1/xactengine3_1.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_1/xactengine3_1.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index aa8aede3657..aeac5d4cd37 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0302 +#if XACT3_VER == 0x0301 +[ + helpstring("XACT3.1 Class"), + threading(both), + uuid(962f5027-99be-4692-a468-85802cf8de61) +] +coclass XACTEngine31 { interface IXACT32Engine; } +#elif XACT3_VER == 0x0302 [ helpstring("XACT3.2 Class"), threading(both), -- 2.27.0

1 0

[PATCH 5/7] xactengine3_2: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_2/Makefile.in | 11 +++++++++++ dlls/xactengine3_2/xactengine3_2.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_2/Makefile.in create mode 100644 dlls/xactengine3_2/xactengine3_2.spec diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in new file mode 100644 index 00000000000..911888ec6e5 --- /dev/null +++ b/dlls/xactengine3_2/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_2.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0302 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_2/xactengine3_2.spec b/dlls/xactengine3_2/xactengine3_2.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_2/xactengine3_2.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index a8182a1552b..aa8aede3657 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0303 +#if XACT3_VER == 0x0302 +[ + helpstring("XACT3.2 Class"), + threading(both), + uuid(d3332f02-3dd0-4de9-9aec-20d85c4111b6) +] +coclass XACTEngine32 { interface IXACT32Engine; } +#elif XACT3_VER == 0x0303 [ helpstring("XACT3.3 Class"), threading(both), -- 2.27.0

1 0

[PATCH 4/7] xactengine3_3: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_3/Makefile.in | 11 +++++++++++ dlls/xactengine3_3/xactengine3_3.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_3/Makefile.in create mode 100644 dlls/xactengine3_3/xactengine3_3.spec diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in new file mode 100644 index 00000000000..cf0155f1bee --- /dev/null +++ b/dlls/xactengine3_3/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_3.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0303 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_3/xactengine3_3.spec b/dlls/xactengine3_3/xactengine3_3.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_3/xactengine3_3.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 2a8eee8face..a8182a1552b 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0304 +#if XACT3_VER == 0x0303 +[ + helpstring("XACT3.3 Class"), + threading(both), + uuid(94c1affa-66e7-4961-9521-cfdef3128d4f) +] +coclass XACTEngine33 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0304 [ helpstring("XACT3.4 Class"), threading(both), -- 2.27.0

1 0

[PATCH 3/7] xactengine3_4: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_4/Makefile.in | 11 +++++++++++ dlls/xactengine3_4/xactengine3_4.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_4/Makefile.in create mode 100644 dlls/xactengine3_4/xactengine3_4.spec diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in new file mode 100644 index 00000000000..f90ca3d32cd --- /dev/null +++ b/dlls/xactengine3_4/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_4.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0304 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_4/xactengine3_4.spec b/dlls/xactengine3_4/xactengine3_4.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_4/xactengine3_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 186bc06537d..2a8eee8face 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0305 +#if XACT3_VER == 0x0304 +[ + helpstring("XACT3.4 Class"), + threading(both), + uuid(0977d092-2d95-4e43-8d42-9ddcc2545ed5) +] +coclass XACTEngine34 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0305 [ helpstring("XACT3.5 Class"), threading(both), -- 2.27.0

1 0

[PATCH 2/7] xactengine3_5: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_5/Makefile.in | 11 +++++++++++ dlls/xactengine3_5/xactengine3_5.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_5/Makefile.in create mode 100644 dlls/xactengine3_5/xactengine3_5.spec diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in new file mode 100644 index 00000000000..b9f3f09ff37 --- /dev/null +++ b/dlls/xactengine3_5/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_5.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0305 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_5/xactengine3_5.spec b/dlls/xactengine3_5/xactengine3_5.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_5/xactengine3_5.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index a6abeb773ca..186bc06537d 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0306 +#if XACT3_VER == 0x0305 +[ + helpstring("XACT3.5 Class"), + threading(both), + uuid(074b110f-7f58-4743-aea5-12f15b5074ed) +] +coclass XACTEngine35 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0306 [ helpstring("XACT3.6 Class"), threading(both), -- 2.27.0

1 0

[PATCH] ntdll/tests: Handle 32 cores.
by Daniel Lehman 06 Aug '20

06 Aug '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/tests/info.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a127c87781..057b855914 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -51,6 +51,12 @@ static BOOL is_wow64; */ static DWORD one_before_last_pid = 0; +static inline DWORD_PTR get_affinity_mask(DWORD num_cpus) +{ + if (num_cpus >= sizeof(DWORD_PTR) * 8) return ~(DWORD_PTR)0; + return ((DWORD_PTR)1 << num_cpus) - 1; +} + #define NTDLL_GET_PROC(func) do { \ p ## func = (void*)GetProcAddress(hntdll, #func); \ if(!p ## func) { \ @@ -2251,8 +2257,8 @@ static void test_affinity(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = pbi.AffinityMask; - ok( proc_affinity == (1 << si.dwNumberOfProcessors) - 1, "Unexpected process affinity\n" ); - proc_affinity = 1 << si.dwNumberOfProcessors; + ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); + proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -2264,8 +2270,8 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); - thread_affinity = 1 << si.dwNumberOfProcessors; + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); + thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -2319,7 +2325,7 @@ static void test_affinity(void) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "unexpected affinity %#lx\n", tbi.AffinityMask ); + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#lx\n", tbi.AffinityMask ); } else skip("Cannot test thread affinity mask for 'all processors' flag\n"); @@ -2341,13 +2347,13 @@ static void test_affinity(void) ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - proc_affinity = (1 << si.dwNumberOfProcessors) - 1; + proc_affinity = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); } @@ -2445,13 +2451,13 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); /* allow the test to run on all processors */ - new_mask = (1 << si.dwNumberOfProcessors) - 1; + new_mask = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask)); ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); for (i = 0; i < si.dwNumberOfProcessors; i++) { - new_mask = 1 << i; + new_mask = (DWORD_PTR)1 << i; status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask)); ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); -- 2.25.1

1 0

[PATCH 6/6] xactengine3_7: Implement IXACT3Engine::RegisterNotification and IXACT3Engine::UnRegisterNotification functions.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 3

[PATCH 5/6] xactengine3_7: Implement IXACT3WaveBank::Play function.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 2

[PATCH 4/6] xactengine3_7: Implement IXACT3SoundBank::Play function.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 1/6] xactengine3_7: Implement IXACT3WaveBank Interface.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 3/6] xactengine3_7: Implement IXACT3Wave interface.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 2/6] xactengine3_7: Implement IXACT3Engine::CreateStreamingWaveBank.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] winex11.drv: Remove active client window from window data before deleting it.
by Paul Gofman 05 Aug '20

05 Aug '20

Fixes a crash with BadDrawable X error which happens when client window is used in windows.c:sync_client_position() after the GL drawable has been deleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49649 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4a3ab31273a..a2ec8bd0c91 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -240,6 +240,7 @@ enum dc_gl_type struct gl_drawable { LONG ref; /* reference count */ + HWND hwnd; enum dc_gl_type type; /* type of GL surface */ GLXDrawable drawable; /* drawable for rendering with GL */ Window window; /* window if drawable is a GLXWindow */ @@ -1162,10 +1163,23 @@ static void release_gl_drawable( struct gl_drawable *gl ) { case DC_GL_WINDOW: case DC_GL_CHILD_WIN: + { + struct x11drv_win_data *data = get_win_data( gl->hwnd ); + TRACE( "destroying %lx drawable %lx\n", gl->window, gl->drawable ); + if (data) + { + if (data->client_window == gl->window) + { + XDeleteContext( data->display, data->client_window, winContext ); + data->client_window = 0; + } + release_win_data( data ); + } pglXDestroyWindow( gdi_display, gl->drawable ); XDestroyWindow( gdi_display, gl->window ); break; + } case DC_GL_PIXMAP_WIN: TRACE( "destroying pixmap %lx drawable %lx\n", gl->pixmap, gl->drawable ); pglXDestroyPixmap( gdi_display, gl->drawable ); @@ -1321,6 +1335,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI * there is no way to query it, so we have to store it here. */ + gl->hwnd = hwnd; gl->swap_interval = 1; gl->refresh_swap_interval = TRUE; gl->format = format; -- 2.26.2

1 0

[PATCH v2] comdlg32: Filename should be filled after CDN_INITDONE.
by Mikołaj Zalewski 05 Aug '20

05 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33590 Signed-off-by: Mikołaj Zalewski <mikolaj(a)zalewski.pl>

1 0

[PATCH v2] ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb.
by Mikołaj Zalewski 05 Aug '20

05 Aug '20

Without it, Raspbian gcc thinks the next function (raise_func_trampoline_arm) is in Thumb and will create its own trampoline to to execute it as Thumb (bad). Signed-off-by: Mikołaj Zalewski <mikolaj(a)zalewski.pl>

1 0

[PATCH 1/3] ntdll: Add additional fields to generated SMBIOS baseboard info table.
by Brendan Shanks 05 Aug '20

05 Aug '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 57 +++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4e0841175eb..69532669bef 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -123,6 +123,12 @@ struct smbios_board BYTE product; BYTE version; BYTE serial; + BYTE asset_tag; + BYTE feature_flags; + BYTE location; + WORD chassis_handle; + BYTE board_type; + BYTE num_contained_handles; }; struct smbios_chassis @@ -1250,8 +1256,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char system_sku[128], system_family[128]; size_t system_sku_len, system_family_len; - char board_vendor[128], board_product[128], board_version[128], board_serial[128]; - size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; + char board_vendor[128], board_product[128], board_version[128], board_serial[128], board_asset_tag[128]; + size_t board_vendor_len, board_product_len, board_version_len, board_serial_len, board_asset_tag_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; @@ -1279,6 +1285,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + board_asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); @@ -1297,7 +1304,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + L(board_serial_len) + 1, 2); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + + L(board_serial_len) + L(board_asset_tag_len) + 1, 2); *required_len += sizeof(struct smbios_chassis); *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + @@ -1371,24 +1379,6 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - string_count = 0; chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; @@ -1412,6 +1402,31 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_vendor_len ? ++string_count : 0; + board->product = board_product_len ? ++string_count : 0; + board->version = board_version_len ? ++string_count : 0; + board->serial = board_serial_len ? ++string_count : 0; + board->asset_tag = board_asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_vendor, board_vendor_len); + copy_smbios_string(&buffer, board_product, board_product_len); + copy_smbios_string(&buffer, board_version, board_version_len); + copy_smbios_string(&buffer, board_serial, board_serial_len); + copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + end_of_table = (struct smbios_header*)buffer; end_of_table->type = 127; end_of_table->length = sizeof(struct smbios_header); -- 2.26.2

1 2

[PATCH 1/2] include: Define all CLSID/IID_IXACT3Engine versions
by Alistair Leslie-Hughes 05 Aug '20

05 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 80059c124a5..2b4f0e07f3c 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -30,11 +30,34 @@ extern "C" { #endif -DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#if XACT3_VER == 0x0300 + DEFINE_GUID(CLSID_XACTEngine, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +#elif XACT3_VER == 0x0301 + DEFINE_GUID(CLSID_XACTEngine, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +#elif XACT3_VER == 0x0302 + DEFINE_GUID(CLSID_XACTEngine, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +#elif XACT3_VER == 0x0303 + DEFINE_GUID(CLSID_XACTEngine, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +#elif XACT3_VER == 0x0304 + DEFINE_GUID(CLSID_XACTEngine, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +#elif XACT3_VER == 0x0305 + DEFINE_GUID(CLSID_XACTEngine, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +#elif XACT3_VER == 0x0306 + DEFINE_GUID(CLSID_XACTEngine, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); +#else /* XACT3_VER == 0x0307 or not defined */ + DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#endif + DEFINE_GUID(CLSID_XACTAuditionEngine, 0x9ecdd80d, 0x0e81, 0x40d8, 0x89, 0x03, 0x2b, 0xf7, 0xb1, 0x31, 0xac, 0x43); DEFINE_GUID(CLSID_XACTDebugEngine, 0x02860630, 0xbf3b, 0x42a8, 0xb1, 0x4e, 0x91, 0xed, 0xa2, 0xf5, 0x1e, 0xa5); -DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#if XACT3_VER == 0x0300 + DEFINE_GUID(IID_IXACT3Engine, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +#elif XACT3_VER >= 0x0301 && XACT3_VER <= 0x304 + DEFINE_GUID(IID_IXACT3Engine, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); +#else + DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#endif typedef struct IXACT3SoundBank IXACT3SoundBank; typedef struct IXACT3WaveBank IXACT3WaveBank; -- 2.27.0

2 1

[PATCH v2 1/3] amstream/tests: Split test_IDirectDrawStreamSample().
by Gijs Vermeulen 05 Aug '20

05 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 268 ++++++++++++++++++++------------- 1 file changed, 167 insertions(+), 101 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index cf66538a7a..1310e42cf2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2543,106 +2543,6 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_IDirectDrawStreamSample(void) -{ - IDirectDrawMediaStream *ddraw_stream = NULL; - IDirectDrawStreamSample *sample = NULL; - IDirectDrawSurface *surface, *surface2; - IMediaStream *stream2, *stream = NULL; - DDSURFACEDESC desc = { sizeof(desc) }; - IAMMultiMediaStream *mmstream; - IDirectDrawSurface7 *surface7; - HRESULT hr; - RECT rect; - - if (!(mmstream = create_ammultimediastream())) - return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(mmstream); - return; - } - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - - surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface != NULL, "got %p\n", surface); - - /* Crashes on native. */ - if (0) - { - hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - } - - hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); - IMediaStream_Release(stream2); - - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDirectDrawSurface7_Release(surface7); - - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); - ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); - ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); - IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(sample); - - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(surface, 2); - - surface2 = NULL; - SetRectEmpty(&rect); - hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface == surface2, "got %p\n", surface2); - ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); - EXPECT_REF(surface, 3); - IDirectDrawSurface_Release(surface2); - - hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - IDirectDrawStreamSample_Release(sample); - IDirectDrawSurface_Release(surface); - -error: - if (ddraw_stream) - IDirectDrawMediaStream_Release(ddraw_stream); - if (stream) - IMediaStream_Release(stream); - - release_directdraw(); - IAMMultiMediaStream_Release(mmstream); -} - static IUnknown *create_audio_data(void) { IUnknown *audio_data = NULL; @@ -5728,6 +5628,170 @@ static void test_audiostreamsample_get_audio_data(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_create_sample(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawSurface *surface, *surface2; + DDSURFACEDESC desc = { sizeof(desc) }; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream; + IDirectDraw *ddraw; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + SetRectEmpty(&rect); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + EXPECT_REF(stream, 3); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(stream, 4); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + IDirectDrawSurface_Release(surface); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); + ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(stream, 3); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + SetRectEmpty(&rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface2 == surface, "Expected surface %p, got %p.\n", surface, surface2); + ok(rect.right > 0 && rect.bottom > 0, "Got rect %d, %d.\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(surface, 1); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream, *stream2; + IDirectDraw *ddraw; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + todo_wine EXPECT_REF(stream, 4); + hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + todo_wine EXPECT_REF(stream, 5); + IMediaStream_Release(stream2); + todo_wine EXPECT_REF(stream, 4); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5744,7 +5808,6 @@ START_TEST(amstream) test_set_state(); test_enum_media_types(); test_media_types(); - test_IDirectDrawStreamSample(); test_avi_path = load_resource(L"test.avi"); @@ -5780,6 +5843,9 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); + test_ddrawstream_create_sample(); + + test_ddrawstreamsample_get_media_stream(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.28.0

3 5

[PATCH v2 1/2] fsutil: Print out usage message
by Arkadiusz Hiler 05 Aug '20

05 Aug '20

From: Michael Müller <michael(a)fds-team.de> Fsutil doesn't do anything yet other than printing out usage message. This patch puts some thing in place in preparation for the implementation of hardlink subcommand. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- programs/fsutil/Makefile.in | 4 +++ programs/fsutil/fsutil.mc | 27 ++++++++++++++++ programs/fsutil/main.c | 63 ++++++++++++++++++++++++++++++++++--- programs/fsutil/resources.h | 21 +++++++++++++ 4 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 programs/fsutil/fsutil.mc create mode 100644 programs/fsutil/resources.h diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index 64307e83ac..fe736bad5d 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,6 +1,10 @@ MODULE = fsutil.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +MC_SRCS = \ + fsutil.mc diff --git a/programs/fsutil/fsutil.mc b/programs/fsutil/fsutil.mc new file mode 100644 index 0000000000..54c801cb2b --- /dev/null +++ b/programs/fsutil/fsutil.mc @@ -0,0 +1,27 @@ +; +; Copyright 2020 Arkadiusz Hiler for CodeWeavers +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:fsutil) + +MessageId=101 +SymbolicName=STRING_USAGE +Language=ENU +- Supported Commands - + +[NONE] +. diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index eb4e341297..1d61edab75 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -1,5 +1,6 @@ /* * Copyright 2016 Austin English + * Copyright 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +17,70 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> + #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(fsutil); +static void output_write(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!msgA) return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } +} + +static int WINAPIV output_string(int msg, ...) +{ + WCHAR out[8192]; + __ms_va_list arguments; + int len; + + __ms_va_start(arguments, msg); + len = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE, NULL, msg, 0, out, ARRAY_SIZE(out), &arguments); + __ms_va_end(arguments); + + if (len == 0 && GetLastError() != NO_ERROR) + WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg); + else + output_write(out, len); + + return 0; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); + TRACE("Command line:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", debugstr_w(argv[i])); + TRACE("\n"); - return 0; + if (argc > 1) + { + FIXME("unsupported command %s\n", debugstr_w(argv[1])); + ret = 1; + } + + output_string(STRING_USAGE); + return ret; } diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h new file mode 100644 index 0000000000..36b0ffc35f --- /dev/null +++ b/programs/fsutil/resources.h @@ -0,0 +1,21 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#define STRING_USAGE 101 -- 2.28.0

2 3

[PATCH 1/2] fsutil: Print out usage message
by Arkadiusz Hiler 05 Aug '20

05 Aug '20

From: Michael Müller <michael(a)fds-team.de> Fsutil doesn't do anything yet other than printing out usage message. This patch puts some thing in place in preparation for the implementation of hardlink subcommand. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- programs/fsutil/Makefile.in | 4 +++ programs/fsutil/fsutil.mc | 27 ++++++++++++++++ programs/fsutil/main.c | 63 ++++++++++++++++++++++++++++++++++--- programs/fsutil/resources.h | 21 +++++++++++++ 4 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 programs/fsutil/fsutil.mc create mode 100644 programs/fsutil/resources.h diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index 64307e83ac..fe736bad5d 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,6 +1,10 @@ MODULE = fsutil.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +MC_SRCS = \ + fsutil.mc diff --git a/programs/fsutil/fsutil.mc b/programs/fsutil/fsutil.mc new file mode 100644 index 0000000000..54c801cb2b --- /dev/null +++ b/programs/fsutil/fsutil.mc @@ -0,0 +1,27 @@ +; +; Copyright 2020 Arkadiusz Hiler for CodeWeavers +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:fsutil) + +MessageId=101 +SymbolicName=STRING_USAGE +Language=ENU +- Supported Commands - + +[NONE] +. diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index eb4e341297..1d61edab75 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -1,5 +1,6 @@ /* * Copyright 2016 Austin English + * Copyright 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +17,70 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> + #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(fsutil); +static void output_write(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!msgA) return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } +} + +static int WINAPIV output_string(int msg, ...) +{ + WCHAR out[8192]; + __ms_va_list arguments; + int len; + + __ms_va_start(arguments, msg); + len = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE, NULL, msg, 0, out, ARRAY_SIZE(out), &arguments); + __ms_va_end(arguments); + + if (len == 0 && GetLastError() != NO_ERROR) + WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg); + else + output_write(out, len); + + return 0; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); + TRACE("Command line:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", debugstr_w(argv[i])); + TRACE("\n"); - return 0; + if (argc > 1) + { + FIXME("unsupported command %s\n", debugstr_w(argv[1])); + ret = 1; + } + + output_string(STRING_USAGE); + return ret; } diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h new file mode 100644 index 0000000000..36b0ffc35f --- /dev/null +++ b/programs/fsutil/resources.h @@ -0,0 +1,21 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#define STRING_USAGE 101 -- 2.28.0

2 4

[PATCH 2/2] msvcrt: Import acos from musl.
by Piotr Caban 05 Aug '20

05 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] msvcrt: Import acosf from musl.
by Piotr Caban 05 Aug '20

05 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 63 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 9 deletions(-)

1 0

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-devel