[akhaldi] 66626: [ADVPACK] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Mon Mar  9 19:19:38 2015
New Revision: 66626

URL: http://svn.reactos.org/svn/reactos?rev=66626&view=rev
Log:
[ADVPACK] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/advpack/advpack.c
    trunk/reactos/dll/win32/advpack/files.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/advpack/advpack.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.c...
==============================================================================
--- trunk/reactos/dll/win32/advpack/advpack.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/advpack.c	[iso-8859-1] Mon Mar  9 19:19:38 2015
@@ -665,7 +665,7 @@
                                     dwBufferSize, NULL, NULL);
             }
             else
-                res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                res = E_NOT_SUFFICIENT_BUFFER;
         }

HeapFree(GetProcessHeap(), 0, bufferW);
@@ -725,7 +725,7 @@
                            pszBuffer, dwBufferSize, pdwRequiredSize))
     {
         if (dwBufferSize < *pdwRequiredSize)
-            hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            hret = E_NOT_SUFFICIENT_BUFFER;
         else
             hret = SPAPI_E_LINE_NOT_FOUND;
     }
@@ -782,7 +782,7 @@
                                     dwBufferSize, NULL, NULL);
             }
             else
-                res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                res = E_NOT_SUFFICIENT_BUFFER;
         }

HeapFree(GetProcessHeap(), 0, bufferW);
@@ -840,7 +840,7 @@
                            pszBuffer, dwBufferSize, pdwRequiredSize))
     {
         if (dwBufferSize < *pdwRequiredSize)
-            return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            return E_NOT_SUFFICIENT_BUFFER;

return SPAPI_E_LINE_NOT_FOUND;
     }

Modified: trunk/reactos/dll/win32/advpack/files.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?r...
==============================================================================
--- trunk/reactos/dll/win32/advpack/files.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/files.c	[iso-8859-1] Mon Mar  9 19:19:38 2015
@@ -554,7 +554,7 @@
     szConvertedList[dwLen - 1] = '\0';

/* empty list */
-    if (!lstrlenA(szConvertedList))
+    if (!szConvertedList[0])
     {
         HeapFree(GetProcessHeap(), 0, szConvertedList);
         return NULL;

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Mar  9 19:19:38 2015
@@ -51,7 +51,7 @@

reactos/dll/win32/activeds            # Synced to Wine-1.7.27
 reactos/dll/win32/actxprxy            # Synced to Wine-1.7.27
-reactos/dll/win32/advpack             # Synced to Wine-1.7.27
+reactos/dll/win32/advpack             # Synced to WineStaging-1.7.37
 reactos/dll/win32/atl                 # Synced to Wine-1.7.27
 reactos/dll/win32/atl80               # Synced to Wine-1.7.27
 reactos/dll/win32/atl100              # Synced to Wine-1.7.27