Changeset 1391 for trunk/dll/common.c

Timestamp:

Jan 12, 2009, 12:55:53 AM (17 years ago)

Author:

Gregg Young

Message:

Move nontranslated strings to init.c and codepage.c; use those strings in place of GetPString calls. Move other strings to a StringTable; minor cleanup and code changes to codepage.c to use a string array instead of GetPString calls. Ticket 340

File:

• trunk/dll/common.c (modified) (4 diffs)

trunk/dll/common.c

@@ -23 +23 @@
   06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
+  11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
 
 ***********************************************************************/
@@ -174 +175 @@
       case DIR_VIEW:
       case DIR_FILTER:
-
-      SetPresParams(hwnd, &RGBGREY, &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVTEXT));
+      //fixme to allow user to change presparams 1-10-09 GKY
+      SetPresParams(hwnd, &RGBGREY, &RGBBLACK, &RGBBLACK, FNT_8HELVETICA);
       return rc;
     }
@@ -354 +355 @@
       UCHAR parm[2];
       ULONG plen = sizeof(parm), dlen = 0L;
+      APIRET rc;
 
       switch (SHORT1FROMMP(cmd)) {
@@ -368 +370 @@
       parm[1] = *dv - 'A';
       DosError(FERR_DISABLEHARDERR);
-      DosDevIOCtl(-1L,
-                  8L, 0x40L, &parm, sizeof(parm), &plen, NULL, 0L, &dlen);
+      rc = DosDevIOCtl(-1L, 8L, 0x40L, &parm, sizeof(parm), &plen, NULL, 0L, &dlen);
+      DbgMsg(pszSrcFile, __LINE__, "Eject parm %i %i rc %i", parm[0], parm[1], rc);
       if (cmd == IDM_EJECT &&
           (fEjectFlpyScan ? TRUE : parm[1] > 1) &&