Changeset 10848

Timestamp:

Jun 26, 1999, 8:35:08 PM (26 years ago)

Author:

sandervl

Message:

KERNEL32/lang.cpp: Bugfix for GetLocaleInfoA

Location:

tags/trunk

Files:

• ChangeLog (modified) (1 diff)
• src/kernel32/lang.cpp (modified) (4 diffs)

tags/trunk/ChangeLog ¶

@@ -1 @@
- /* $Id: ChangeLog,v 1.25 1999-06-26 18:23:58 sandervl Exp $ */
+ /* $Id: ChangeLog,v 1.26 1999-06-26 18:34:45 sandervl Exp $ */
  99-06-26: Sander van Leeuwen
         - USER32: Changes for message spy & several message handler changes
         - USER32: Restore win32 tib in window msg callback
         - KERNEL32/include: Restore OS/2 tib on entering Open32 or OS/2 apis
+        - KERNEL32/lang.cpp: Bugfix for GetLocaleInfoA (if buf ptr == null, only 
+          return size of memory block required to hold info)
 
  99-06-25: Achim Hasenmueller

tags/trunk/src/kernel32/lang.cpp ¶

@@ -1 @@
-/* $Id: lang.cpp,v 1.5 1999-06-24 08:47:40 sandervl Exp $ */
+/* $Id: lang.cpp,v 1.6 1999-06-26 18:35:08 sandervl Exp $ */
 
 /*
@@ -76 +76 @@
   {
     case LOCALE_SDECIMAL:
-      *buf = CtryInfo.szDecimal[0];
+      if(buf) *buf = CtryInfo.szDecimal[0];
       return 1;
     case LOCALE_SDATE:
-      *buf = CtryInfo.szDateSeparator[0];
+      if(buf) *buf = CtryInfo.szDateSeparator[0];
       return 1;
     case LOCALE_STIME:
-      *buf = CtryInfo.szTimeSeparator[0];
+      if(buf) *buf = CtryInfo.szTimeSeparator[0];
       return 1;
     case LOCALE_STHOUSAND:
-      *buf = CtryInfo.szThousandsSeparator[0];
+      if(buf) *buf = CtryInfo.szThousandsSeparator[0];
       return 1;
     case LOCALE_SCURRENCY:
@@ -176 +176 @@
           break;
       }
-      *buf = 0;
+      if(buf) *buf = 0;
       return 1;
 /***
@@ -196 +196 @@
     default:
       dprintf(("KERNEL32:  OS2GetLocaleInfoA: LCType %d not yet supported\n", LCType));
-      *buf = '1';
+      if(buf) *buf = '1';
       return(1);
   }