[ros-diffs] [gvg] 16484: Sync to Wine-20050628:

Sync to Wine-20050628:
Alexandre Julliard [e-mail]
- Sort entry points in the same order as Windows.
- Added magic comments to all Wine-specific registry accesses to make
  them easier to grep.
Modified: trunk/reactos/lib/mpr/mpr.spec
Modified: trunk/reactos/lib/mpr/pwcache.c
  _____

Modified: trunk/reactos/lib/mpr/mpr.spec
--- trunk/reactos/lib/mpr/mpr.spec	2005-07-07 13:43:03 UTC (rev
16483)
+++ trunk/reactos/lib/mpr/mpr.spec	2005-07-07 15:05:36 UTC (rev
16484)
@@ -67,17 +67,22 @@

@ 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)
@@ -91,10 +96,14 @@
 @ 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)
@@ -103,14 +112,3 @@
 @ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr)
 @ stdcall WNetVerifyPasswordA(str ptr)
 @ stdcall WNetVerifyPasswordW(wstr ptr)
-
-#additions, not in win95 mpr.dll
-@ stub WNetRestoreConnection
-@ stub WNetLogonNotify
-@ stub WNetPasswordChangeNotify
-@ stub WNetGetPropertyTextA
-@ stub WNetPropertyDialogA
-@ stub WNetGetDirectoryTypeA
-@ stub WNetFMXGetPermHelp
-@ stub WNetFMXEditPerm
-@ stub WNetFMXGetPermCaps
  _____

Modified: trunk/reactos/lib/mpr/pwcache.c
--- trunk/reactos/lib/mpr/pwcache.c	2005-07-07 13:43:03 UTC (rev
16483)
+++ trunk/reactos/lib/mpr/pwcache.c	2005-07-07 15:05:36 UTC (rev
16484)
@@ -99,6 +99,7 @@

pbPassword, debugstr_a(pbPassword), cbPassword,
       nType, x );

+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );
     if( r )
         return WN_ACCESS_DENIED;
@@ -137,6 +138,7 @@
     WARN( "(%p(%s), %d, %d): totally insecure\n",
            pbResource, debugstr_a(pbResource), cbResource, nType );

+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );
     if( r )
         return WN_ACCESS_DENIED;
@@ -191,6 +193,7 @@

memset( pbPassword, 0, *pcbPassword);

+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );
     if( r )
         return WN_ACCESS_DENIED;
@@ -249,6 +252,7 @@
            debugstr_an(pbPrefix,cbPrefix), cbPrefix,
       nType, enumPasswordProc, param );

+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );
     if( r )
         return WN_ACCESS_DENIED;