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

Timestamp:

Aug 13, 1999, 1:33:38 AM (26 years ago)

Author:

phaller

Message:

Add: added ODINWRAP support plus few enhancements to VERSION

File:

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

trunk/src/kernel32/lang.cpp

@@ -14 +14 @@
 #include <stdio.h>
 #include <string.h>
+#include <odinwrap.h>
+#include <heapstring.h>
+#include <win\winreg.h>
 #include <winos2def.h>
 #include "unicode.h"
+
+ODINDEBUGCHANNEL(KERNEL32-LANG)
+
 
 //******************************************************************************
@@ -891 +897 @@
 
 /*****************************************************************************
- * Name      : DWORD VerLanguageNameA
- * Purpose   : The VerLanguageNameA function converts the specified binary
- *             Microsoft language identifier into a text representation of the language.
- * Parameters: DWORD  idLang   Microsoft language identifier
- *             LPTSTR lpszLang address of buffer for language string
- *             DWORD  cbLang   size of buffer
+ * Name      :
+ * Purpose   :
+ * Parameters:
  * Variables :
- * Result    : size of target buffer
+ * Result    :
  * Remark    :
  * Status    : UNTESTED STUB
  *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
  *****************************************************************************/
 
-DWORD WIN32API VerLanguageNameA(UINT  idLang,
-                                LPSTR lpszLang,
-                                UINT  cbLang)
-{
-  dprintf(("KERNEL32: VerLanguageNameA(%08x,%08x,%08x) not implemented.\n",
-           idLang,
-           lpszLang,
-           cbLang));
-
-  return (0);
-}
-
+ODINFUNCTION3(DWORD,VerLanguageNameA,DWORD,  wLang,
+                                     LPSTR,  szLang,
+                                     DWORD,  nSize)
+{
+  char    buffer[80];
+  LPCSTR  name;
+  DWORD   result;
+
+  /*
+   * First, check \System\CurrentControlSet\control\Nls\Locale\<langid>
+   * from the registry.
+   */
+
+#if 0
+PHS: disabled because if interlinkage with registry
+  sprintf( buffer,
+           "\\System\\CurrentControlSet\\control\\Nls\\Locale\\%08x",
+           wLang );
+
+  result = RegQueryValueA(HKEY_LOCAL_MACHINE,
+                          buffer,
+                          szLang,
+                          (LPLONG)&nSize );
+  if (result == ERROR_SUCCESS ||
+      result == ERROR_MORE_DATA)
+    return nSize;
+#endif
+
+  /*
+   * If that fails, use the internal table
+   * (actually, Windows stores the names in a string table resource ...)
+   */
+
+  lstrcpynA(szLang,
+            "Language-Neutral",
+            nSize);
+
+  return strlen(szLang);
+}
 
 /*****************************************************************************
- * Name      : DWORD VerLanguageNameW
- * Purpose   : The VerLanguageNameW function converts the specified binary
- *             Microsoft language identifier into a text representation of the language.
- * Parameters: DWORD  idLang   Microsoft language identifier
- *             LPTSTR lpszLang address of buffer for language string
- *             DWORD  cbLang   size of buffer
+ * Name      :
+ * Purpose   :
+ * Parameters:
  * Variables :
- * Result    : size of target buffer
+ * Result    :
  * Remark    :
  * Status    : UNTESTED STUB
  *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
  *****************************************************************************/
 
-DWORD WIN32API VerLanguageNameW(UINT  idLang,
-                                LPWSTR lpszLang,
-                                UINT  cbLang)
-{
-  dprintf(("KERNEL32: VerLanguageNameW(%08x,%08x,%08x) not implemented.\n",
-           idLang,
-           lpszLang,
-           cbLang));
-
-  return (0);
-}
+ODINFUNCTION3(DWORD,VerLanguageNameW,DWORD,  wLang,
+                                     LPWSTR, szLang,
+                                     DWORD,  nSize)
+{
+  LPSTR szLangA;
+  DWORD rc;
+
+  if ( (szLang == NULL) ||
+       (nSize  == 0) )          // validate parameters
+     return 0;
+
+  szLangA = (LPSTR)HEAP_malloc(nSize + 1);
+  rc = VerLanguageNameA(wLang,
+                        szLangA,
+                        nSize);
+  if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA)
+    AsciiToUnicodeN(szLangA,
+                    szLang,
+                    nSize);
+  HEAP_free(szLangA);
+  return rc;
+}
+
+