Changeset 275 for trunk/src/pe2lx/pe.cpp

Timestamp:

Jul 6, 1999, 10:50:12 AM (26 years ago)

Author:

sandervl

Message:

Edgar Buerkle's codepages changes

File:

• trunk/src/pe2lx/pe.cpp (modified) (9 diffs)

trunk/src/pe2lx/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.4 1999-06-21 01:15:40 buerkle Exp $ */
+/* $Id: pe.cpp,v 1.5 1999-07-06 08:50:11 sandervl Exp $ */
 
 /*
@@ -58 +58 @@
 /**/
 
-
+BOOL fUseCodePage = FALSE;
+int  WinCodePage;
+ 
 char INFO_BANNER[] =
-"Usage: PE2LX winfile \n\
-       OR\n\
-       PE2LX winfile os2file\n";
+"Usage: PE2LX winfile [os2file] [-cp]\n\
+        OR\n\
+        PE2LX winfile os2file [-cp]\n";
 
 char *ResTypes[MAX_RES] =
@@ -95 +97 @@
 PIMAGE_SECTION_HEADER    psh;
 int  nSections;
-
-  if(argc != 2 && argc != 3) {
+char *winfile=NULL, *os2file=NULL;
+
+  if(argc < 2 || argc > 4) {
         cout << "pe2lx v0.0." << PE2LX_VERSION << "alpha"<< endl;
         cout << INFO_BANNER << endl;
         return(0);
   }
-
-  rc = DosOpen(argv[1],                        /* File path name */
+  for(i=1;i<argc;i++)
+  {
+      if(!stricmp(argv[i], "/CP") || !stricmp(argv[i], "-CP"))
+        fUseCodePage = TRUE;
+      else if(winfile == NULL)
+        winfile = argv[i];
+      else if(os2file == NULL)
+        os2file = argv[i];
+  }
+
+  rc = DosOpen(winfile,                        /* File path name */
                &win32handle,                   /* File handle */
                &ulAction,                      /* Action taken */
@@ -163 +175 @@
         return(1);
   }
-  if(argc == 2) {
+  if(os2file == NULL) {
         //ok, it's a PE file, so we can safely make a backup copy
-        char *newfile = (char *)malloc(strlen(argv[1])+1);
-        strcpy(newfile, argv[1]);
+        char *newfile = (char *)malloc(strlen(winfile)+1);
+        strcpy(newfile, winfile);
         newfile[strlen(newfile)-1]++;
         //save copy of win32 exe/dll (exe->exf, dll->dlk)
-        rc = DosMove(argv[1], newfile);
+        rc = DosMove(winfile, newfile);
         if(rc) {
                 cout << "Unable to save original win32 file to " << newfile << "(" << rc << ")" << endl;
@@ -214 +226 @@
   ////  OS2Exe.SetStackSize(oh.SizeOfStackCommit);
   OS2Exe.SetStackSize(max(oh.SizeOfStackCommit, oh.SizeOfStackReserve));
-  if(argc == 2)
-        OS2Exe.SetModuleName(argv[1]);
-  else  OS2Exe.SetModuleName(argv[2]);
+  if(os2file == NULL)
+        OS2Exe.SetModuleName(winfile);
+  else  OS2Exe.SetModuleName(os2file);
 
   nSections = NR_SECTIONS(win32file);
@@ -557 +569 @@
   }
   OS2Exe.SaveConvertedNames();
-  if(argc == 2)
-        OS2Exe.SaveNewExeFile(argv[1]);
-  else  OS2Exe.SaveNewExeFile(argv[2]);
+  if(os2file == NULL)
+        OS2Exe.SaveNewExeFile(winfile);
+  else  OS2Exe.SaveNewExeFile(os2file);
 
   return(0);
@@ -617 +629 @@
                 cout << "Resource Data RVA " << hex(pData->OffsetToData) << endl;
                 cout << "Resource Data VA  " << hex(VirtualAddress) << endl;
-                cout << "Resource Codepage " << pData->CodePage << endl;
+                if(fUseCodePage == TRUE)
+                        WinCodePage = pData->CodePage;
+                else    WinCodePage = 0;
+ 
                 if(pData->Size) {//winamp17 winzip archive has resource with size 0
                  switch(type) {
                         case NTRT_MENU:
-                                ShowMenu(id, (MenuHeader *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size);
+                                ShowMenu(id, (MenuHeader *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size, WinCodePage);
                                 break;
                         case NTRT_ICON:
@@ -640 +655 @@
                                 break;
                         case NTRT_DIALOG:
-                                ShowDialog(id, (DialogBoxHeader *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size);
+                                ShowDialog(id, (DialogBoxHeader *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size, WinCodePage);
                                 break;
                         case NTRT_VERSION:
@@ -655 +670 @@
 //lower 4 bits are an index into the string table
 //Best solution is to split the strings up and store them as RCDATA
-                                ShowStrings(id, (char *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size);
+                                ShowStrings(id, (char *)((char *)prdRoot + pData->OffsetToData - VirtualAddress), pData->Size, WinCodePage);
                                 break;
                         case NTRT_ACCELERATORS: