March 2007 - Wine-Commits - list.winehq.org

Paul Vriens : advapi32/tests: Use GetModuleHandle and skip.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: f41ebce136b4671dab304fe7dd1eadcdbb2b3d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ebce136b4671dab304fe7d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 13 19:40:47 2007 +0100 advapi32/tests: Use GetModuleHandle and skip. --- dlls/advapi32/tests/crypt_md4.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index 48ee0b9..4370b4e 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -136,9 +136,6 @@ static void test_md4hashfunc(md4hashfunc func) unsigned char in[0x10], output[0x10]; int r; - if (!func) - return; - memset(in, 0, sizeof in); memset(output, 0, sizeof output); r = func(0, in, output); @@ -150,7 +147,7 @@ START_TEST(crypt_md4) { HMODULE module; - if (!(module = LoadLibrary( "advapi32.dll" ))) return; + if (!(module = GetModuleHandleA( "advapi32.dll" ))) return; pMD4Init = (fnMD4Init)GetProcAddress( module, "MD4Init" ); pMD4Update = (fnMD4Update)GetProcAddress( module, "MD4Update" ); @@ -158,16 +155,24 @@ START_TEST(crypt_md4) if (pMD4Init && pMD4Update && pMD4Final) test_md4_ctx(); + else + skip("MD4Init and/or MD4Update and/or MD4Final are not available\n"); pSystemFunction007 = (fnSystemFunction007)GetProcAddress( module, "SystemFunction007" ); if (pSystemFunction007) test_SystemFunction007(); + else + skip("SystemFunction007 is not available\n"); pSystemFunction010 = (md4hashfunc)GetProcAddress( module, "SystemFunction010" ); - pSystemFunction011 = (md4hashfunc)GetProcAddress( module, "SystemFunction011" ); + if (pSystemFunction010) + test_md4hashfunc(pSystemFunction010); + else + skip("SystemFunction010 is not available\n"); - test_md4hashfunc(pSystemFunction010); - test_md4hashfunc(pSystemFunction011); - - FreeLibrary( module ); + pSystemFunction011 = (md4hashfunc)GetProcAddress( module, "SystemFunction011" ); + if (pSystemFunction011) + test_md4hashfunc(pSystemFunction011); + else + skip("SystemFunction011 is not available\n"); }

1 0

