[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:02:07 UTC 2012


The following commit has been merged in the wheezy branch:
commit 249c2c2698b1f582da872365cefb4555fbffb2c9
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Thu Mar 15 23:41:30 2012 +0900

    msvcrt: Add semi stub _mbcjmstojis implementation.
    (cherry picked from commit 0800572257a1da4cb8a18c0017c3057e262903aa)

diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index a8cd237..cde1e06 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -464,6 +464,23 @@ unsigned int CDECL _mbcjistojms(unsigned int c)
 }
 
 /*********************************************************************
+ *		_mbcjmstojis(MSVCRT.@)
+ *
+ *		Converts a sjis character to jis.
+ */
+unsigned int CDECL _mbcjmstojis(unsigned int c)
+{
+  /* Conversion takes place only when codepage is 932.
+     In all other cases, c is returned unchanged */
+  if(get_mbcinfo()->mbcodepage == 932)
+  {
+    FIXME("(%x): stub\n", c);
+  }
+
+  return c;
+}
+
+/*********************************************************************
  *		_mbsdec(MSVCRT.@)
  */
 unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cur)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 1260dfa..00e52f3 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -664,7 +664,7 @@
 # stub _mbccpy_s_l(ptr long ptr str ptr)
 @ cdecl _mbcjistojms (long)
 # stub _mbcjistojms_l(long ptr)
-@ stub _mbcjmstojis(long)
+@ cdecl _mbcjmstojis(long)
 # stub _mbcjmstojis_l(long ptr)
 @ cdecl _mbclen(ptr)
 # stub _mbclen_l(ptr ptr)

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list