Changeset 10005 for trunk/src/msvcrt/locale.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (23 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/locale.c (modified) (9 diffs)

trunk/src/msvcrt/locale.c

@@ -22 +22 @@
 #else
 #include <emxheader.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
 #endif
 
@@ -88 +92 @@
   for (i = 0; i < sizeof(_country_synonyms)/sizeof(char*); i += 2 )
   {
-    if (!strcasecmp(_country_synonyms[i],name))
+    if (!_stricmp(_country_synonyms[i],name))
     {
       TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]);
@@ -126 +130 @@
     return 0;
   /* Partial matches are allowed, e.g. "Germ" matches "Germany" */
-  return !strncasecmp(cmp, buff, strlen(cmp));
+  return !_strnicmp(cmp, buff, strlen(cmp));
 }
 
@@ -227 +231 @@
       {
         /* Special codepage values: OEM & ANSI */
-        if (strcasecmp(locale->search_codepage,"OCP"))
+        if (_stricmp(locale->search_codepage,"OCP"))
         {
           GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE,
                          locale->found_codepage, MAX_ELEM_LEN);
         }
-        if (strcasecmp(locale->search_codepage,"ACP"))
+        if (_stricmp(locale->search_codepage,"ACP"))
         {
           GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE,
@@ -261 +265 @@
 }
 
-extern int snprintf(char *, int, const char *, ...);
 
 /* INTERNAL: Set ctype behaviour for a codepage */
@@ -315 +318 @@
   int lc_all = 0;
 
-  TRACE("(%d %s)\n",category,locale);
+  TRACE("MSVCRT: setlocale (%d %s)\n",category,locale);
 
   if (category < MSVCRT_LC_MIN || category > MSVCRT_LC_MAX)
@@ -445 +448 @@
   MSVCRT_current_lc_all_lcid = lcid;
 
-  snprintf(MSVCRT_current_lc_all,MAX_LOCALE_LENGTH,"%s_%s.%s",
+  _snprintf(MSVCRT_current_lc_all,MAX_LOCALE_LENGTH,"%s_%s.%s",
            lc.found_language,lc.found_country,lc.found_codepage);
 
@@ -522 +525 @@
 {
   LOCK_LOCALE;
+  dprintf(("MSVCRT: _setmbcp %d",cp));
   if (MSVCRT_current_lc_all_cp != cp)
   {
@@ -535 +539 @@
 int _getmbcp(void)
 {
+  dprintf(("MSVCRT: _getmbcp"));
   return MSVCRT_current_lc_all_cp;
 }
+
+/*********************************************************************
+ *              __crtLCMapStringA (MSVCRT.@)
+ */
+int __crtLCMapStringA(
+  LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst,
+  int dstlen, unsigned int codepage, int xflag
+) {
+  FIXME("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n",
+        lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag);
+  /* FIXME: A bit incorrect. But msvcrt itself just converts its
+   * arguments to wide strings and then calls LCMapStringW
+   */
+  return LCMapStringA(lcid,mapflags,src,srclen,dst,dstlen);
+}