[ros-diffs] [akhaldi] 60276: [MPR] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 21 13:12:58 2013
New Revision: 60276

URL: http://svn.reactos.org/svn/reactos?rev=60276&view=rev
Log:
[MPR]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/mpr/CMakeLists.txt
    trunk/reactos/dll/win32/mpr/mpr.spec
    trunk/reactos/dll/win32/mpr/mpr_main.c
    trunk/reactos/dll/win32/mpr/pwcache.c
    trunk/reactos/dll/win32/mpr/wnet.c
    trunk/reactos/dll/win32/mpr/wnetpriv.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t…
==============================================================================
--- trunk/reactos/dll/win32/mpr/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/CMakeLists.txt	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -13,11 +13,10 @@
     nps.c
     pwcache.c
     wnet.c
-    mpr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
 
-add_library(mpr SHARED ${SOURCE})
+add_library(mpr SHARED ${SOURCE} mpr.rc)
 set_module_type(mpr win32dll)
 target_link_libraries(mpr wine)
 add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)

Modified: trunk/reactos/dll/win32/mpr/mpr.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr.spec	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -23,8 +23,6 @@
 24 stdcall @(ptr) MPR_Free
 25 stdcall @(ptr long) _MPR_25
 
-@ stdcall -private DllCanUnloadNow()
-@ stub -private DllGetClassObject
 @ stdcall MultinetGetConnectionPerformanceA(ptr ptr)
 @ stdcall MultinetGetConnectionPerformanceW(ptr ptr)
 @ stdcall MultinetGetErrorTextA(long ptr long)

Modified: trunk/reactos/dll/win32/mpr/mpr_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_main.c	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -76,14 +76,6 @@
 }
 
 /*****************************************************************
- *  DllCanUnloadNow  [MPR.@]
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_OK;
-}
-
-/*****************************************************************
  *  DllMain  [MPR.init]
  */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
@@ -95,6 +87,7 @@
             break;
 
         case DLL_PROCESS_DETACH:
+            if (lpvReserved) break;
             wnetFree();
             break;
     }

Modified: trunk/reactos/dll/win32/mpr/pwcache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/pwcache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/pwcache.c	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -262,7 +262,6 @@
 
     sprintf(prefix, "X-%02X-", nType );
 
-    i = 0;
     for( i=0;  ; i++ )
     {
         val_sz  = sizeof val;
@@ -301,8 +300,8 @@
             continue;
 
         /* read the value data */
-        size = sizeof *entry - sizeof entry->abResource[0] + val_sz + data_sz;
-        entry = HeapAlloc( GetProcessHeap(), 0, sizeof *entry + val_sz + data_sz );
+        size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] );
+        entry = HeapAlloc( GetProcessHeap(), 0, size );
         memcpy( entry->abResource, val, val_sz );
         entry->cbEntry = size;
         entry->cbResource = val_sz;

Modified: trunk/reactos/dll/win32/mpr/wnet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/wnet.c	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -640,7 +640,7 @@
         ret = WN_BAD_POINTER;
     else if (!providerTable || providerTable->numProviders == 0)
     {
-        lphEnum = NULL;
+        *lphEnum = NULL;
         ret = WN_NO_NETWORK;
     }
     else
@@ -732,7 +732,7 @@
         ret = WN_BAD_POINTER;
     else if (!providerTable || providerTable->numProviders == 0)
     {
-        lphEnum = NULL;
+        *lphEnum = NULL;
         ret = WN_NO_NETWORK;
     }
     else
@@ -1175,7 +1175,7 @@
         if (ret == WN_SUCCESS)
         {
             /* reflect the fact that we already enumerated "Entire Network" */
-            lpcCount++;
+            (*lpcCount)++;
             *lpBufferSize = bufferSize + bytesNeeded;
         }
         else
@@ -1894,6 +1894,12 @@
     {
         LPUNIVERSAL_NAME_INFOA info = lpBuffer;
 
+        if (GetDriveTypeA(lpLocalPath) != DRIVE_REMOTE)
+        {
+            err = ERROR_NOT_CONNECTED;
+            break;
+        }
+
         size = sizeof(*info) + lstrlenA(lpLocalPath) + 1;
         if (*lpBufferSize < size)
         {
@@ -1902,7 +1908,6 @@
         }
         info->lpUniversalName = (char *)info + sizeof(*info);
         lstrcpyA(info->lpUniversalName, lpLocalPath);
-        *lpBufferSize = size;
         err = WN_NO_ERROR;
         break;
     }
@@ -1936,6 +1941,12 @@
     {
         LPUNIVERSAL_NAME_INFOW info = lpBuffer;
 
+        if (GetDriveTypeW(lpLocalPath) != DRIVE_REMOTE)
+        {
+            err = ERROR_NOT_CONNECTED;
+            break;
+        }
+
         size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR);
         if (*lpBufferSize < size)
         {
@@ -1944,7 +1955,6 @@
         }
         info->lpUniversalName = (LPWSTR)((char *)info + sizeof(*info));
         lstrcpyW(info->lpUniversalName, lpLocalPath);
-        *lpBufferSize = size;
         err = WN_NO_ERROR;
         break;
     }

Modified: trunk/reactos/dll/win32/mpr/wnetpriv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnetpriv.h?r…
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnetpriv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/wnetpriv.h	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -21,7 +21,7 @@
 #ifndef __WNET_PRIV_H__
 #define __WNET_PRIV_H__
 
-void wnetInit(HINSTANCE hInstDll);
-void wnetFree(void);
+void wnetInit(HINSTANCE hInstDll) DECLSPEC_HIDDEN;
+void wnetFree(void) DECLSPEC_HIDDEN;
 
 #endif /* ndef __WNET_PRIV_H__ */

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Sep 21 13:12:58 2013
@@ -103,7 +103,7 @@
 reactos/dll/win32/mciseq          # Synced to Wine-1.7.1
 reactos/dll/win32/mciwave         # Synced to Wine-1.5.19
 reactos/dll/win32/mlang           # Synced to Wine-1.7.1
-reactos/dll/win32/mpr             # Autosync
+reactos/dll/win32/mpr             # Synced to Wine-1.7.1
 reactos/dll/win32/mprapi          # Synced to Wine-1.5.19
 reactos/dll/win32/msacm32         # Autosync
 reactos/dll/win32/msadp32.acm     # Synced to Wine-1.5.19