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

Timestamp:

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

Author:

sandervl

Message:

Edgar Buerkle's codepages changes

File:

• trunk/src/pe2lx/dialog.cpp (modified) (23 diffs)

trunk/src/pe2lx/dialog.cpp

@@ -1 @@
-/* $Id: dialog.cpp,v 1.6 1999-07-04 19:02:37 sandervl Exp $ */
+/* $Id: dialog.cpp,v 1.7 1999-07-06 08:50:11 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #define INCL_DOSPROCESS          /* DOS Process values       */
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
+#define INCL_DOSNLS
 #define INCL_WIN
 #define INCL_WINMLE
@@ -40 +41 @@
 static void ConvertCaption(ULONG style, char *caption);
 static int  ConvertFont(char *font, PRESPARAMS *dlgpparam, int fsize);
-static void ShowDialogEx(int id, WINDLGTEMPLATEEX *dhdr, int size);
+static void ShowDialogEx(int id, WINDLGTEMPLATEEX *dhdr, int size, int cp);
 
 //******************************************************************************
@@ -48 +49 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //******************************************************************************
-void ShowDialog(int id, DialogBoxHeader *dhdr, int size)
+void ShowDialog(int id, DialogBoxHeader *dhdr, int size, int cp)
 {
  WINDLGTEMPLATEEX *windlgex = (WINDLGTEMPLATEEX *)dhdr;
@@ -63 +64 @@
  ULONG        ctrlflag, winclass;
  BOOL         fIconBmp;
+ ULONG        ulCpSize, ulCP;
 
   //First save original win32 resource
@@ -68 +70 @@
 
   if(windlgex->wDlgVer == 1 && windlgex->wSignature == 0xFFFF) {
-        ShowDialogEx(id, windlgex, size);
+        ShowDialogEx(id, windlgex, size, cp);
         return;
   }
@@ -79 +81 @@
   dlgcurdata = dlgdata;
 
-  dlgt->codepage         = 437;
+  if(cp == 0) {
+        dlgt->codepage         = 437;
+  }
+  else
+  {
+        DosQueryCp(sizeof(ulCP), &ulCP, &ulCpSize);
+        dlgt->codepage = ulCP;
+  }
   dlgt->offadlgti        = 14;
   dlgt->fsTemplateStatus = 1;
@@ -145 +154 @@
         }
         else {
-                cout << "Menu namestring    : " << UnicodeToAscii((WCHAR *)(&dhdr->fNameOrd)) << endl;
+                cout << "Menu namestring    : " << UnicodeToAscii((WCHAR *)(&dhdr->fNameOrd), cp) << endl;
                 ptrArray = (WORD *)((int)&dhdr->fNameOrd + UniStrlen((WCHAR *)(&dhdr->fNameOrd))*2 + sizeof(WCHAR));
         }
@@ -159 +168 @@
         }
         else {
-                szClass = UnicodeToAscii((WCHAR *)ptrArray);
+                szClass = UnicodeToAscii((WCHAR *)ptrArray, cp);
                 cout << "Class Name            : " << szClass << endl;
 
@@ -181 +190 @@
   }
   else {
-        ctrltext = UnicodeToAscii((WCHAR *)(ptrArray));
+        ctrltext = UnicodeToAscii((WCHAR *)(ptrArray), cp);
         cout << "Title                : " << ctrltext << endl;
         ctrldata = (ControlData *)((int)(int)ptrArray + UniStrlen((WCHAR *)(ptrArray))*2 + sizeof(WORD));
@@ -199 +208 @@
   if(dhdr->lStyle & DS_SETFONT) {
         fhdr = (FontHeader *)ctrldata;
-        font = UnicodeToAscii(fhdr->szFontName);
+        font = UnicodeToAscii(fhdr->szFontName, cp);
         cout << "Font Point Size      : " << fhdr->wPointSize << endl;
         cout << "Font Name            : " << font << endl;
@@ -271 +280 @@
         }
         else {
-                szClass = UnicodeToAscii((WCHAR *)&ctrldata->fClassId);
+                szClass = UnicodeToAscii((WCHAR *)&ctrldata->fClassId, cp);
                 cout << "Class Name            : " << szClass << endl;
                 szCaption = (WCHAR *)((int)ctrldata + sizeof(ControlData) + strlen(szClass)*2);
@@ -289 +298 @@
         }
         else {  //Handle Caption
-                ctrltext = UnicodeToAscii(szCaption);
+                ctrltext = UnicodeToAscii(szCaption, cp);
                 //SvL: (16-9-'97) Convert '&' chars to '~' (for some classes)
                 ConvertCaption(winclass, ctrltext);
@@ -312 +321 @@
                         }
                 }
