Dll* functions that should be exported by name

Francois Gouget fgouget at free.fr
Wed Aug 10 06:50:57 CDT 2005


I found a number of Dll* functions that should be exported by name 
rather than by ordinal (i.e. they have different ordinals depending on 
the Windows version you look at).

So I modified the spec file and their documentation accordingly.

Changelog:

  * dlls/dplayx/dplayx.spec
    dlls/dplayx/dpclassfactory.c
    dlls/dplayx/dplayx_main.c
    dlls/dpnhpast/dpnhpast.spec
    dlls/dpnhpast/main.c
    dlls/msi/msi.spec
    dlls/msi/msi.c
    dlls/msi/regsvr.c
    dlls/oleaut32/oleaut32.spec
    dlls/oleaut32/oleaut.c
    dlls/oleaut32/regsvr.c

    Francois Gouget <fgouget at free.fr>
    Change some Dll* functions so they are exported by name like on Windows.
    Update the documentation accordingly.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                  There are 10 types of people in the world...
                those who understand binary and those who don't.
-------------- next part --------------
Index: dlls/dplayx/dplayx.spec
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplayx.spec,v
retrieving revision 1.20
diff -u -p -r1.20 dplayx.spec
--- dlls/dplayx/dplayx.spec	8 Aug 2005 17:35:28 -0000	1.20
+++ dlls/dplayx/dplayx.spec	10 Aug 2005 09:46:38 -0000
@@ -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()
Index: dlls/dplayx/dpclassfactory.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dpclassfactory.c,v
retrieving revision 1.27
diff -u -p -r1.27 dpclassfactory.c
--- dlls/dplayx/dpclassfactory.c	8 Aug 2005 17:35:28 -0000	1.27
+++ dlls/dplayx/dpclassfactory.c	9 Aug 2005 15:41:11 -0000
@@ -101,7 +101,7 @@ static IClassFactoryImpl DP_and_DPL_CF =
 
 
 /*******************************************************************************
- * DllGetClassObject [DPLAYX.11]
+ * DllGetClassObject [DPLAYX.@]
  * Retrieves DP or DPL class object from a DLL object
  *
  * NOTES
Index: dlls/dplayx/dplayx_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplayx_main.c,v
retrieving revision 1.19
diff -u -p -r1.19 dplayx_main.c
--- dlls/dplayx/dplayx_main.c	8 Aug 2005 17:35:28 -0000	1.19
+++ dlls/dplayx/dplayx_main.c	10 Aug 2005 11:32:31 -0000
@@ -95,7 +95,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL,
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (DPLAYX.10)
+ *              DllCanUnloadNow (DPLAYX.@)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
Index: dlls/dpnhpast/dpnhpast.spec
===================================================================
RCS file: /var/cvs/wine/dlls/dpnhpast/dpnhpast.spec,v
retrieving revision 1.3
diff -u -p -r1.3 dpnhpast.spec
--- dlls/dpnhpast/dpnhpast.spec	8 Aug 2005 17:35:28 -0000	1.3
+++ dlls/dpnhpast/dpnhpast.spec	10 Aug 2005 10:03:49 -0000
@@ -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()
Index: dlls/dpnhpast/main.c
===================================================================
RCS file: /var/cvs/wine/dlls/dpnhpast/main.c,v
retrieving revision 1.6
diff -u -p -r1.6 main.c
--- dlls/dpnhpast/main.c	8 Aug 2005 17:35:28 -0000	1.6
+++ dlls/dpnhpast/main.c	9 Aug 2005 23:59:33 -0000
@@ -63,7 +63,7 @@ HRESULT WINAPI DPNHPAST_DirectPlayNATHel
 
 
 /******************************************************************
- *		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(REFCLSI
 
 
 /******************************************************************
- *		DllUnregisterServer (DPNHPAST.5)
+ *		DllUnregisterServer (DPNHPAST.@)
  *
  *
  */
Index: dlls/msi/msi.spec
===================================================================
RCS file: /var/cvs/wine/dlls/msi/msi.spec,v
retrieving revision 1.41
diff -u -p -r1.41 msi.spec
--- dlls/msi/msi.spec	8 Aug 2005 17:37:41 -0000	1.41
+++ dlls/msi/msi.spec	10 Aug 2005 10:02:05 -0000
@@ -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()
Index: dlls/msi/msi.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/msi.c,v
retrieving revision 1.96
diff -u -p -r1.96 msi.c
--- dlls/msi/msi.c	10 Aug 2005 09:53:47 -0000	1.96
+++ dlls/msi/msi.c	10 Aug 2005 11:40:06 -0000
@@ -1340,7 +1340,7 @@ static const IClassFactoryVtbl MsiCF_Vtb
 static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl };
 
 /******************************************************************
- * DllGetClassObject          [MSI.2]
+ * DllGetClassObject          [MSI.@]
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
Index: dlls/msi/regsvr.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/regsvr.c,v
retrieving revision 1.2
diff -u -p -r1.2 regsvr.c
--- dlls/msi/regsvr.c	8 Aug 2005 17:37:41 -0000	1.2
+++ dlls/msi/regsvr.c	10 Aug 2005 11:41:00 -0000
@@ -596,7 +596,7 @@ static struct regsvr_interface const int
 };
 
 /***********************************************************************
- *		DllRegisterServer
+ *		DllRegisterServer (MSI.@)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
@@ -611,7 +611,7 @@ HRESULT WINAPI DllRegisterServer(void)
 }
 
 /***********************************************************************
- *		DllUnregisterServer
+ *		DllUnregisterServer (MSI.@)
  */
 HRESULT WINAPI DllUnregisterServer(void)
 {
Index: dlls/oleaut32/oleaut32.spec
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/oleaut32.spec,v
retrieving revision 1.75
diff -u -p -r1.75 oleaut32.spec
--- dlls/oleaut32/oleaut32.spec	29 Jun 2005 20:16:41 -0000	1.75
+++ dlls/oleaut32/oleaut32.spec	10 Aug 2005 10:02:50 -0000
@@ -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()
Index: dlls/oleaut32/oleaut.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/oleaut.c,v
retrieving revision 1.51
diff -u -p -r1.51 oleaut.c
--- dlls/oleaut32/oleaut.c	9 Aug 2005 10:38:54 -0000	1.51
+++ dlls/oleaut32/oleaut.c	9 Aug 2005 15:44:04 -0000
@@ -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(REFCLSI
 }
 
 /***********************************************************************
- *		DllCanUnloadNow (OLEAUT32.410)
+ *		DllCanUnloadNow (OLEAUT32.@)
  *
  * Determine if this dll can be unloaded from the callers address space.
  *
Index: dlls/oleaut32/regsvr.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/regsvr.c,v
retrieving revision 1.6
diff -u -p -r1.6 regsvr.c
--- dlls/oleaut32/regsvr.c	19 Jul 2005 19:43:54 -0000	1.6
+++ dlls/oleaut32/regsvr.c	10 Aug 2005 11:35:08 -0000
@@ -901,7 +901,7 @@ static struct regsvr_interface const int
 };
 
 /***********************************************************************
- *		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)
 {


More information about the wine-patches mailing list