From: Aleksey Bragin <aleksey@reactos.org>
Date: Thu, 4 Feb 2010 14:40:36 +0000 (+0000)
Subject: [base/system/expand]
X-Git-Tag: backups/jcatena-branch@60647^2~106
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=c2c6cc65aaea7837670aeb7c3cf6a208e41d2aea

[base/system/expand]
- Update expand utility to Wine-1.1.37. Last update happened 7 years ago and since then it was translated into 20 languages. Sorry to all the translators but the preference is given to a working untranslated version rather than a non-working localized one.
See issue #4637 for more details.

svn path=/trunk/; revision=45418
---

diff --git a/reactos/base/system/expand/expand.c b/reactos/base/system/expand/expand.c
index cfd45b15eb5..deb558bfb7f 100644
--- a/reactos/base/system/expand/expand.c
+++ b/reactos/base/system/expand/expand.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 1997 Victor Schneider
  * Copyright 2002 Alexandre Julliard
+ * Copyright 2007 Hans Leidekker
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,44 +15,178 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdlib.h>
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
 #include <lzexpand.h>
-#include <tchar.h>
+#include <setupapi.h>
+
+static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 )
+{
+    FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1;
+    char buffer[MAX_PATH];
+    char* basename;
 
-#include "resource.h"
+    switch (notification)
+    {
+    case SPFILENOTIFY_FILEINCABINET:
+    {
+        LPSTR outfile = context;
+        if (outfile[0] != 0)
+        {
+            SetLastError( ERROR_NOT_SUPPORTED );
+            return FILEOP_ABORT;
+        }
+        GetFullPathNameA( info->NameInCabinet, sizeof(buffer), buffer, &basename );
+        strcpy( outfile, basename );
+        return FILEOP_SKIP;
+    }
+    default: return NO_ERROR;
+    }
+}
 
-int _tmain(int argc, TCHAR *argv[])
+static UINT CALLBACK extract_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 )
 {
-  OFSTRUCT SourceOpenStruct1, SourceOpenStruct2;
-  LONG ret;
-  HFILE hSourceFile, hDestFile;
-  TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-  if (argc < 2)
-  {
-      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);
-  if (argv[2])
-      hDestFile = LZOpenFile(argv[2], &SourceOpenStruct2, OF_CREATE | OF_WRITE);
-  else
-  {
-      TCHAR OriginalName[MAX_PATH];
-      GetExpandedName(argv[1], OriginalName);
-      hDestFile = LZOpenFile(OriginalName, &SourceOpenStruct2, OF_CREATE | OF_WRITE);
-  }
-  ret = LZCopy(hSourceFile, hDestFile);
-  LZClose(hSourceFile);
-  LZClose(hDestFile);
-  LoadString( GetModuleHandle(NULL), IDS_FAILS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
-  if (ret <= 0) _ftprintf(stderr,szMsg,ret);
-  return (ret <= 0);
+    FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1;
+
+    switch (notification)
+    {
+    case SPFILENOTIFY_FILEINCABINET:
+    {
+        LPCSTR targetname = context;
+
+        strcpy( info->FullTargetName, targetname );
+        return FILEOP_DOIT;
+    }
+    default: return NO_ERROR;
+    }
+}
+
+static BOOL option_equal(LPCSTR str1, LPCSTR str2)
+{
+    if (str1[0] != '/' && str1[0] != '-')
+        return FALSE;
+    return !lstrcmpA( str1 + 1, str2 );
+}
+
+int main(int argc, char *argv[])
+{
+    int ret = 0;
+    char infile[MAX_PATH], outfile[MAX_PATH], actual_name[MAX_PATH];
+    char outfile_basename[MAX_PATH], *basename_index;
+    UINT comp;
+
+    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] );
+        return 1;
+    }
+
+    if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r")))
+        GetFullPathNameA( argv[2], sizeof(infile), infile, NULL );
+    else
+        GetFullPathNameA( argv[1], sizeof(infile), infile, NULL );
+
+    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 );
+        return 1;
+    }
+
+    if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r")))
+    {
+        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] );
+                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] );
+            return 1;
+        }
+        }
+    }
+    else
+        GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL );
+
+    if (!lstrcmpiA( infile, outfile ))
+    {
+        fprintf( stderr, "%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] );
+            return 1;
+        }
+        break;
+    }
+    case FILE_COMPRESSION_WINLZA:
+    {
+        INT hin, hout;
+        OFSTRUCT ofin, ofout;
+        LONG error;
+
+        if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0)
+        {
+            fprintf( stderr, "%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 );
+            return 1;
+        }
+        error = LZCopy( hin, hout );
+
+        LZClose( hin );
+        LZClose( hout );
+
+        if (error < 0)
+        {
+            fprintf( stderr, "%s: LZCopy failed, error is %ld\n", argv[0], error );
+            return 1;
+        }
+        break;
+    }
+    default:
+    {
+        if (!CopyFileA( infile, outfile, FALSE ))
+        {
+            fprintf( stderr, "%s: CopyFileA failed\n", argv[0] );
+            return 1;
+        }
+        break;
+    }
+    }
+    return ret;
 }