Paul Vriens : crypt32/tests: Use GetModuleHandle and skip.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 68fec9028ce022be92892bd98d7c389e82b83003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fec9028ce022be92892bd98… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 13 19:40:30 2007 +0100 crypt32/tests: Use GetModuleHandle and skip. --- dlls/crypt32/tests/base64.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 6cc8df9..1610288 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -132,8 +132,6 @@ static void testBinaryToStringA(void) BOOL ret; DWORD strLen = 0, i; - if (!pCryptBinaryToStringA) return; - ret = pCryptBinaryToStringA(NULL, 0, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -320,8 +318,6 @@ static void testStringToBinaryA(void) BOOL ret; DWORD bufLen = 0, i; - if (!pCryptStringToBinaryA) return; - ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -443,7 +439,7 @@ static void testStringToBinaryA(void) START_TEST(base64) { - HMODULE lib = LoadLibraryA("crypt32"); + HMODULE lib = GetModuleHandleA("crypt32"); if (lib) { @@ -452,9 +448,14 @@ START_TEST(base64) pCryptStringToBinaryA = (CryptStringToBinaryAFunc)GetProcAddress(lib, "CryptStringToBinaryA"); - testBinaryToStringA(); - testStringToBinaryA(); + if (pCryptBinaryToStringA) + testBinaryToStringA(); + else + skip("CryptBinaryToStringA is not available\n"); - FreeLibrary(lib); + if (pCryptStringToBinaryA) + testStringToBinaryA(); + else + skip("CryptStringToBinaryA is not available\n"); } }

1 0

Eric Pouech : dbghelp: Renamed pe_load_module (resp pe_load_module_from_pcs )
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 9a0e666733ebd00e0f467e7b8cba74d8899ce01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0e666733ebd00e0f467e7b8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:33:08 2007 +0100 dbghelp: Renamed pe_load_module (resp pe_load_module_from_pcs) to pe_load_native_module (resp pe_load_builtin_module) to better describe what those functions actually do. --- dlls/dbghelp/dbghelp_private.h | 8 ++++---- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/pe_module.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b62b120..9eccde6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -478,11 +478,11 @@ extern BOOL pdb_fetch_file_info(struct pdb_lookup* pdb_lookup); /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth); extern struct module* - pe_load_module(struct process* pcs, const WCHAR* name, - HANDLE hFile, DWORD base, DWORD size); + pe_load_native_module(struct process* pcs, const WCHAR* name, + HANDLE hFile, DWORD base, DWORD size); extern struct module* - pe_load_module_from_pcs(struct process* pcs, const WCHAR* name, - DWORD base, DWORD size); + pe_load_builtin_module(struct process* pcs, const WCHAR* name, + DWORD base, DWORD size); extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module); /* source.c */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 81f441a..40e09b8 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -524,13 +524,13 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!module && module_is_elf_container_loaded(pcs, wImageName, BaseOfDll)) { /* force the loading of DLL as builtin */ - module = pe_load_module_from_pcs(pcs, wImageName, BaseOfDll, SizeOfDll); + module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); } } if (!module) { /* otherwise, try a regular PE module */ - if (!(module = pe_load_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll))) + if (!(module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll))) { /* and finally and ELF module */ if (module_get_type_by_name(wImageName) == DMT_ELF) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b85c658..ee6997f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -320,11 +320,11 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) } /****************************************************************** - * pe_load_module + * pe_load_native_module * */ -struct module* pe_load_module(struct process* pcs, const WCHAR* name, - HANDLE hFile, DWORD base, DWORD size) +struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, + HANDLE hFile, DWORD base, DWORD size) { struct module* module = NULL; BOOL opened = FALSE; @@ -394,11 +394,11 @@ BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth) } /****************************************************************** - * pe_load_module_from_pcs + * pe_load_builtin_module * */ -struct module* pe_load_module_from_pcs(struct process* pcs, const WCHAR* name, - DWORD base, DWORD size) +struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, + DWORD base, DWORD size) { struct module* module = NULL;

1 0

Eric Pouech : imagehlp: Added a few more forward definitions to dbghelp.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: a6fd78d9a37c0f9fd87ded092223d132858fdc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fd78d9a37c0f9fd87ded092… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:34:01 2007 +0100 imagehlp: Added a few more forward definitions to dbghelp. --- dlls/imagehlp/imagehlp.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 424c731..dee6a59 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -1,7 +1,7 @@ @ stdcall BindImage(str str str) @ stdcall BindImageEx(long str str str ptr) @ stdcall CheckSumMappedFile(ptr long ptr ptr) -@ stub EnumerateLoadedModules64 +@ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules @ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @@ -54,7 +54,7 @@ @ stdcall SymEnumerateSymbols(long long ptr ptr) dbghelp.SymEnumerateSymbols @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW -@ stub SymFindFileInPath +@ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath @ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName @ stdcall SymFunctionTableAccess64(long double) dbghelp.SymFunctionTableAccess64 @@ -88,8 +88,8 @@ @ stdcall SymInitialize(long str long) dbghelp.SymInitialize @ stdcall SymLoadModule64(long long str str double long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule -@ stub SymMatchFileName -@ stub SymMatchString +@ stdcall SymMatchFileName(str str ptr ptr) dbghelp.SymMatchFileName +@ stdcall SymMatchString(str str long) dbghelp.SymMatchString @ stdcall SymRegisterCallback64(long ptr double) dbghelp.SymRegisterCallback64 @ stdcall SymRegisterCallback(long ptr ptr) dbghelp.SymRegisterCallback @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) dbghelp.SymRegisterFunctionEntryCallback64

1 0

Eric Pouech : dbghelp: Get rid of module_name in all traces ( using Unicode flavor).
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: f2cfb374a4a9d9fa6f2bc5d93e4696a624e4fab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2cfb374a4a9d9fa6f2bc5d93… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:26:33 2007 +0100 dbghelp: Get rid of module_name in all traces (using Unicode flavor). --- dlls/dbghelp/dwarf.c | 6 ++++-- dlls/dbghelp/elf_module.c | 20 ++++++++++++-------- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 16 ++++++++-------- dlls/dbghelp/type.c | 3 ++- 7 files changed, 29 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2cfb374a4a9d9fa6f2bc…

1 0

Eric Pouech : dbghelp: Cleanups for module loading ( lookups on module name and image name are two different things)
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: ade919c603cc92e3ef97d8bd39d20185514bbd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade919c603cc92e3ef97d8bd3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:33:02 2007 +0100 dbghelp: Cleanups for module loading (lookups on module name and image name are two different things) - split up module_find_by_name in two different functions: + reused module_find_by_name which looks upon the module name + added module_is_already_loaded which looks upon the image name - cleanup module loading using these functions (removed extra parameter to pe_load_module_from_pcs) --- dlls/dbghelp/dbghelp_private.h | 9 ++- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/module.c | 101 +++++++++++++++++++++------------------ dlls/dbghelp/pe_module.c | 54 ++++++--------------- dlls/dbghelp/source.c | 2 +- dlls/dbghelp/symbol.c | 2 +- 6 files changed, 79 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ade919c603cc92e3ef97d…

1 0

Eric Pouech : dbghelp: Rewrote module_is_elf_container_loaded so that it no longer
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 59f93f64b752decc4fb1699a68d3996ba3ee383b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f93f64b752decc4fb1699a6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:32:57 2007 +0100 dbghelp: Rewrote module_is_elf_container_loaded so that it no longer uses the stored ModuleName (that the dbghelp's caller can override) but rather a combination of base address and filename for the module. --- dlls/dbghelp/module.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index e70ffe5..8dce671 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -358,27 +358,39 @@ struct module* module_find_by_addr(const struct process* pcs, unsigned long addr return module; } +/****************************************************************** + * module_is_elf_container_loaded + * + * checks whether the ELF container, for a (supposed) PE builtin is + * already loaded + */ static BOOL module_is_elf_container_loaded(struct process* pcs, - const WCHAR* ImageName, - const WCHAR* ModuleName) + const WCHAR* ImageName, DWORD base) { - WCHAR buffer[MAX_PATH]; size_t len; struct module* module; + LPCWSTR filename, modname; + + if (!base) return FALSE; + filename = get_filename(ImageName, NULL); + len = strlenW(filename); - if (!ModuleName) - { - module_fill_module(ImageName, buffer, sizeof(buffer)); - ModuleName = buffer; - } - len = strlenW(ModuleName); for (module = pcs->lmodules; module; module = module->next) { - if (!strncmpiW(module->module.ModuleName, ModuleName, len) && - module->type == DMT_ELF && - !strcmpW(module->module.ModuleName + len, S_ElfW)) - return TRUE; + if (module->type == DMT_ELF && + base >= module->module.BaseOfImage && + base < module->module.BaseOfImage + module->module.ImageSize) + { + modname = get_filename(module->module.LoadedImageName, NULL); + if (!strncmpiW(modname, filename, len) && + !memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR))) + { + return TRUE; + } + } } + /* likely a native PE module */ + WARN("Couldn't find container for %s\n", debugstr_w(ImageName)); return FALSE; } @@ -499,7 +511,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam /* this is a Wine extension to the API just to redo the synchronisation */ if (!wImageName && !hFile) return 0; - if (module_is_elf_container_loaded(pcs, wImageName, wModuleName)) + if (module_is_elf_container_loaded(pcs, wImageName, BaseOfDll)) { /* force the loading of DLL as builtin */ if ((module = pe_load_module_from_pcs(pcs, wImageName, wModuleName,

1 0

Eric Pouech : dbghelp: Added helper to get the basename + extension from full filename.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: a6a57c934c19c6c2c4efcb1917af066924db0dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a57c934c19c6c2c4efcb191… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:32:52 2007 +0100 dbghelp: Added helper to get the basename + extension from full filename. --- dlls/dbghelp/module.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c906d1f..e70ffe5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -64,17 +64,25 @@ static int match_ext(const WCHAR* ptr, size_t len) return 0; } +static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) +{ + const WCHAR* ptr; + + if (!endptr) endptr = name + strlenW(name); + for (ptr = endptr - 1; ptr >= name; ptr--) + { + if (*ptr == '/' || *ptr == '\\') break; + } + return ++ptr; +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *ptr,*endptr; + const WCHAR *ptr, *endptr; size_t len, l; - endptr = in + strlenW(in); - for (ptr = endptr - 1; - ptr >= in && *ptr != '/' && *ptr != '\\'; - ptr--); - ptr++; - len = min(endptr-ptr,size-1); + ptr = get_filename(in, endptr = in + strlenW(in)); + len = min(endptr - ptr, size - 1); memcpy(out, ptr, len * sizeof(WCHAR)); out[len] = '\0'; if (len > 4 && (l = match_ext(out, len)))

1 0

Jacek Caban : itss: Added test of URLs with trailing slash.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: b68e0cef1bbd84a00681e8ab1a341ff42c9b1969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68e0cef1bbd84a00681e8ab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 18:44:05 2007 +0100 itss: Added test of URLs with trailing slash. --- dlls/itss/tests/protocol.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index c170d7e..680a867 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -82,7 +82,8 @@ static const WCHAR blank_url6[] = {'i','t','s',':', 't','e','s','t','.','c','h','m',':',':','/','%','6','2','l','a','n','k','.','h','t','m','l',0}; static const WCHAR blank_url7[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; - +static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', + 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static enum { ITS_PROTOCOL, @@ -93,6 +94,8 @@ static const WCHAR cache_file1[] = {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR cache_file2[] = {'t','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR cache_file3[] = + {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static const WCHAR *cache_file = cache_file1; static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) @@ -275,7 +278,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) +static void protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL expect_mime) { HRESULT hres; @@ -283,7 +286,8 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) if(test_protocol == MK_PROTOCOL) SET_EXPECT(ReportProgress_DIRECTBIND); SET_EXPECT(ReportProgress_SENDINGREQUEST); - SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + if(expect_mime) + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); SET_EXPECT(ReportData); @@ -299,7 +303,8 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) if(test_protocol == MK_PROTOCOL) CHECK_CALLED(ReportProgress_DIRECTBIND); CHECK_CALLED(ReportProgress_SENDINGREQUEST); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(expect_mime) + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); CHECK_CALLED(ReportData); @@ -308,7 +313,7 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } -static void test_protocol_url(IClassFactory *factory, LPCWSTR url) +static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_mime) { IInternetProtocol *protocol; BYTE buf[512]; @@ -320,7 +325,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) if(FAILED(hres)) return; - protocol_start(protocol, url); + protocol_start(protocol, url, expect_mime); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == 13, "cb=%u expected 13\n", cb); @@ -339,7 +344,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) "Read returned %08x\n", hres); ok(cb == 0xdeadbeef, "cb=%u expected 0xdeadbeef\n", cb); - protocol_start(protocol, url); + protocol_start(protocol, url, expect_mime); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == 2, "cb=%u expected 2\n", cb); @@ -359,7 +364,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) if(FAILED(hres)) return; - protocol_start(protocol, url); + protocol_start(protocol, url, expect_mime); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); hres = IInternetProtocol_LockRequest(protocol, 0); @@ -377,7 +382,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) if(FAILED(hres)) return; - protocol_start(protocol, url); + protocol_start(protocol, url, expect_mime); hres = IInternetProtocol_LockRequest(protocol, 0); ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); @@ -403,7 +408,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) if(FAILED(hres)) return; - protocol_start(read_protocol, url); + protocol_start(read_protocol, url, expect_mime); ref = IInternetProtocol_Release(read_protocol); ok(!ref, "protocol ref=%d\n", ref); read_protocol = NULL; @@ -572,12 +577,13 @@ static void test_its_protocol(void) ref = IInternetProtocol_Release(protocol); ok(!ref, "protocol ref=%d\n", ref); - test_protocol_url(factory, blank_url1); - test_protocol_url(factory, blank_url2); - test_protocol_url(factory, blank_url3); - test_protocol_url(factory, blank_url4); - test_protocol_url(factory, blank_url5); - test_protocol_url(factory, blank_url6); + test_protocol_url(factory, blank_url1, TRUE); + test_protocol_url(factory, blank_url2, TRUE); + test_protocol_url(factory, blank_url3, TRUE); + test_protocol_url(factory, blank_url4, TRUE); + test_protocol_url(factory, blank_url5, TRUE); + test_protocol_url(factory, blank_url6, TRUE); + test_protocol_url(factory, blank_url8, TRUE); } IClassFactory_Release(factory); @@ -600,9 +606,11 @@ static void test_mk_protocol(void) return; cache_file = cache_file1; - test_protocol_url(cf, blank_url3); + test_protocol_url(cf, blank_url3, TRUE); cache_file = cache_file2; - test_protocol_url(cf, blank_url7); + test_protocol_url(cf, blank_url7, TRUE); + cache_file = cache_file3; + test_protocol_url(cf, blank_url8, FALSE); IClassFactory_Release(cf); }

1 0

Jacek Caban : itss: Use object_name in FindMimeFromData.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: dda4420f058b17dcd4331e70a82470f6307c36dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda4420f058b17dcd4331e70a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 18:43:17 2007 +0100 itss: Use object_name in FindMimeFromData. --- dlls/itss/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 539e52b..dd30c7d 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -226,7 +226,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, HeapFree(GetProcessHeap(), 0, file_name); /* FIXME: Native doesn't use FindMimeFromData */ - hres = FindMimeFromData(NULL, szUrl, NULL, 0, NULL, 0, &mime, 0); + hres = FindMimeFromData(NULL, object_name, NULL, 0, NULL, 0, &mime, 0); if(SUCCEEDED(hres)) { IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); CoTaskMemFree(mime);

1 0