[PATCH] qedit/tests: Use ANSI-Functions to run the test on win9x

[Detlef Riekenberg]

---
 dlls/qedit/tests/mediadet.c |   61 ++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c
index 2b43124..4cb665e 100644
--- a/dlls/qedit/tests/mediadet.c
+++ b/dlls/qedit/tests/mediadet.c
@@ -30,63 +30,70 @@
 #include "qedit.h"
 #include "rc.h"
 
+static  CHAR test_avi_filenameA[MAX_PATH];
 static WCHAR test_avi_filename[MAX_PATH];
+static  CHAR test_sound_avi_filenameA[MAX_PATH];
 static WCHAR test_sound_avi_filename[MAX_PATH];
 
-static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH])
+static LPSTR unpack_avi_file(int id, LPSTR prefix, LPWSTR nameW, LPSTR name)
 {
-    static WCHAR temp_path[MAX_PATH];
-    static WCHAR prefix[] = {'D','E','S',0};
-    static WCHAR avi[] = {'a','v','i',0};
+    static CHAR temp_path[MAX_PATH];
+    static CHAR avi[] = {'a','v','i',0};
     HRSRC res;
     HGLOBAL data;
     char *mem;
     DWORD size, written;
     HANDLE fh;
 
-    res = FindResourceW(NULL, (LPWSTR) id, (LPWSTR) AVI_RES_TYPE);
+    res = FindResourceA(NULL, (LPSTR) id, (LPSTR) AVI_RES_TYPE);
     if (!res)
-        return FALSE;
+        return "FindResourceA";
 
     data = LoadResource(NULL, res);
     if (!data)
-        return FALSE;
+        return "LoadResource";
 
     mem = LockResource(data);
     if (!mem)
-        return FALSE;
+        return "LockResource";
 
     size = SizeofResource(NULL, res);
     if (size == 0)
-        return FALSE;
+        return "SizeofResource";
 
-    if (!GetTempPathW(MAX_PATH, temp_path))
-        return FALSE;
+    if (!GetTempPathA(MAX_PATH, temp_path))
+        return "GetTempPathA";
 
     /* We might end up relying on the extension here, so .TMP is no good.  */
-    if (!GetTempFileNameW(temp_path, prefix, 0, name))
-        return FALSE;
+    if (!GetTempFileNameA(temp_path, prefix, 0, name))
+        return "GetTempFileNameA";
 
-    DeleteFileW(name);
-    lstrcpyW(name + lstrlenW(name) - 3, avi);
 
-    fh = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW,
+    DeleteFileA(name);
+    lstrcpyA(name + lstrlenA(name) - 3, avi);
+
+    fh = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_NEW,
                      FILE_ATTRIBUTE_NORMAL, NULL);
     if (fh == INVALID_HANDLE_VALUE)
-        return FALSE;
+        return "CreateFileA";
 
     if (!WriteFile(fh, mem, size, &written, NULL) || written != size)
-        return FALSE;
+        return "WriteFile";
 
     CloseHandle(fh);
 
-    return TRUE;
+    MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, MAX_PATH);
+    return NULL;
 }
 
-static BOOL init_tests(void)
+static LPSTR init_tests(void)
 {
-    return unpack_avi_file(TEST_AVI_RES, test_avi_filename)
-        && unpack_avi_file(TEST_SOUND_AVI_RES, test_sound_avi_filename);
+    LPSTR ptr;
+
+    ptr = unpack_avi_file(TEST_AVI_RES, "tst", test_avi_filename, test_avi_filenameA);
+    if (ptr) return ptr;    
+    return unpack_avi_file(TEST_SOUND_AVI_RES, "snd", test_sound_avi_filename, test_sound_avi_filenameA);
+
 }
 
 static void test_mediadet(void)
@@ -225,7 +232,7 @@ static void test_mediadet(void)
     hr = IMediaDet_Release(pM);
     ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);
 
-    DeleteFileW(test_avi_filename);
+    DeleteFileA(test_avi_filenameA);
 
     /* test_sound.avi has one video stream and one audio stream.  */
     hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER,
@@ -293,14 +300,16 @@ static void test_mediadet(void)
     hr = IMediaDet_Release(pM);
     ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);
 
-    DeleteFileW(test_sound_avi_filename);
+    DeleteFileA(test_sound_avi_filenameA);
 }
 
 START_TEST(mediadet)
 {
-    if (!init_tests())
+    LPSTR ptr;
+
+    if (ptr = init_tests())
     {
-        skip("Couldn't initialize tests!\n");
+        skip("Couldn't initialize tests: %s\n", ptr);
         return;
     }
 
-- 
1.5.4.3


--=-Mvi2WxqrufLm+fQcrt9G--