[gvg] 17669: Sync to Wine-20050830:

Sync to Wine-20050830:
Alexandre Julliard <julliard(a)winehq.org>
- Don't prefix the functions DllCanUnloadNow, DllGetClassObject and
  Dll(Un)RegisterServer with the dll name so that the compiler can check
  the prototypes.
Modified: trunk/reactos/lib/mpr/mpr.spec
Modified: trunk/reactos/lib/mpr/mpr_main.c
  _____  

Modified: trunk/reactos/lib/mpr/mpr.spec
--- trunk/reactos/lib/mpr/mpr.spec	2005-09-05 21:08:24 UTC (rev
17668)
+++ trunk/reactos/lib/mpr/mpr.spec	2005-09-05 21:15:50 UTC (rev
17669)
@@ -1,114 +1,114 @@

-# ordinal exports
- 1 stub @
- 2 stub @
- 3 stub @
- 4 stub @
- 5 stub @
- 6 stub @
- 7 stub @
- 8 stub @
- 9 stub @
-12 stub @
-13 stub @
-14 stub @
-15 stub @
-16 stub @
-17 stub @
-18 stub @
-19 stub @
-20 stub @
-21 stub @
-22 stdcall @(long) MPR_Alloc
-23 stdcall @(ptr long) MPR_ReAlloc
-24 stdcall @(ptr) MPR_Free
-25 stdcall @(ptr long) _MPR_25
-
-@ stdcall -private DllCanUnloadNow() MPR_DllCanUnloadNow
-@ stub DllGetClassObject
-@ stdcall MultinetGetConnectionPerformanceA(ptr ptr)
-@ stdcall MultinetGetConnectionPerformanceW(ptr ptr)
-@ stdcall MultinetGetErrorTextA(long ptr long)
-@ stdcall MultinetGetErrorTextW(long ptr long)
-@ stdcall NPSAuthenticationDialogA(ptr)
-@ stdcall NPSCopyStringA(str ptr ptr)
-@ stdcall NPSDeviceGetNumberA(str ptr ptr)
-@ stdcall NPSDeviceGetStringA(long long ptr long)
-@ stdcall NPSGetProviderHandleA(ptr)
-@ stdcall NPSGetProviderNameA(long ptr)
-@ stdcall NPSGetSectionNameA(long ptr)
-@ stdcall NPSNotifyGetContextA(ptr)
-@ stdcall NPSNotifyRegisterA(long ptr)
-@ stdcall NPSSetCustomTextA(str)
-@ stdcall NPSSetExtendedErrorA(long str)
-@ stub PwdChangePasswordA
-@ stub PwdChangePasswordW
-@ stub PwdGetPasswordStatusA
-@ stub PwdGetPasswordStatusW
-@ stub PwdSetPasswordStatusA
-@ stub PwdSetPasswordStatusW
-@ stdcall WNetAddConnection2A(ptr str str long)
-@ stdcall WNetAddConnection2W(ptr wstr wstr long)
-@ stdcall WNetAddConnection3A(long ptr str str long)
-@ stdcall WNetAddConnection3W(long ptr wstr wstr long)
-@ stdcall WNetAddConnectionA(str str str)
-@ stdcall WNetAddConnectionW(wstr wstr wstr)
-@ stdcall WNetCachePassword(str long str long long long)
-@ stdcall WNetCancelConnection2A(str long long)
-@ stdcall WNetCancelConnection2W(wstr long long)
-@ stdcall WNetCancelConnectionA(str long)
-@ stdcall WNetCancelConnectionW(wstr long)
-@ stdcall WNetCloseEnum(long)
-@ stdcall WNetConnectionDialog1A(ptr)
-@ stdcall WNetConnectionDialog1W(ptr)
-@ stdcall WNetConnectionDialog(long long)
-@ stdcall WNetDisconnectDialog1A(ptr)
-@ stdcall WNetDisconnectDialog1W(ptr)
-@ stdcall WNetDisconnectDialog(long long)
-@ stdcall WNetEnumCachedPasswords(str long long ptr long)
-@ stdcall WNetEnumResourceA(long ptr ptr ptr)
-@ stdcall WNetEnumResourceW(long ptr ptr ptr)
-@ stub WNetFMXEditPerm
-@ stub WNetFMXGetPermCaps
-@ stub WNetFMXGetPermHelp
-@ stub WNetFormatNetworkNameA
-@ stub WNetFormatNetworkNameW
-@ stdcall WNetGetCachedPassword(ptr long ptr ptr long)
-@ stdcall WNetGetConnectionA(str ptr ptr)
-@ stdcall WNetGetConnectionW(wstr ptr ptr)
-@ stub WNetGetDirectoryTypeA
-@ stub WNetGetHomeDirectoryA
-@ stub WNetGetHomeDirectoryW
-@ stdcall WNetGetLastErrorA(ptr ptr long ptr long)
-@ stdcall WNetGetLastErrorW(ptr ptr long ptr long)
-@ stdcall WNetGetNetworkInformationA(str ptr)
-@ stdcall WNetGetNetworkInformationW(wstr ptr)
-@ stub WNetGetPropertyTextA
-@ stdcall WNetGetProviderNameA(long ptr ptr)
-@ stdcall WNetGetProviderNameW(long ptr ptr)
-@ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr)
-@ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr)
-@ stdcall WNetGetResourceParentA(ptr ptr ptr)
-@ stdcall WNetGetResourceParentW(ptr ptr ptr)
-@ stdcall WNetGetUniversalNameA (str long ptr ptr)
-@ stdcall WNetGetUniversalNameW (wstr long ptr ptr)
-@ stdcall WNetGetUserA(str ptr ptr)
-@ stdcall WNetGetUserW(wstr wstr ptr)
-@ stdcall WNetLogoffA(str long)
-@ stdcall WNetLogoffW(wstr long)
-@ stdcall WNetLogonA(str long)
-@ stub WNetLogonNotify
-@ stdcall WNetLogonW(wstr long)
-@ stdcall WNetOpenEnumA(long long long ptr ptr)
-@ stdcall WNetOpenEnumW(long long long ptr ptr)
-@ stub WNetPasswordChangeNotify
-@ stub WNetPropertyDialogA
-@ stdcall WNetRemoveCachedPassword(long long long)
-@ stub WNetRestoreConnection
-@ stdcall WNetRestoreConnectionA(long str)
-@ stdcall WNetRestoreConnectionW(long wstr)
-@ stdcall WNetSetConnectionA(str long ptr)
-@ stdcall WNetSetConnectionW(wstr long ptr)
-@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr)
-@ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr)
-@ stdcall WNetVerifyPasswordA(str ptr)
-@ stdcall WNetVerifyPasswordW(wstr ptr)
+# ordinal exports
+ 1 stub @
+ 2 stub @
+ 3 stub @
+ 4 stub @
+ 5 stub @
+ 6 stub @
+ 7 stub @
+ 8 stub @
+ 9 stub @
+12 stub @
+13 stub @
+14 stub @
+15 stub @
+16 stub @
+17 stub @
+18 stub @
+19 stub @
+20 stub @
+21 stub @
+22 stdcall @(long) MPR_Alloc
+23 stdcall @(ptr long) MPR_ReAlloc
+24 stdcall @(ptr) MPR_Free
+25 stdcall @(ptr long) _MPR_25
+
+@ stdcall -private DllCanUnloadNow()
+@ stub DllGetClassObject
+@ stdcall MultinetGetConnectionPerformanceA(ptr ptr)
+@ stdcall MultinetGetConnectionPerformanceW(ptr ptr)
+@ stdcall MultinetGetErrorTextA(long ptr long)
+@ stdcall MultinetGetErrorTextW(long ptr long)
+@ stdcall NPSAuthenticationDialogA(ptr)
+@ stdcall NPSCopyStringA(str ptr ptr)
+@ stdcall NPSDeviceGetNumberA(str ptr ptr)
+@ stdcall NPSDeviceGetStringA(long long ptr long)
+@ stdcall NPSGetProviderHandleA(ptr)
+@ stdcall NPSGetProviderNameA(long ptr)
+@ stdcall NPSGetSectionNameA(long ptr)
+@ stdcall NPSNotifyGetContextA(ptr)
+@ stdcall NPSNotifyRegisterA(long ptr)
+@ stdcall NPSSetCustomTextA(str)
+@ stdcall NPSSetExtendedErrorA(long str)
+@ stub PwdChangePasswordA
+@ stub PwdChangePasswordW
+@ stub PwdGetPasswordStatusA
+@ stub PwdGetPasswordStatusW
+@ stub PwdSetPasswordStatusA
+@ stub PwdSetPasswordStatusW
+@ stdcall WNetAddConnection2A(ptr str str long)
+@ stdcall WNetAddConnection2W(ptr wstr wstr long)
+@ stdcall WNetAddConnection3A(long ptr str str long)
+@ stdcall WNetAddConnection3W(long ptr wstr wstr long)
+@ stdcall WNetAddConnectionA(str str str)
+@ stdcall WNetAddConnectionW(wstr wstr wstr)
+@ stdcall WNetCachePassword(str long str long long long)
+@ stdcall WNetCancelConnection2A(str long long)
+@ stdcall WNetCancelConnection2W(wstr long long)
+@ stdcall WNetCancelConnectionA(str long)
+@ stdcall WNetCancelConnectionW(wstr long)
+@ stdcall WNetCloseEnum(long)
+@ stdcall WNetConnectionDialog1A(ptr)
+@ stdcall WNetConnectionDialog1W(ptr)
+@ stdcall WNetConnectionDialog(long long)
+@ stdcall WNetDisconnectDialog1A(ptr)
+@ stdcall WNetDisconnectDialog1W(ptr)
+@ stdcall WNetDisconnectDialog(long long)
+@ stdcall WNetEnumCachedPasswords(str long long ptr long)
+@ stdcall WNetEnumResourceA(long ptr ptr ptr)
+@ stdcall WNetEnumResourceW(long ptr ptr ptr)
+@ stub WNetFMXEditPerm
+@ stub WNetFMXGetPermCaps
+@ stub WNetFMXGetPermHelp
+@ stub WNetFormatNetworkNameA
+@ stub WNetFormatNetworkNameW
+@ stdcall WNetGetCachedPassword(ptr long ptr ptr long)
+@ stdcall WNetGetConnectionA(str ptr ptr)
+@ stdcall WNetGetConnectionW(wstr ptr ptr)
+@ stub WNetGetDirectoryTypeA
+@ stub WNetGetHomeDirectoryA
+@ stub WNetGetHomeDirectoryW
+@ stdcall WNetGetLastErrorA(ptr ptr long ptr long)
+@ stdcall WNetGetLastErrorW(ptr ptr long ptr long)
+@ stdcall WNetGetNetworkInformationA(str ptr)
+@ stdcall WNetGetNetworkInformationW(wstr ptr)
+@ stub WNetGetPropertyTextA
+@ stdcall WNetGetProviderNameA(long ptr ptr)
+@ stdcall WNetGetProviderNameW(long ptr ptr)
+@ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr)
+@ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr)
+@ stdcall WNetGetResourceParentA(ptr ptr ptr)
+@ stdcall WNetGetResourceParentW(ptr ptr ptr)
+@ stdcall WNetGetUniversalNameA (str long ptr ptr)
+@ stdcall WNetGetUniversalNameW (wstr long ptr ptr)
+@ stdcall WNetGetUserA(str ptr ptr)
+@ stdcall WNetGetUserW(wstr wstr ptr)
+@ stdcall WNetLogoffA(str long)
+@ stdcall WNetLogoffW(wstr long)
+@ stdcall WNetLogonA(str long)
+@ stub WNetLogonNotify
+@ stdcall WNetLogonW(wstr long)
+@ stdcall WNetOpenEnumA(long long long ptr ptr)
+@ stdcall WNetOpenEnumW(long long long ptr ptr)
+@ stub WNetPasswordChangeNotify
+@ stub WNetPropertyDialogA
+@ stdcall WNetRemoveCachedPassword(long long long)
+@ stub WNetRestoreConnection
+@ stdcall WNetRestoreConnectionA(long str)
+@ stdcall WNetRestoreConnectionW(long wstr)
+@ stdcall WNetSetConnectionA(str long ptr)
+@ stdcall WNetSetConnectionW(wstr long ptr)
+@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr)
+@ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr)
+@ stdcall WNetVerifyPasswordA(str ptr)
+@ stdcall WNetVerifyPasswordW(wstr ptr)
Property changes on: trunk/reactos/lib/mpr/mpr.spec
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/mpr/mpr_main.c
--- trunk/reactos/lib/mpr/mpr_main.c	2005-09-05 21:08:24 UTC (rev
17668)
+++ trunk/reactos/lib/mpr/mpr_main.c	2005-09-05 21:15:50 UTC (rev
17669)
@@ -75,7 +75,7 @@

 /*****************************************************************
  *  DllCanUnloadNow  [MPR.@]
  */
-DWORD WINAPI MPR_DllCanUnloadNow(void)
+STDAPI DllCanUnloadNow(void)
 {
     FIXME("Stub\n");
     return S_OK;