api-ms: Redirect com-private to combase.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-09-02 14:14:48 +03:00 committed by Alexandre Julliard
parent 1a7dbcfd42
commit 5d5329936e
2 changed files with 30 additions and 28 deletions

View file

@ -1,37 +1,37 @@
@ stub CLSIDFromOle1Class @ stub CLSIDFromOle1Class
@ stub CleanupOleStateInAllTls @ stub CleanupOleStateInAllTls
@ stub CleanupTlsOleState @ stdcall CleanupTlsOleState(ptr) combase.CleanupTlsOleState
@ stub ClearCleanupFlag @ stub ClearCleanupFlag
@ stub CoCreateErrorInfo @ stdcall CoCreateErrorInfo(ptr) combase.CoCreateErrorInfo
@ stub CoCreateObjectInContext @ stub CoCreateObjectInContext
@ stub CoDeactivateObject @ stub CoDeactivateObject
@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState
@ stub CoGetApartmentID @ stub CoGetApartmentID
@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState @ stdcall CoGetCallState(long ptr) combase.CoGetCallState
@ stub CoGetClassVersion @ stub CoGetClassVersion
@ stub CoGetErrorInfo @ stdcall CoGetErrorInfo(long ptr) combase.CoGetErrorInfo
@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile
@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage
@ stub CoGetModuleType @ stub CoGetModuleType
@ stub CoGetProcessIdentifier @ stub CoGetProcessIdentifier
@ stub CoGetSystemSecurityPermissions @ stub CoGetSystemSecurityPermissions
@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @ stdcall CoInitializeWOW(long long) combase.CoInitializeWOW
@ stub CoPopServiceDomain @ stub CoPopServiceDomain
@ stub CoPushServiceDomain @ stub CoPushServiceDomain
@ stub CoReactivateObject @ stub CoReactivateObject
@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy @ stdcall CoRegisterInitializeSpy(ptr ptr) combase.CoRegisterInitializeSpy
@ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy @ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy
@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter @ stdcall CoRegisterMessageFilter(ptr ptr) combase.CoRegisterMessageFilter
@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stdcall CoRegisterSurrogateEx(ptr ptr) combase.CoRegisterSurrogateEx
@ stub CoRetireServer @ stub CoRetireServer
@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeInitializeSpy(int64) combase.CoRevokeInitializeSpy
@ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy
@ stub CoSetErrorInfo @ stdcall CoSetErrorInfo(long ptr) combase.CoSetErrorInfo
@ stub CoUnloadingWOW @ stub CoUnloadingWOW
@ stub CoVrfCheckThreadState @ stub CoVrfCheckThreadState
@ stub CoVrfGetThreadState @ stub CoVrfGetThreadState
@ stub CoVrfReleaseThreadState @ stub CoVrfReleaseThreadState
@ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook @ stdcall DllDebugObjectRPCHook(long ptr) combase.DllDebugObjectRPCHook
@ stub EnableHookObject @ stub EnableHookObject
@ stub FreePropVariantArrayWorker @ stub FreePropVariantArrayWorker
@ stub GetCatalogHelper @ stub GetCatalogHelper
@ -51,7 +51,7 @@
@ stub InternalCoIsSurrogateProcess @ stub InternalCoIsSurrogateProcess
@ stub InternalCoRegisterDisconnectCallback @ stub InternalCoRegisterDisconnectCallback
@ stub InternalCoRegisterSurrogatedObject @ stub InternalCoRegisterSurrogatedObject
@ stub InternalCoStdMarshalObject @ stdcall InternalCoStdMarshalObject(ptr long ptr ptr) combase.InternalCoStdMarshalObject
@ stub InternalCoUnregisterDisconnectCallback @ stub InternalCoUnregisterDisconnectCallback
@ stub InternalCompleteObjRef @ stub InternalCompleteObjRef
@ stub InternalCreateCAggId @ stub InternalCreateCAggId
@ -60,15 +60,15 @@
@ stub InternalFillLocalOXIDInfo @ stub InternalFillLocalOXIDInfo
@ stub InternalFreeObjRef @ stub InternalFreeObjRef
@ stub InternalGetWindowPropInterface @ stub InternalGetWindowPropInterface
@ stub InternalIrotEnumRunning @ stdcall InternalIrotEnumRunning(ptr) combase.InternalIrotEnumRunning
@ stub InternalIrotGetObject @ stdcall InternalIrotGetObject(ptr ptr ptr) combase.InternalIrotGetObject
@ stub InternalIrotGetTimeOfLastChange @ stdcall InternalIrotGetTimeOfLastChange(ptr ptr) combase.InternalIrotGetTimeOfLastChange
@ stub InternalIrotIsRunning @ stdcall InternalIrotIsRunning(ptr) combase.InternalIrotIsRunning
@ stub InternalIrotNoteChangeTime @ stdcall InternalIrotNoteChangeTime(long ptr) combase.InternalIrotNoteChangeTime
@ stub InternalIrotRegister @ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr) combase.InternalIrotRegister
@ stub InternalIrotRevoke @ stdcall InternalIrotRevoke(long ptr ptr ptr) combase.InternalIrotRevoke
@ stub InternalIsApartmentInitialized @ stub InternalIsApartmentInitialized
@ stub InternalIsProcessInitialized @ stdcall InternalIsProcessInitialized() combase.InternalIsProcessInitialized
@ stub InternalMarshalObjRef @ stub InternalMarshalObjRef
@ stub InternalNotifyDDStartOrStop @ stub InternalNotifyDDStartOrStop
@ stub InternalOleModalLoopBlockFn @ stub InternalOleModalLoopBlockFn
@ -79,7 +79,7 @@
@ stub InternalSetAptCallCtrlOnTlsIfRequired @ stub InternalSetAptCallCtrlOnTlsIfRequired
@ stub InternalSetOleThunkWowPtr @ stub InternalSetOleThunkWowPtr
@ stub InternalStubInvoke @ stub InternalStubInvoke
@ stub InternalTlsAllocData @ stdcall InternalTlsAllocData(ptr) combase.InternalTlsAllocData
@ stub InternalUnmarshalObjRef @ stub InternalUnmarshalObjRef
@ stub NdrExtStubInitialize @ stub NdrExtStubInitialize
@ stub NdrOleDllGetClassObject @ stub NdrOleDllGetClassObject

View file

@ -329,13 +329,15 @@ my @dll_groups =
"api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-core-systemtopology-l1-1-0",
"api-ms-win-security-grouppolicy-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0",
], ],
[
"combase",
"api-ms-win-core-com-private-l1-1-0",
],
[ [
"ole32", "ole32",
"api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-downlevel-ole32-l1-1-0",
"api-ms-win-core-com-l1-1-0", "api-ms-win-core-com-l1-1-0",
"api-ms-win-core-com-l1-1-1", "api-ms-win-core-com-l1-1-1",
"api-ms-win-core-com-private-l1-1-0",
"combase",
"iprop", "iprop",
], ],
[ [