[ros-diffs] [spetreolle] 42999: sync mlang winetest with wine 1.1.29

Author: spetreolle
Date: Sun Sep  6 13:05:14 2009
New Revision: 42999

URL: http://svn.reactos.org/svn/reactos?rev=42999&view=rev
Log:
sync mlang winetest with wine 1.1.29

Modified:
    trunk/rostests/winetests/mlang/mlang.c

Modified: trunk/rostests/winetests/mlang/mlang.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?re...
==============================================================================
--- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Sun Sep  6 13:05:14 2009
@@ -280,44 +280,6 @@
         str2++;
     }
     *str1 = '\0';
-}
-
-#define DEBUGSTR_W_MAXLEN 64
-
-static CHAR * debugstr_w(const WCHAR * strW)
-{
-    static CHAR buffers[DEBUGSTR_W_MAXLEN * 2];
-    static DWORD pos = 0;
-    CHAR * strA;
-    DWORD len = DEBUGSTR_W_MAXLEN - 4;
-
-    strA = &buffers[pos];
-
-    *strA++ = 'L';
-    *strA++ = '"';
-
-    while (*strW && (len > 4)) {
-        if ((*strW < ' ') || (*strW > 126)) {
-            sprintf(strA, "\%04x", *strW);
-            strA +=5;
-            len -=5;
-        }
-        else
-        {
-            *strA++ = *strW;
-            len--;
-        }
-        strW++;
-    }
-    *strA++ = '"';
-    *strA = '\0';
-
-    strA = &buffers[pos];
-    pos += DEBUGSTR_W_MAXLEN;
-    if (pos >= sizeof(buffers)) pos = 0;
-
-    return strA;
-
 }

static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2)
@@ -1296,14 +1258,14 @@
                 broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
                 broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)),
                 "#%02d: got %s (expected %s)\n", i,
-                debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename));
+                wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
         }
         else
             ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
                 broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
                 broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)),
                 "#%02d: got %s (expected %s)\n", i,
-                debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename));
+                wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));

}