[akhaldi] 58800: [EXPAND] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Sun Apr 21 12:33:33 2013
New Revision: 58800

URL: http://svn.reactos.org/svn/reactos?rev=58800&view=rev
Log:
[EXPAND]
* Sync with Wine 1.5.26.

Modified:
    trunk/reactos/base/system/expand/expand.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/system/expand/expand.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.c...
==============================================================================
--- trunk/reactos/base/system/expand/expand.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/expand/expand.c [iso-8859-1] Sun Apr 21 12:33:33 2013
@@ -27,6 +27,21 @@
 #include <stdio.h>
 #include <lzexpand.h>
 #include <setupapi.h>
+
+static int myprintf(const char* format, ...)
+{
+    va_list     va;
+    char        tmp[8192];
+    DWORD       w = 0;
+    int         len;
+
+    va_start(va, format);
+    len = vsnprintf(tmp, sizeof(tmp), format, va);
+    if (len > 0)
+        WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL);
+    va_end(va);
+    return w;
+}

static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 )
 {
@@ -85,9 +100,9 @@

if (argc < 3)
     {
-        fprintf( stderr, "Usage:\n" );
-        fprintf( stderr, "\t%s infile outfile\n", argv[0] );
-        fprintf( stderr, "\t%s /r infile\n", argv[0] );
+        myprintf( "Usage:\n" );
+        myprintf( "\t%s infile outfile\n", argv[0] );
+        myprintf( "\t%s /r infile\n", argv[0] );
         return 1;
     }

@@ -98,7 +113,7 @@

if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp ))
     {
-        fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile );
+        myprintf( "%s: can't open input file %s\n", argv[0], infile );
         return 1;
     }

@@ -107,28 +122,22 @@
         switch (comp)
         {
         case FILE_COMPRESSION_MSZIP:
-        {
             outfile_basename[0] = 0;
             if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename ))
             {
-                fprintf( stderr, "%s: can't determine original name\n", argv[0] );
+                myprintf( "%s: can't determine original name\n", argv[0] );
                 return 1;
             }
             GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index );
             *basename_index = 0;
             strcat( outfile, outfile_basename );
             break;
-        }
         case FILE_COMPRESSION_WINLZA:
-        {
             GetExpandedNameA( infile, outfile_basename );
             break;
-        }
         default:
-        {
-            fprintf( stderr, "%s: can't determine original\n", argv[0] );
+            myprintf( "%s: can't determine original\n", argv[0] );
             return 1;
-        }
         }
     }
     else
@@ -136,21 +145,19 @@

if (!lstrcmpiA( infile, outfile ))
     {
-        fprintf( stderr, "%s: can't expand file to itself\n", argv[0] );
+        myprintf( "%s: can't expand file to itself\n", argv[0] );
         return 1;
     }

switch (comp)
     {
     case FILE_COMPRESSION_MSZIP:
-    {
         if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile ))
         {
-            fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] );
+            myprintf( "%s: cabinet extraction failed\n", argv[0] );
             return 1;
         }
         break;
-    }
     case FILE_COMPRESSION_WINLZA:
     {
         INT hin, hout;
@@ -159,13 +166,13 @@

if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0)
         {
-            fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile );
+            myprintf( "%s: can't open input file %s\n", argv[0], infile );
             return 1;
         }
         if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0)
         {
             LZClose( hin );
-            fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile );
+            myprintf( "%s: can't open output file %s\n", argv[0], outfile );
             return 1;
         }
         error = LZCopy( hin, hout );
@@ -175,20 +182,18 @@

if (error < 0)
         {
-            fprintf( stderr, "%s: LZCopy failed, error is %ld\n", argv[0], error );
+            myprintf( "%s: LZCopy failed, error is %d\n", argv[0], error );
             return 1;
         }
         break;
     }
     default:
-    {
         if (!CopyFileA( infile, outfile, FALSE ))
         {
-            fprintf( stderr, "%s: CopyFileA failed\n", argv[0] );
+            myprintf( "%s: CopyFileA failed\n", argv[0] );
             return 1;
         }
         break;
     }
-    }
     return ret;
 }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=5...
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Apr 21 12:33:33 2013
@@ -219,7 +219,7 @@
 reactos/base/applications/winhlp32        # Synced to Wine-1.5.26
 reactos/base/applications/wordpad         # Synced to Wine-1.5.26
 reactos/base/services/rpcss               # Synced to Wine-20081105
-reactos/base/system/expand                # Autosync
+reactos/base/system/expand                # Synced to Wine-1.5.26
 reactos/base/system/msiexec               # Autosync
 reactos/modules/rosapps/winfile           # Autosync