diff --git a/reactos/base/system/expand/expand.rbuild b/reactos/base/system/expand/expand.rbuild
index 971fd67def9..6e67355660f 100644
--- a/reactos/base/system/expand/expand.rbuild
+++ b/reactos/base/system/expand/expand.rbuild
@@ -3,8 +3,8 @@
 <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" >
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="expand">.</include>
-	<define name="ANONYMOUSUNIONS" />
 	<library>lz32</library>
+	<library>setupapi</library>
 	<library>user32</library>
 	<file>expand.c</file>
 	<file>expand.rc</file>
diff --git a/reactos/base/system/expand/expand.rc b/reactos/base/system/expand/expand.rc
index e480376b49e..3c4581ceacb 100644
--- a/reactos/base/system/expand/expand.rc
+++ b/reactos/base/system/expand/expand.rc
@@ -3,5 +3,3 @@
 #define REACTOS_STR_INTERNAL_NAME	"expand\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"expand.exe\0"
 #include <reactos/version.rc>
-
-#include "rsrc.rc"
diff --git a/reactos/base/system/expand/lang/bg-BG.rc b/reactos/base/system/expand/lang/bg-BG.rc
deleted file mode 100644
index 13f751ccf85..00000000000
--- a/reactos/base/system/expand/lang/bg-BG.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Ïðèíàäëåæíîñò íà ÐåàêòÎÑ çà ðàçãúâàíå (ðàçêîìïðåñèðàíå) íà ôàéëîâå, â. 1.0\n\
-Âúçïðîèçâîäñòâåíî ïðàâî íà Victor Schneider 1997\n\n\
-Óïîòðåáà: %s âõîäÿùôàéë [èçõîäÿùôàéë]\n"
-
-IDS_FAILS "LZCopy íåóñïåøíî: âúðíàòî å %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/cs-CZ.rc b/reactos/base/system/expand/lang/cs-CZ.rc
deleted file mode 100644
index d562e17f000..00000000000
--- a/reactos/base/system/expand/lang/cs-CZ.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-/* FILE:        system/expand/lang/cs-CZ.rc
- * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2008-04-21
- */
-
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS rozbalovaè souborù - verze 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Použití: %s vstupní soubor [výstupní soubor]\n"
-
-IDS_FAILS "LZCopy selhalo: návratový kód je %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/de-DE.rc b/reactos/base/system/expand/lang/de-DE.rc
deleted file mode 100644
index 6738bd161d9..00000000000
--- a/reactos/base/system/expand/lang/de-DE.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Translated into German.
- * By Rouven Wessling 2005 pentiumforever@gmail.com
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Dateiexpansionsprogramm Version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Verwendung: %s Eingabedatei [Ausgabedatei]\n"
-
-IDS_FAILS "LZCopy fehlgeschlagen: Rückgabe ist %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/el-GR.rc b/reactos/base/system/expand/lang/el-GR.rc
deleted file mode 100644
index 866523ebfc2..00000000000
--- a/reactos/base/system/expand/lang/el-GR.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- * GR.rc by Dj Apal®
- *
- */
-
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Expansion Utility Version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-×ñÞóç: %s infile [outfile]\n"
-
-IDS_FAILS "LZÁíôéãñáöÞ áðÝôõ÷å: åðéóôñÜöçêå %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/en-US.rc b/reactos/base/system/expand/lang/en-US.rc
deleted file mode 100644
index 9cd8de1715f..00000000000
--- a/reactos/base/system/expand/lang/en-US.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS File Expansion Utility Version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Usage: %s infile [outfile]\n"
-
-IDS_FAILS "LZCopy failed: return is %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/es-ES.rc b/reactos/base/system/expand/lang/es-ES.rc
deleted file mode 100644
index 5f4fcd8ec86..00000000000
--- a/reactos/base/system/expand/lang/es-ES.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Utilidad de Descompresión de Archivos Versión 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Utilización: %s archivo entrada [archivo salida]\n"
-
-IDS_FAILS "LZCopy falló: el resultado es %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/fr-FR.rc b/reactos/base/system/expand/lang/fr-FR.rc
deleted file mode 100644
index bca0a879a51..00000000000
--- a/reactos/base/system/expand/lang/fr-FR.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Utilitaire de décompression de fichiers Version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Utilisation : %s FichierEntrée [fichierdesortie]\n"
-
-IDS_FAILS "LZCopy a echoué : code d'erreur retourné : %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/hu-HU.rc b/reactos/base/system/expand/lang/hu-HU.rc
deleted file mode 100644
index bc5d389ecca..00000000000
--- a/reactos/base/system/expand/lang/hu-HU.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas@gmail.com>
- */
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Fájlkicsomagoló segédprogram 1.0 verzió\n\
-Szerzõi jog: Victor Schneider 1997\n\n\
-Használat: %s forrás [cél]\n"
-
-IDS_FAILS "LZCopy sikertelen, visszatérése: %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/id-ID.rc b/reactos/base/system/expand/lang/id-ID.rc
deleted file mode 100644
index ff81a2036bf..00000000000
--- a/reactos/base/system/expand/lang/id-ID.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Translated into Indonesian.
- * By Zaenal Mutaqin 2007 ade999@gmail.com
- */
-
-#include "resource.h"
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Utilitas Ekspansi File ReactOS Versi 1.0\n\
-Hak Cipta Victor Schneider 1997\n\n\
-Pemakaian: %s infile [outfile]\n"
-
-IDS_FAILS "LZCopy gagal: hasilnya adalah %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/it-IT.rc b/reactos/base/system/expand/lang/it-IT.rc
deleted file mode 100644
index 1439a0ff7bb..00000000000
--- a/reactos/base/system/expand/lang/it-IT.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "resource.h"
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Programma per la espansione dei file di ReactOS Versione 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Usage: %s infile [outfile]\n"
-
-IDS_FAILS "LZCopy fallito: return è %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/ja-JP.rc b/reactos/base/system/expand/lang/ja-JP.rc
deleted file mode 100644
index e5c72e33ea5..00000000000
--- a/reactos/base/system/expand/lang/ja-JP.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS File Expansion Utility Version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Žg—p–@: %s “WŠJŒ³ƒtƒ@ƒCƒ‹ [“WŠJæƒtƒ@ƒCƒ‹]\n"
-
-IDS_FAILS "LZCopy ‚ÉŽ¸”s‚µ‚Ü‚µ‚½: •Ô‚è’l‚Í %ld ‚Å‚·B\n"
-END
diff --git a/reactos/base/system/expand/lang/lt-LT.rc b/reactos/base/system/expand/lang/lt-LT.rc
deleted file mode 100644
index 21e97f2cd88..00000000000
--- a/reactos/base/system/expand/lang/lt-LT.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Translation by Vytis 'CMan' Girdþijauskas cman@cman.us */
-
-#include "resource.h"
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS bylø iðplëtimo pagalbinë programa. Versija 1.0\n\
-(C) Victor Schneider 1997\n\n\
-Naudojimas: %s ðaltinio_byla [iðvesties_byla]\n"
-
-IDS_FAILS "LZCopy nepavyko: graþino %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/no-NO.rc b/reactos/base/system/expand/lang/no-NO.rc
deleted file mode 100644
index e3ab04650d8..00000000000
--- a/reactos/base/system/expand/lang/no-NO.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Fil ekstrakterings Verktøy Versjon 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Bruk: %s  innfil [utfil]\n"
-
-IDS_FAILS "LZCopy mislykket: retur ble %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/pl-PL.rc b/reactos/base/system/expand/lang/pl-PL.rc
deleted file mode 100644
index 79185ef9711..00000000000
--- a/reactos/base/system/expand/lang/pl-PL.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "resource.h"
-/*
-* translated by xrogers (http://rogers.cyberdusk.pl/)
-* xxrogers@users.sourceforge.net
-* https://sourceforge.net/projects/reactospl
-*/
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Narzêdzie rozwijania plików ReactOS wersja 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Sposób u¿ycia: %s plik_wejœciowy [plik_wyjœciowy]\n"
-
-IDS_FAILS "Nieudane LZCopy: zwrócony wynik %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/pt-BR.rc b/reactos/base/system/expand/lang/pt-BR.rc
deleted file mode 100644
index d7cf730161a..00000000000
--- a/reactos/base/system/expand/lang/pt-BR.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus@itkonsult-olsen.com
- */
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS Utilitário para Expandir Arquivos - Versão 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Uso: %s origem [destino]\n"
-
-IDS_FAILS "LZCopy falhou: resultado é %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/ru-RU.rc b/reactos/base/system/expand/lang/ru-RU.rc
deleted file mode 100644
index 723d14a8ea1..00000000000
--- a/reactos/base/system/expand/lang/ru-RU.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "resource.h"
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Óòèëèòà ðàñïàêîâêè ôàéëîâ ReactOS, âåðñèÿ 1.0\n\
-Àâòîðñêèå ïðàâà (ñ) Âèêòîð Øíåéäåð 1997\n\n\
-Èñïîëüçîâàíèå: %s èñõîäíûé_ôàéë [âûõîäíîé_ôàéë]\n"
-
-IDS_FAILS "Íå óäàëîñü âûïîëíèòü LZCopy, âîçâðàùåíî: %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/sv-SE.rc b/reactos/base/system/expand/lang/sv-SE.rc
deleted file mode 100644
index 25b37de2e27..00000000000
--- a/reactos/base/system/expand/lang/sv-SE.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "resource.h"
-/*
- * Copyright 2005 David Nordenberg
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "ReactOS verktyg för filextrahering version 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Användning: %s källfil [målfil]\n"
-
-IDS_FAILS "LZCopy misslyckades, felkod: %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/th-TH.rc b/reactos/base/system/expand/lang/th-TH.rc
deleted file mode 100644
index 86456783bfa..00000000000
--- a/reactos/base/system/expand/lang/th-TH.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * ReactOS File Expansion Utility
- *
- * Copyright 2006 Sumath Aowsakulsutthi (Thai translation)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "resource.h"
-
-LANGUAGE LANG_THAI, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "â»Ãá¡ÃÁÍÃö»ÃÐ⪹ìà¾×èÍ»ÃѺáµè§á¿éÁ¢Í§ ReactOS ÃØè¹·Õè 1.0\n\
-ʧǹÅÔ¢ÊÔ·¸Ôì Victor Schneider 1997\n\n\
-ÊÀÒÇÐãªé§Ò¹: %s á¿éÁÀÒÂã¹ [á¿éÁÀÒ¹͡]\n"
-
-IDS_FAILS "¡ÒäѴÅÍ¡ÅéÁàËÅÇ: Âé͹¡ÅѺà»ç¹ %ld\n"
-END
diff --git a/reactos/base/system/expand/lang/uk-UA.rc b/reactos/base/system/expand/lang/uk-UA.rc
deleted file mode 100644
index 27fbed4d6fa..00000000000
--- a/reactos/base/system/expand/lang/uk-UA.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * PROJECT:     ReactOS File Expansion Utility
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/system/expand/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for Expand
- * TRANSLATOR:  Artem Reznikov
- */
-#include "resource.h"
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_Copy, "Ïðîãðàìà ðîçïàêîâêè ôàéë³â ReactOS âåðñ³ÿ 1.0\n\
-Copyright Victor Schneider 1997\n\n\
-Usage: %s infile [outfile]\n"
-
-IDS_FAILS "Íå âäàëîñÿ âèêîíàòè: return is %ld\n"
-END
diff --git a/reactos/base/system/expand/resource.h b/reactos/base/system/expand/resource.h
deleted file mode 100644
index 20560c1a96d..00000000000
--- a/reactos/base/system/expand/resource.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef RESOURCE_H__
-#define RESOURCE_H__
-
-#define RC_STRING_MAX_SIZE                 4096
-#define IDS_Copy                            100
-#define IDS_FAILS                           101
-
-#endif
-
-/* EOF */
diff --git a/reactos/base/system/expand/rsrc.rc b/reactos/base/system/expand/rsrc.rc
deleted file mode 100644
index 45e22c26596..00000000000
--- a/reactos/base/system/expand/rsrc.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "lang/bg-BG.rc"
-#include "lang/cs-CZ.rc"
-#include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/hu-HU.rc"
-#include "lang/id-ID.rc"
-#include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
-#include "lang/lt-LT.rc"
-#include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
-#include "lang/pt-BR.rc"
-#include "lang/ru-RU.rc"
-#include "lang/sv-SE.rc"
-#include "lang/th-TH.rc"
-#include "lang/uk-UA.rc"