From b6135732d49e97404de922fbf01d5631573b8c70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 2 Jun 2019 00:23:02 +0200 Subject: [PATCH] [DLLs] Fix .spec files regarding OLE-specific exports. - Do not use hardcoded ordinals, add missing '-private'. Except for MSXML3, OLE32 and RSAENH, see commit bff824b2 for more details. - SHSVCS: The 6 first exports are nonamed with ordinals. Replace exported commented stubs by actual exported stubs instead. Co-Authored-By: Timo Kreuzer --- base/services/shsvcs/shsvcs.spec | 32 +++++++++++++-------------- dll/directx/bdaplgin/bdaplgin.spec | 8 +++---- dll/directx/ddraw/ddraw.spec | 4 ++-- dll/directx/msdvbnp/msdvbnp.spec | 8 +++---- dll/directx/msvidctl/msvidctl.spec | 8 +++---- dll/shellext/netplwiz/netplwiz.spec | 2 +- drivers/multimedia/bdasup/bdasup.spec | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/base/services/shsvcs/shsvcs.spec b/base/services/shsvcs/shsvcs.spec index e3ef5261f80..db98bcf0819 100644 --- a/base/services/shsvcs/shsvcs.spec +++ b/base/services/shsvcs/shsvcs.spec @@ -1,16 +1,16 @@ -1 stdcall ThemeWatchForStart() -2 stdcall ThemeWaitForServiceReady(long) -#3 stub Stub3 -#4 stub Stub4 -#5 stub Stub5 -#6 stub Stub6 -#7 stub BadApplicationServiceMain -8 stdcall DllInstall(long wstr) -9 stdcall DllRegisterServer() -10 stdcall DllUnregisterServer() -#11 stub HardwareDetectionServiceMain -12 stdcall ThemeServiceMain(long ptr) -#13 stub CreateHardwareEventMoniker -14 stdcall DllCanUnloadNow() -15 stdcall DllGetClassObject(ptr ptr ptr) -#16 stub FUSCompatibilityEntryW +1 stdcall -noname ThemeWatchForStart() +2 stdcall -noname ThemeWaitForServiceReady(long) +3 stdcall -stub -noname ThemeUserLogoff() +4 stdcall -stub -noname ThemeUserLogon(ptr) +5 stdcall -stub -noname ThemeUserStartShell() +6 stdcall -stub -noname ThemeUserTSReconnect() +@ stdcall -stub BadApplicationServiceMain(long ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall -stub HardwareDetectionServiceMain(long ptr) +@ stdcall ThemeServiceMain(long ptr) +@ stdcall -stub CreateHardwareEventMoniker(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -stub FUSCompatibilityEntryW(long long wstr long) diff --git a/dll/directx/bdaplgin/bdaplgin.spec b/dll/directx/bdaplgin/bdaplgin.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/bdaplgin/bdaplgin.spec +++ b/dll/directx/bdaplgin/bdaplgin.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/directx/ddraw/ddraw.spec b/dll/directx/ddraw/ddraw.spec index c372ab91504..07cabfaf527 100644 --- a/dll/directx/ddraw/ddraw.spec +++ b/dll/directx/ddraw/ddraw.spec @@ -13,8 +13,8 @@ @ stdcall DirectDrawEnumerateW(ptr ptr) @ stdcall DirectDrawEnumerateExA(ptr ptr long) @ stdcall DirectDrawEnumerateExW(ptr ptr long) -#@ stdcall DllCanUnloadNow() -#@ stdcall DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) #@ stdcall GetDDSurfaceLocal #@ stdcall GetOLEThunkData #@ stdcall GetSurfaceFromDC diff --git a/dll/directx/msdvbnp/msdvbnp.spec b/dll/directx/msdvbnp/msdvbnp.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/msdvbnp/msdvbnp.spec +++ b/dll/directx/msdvbnp/msdvbnp.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/directx/msvidctl/msvidctl.spec b/dll/directx/msvidctl/msvidctl.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/msvidctl/msvidctl.spec +++ b/dll/directx/msvidctl/msvidctl.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/shellext/netplwiz/netplwiz.spec b/dll/shellext/netplwiz/netplwiz.spec index 433874cb0b2..3437cce869c 100644 --- a/dll/shellext/netplwiz/netplwiz.spec +++ b/dll/shellext/netplwiz/netplwiz.spec @@ -5,7 +5,7 @@ 5 stub ClearAutoLogon @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -8 stub -private DllInstall +@ stub -private DllInstall 9 stdcall DllMain(ptr long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/drivers/multimedia/bdasup/bdasup.spec b/drivers/multimedia/bdasup/bdasup.spec index cd1b2e45e39..cdaa7776717 100644 --- a/drivers/multimedia/bdasup/bdasup.spec +++ b/drivers/multimedia/bdasup/bdasup.spec @@ -1,4 +1,4 @@ -@ stdcall DllInitialize(ptr) +@ stdcall -private DllInitialize(ptr) @ stdcall BdaCheckChanges(ptr) @ stdcall BdaCommitChanges(ptr) @ stdcall BdaCreateFilterFactory(ptr ptr ptr) -- 2.17.1