Sync to Wine-20050628:

Alexandre Julliard <julliard@winehq.org>
- Sort entry points in the same order as Windows.
- Added magic comments to all Wine-specific registry accesses to make
  them easier to grep.

svn path=/trunk/; revision=16484

diff --git a/reactos/lib/mpr/mpr.spec b/reactos/lib/mpr/mpr.spec
index c3afdad..ed29395 100644 (file)
--- a/reactos/lib/mpr/mpr.spec
+++ b/reactos/lib/mpr/mpr.spec
@@ -67,17 +67,22 @@
 @ stdcall WNetEnumCachedPasswords(str long long ptr long)\r
 @ stdcall WNetEnumResourceA(long ptr ptr ptr)\r
 @ stdcall WNetEnumResourceW(long ptr ptr ptr)\r
+@ stub WNetFMXEditPerm\r
+@ stub WNetFMXGetPermCaps\r
+@ stub WNetFMXGetPermHelp\r
 @ stub WNetFormatNetworkNameA\r
 @ stub WNetFormatNetworkNameW\r
 @ stdcall WNetGetCachedPassword(ptr long ptr ptr long)\r
 @ stdcall WNetGetConnectionA(str ptr ptr)\r
 @ stdcall WNetGetConnectionW(wstr ptr ptr)\r
+@ stub WNetGetDirectoryTypeA\r
 @ stub WNetGetHomeDirectoryA\r
 @ stub WNetGetHomeDirectoryW\r
 @ stdcall WNetGetLastErrorA(ptr ptr long ptr long)\r
 @ stdcall WNetGetLastErrorW(ptr ptr long ptr long)\r
 @ stdcall WNetGetNetworkInformationA(str ptr)\r
 @ stdcall WNetGetNetworkInformationW(wstr ptr)\r
+@ stub WNetGetPropertyTextA\r
 @ stdcall WNetGetProviderNameA(long ptr ptr)\r
 @ stdcall WNetGetProviderNameW(long ptr ptr)\r
 @ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr)\r
@@ -91,10 +96,14 @@
 @ stdcall WNetLogoffA(str long)\r
 @ stdcall WNetLogoffW(wstr long)\r
 @ stdcall WNetLogonA(str long)\r
+@ stub WNetLogonNotify\r
 @ stdcall WNetLogonW(wstr long)\r
 @ stdcall WNetOpenEnumA(long long long ptr ptr)\r
 @ stdcall WNetOpenEnumW(long long long ptr ptr)\r
+@ stub WNetPasswordChangeNotify\r
+@ stub WNetPropertyDialogA\r
 @ stdcall WNetRemoveCachedPassword(long long long)\r
+@ stub WNetRestoreConnection\r
 @ stdcall WNetRestoreConnectionA(long str)\r
 @ stdcall WNetRestoreConnectionW(long wstr)\r
 @ stdcall WNetSetConnectionA(str long ptr)\r
@@ -103,14 +112,3 @@
 @ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr)\r
 @ stdcall WNetVerifyPasswordA(str ptr)\r
 @ stdcall WNetVerifyPasswordW(wstr ptr)\r
-\r
-#additions, not in win95 mpr.dll\r
-@ stub WNetRestoreConnection\r
-@ stub WNetLogonNotify\r
-@ stub WNetPasswordChangeNotify\r
-@ stub WNetGetPropertyTextA\r
-@ stub WNetPropertyDialogA\r
-@ stub WNetGetDirectoryTypeA\r
-@ stub WNetFMXGetPermHelp\r
-@ stub WNetFMXEditPerm\r
-@ stub WNetFMXGetPermCaps\r

diff --git a/reactos/lib/mpr/pwcache.c b/reactos/lib/mpr/pwcache.c
index 5bffc44..7f24cf4 100644 (file)
--- a/reactos/lib/mpr/pwcache.c
+++ b/reactos/lib/mpr/pwcache.c
@@ -99,6 +99,7 @@ DWORD WINAPI WNetCachePassword(
           pbPassword, debugstr_a(pbPassword), cbPassword,\r
           nType, x );\r
 \r
+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */\r
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );\r
     if( r )\r
         return WN_ACCESS_DENIED;\r
@@ -137,6 +138,7 @@ UINT WINAPI WNetRemoveCachedPassword(
     WARN( "(%p(%s), %d, %d): totally insecure\n",\r
            pbResource, debugstr_a(pbResource), cbResource, nType );\r
 \r
+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */\r
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );\r
     if( r )\r
         return WN_ACCESS_DENIED;\r
@@ -191,6 +193,7 @@ DWORD WINAPI WNetGetCachedPassword(
 \r
     memset( pbPassword, 0, *pcbPassword);\r
 \r
+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */\r
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );\r
     if( r )\r
         return WN_ACCESS_DENIED;\r
@@ -249,6 +252,7 @@ UINT WINAPI WNetEnumCachedPasswords(
            debugstr_an(pbPrefix,cbPrefix), cbPrefix,\r
           nType, enumPasswordProc, param );\r
 \r
+    /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */\r
     r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey );\r
     if( r )\r
         return WN_ACCESS_DENIED;\r