From 0de0d11357c226e8dd8ed0913b8398247ffffe80 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Wed, 10 Aug 2005 13:02:43 +0000 Subject: [PATCH] Change some Dll* functions so they are exported by name like on Windows. Update the documentation accordingly. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplayx.spec | 5 +++-- dlls/dplayx/dplayx_main.c | 2 +- dlls/dpnhpast/dpnhpast.spec | 9 +++++---- dlls/dpnhpast/main.c | 8 ++++---- dlls/msi/msi.c | 2 +- dlls/msi/msi.spec | 9 +++++---- dlls/msi/regsvr.c | 4 ++-- dlls/oleaut32/oleaut.c | 4 ++-- dlls/oleaut32/oleaut32.spec | 9 +++++---- dlls/oleaut32/regsvr.c | 4 ++-- 11 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 0c2f456ff2c..610b44bdd56 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -101,7 +101,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {&DP_and_DPL_Vtbl, 1 }; /******************************************************************************* - * DllGetClassObject [DPLAYX.11] + * DllGetClassObject [DPLAYX.@] * Retrieves DP or DPL class object from a DLL object * * NOTES diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec index 683e3b1bd52..7a17b03fe52 100644 --- a/dlls/dplayx/dplayx.spec +++ b/dlls/dplayx/dplayx.spec @@ -5,7 +5,8 @@ 5 stdcall DirectPlayLobbyCreateW(ptr ptr ptr ptr long) 6 extern gdwDPlaySPRefCount 9 stdcall DirectPlayEnumerate(ptr ptr) DirectPlayEnumerateA - 10 stdcall -private DllCanUnloadNow() - 11 stdcall -private DllGetClassObject(ptr ptr ptr) + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index f11ae99da58..20f214b4388 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -95,7 +95,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) } /*********************************************************************** - * DllCanUnloadNow (DPLAYX.10) + * DllCanUnloadNow (DPLAYX.@) */ HRESULT WINAPI DllCanUnloadNow(void) { diff --git a/dlls/dpnhpast/dpnhpast.spec b/dlls/dpnhpast/dpnhpast.spec index c6848c09759..67fb171001e 100644 --- a/dlls/dpnhpast/dpnhpast.spec +++ b/dlls/dpnhpast/dpnhpast.spec @@ -1,5 +1,6 @@ 1 stub DirectPlayNATHelpCreate -2 stdcall -private DllRegisterServer() -3 stdcall -private DllCanUnloadNow() -4 stdcall -private DllGetClassObject(ptr ptr ptr) -5 stdcall -private DllUnregisterServer() + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 1d639c4af39..93ba422ea0e 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -63,7 +63,7 @@ HRESULT WINAPI DPNHPAST_DirectPlayNATHelpCreate() /****************************************************************** - * DllRegisterServer (DPNHPAST.2) + * DllRegisterServer (DPNHPAST.@) * * */ @@ -75,7 +75,7 @@ HRESULT WINAPI DllRegisterServer(void) /****************************************************************** - * DllCanUnloadNow (DPNHPAST.3) + * DllCanUnloadNow (DPNHPAST.@) * * */ @@ -87,7 +87,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DPNHPAST.4) + * DllGetClassObject (DPNHPAST.@) * * */ @@ -99,7 +99,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /****************************************************************** - * DllUnregisterServer (DPNHPAST.5) + * DllUnregisterServer (DPNHPAST.@) * * */ diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5b92d7d173e..0d58d3c95c0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1340,7 +1340,7 @@ static const IClassFactoryVtbl MsiCF_Vtbl = static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; /****************************************************************** - * DllGetClassObject [MSI.2] + * DllGetClassObject [MSI.@] */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 1bc738bb4d4..bb25d20ed3b 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -1,7 +1,3 @@ -1 stdcall -private DllCanUnloadNow() -2 stdcall -private DllGetClassObject(ptr ptr ptr) -3 stdcall -private DllRegisterServer() -4 stdcall -private DllUnregisterServer() 5 stdcall MsiAdvertiseProductA(str str str long) 6 stdcall MsiAdvertiseProductW(wstr wstr wstr long) 7 stdcall MsiCloseAllHandles() @@ -234,3 +230,8 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stub Migrate10CachedPackagesW + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index dff338375db..f49b78a3bd5 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -596,7 +596,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer + * DllRegisterServer (MSI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -611,7 +611,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer + * DllUnregisterServer (MSI.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index c6e0139f739..2f0a9b5a4fd 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -700,7 +700,7 @@ extern void _get_STDFONT_CF(LPVOID); extern void _get_STDPIC_CF(LPVOID); /*********************************************************************** - * DllGetClassObject (OLEAUT32.1) + * DllGetClassObject (OLEAUT32.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { @@ -735,7 +735,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) } /*********************************************************************** - * DllCanUnloadNow (OLEAUT32.410) + * DllCanUnloadNow (OLEAUT32.@) * * Determine if this dll can be unloaded from the callers address space. * diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 0bb02f42d5c..cac6ae44b00 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -1,4 +1,3 @@ -1 stdcall -private DllGetClassObject(ptr ptr ptr) 2 stdcall SysAllocString(wstr) 3 stdcall SysReAllocString(ptr wstr) 4 stdcall SysAllocStringLen(wstr long) @@ -312,8 +311,6 @@ 317 stdcall VarR8Round(double long ptr) 318 stdcall VarCat(ptr ptr ptr) 319 stdcall VarDateFromUdateEx(ptr long long ptr) -320 stdcall -private DllRegisterServer() -321 stdcall -private DllUnregisterServer() 322 stdcall GetRecordInfoFromGuids(ptr long long long ptr ptr) 323 stdcall GetRecordInfoFromTypeInfo(ptr ptr) 325 stub SetVarConversionLocaleSetting @@ -382,7 +379,6 @@ 399 stub UserMSG_free_local 401 stdcall OleLoadPictureEx(ptr long long long long long long ptr) 402 stub OleLoadPictureFileEx -410 stdcall -private DllCanUnloadNow() 411 stdcall SafeArrayCreateVector(long long long) 412 stdcall SafeArrayCopyData(ptr ptr) 413 stdcall VectorFromBstr(ptr ptr) @@ -414,3 +410,8 @@ 439 stdcall VarUI8FromUI2(long ptr) 440 stdcall VarUI8FromUI4(long ptr) 441 stdcall VarUI8FromDec(long ptr) + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index daa9d55ff85..9ab5fd45bee 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -901,7 +901,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (OLEAUT32.320) + * DllRegisterServer (OLEAUT32.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -916,7 +916,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (OLEAUT32.321) + * DllUnregisterServer (OLEAUT32.@) */ HRESULT WINAPI DllUnregisterServer(void) {