Remove all hardcode string to En.rc

so it can be translaterem

svn path=/trunk/; revision=15249

diff --git a/reactos/subsys/system/expand/En.rc b/reactos/subsys/system/expand/En.rc
new file mode 100644 (file)
index 0000000..f8489a7
--- /dev/null
+++ b/reactos/subsys/system/expand/En.rc
@@ -0,0 +1,16 @@
+#include "resource.h"\r
+/*\r
+ * Moved all hardcoded strings to En.rc.\r
+ * By Magnus Olsen  2005 magnus@itkonsult-olsen.com\r
+ */\r
+\r
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT\r
+STRINGTABLE DISCARDABLE\r
+{\r
+\r
+IDS_Copy, "ReactOS File Expansion Utility Version 1.0\n\\r
+Copyright Victor Schneider 1997\n\n\\r
+Usage: %s infile [outfile]\n"\r
+\r
+IDS_FAILS "LZCopy failed: return is %ld\n"\r
+}\r

diff --git a/reactos/subsys/system/expand/expand.c b/reactos/subsys/system/expand/expand.c
index ece8f04..00f7c36 100644 (file)
--- a/reactos/subsys/system/expand/expand.c
+++ b/reactos/subsys/system/expand/expand.c
@@ -22,18 +22,21 @@
 #include <string.h>
 #include <windows.h>
 #include <lzexpand.h>
+#include <tchar.h>
 
-int main(int argc, char *argv[])
+#include "resource.h"
+
+_tmain(int argc, TCHAR *argv[])
 {
   OFSTRUCT SourceOpenStruct1, SourceOpenStruct2;
   LONG ret;
-  HFILE hSourceFile, hDestFile;
+  HFILE hSourceFile, hDestFile;  
+  TCHAR szMsg[RC_STRING_MAX_SIZE];
 
   if (argc < 2)
   {
-      fprintf( stderr, "ReactOS File Expansion Utility Version 1.0\n", argv[0] );
-      fprintf( stderr, "Copyright Victor Schneider 1997\n\n", argv[0] );
-      fprintf( stderr, "Usage: %s infile [outfile]\n", argv[0] );
+      LoadString( GetModuleHandle(NULL), IDS_Copy, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);   
+      _ftprintf( stderr, szMsg, argv[0] );      
       return 1;
   }
   hSourceFile = LZOpenFile(argv[1], &SourceOpenStruct1, OF_READ);
@@ -41,13 +44,14 @@ int main(int argc, char *argv[])
       hDestFile = LZOpenFile(argv[2], &SourceOpenStruct2, OF_CREATE | OF_WRITE);
   else
   {
-      char OriginalName[MAX_PATH];
+      TCHAR OriginalName[MAX_PATH];
       GetExpandedName(argv[1], OriginalName);
       hDestFile = LZOpenFile(OriginalName, &SourceOpenStruct2, OF_CREATE | OF_WRITE);
   }
   ret = LZCopy(hSourceFile, hDestFile);
   LZClose(hSourceFile);
   LZClose(hDestFile);
-  if (ret <= 0) fprintf(stderr,"LZCopy failed: return is %ld\n",ret);
+  LoadString( GetModuleHandle(NULL), IDS_FAILS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);      
+  if (ret <= 0) _ftprintf(stderr,szMsg,ret);
   return (ret <= 0);
 }

diff --git a/reactos/subsys/system/expand/expand.rc b/reactos/subsys/system/expand/expand.rc
new file mode 100644 (file)
index 0000000..3a88217
--- /dev/null
+++ b/reactos/subsys/system/expand/expand.rc
@@ -0,0 +1,9 @@
+/* $Id: format.rc 15157 2005-05-09 00:05:15Z greatlrd $ */\r
+#include <windows.h>\r
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS File Expansion Utility Version 1.0 \0"\r
+#define REACTOS_STR_INTERNAL_NAME      "expand\0"\r
+#define REACTOS_STR_ORIGINAL_FILENAME  "expand.exe\0"\r
+#include <reactos/version.rc>\r
+\r
+#include "En.rc"\r
+\r

diff --git a/reactos/subsys/system/expand/makefile b/reactos/subsys/system/expand/makefile
index e593ec7..76a5911 100644 (file)
--- a/reactos/subsys/system/expand/makefile
+++ b/reactos/subsys/system/expand/makefile
@@ -2,8 +2,6 @@
 
 PATH_TO_TOP = ../../..
 
-TARGET_NORC = yes
-
 TARGET_TYPE = program
 
 TARGET_APPTYPE = console
@@ -12,7 +10,7 @@ TARGET_NAME = expand
 
 TARGET_INSTALLDIR = system32
 
-TARGET_CFLAGS = -D__USE_W32API
+TARGET_CFLAGS = -D__USE_W32API 
 
 TARGET_SDKLIBS = lz32.a
 

diff --git a/reactos/subsys/system/expand/resource.h b/reactos/subsys/system/expand/resource.h
new file mode 100644 (file)
index 0000000..e4a1499
--- /dev/null
+++ b/reactos/subsys/system/expand/resource.h
@@ -0,0 +1,8 @@
+\r
+\r
+#define RC_STRING_MAX_SIZE                 4096\r
+#define IDS_Copy                            100\r
+#define IDS_FAILS                           101\r
+\r
+\r
+/* EOF */\r