Changeset 7334 for trunk/src/kernel32/ole2nls.cpp

Timestamp:

Nov 14, 2001, 1:30:46 PM (24 years ago)

Author:

phaller

Message:

replaced heap alloc by stack alloc

File:

• trunk/src/kernel32/ole2nls.cpp (modified) (4 diffs)

trunk/src/kernel32/ole2nls.cpp

@@ -1 @@
-/* $Id: ole2nls.cpp,v 1.14 2001-09-05 12:57:59 bird Exp $
+/* $Id: ole2nls.cpp,v 1.15 2001-11-14 12:30:40 phaller Exp $
  *
  *  National Language Support library
@@ -442 +442 @@
     int string_num;
     int i;
+
+    /* Replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */
+    if(SUBLANGID(lang_id) == SUBLANG_NEUTRAL)
+        lang_id = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT);
 
     hrsrc = FindResourceExW(hModule, RT_STRINGW, (LPCWSTR)((res_id >> 4) + 1), lang_id);
@@ -2022 +2026 @@
    * characters, we can support NORM_IGNOREKANATYPE
    */
+#ifdef DEBUG
   if (mapflags & ~LCMAPSTRINGA_SUPPORTED_FLAGS)
   {
@@ -2035 +2040 @@
      );
   }
+#endif
 
   if ( !(mapflags & LCMAP_SORTKEY) )