[ros-diffs] [akhaldi] 62903: [LOCALSPL] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:00:15 2014
New Revision: 62903

URL: http://svn.reactos.org/svn/reactos?rev=62903&view=rev
Log:
[LOCALSPL]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/localspl/provider.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/localspl/provider.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide…
==============================================================================
--- trunk/reactos/dll/win32/localspl/provider.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/provider.c	[iso-8859-1] Wed Apr 23 14:00:15 2014
@@ -199,7 +199,7 @@
 static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd )
 {
     WCHAR *srcname;
-    DWORD res;
+    BOOL res;
 
     apd->src[apd->srclen] = '\0';
     apd->dst[apd->dstlen] = '\0';
@@ -222,9 +222,9 @@
 
     /* FIXME: handle APD_COPY_NEW_FILES */
     res = CopyFileW(srcname, apd->dst, FALSE);
-    TRACE("got %u with %u\n", res, GetLastError());
-
-    return (apd->lazy) ? TRUE : res;
+    TRACE("got %d with %u\n", res, GetLastError());
+
+    return apd->lazy || res;
 }
 
 /******************************************************************
@@ -234,7 +234,7 @@
  *
  * RETURNS
  *  the length (in WCHAR) of the serverpart (0 for the local computer)
- *  (-length), when the name is to long
+ *  (-length), when the name is too long
  *
  */
 static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target)
@@ -1115,7 +1115,7 @@
 
     if (!fpGetPrinterDriverDirectory(NULL, (LPWSTR) env->envname, 1,
                                      (LPBYTE) fullname, len, &len)) {
-        /* Should never Fail */
+        /* Should never fail */
         SetLastError(ERROR_BUFFER_OVERFLOW);
         return NULL;
     }
@@ -1319,7 +1319,7 @@
     len = sizeof(apd.src) - sizeof(version3_subdirW) - sizeof(WCHAR);
     if (!fpGetPrinterDriverDirectory(NULL, (LPWSTR) env->envname, 1,
                                     (LPBYTE) apd.src, len, &len)) {
-        /* Should never Fail */
+        /* Should never fail */
         return FALSE;
     }
     memcpy(apd.dst, apd.src, len);

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] Wed Apr 23 14:00:15 2014
@@ -94,7 +94,7 @@
 reactos/dll/win32/itss             # Synced to Wine-1.7.17
 reactos/dll/win32/jscript          # Synced to Wine-1.7.17
 reactos/dll/win32/loadperf         # Synced to Wine-1.7.1
-reactos/dll/win32/localspl         # Synced to Wine-1.7.1
+reactos/dll/win32/localspl         # Synced to Wine-1.7.17
 reactos/dll/win32/localui          # Synced to Wine-1.7.1
 reactos/dll/win32/lz32             # Synced to Wine-1.7.1
 reactos/dll/win32/mapi32           # Synced to Wine-1.7.1