wine/dlls/msvcrt locale.c

[Alexandre Julliard]

ChangeSet ID:	21370
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/21 07:34:38

Modified files:
	dlls/msvcrt    : locale.c 

Log message:
	Rein Klazes <wijn at wanadoo.nl>
	Fix bogus unreal code page messages in _setmbcp().

Patch: http://cvs.winehq.org/patch.py?id=21370

Old revision  New revision  Changes     Path
 1.29          1.30          +6 -4       wine/dlls/msvcrt/locale.c

Index: wine/dlls/msvcrt/locale.c
diff -u -p wine/dlls/msvcrt/locale.c:1.29 wine/dlls/msvcrt/locale.c:1.30
--- wine/dlls/msvcrt/locale.c:1.29	21 Nov 2005 13:34:38 -0000
+++ wine/dlls/msvcrt/locale.c	21 Nov 2005 13:34:38 -0000
@@ -519,10 +519,11 @@ const char* _Strftime(char *out, unsigne
 int _setmbcp(int cp)
 {
   LOCK_LOCALE;
-  if ((msvcrt_current_lc_all_cp != cp) && (cp > _MB_CP_SBCS))
+  if ( cp > _MB_CP_SBCS)
   {
-    /* FIXME: set ctype behaviour for this cp */
-    msvcrt_current_lc_all_cp = cp;
+    if( msvcrt_current_lc_all_cp != cp)
+      /* FIXME: set ctype behaviour for this cp */
+      msvcrt_current_lc_all_cp = cp;
   }
   else if(cp == _MB_CP_ANSI)
   {
@@ -539,13 +540,14 @@ int _setmbcp(int cp)
   }
   else if(cp == _MB_CP_SBCS)
   {
-    FIXME ("SBCS codepages (e.g. %d) not implemented\n", cp);
+    FIXME ("SBCS codepages not implemented\n");
   }
   else
   {
     FIXME ("Unreal codepages (e.g. %d) not implemented\n", cp);
   }
   UNLOCK_LOCALE;
+  TRACE("(%d) -> %d\n", cp, msvcrt_current_lc_all_cp);
   return 0;
 }