Changeset 3804 for trunk/src/kernel32/lang.cpp

Timestamp:

Jul 6, 2000, 11:18:45 PM (25 years ago)

Author:

sandervl

Message:

strncpy call changes + language api updates/fixes

File:

• trunk/src/kernel32/lang.cpp (modified) (9 diffs)

trunk/src/kernel32/lang.cpp

@@ -1 @@
-/* $Id: lang.cpp,v 1.23 2000-06-23 19:02:37 sandervl Exp $ */
+/* $Id: lang.cpp,v 1.24 2000-07-06 21:18:43 sandervl Exp $ */
 /*
  * Win32 language API functions for OS/2
@@ -6 +6 @@
  * Copyright 1998 Patrick Haller
  * Copyright 1999 Przemyslaw Dobrowolski
+ *
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -21 +22 @@
 #include "unicode.h"
 #include "oslibmisc.h"
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_lang
@@ -880 +882 @@
 BOOL WIN32API IsValidLocale(LCID Locale, DWORD dwFlags)
 {
-  dprintf(("KERNEL32:  OS2IsValidLocale, always returns TRUE\n"));
+  dprintf(("KERNEL32: IsValidLocale, always returns TRUE\n"));
   return(TRUE);
 }
@@ -887 +889 @@
 LCID WIN32API GetThreadLocale()
 {
-  dprintf(("KERNEL32:  OS2GetThreadLocale always return US English!\n"));
-  return(0x409);        //US English
-}
-//******************************************************************************
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetThreadLocale( LCID locale )
-{
-  dprintf(("KERNEL32:  OS2SetThreadLocale not implemented!\n"));
+ THDB *thdb = GetThreadTHDB();
+
+  if(thdb == NULL) {
+        dprintf(("KERNEL32: ERROR: GetThreadLocale thdb == NULL!"));
+        return FALSE;
+  }
+  dprintf(("KERNEL32: GetThreadLocale returned %x", thdb->lcid));
+  return(thdb->lcid);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetThreadLocale(LCID locale)
+{
+ THDB *thdb = GetThreadTHDB();
+ 
+  if(thdb == NULL) {
+        dprintf(("KERNEL32: ERROR SetThreadLocale thdb == NULL!"));
+        return FALSE;
+  }
+  dprintf(("KERNEL32: SetThreadLocale %x", locale));
+  thdb->lcid = locale;
   return(TRUE);
 }
@@ -901 +915 @@
 //******************************************************************************
 BOOL WIN32API EnumSystemLocalesA(LOCALE_ENUMPROCA lpLocaleEnumProc,
-                                    DWORD dwFlags)
-{
+                                 DWORD dwFlags)
+{
+ char buffer[32];
+
   dprintf(("EnumSystemLocalesA %X %X\n", lpLocaleEnumProc, dwFlags));
   if(lpLocaleEnumProc == NULL || ((dwFlags & LCID_INSTALLED) && (dwFlags & LCID_SUPPORTED))) {
@@ -909 +925 @@
         return(FALSE);
   }
-  lpLocaleEnumProc("OS/2 US English");
+
+  sprintf(buffer, "%08lx", GetUserDefaultLCID());
+  lpLocaleEnumProc(buffer);
   return(TRUE);
 }
@@ -915 +933 @@
 //******************************************************************************
 BOOL WIN32API EnumSystemLocalesW(LOCALE_ENUMPROCW lpLocaleEnumProc,
-                                    DWORD            dwFlags)
-{
- WCHAR locStr[32];
+                                 DWORD            dwFlags)
+{
+ WCHAR bufferW[32];
+ char  bufferA[32];
 
   dprintf(("EnumSystemLocalesW %X %X\n", lpLocaleEnumProc, dwFlags));
@@ -925 +944 @@
         return(FALSE);
   }
-  AsciiToUnicode("OS/2 US English", locStr);
-  lpLocaleEnumProc(locStr);
+  sprintf(bufferA, "%08lx", GetUserDefaultLCID());
+  lstrcpyAtoW(bufferW, bufferA);
+
+  lpLocaleEnumProc(bufferW);
   return(TRUE);
 }