Austin English : mlang/tests: Remove win9x hacks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ed5f21d0277deddfe8f0a5fb3b12646df69b15e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ed5f21d0277deddfe8f0a5fb3b12646df69b15e

Author: Austin English <austinenglish at gmail.com>
Date:   Fri Feb 25 14:35:46 2011 -0800

mlang/tests: Remove win9x hacks.

---

 dlls/mlang/tests/mlang.c |   52 ++++++---------------------------------------
 1 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 96a19a6..65e0266 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -254,28 +254,6 @@ static BOOL init_function_ptrs(void)
         ok(0, (format), string1, string2); \
     }
 
-/* lstrcmpW is not supported on Win9x! */
-static int mylstrcmpW(const WCHAR* str1, const WCHAR* str2)
-{
-    if (!str2) return 1;
-    while (*str1 && *str1==*str2) {
-        str1++;
-        str2++;
-    }
-    return *str1-*str2;
-}
-
-/* lstrcpyW is not supported on Win95 */
-static void mylstrcpyW(WCHAR* str1, const WCHAR* str2)
-{
-    while (str2 && *str2) {
-        *str1 = *str2;
-        str1++;
-        str2++;
-    }
-    *str1 = '\0';
-}
-
 static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2)
 {
     /* these APIs are broken regarding constness of the input buffer */
@@ -586,8 +564,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags)
 #ifdef DUMP_CP_INFO
         trace("%u: codepage %u family %u\n", i, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage);
 #endif
-        /* Win95 does not support UTF-7 */
-        if (cpinfo[i].uiCodePage == CP_UTF7) continue;
 
 	/* support files for some codepages might be not installed, or
 	 * the codepage is just an alias.
@@ -1227,21 +1203,21 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
             "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766);
 
         /* Some IE versions truncate an oversized name one character to short */
-        mylstrcpyW(short_broken_name, info_table[i].broken_name);
+        lstrcpyW(short_broken_name, info_table[i].broken_name);
         short_broken_name[MAX_LOCALE_NAME - 2] = '\0';
 
         if (info_table[i].todo & TODO_NAME) {
             todo_wine
-            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)),
+            ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
+                broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
+                broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)),
                 "#%02d: got %s (expected %s)\n", i,
                 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)),
+            ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
+                broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
+                broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)),
                 "#%02d: got %s (expected %s)\n", i,
                 wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
 
@@ -1902,20 +1878,6 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2)
     UINT i;
     HRESULT hr;
 
-    SetLastError(0xdeadbeef);
-    lstrcmpW(NULL, NULL);
-    if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
-    {
-        /* This corruption leads (sometimes) to test failures in oleaut32 but also
-         * to the inability to use the Regional Settings.
-         * This only seems to be an issue with Win98 and IE6 (mlang version 6.0.2800.1106).
-         *
-         * A reboot restores the codepages again.
-         */
-        win_skip("IsCodePageInstallable could mess up the codepages on Win98\n");
-        return;
-    }
-
     for (i = 0; i < 0xffff; i++)
     {
         hr = IMultiLanguage2_IsCodePageInstallable(ml2, i);