Changeset 83 for trunk/src/user32

Timestamp:

Jun 9, 1999, 10:16:53 PM (26 years ago)

Author:

phaller

Message:

Fix: various unicode fixes

File:

• trunk/src/user32/RESSTRING.C (modified) (1 diff)

trunk/src/user32/RESSTRING.C

@@ -23 +23 @@
 #include "unicode.h"
 
-static char *UnicodeToAsciiN(WCHAR *wstring, char *astring, int maxlen);
-
 /******************************************************************************/
-//Strings stored as original: WORD    len 
+//Strings stored as original: WORD    len
 //                            UNICODE string (not null terminated)
 /******************************************************************************/
-int OS2LoadStringAscii(HINSTANCE hinst, UINT wID, LPSTR lpBuffer, int cchBuffer)
+int OS2LoadStringAscii(HINSTANCE hinst,
+                       UINT      wID,
+                       LPSTR     lpBuffer,
+                       int       cchBuffer)
 {
- APIRET  rc;
- WCHAR  *szbuf;
- char    modname[128];
- HMODULE hmodule;
+  APIRET  rc;
+  WCHAR  *szbuf;
+  char    modname[128];
+  HMODULE hmodule;
 
-  if(hinst != 0 && hinst != -1) {
-        if(Win32QueryModuleName(hinst, modname, sizeof(modname)) == 0) {
-#ifdef DEBUG
-                WriteLog("Can't determine handle of dll %X\n", hinst);
-#endif
-                return(0);
-        }
-        rc = DosQueryModuleHandle(modname, &hmodule);
-        if(rc) {
-#ifdef DEBUG
-                WriteLog("Can't determine handle of dll %s\n", modname);
-#endif
-                return(0);
-        }
+  if(hinst != 0 && hinst != -1)
+  {
+    if(Win32QueryModuleName(hinst,
+                            modname,
+                            sizeof(modname)) == 0)
+    {
+      dprintf(("USER32: OS2LoadStringAscii: Can't determine handle of dll %08xh\n",
+               hinst));
+      return(0);
+   }
+
+   rc = DosQueryModuleHandle(modname,
+                             &hmodule);
+   if(rc)
+   {
+     dprintf(("USER32: OS2LoadStringAscii: Can't determine handle of dll %s\n",
+              modname));
+
+     return(0);
+   }
   }
-  else  hmodule = 0;
+  else
+    hmodule = 0;
 
-  rc = DosGetResource(hmodule, RT_RCDATA, wID, (PPVOID)&szbuf);
-  if(rc) {
-#ifdef DEBUG
-        WriteLog("OS2LoadString failed with rc %d\n", rc);
-#endif
-        if(lpBuffer)    *lpBuffer = 0;
-        return(0);      //TODO: SetLastError!
+  rc = DosGetResource(hmodule,
+                      RT_RCDATA,
+                      wID,
+                      (PPVOID)&szbuf);
+  if(rc)
+  {
+    dprintf(("USER32: OS2LoadStringAscii failed with rc %08xh\n",
+             rc));
+
+    if(lpBuffer)
+      *lpBuffer = 0;
+
+    return(0);  //TODO: SetLastError!
   }
-  UnicodeToAsciiN(szbuf+1, lpBuffer, min((*szbuf), cchBuffer-1));
-#ifdef DEBUG
-  WriteLog("OS2LoadString retrieved string '%s' (size %d)\n", lpBuffer, (int)*szbuf);
-#endif
+
+  UnicodeToAsciiN(szbuf+1,
+                  lpBuffer,
+                  min((*szbuf), cchBuffer-1));
+
+  dprintf(("USER32: OS2LoadStringA retrieved string '%s' (size %d)\n",
+           lpBuffer,
+           (int)*szbuf));
+
   DosFreeResource(szbuf);
-  return(strlen(lpBuffer));     //not including null terminator!
+  return(strlen(lpBuffer));              //not including null terminator!
 }
 //******************************************************************************
 //******************************************************************************
-int OS2LoadStringUnicode(HINSTANCE hinst, UINT wID, WCHAR *lpBuffer, int cchBuffer)
+int OS2LoadStringUnicode(HINSTANCE hinst,
+                         UINT      wID,
+                         WCHAR     *lpBuffer,
+                         int       cchBuffer)
 {
- APIRET  rc;
- WCHAR  *szbuf;
- char    modname[128];
- HMODULE hmodule;
+  APIRET  rc;
+  WCHAR  *szbuf;
+  char    modname[128];
+  HMODULE hmodule;
+
 #ifdef DEBUG
  char   *astring;
 #endif
 
-  if(hinst != 0 && hinst != -1) {
-        if(Win32QueryModuleName(hinst, modname, sizeof(modname)) == 0) {
-#ifdef DEBUG
-                WriteLog("Can't determine handle of dll %X\n", hinst);
-#endif
-                return(0);
-        }
-        rc = DosQueryModuleHandle(modname, &hmodule);
-        if(rc) {
-#ifdef DEBUG
-                WriteLog("Can't determine handle of dll %s\n", modname);
-#endif
-                return(0);
-        }
+  if(hinst != 0 && hinst != -1)
+  {
+    if(Win32QueryModuleName(hinst,
+                            modname,
+                            sizeof(modname)) == 0)
+    {
+      dprintf(("USER32: OS2LoadStringUnicode: Can't determine handle of dll %08xh\n",
+               hinst));
+      return(0);
+   }
+
+   rc = DosQueryModuleHandle(modname,
+                             &hmodule);
+   if(rc)
+   {
+     dprintf(("USER32: OS2LoadStringUnicode: Can't determine handle of dll %s\n",
+              modname));
+
+     return(0);
+   }
   }
-  else  hmodule = 0;
+  else
+    hmodule = 0;
 
-  rc = DosGetResource(hmodule, RT_RCDATA, wID, (PPVOID)&szbuf);
-  if(rc) {
-#ifdef DEBUG
-        WriteLog("OS2LoadString failed with rc %d\n", rc);
-#endif
-        if(lpBuffer)    *lpBuffer = 0;
-        return(0);      //TODO: SetLastError!
+  rc = DosGetResource(hmodule,
+                      RT_RCDATA,
+                      wID,
+                      (PPVOID)&szbuf);
+  if(rc)
+  {
+    dprintf(("USER32: OS2LoadStringUnicode failed with rc %08xh\n",
+             rc));
+
+    if(lpBuffer)
+      *lpBuffer = 0;
+
+    return(0);  //TODO: SetLastError!
   }
-  memcpy(lpBuffer, szbuf+1, min((*szbuf), cchBuffer-1)*sizeof(WCHAR));
+
+
+  memcpy(lpBuffer,
+         szbuf+1,
+         min((*szbuf), cchBuffer-1) * sizeof(WCHAR));
+
   lpBuffer[min((*szbuf), cchBuffer-1)] = 0;
 
 #ifdef DEBUG
   astring = UnicodeToAsciiString(lpBuffer);
-  WriteLog("OS2LoadStringW retrieved string '%s' of size %d\n", astring, (int)*szbuf);
+  WriteLog("USER32: OS2LoadStringUnicode retrieved string '%s' of size %d\n",
+           astring,
+           (int)*szbuf);
   FreeAsciiString(astring);
 #endif
+
   DosFreeResource(szbuf);
-  return(UniStrlen(lpBuffer));  //not including null terminator!
+  return(UniStrlen(lpBuffer));           //not including null terminator!
 }
-//******************************************************************************
-//******************************************************************************
-static char *UnicodeToAsciiN(WCHAR *wstring, char *astring, int maxlen)
-{
- int i;
 
-  for(i=0;i<maxlen;i++) {
-        astring[i] = (UCHAR)wstring[i];
-  }
-  astring[maxlen] = 0;
-  return(astring);
-}
-/******************************************************************************/
-/******************************************************************************/
-