diff --git a/rostests/winetests/urlmon/protocol.c b/rostests/winetests/urlmon/protocol.c index bc666ebbbb4..638a0d79f3d 100644 --- a/rostests/winetests/urlmon/protocol.c +++ b/rostests/winetests/urlmon/protocol.c @@ -29,8 +29,6 @@ #include "urlmon.h" #include "wininet.h" -#include "initguid.h" - #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE diff --git a/rostests/winetests/urlmon/stream.c b/rostests/winetests/urlmon/stream.c index 4fc96ef6ed5..6b25e2d2d0c 100644 --- a/rostests/winetests/urlmon/stream.c +++ b/rostests/winetests/urlmon/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[] = ""; @@ -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); } diff --git a/rostests/winetests/urlmon/testlist.c b/rostests/winetests/urlmon/testlist.c index 76cace38ca4..1248a7cdc6a 100644 --- a/rostests/winetests/urlmon/testlist.c +++ b/rostests/winetests/urlmon/testlist.c @@ -6,18 +6,8 @@ #define STANDALONE #include "wine/test.h" -extern void func_generated(void); -extern void func_misc(void); -extern void func_protocol(void); -extern void func_stream(void); -extern void func_url(void); const struct test winetest_testlist[] = { - { "generated", func_generated }, - { "misc", func_misc }, - { "protocol", func_protocol }, - { "stream", func_stream }, - { "url", func_url }, { 0, 0 } }; diff --git a/rostests/winetests/urlmon/url.c b/rostests/winetests/urlmon/url.c index c0e93ec6c5b..f315070bb81 100644 --- a/rostests/winetests/urlmon/url.c +++ b/rostests/winetests/urlmon/url.c @@ -28,12 +28,17 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "urlmon.h" #include "wininet.h" #include "mshtml.h" #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -155,8 +160,6 @@ static IInternetProtocolSink *protocol_sink = NULL; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; -extern IID IID_IBindStatusCallbackHolder; - static LPCWSTR urls[] = { WINE_ABOUT_URL, ABOUT_BLANK,