-                cout << "Text                  : " << UnicodeToAscii(szCaption) << endl;
+                cout << "Text                  : " << UnicodeToAscii(szCaption, cp) << endl;
                 szCaption = (WCHAR *)((int)szCaption + UniStrlen(szCaption)*2 + sizeof(WORD));
         }
@@ -328 +337 @@
 //******************************************************************************
 //******************************************************************************
-void ShowDialogEx(int id, WINDLGTEMPLATEEX *dhdr, int size)
+void ShowDialogEx(int id, WINDLGTEMPLATEEX *dhdr, int size, int cp)
 {
  DLGTEMPLATE *dlgt;
@@ -342 +351 @@
  ULONG        ctrlflag, winclass;
  BOOL         fIconBmp;
+ ULONG        ulCpSize, ulCP;
 
   //should be enough
@@ -350 +360 @@
   dlgcurdata = dlgdata;
 
-  dlgt->codepage         = 437;
+  if(cp == 0) {
+        dlgt->codepage         = 437;
+  }
+  else
+  {
+        DosQueryCp(sizeof(ulCP), &ulCP, &ulCpSize);
+        dlgt->codepage = ulCP;
+  }
   dlgt->offadlgti        = 14;
   dlgt->fsTemplateStatus = 1;
@@ -412 +429 @@
         }
         else {
-                cout << "Menu namestring    : " << UnicodeToAscii((WCHAR *)(&dhdr->fNameOrd)) << endl;
+                cout << "Menu namestring    : " << UnicodeToAscii((WCHAR *)(&dhdr->fNameOrd, cp)) << endl;
                 ptrArray = (WORD *)((int)&dhdr->fNameOrd + UniStrlen((WCHAR *)(&dhdr->fNameOrd))*2 + sizeof(WCHAR));
         }
@@ -448 +465 @@
   }
   else {
-        ctrltext = UnicodeToAscii((WCHAR *)(ptrArray));
+        ctrltext = UnicodeToAscii((WCHAR *)(ptrArray), cp);
         cout << "Title                : " << ctrltext << endl;
         ctrldata = (WINDLGITEMTEMPLATEEX *)((int)(int)ptrArray + UniStrlen((WCHAR *)(ptrArray))*2 + sizeof(WORD));
@@ -467 +484 @@
   if(dhdr->lStyle & DS_SETFONT) {
         fhdr = (FontHeaderEx *)ctrldata;
-        font = UnicodeToAscii(fhdr->szFontName);
+        font = UnicodeToAscii(fhdr->szFontName, cp);
         cout << "Font Point Size      : " << fhdr->wPointSize << endl;
         cout << "Font Name            : " << font << endl;
@@ -536 +553 @@
         }
         else {
-                szClass = UnicodeToAscii((WCHAR *)&ctrldata->fClassId);
+                szClass = UnicodeToAscii((WCHAR *)&ctrldata->fClassId, cp);
                 cout << "Class Name            : " << szClass << endl;
                 szCaption = (WCHAR *)((int)ctrldata + sizeof(WINDLGITEMTEMPLATEEX) + strlen(szClass)*2);
@@ -551 +568 @@
         }
         else {  //Handle Caption
-                ctrltext = UnicodeToAscii(szCaption);
+                ctrltext = UnicodeToAscii(szCaption, cp);
                 //SvL: (16-9-'97) Convert '&' chars to '~' (for some classes)
                 ConvertCaption(winclass, ctrltext);
@@ -574 +591 @@
                         }
                 }
-                cout << "Text                  : " << UnicodeToAscii(szCaption) << endl;
+                cout << "Text                  : " << UnicodeToAscii(szCaption, cp) << endl;
                 szCaption = (WCHAR *)((int)szCaption + UniStrlen(szCaption)*2 + sizeof(WORD));
         }