Paul Vriens : urlmon/tests: Fix test on win98.

Fri Sep 5 06:58:19 CDT 2008

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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Fri Sep  5 11:14:59 2008 +0200

urlmon/tests: Fix test on win98.

---

 dlls/urlmon/tests/stream.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c
index 4fc96ef..6b25e2d 100644
--- a/dlls/urlmon/tests/stream.c
+++ b/dlls/urlmon/tests/stream.c
@@ -76,6 +76,7 @@ DEFINE_EXPECT(OnStopBinding);
 DEFINE_EXPECT(OnDataAvailable);
 DEFINE_EXPECT(GetBindInfo);
 
+static const CHAR wszIndexHtmlA[] = "index.html";
 static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0};
 static WCHAR INDEX_HTML[MAX_PATH];
 static const char szHtmlDoc[] = "<HTML></HTML>";
@@ -260,26 +261,22 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = {
 
 static IBindStatusCallback BindStatusCallback = { &BindStatusCallbackVtbl };
 
-static void set_file_url(void)
+static void set_file_url(char *path)
 {
-    int len;
+    char INDEX_HTML_A[MAX_PATH];
 
-    static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'};
-
-    memcpy(INDEX_HTML, wszFile, sizeof(wszFile));
-    len = sizeof(wszFile)/sizeof(WCHAR);
-    INDEX_HTML[len++] = '/';
-    len += GetCurrentDirectoryW(sizeof(INDEX_HTML)/sizeof(WCHAR)-len, INDEX_HTML+len);
-    INDEX_HTML[len++] = '\\';
-    memcpy(INDEX_HTML+len, wszIndexHtml, sizeof(wszIndexHtml));
+    lstrcpyA(INDEX_HTML_A, "file:///");
+    lstrcatA(INDEX_HTML_A, path);
+    MultiByteToWideChar(CP_ACP, 0, INDEX_HTML_A, -1, INDEX_HTML, MAX_PATH);
 }
 
 static void create_file(void)
 {
     HANDLE file;
     DWORD size;
+    CHAR path[MAX_PATH];
 
-    file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+    file = CreateFileA(wszIndexHtmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
                        FILE_ATTRIBUTE_NORMAL, NULL);
     ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n");
     if(file == INVALID_HANDLE_VALUE)
@@ -288,7 +285,10 @@ static void create_file(void)
     WriteFile(file, szHtmlDoc, sizeof(szHtmlDoc)-1, &size, NULL);
     CloseHandle(file);
 
-    set_file_url();
+    GetCurrentDirectoryA(MAX_PATH, path);
+    lstrcatA(path, "\\");
+    lstrcatA(path, wszIndexHtmlA);
+    set_file_url(path);
 }
 
 static void test_URLOpenBlockingStreamW(void)
@@ -370,5 +370,5 @@ START_TEST(stream)
     create_file();
     test_URLOpenBlockingStreamW();
     test_URLOpenStreamW();
-    DeleteFileW(wszIndexHtml);
+    DeleteFileA(wszIndexHtmlA);
 }


