wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Eric Pouech : winegcc: Check that option argument is within command line parameters.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: a5cbdcb8bb4dbc7fcf9acc7b8d673ecebe64f496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cbdcb8bb4dbc7fcf9acc7b8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 winegcc: Check that option argument is within command line parameters. --- tools/winegcc/winegcc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9849afd..8a22dfe 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1297,7 +1297,11 @@ int main(int argc, char **argv) next_is_arg = 1; break; } - if (next_is_arg) option_arg = argv[i+1]; + if (next_is_arg) + { + if (i + 1 >= argc) error("option -%c requires an argument\n", argv[i][1]); + option_arg = argv[i+1]; + } /* determine what options go 'as is' to the linker & the compiler */ raw_compiler_arg = raw_linker_arg = 0;

1 0

Eric Pouech : loader: Protect preloader against ELF file without loadable segments (clang).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7b544af170e3a89d606f41ae4b3bd5c5b4f5f167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b544af170e3a89d606f41ae4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 loader: Protect preloader against ELF file without loadable segments (clang). --- loader/preloader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e1c2276..a94c52c 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -788,6 +788,8 @@ static void map_so_lib( const char *name, struct wld_link_map *l) } /* Now process the load commands and map segments into memory. */ + if (!nloadcmds) + fatal_error( "%s: no segments to load\n", name ); c = loadcmds; /* Length of the sections to be loaded. */

1 0

Eric Pouech : dbghelp: In const types, force 'void' type when none is found .
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 6a60266575ebdc501e533f9c814364746c6ef2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a60266575ebdc501e533f9c8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:45 2011 +0100 dbghelp: In const types, force 'void' type when none is found. --- dlls/dbghelp/dwarf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f0eabaf..1f8d4a7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1317,9 +1317,13 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx, if (di->symt) return di->symt; - TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - ref_type = dwarf2_lookup_type(ctx, di); + if (!(ref_type = dwarf2_lookup_type(ctx, di))) + { + ref_type = ctx->symt_cache[sc_void]; + assert(ref_type); + } if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); di->symt = ref_type;

1 0

Eric Pouech : dbghelp: Return proper null value when lookup_type fails.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 96a38c93d54751c5593e5780e1722322cb498e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a38c93d54751c5593e5780e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:39 2011 +0100 dbghelp: Return proper null value when lookup_type fails. --- dlls/dbghelp/dwarf.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5596c45..f0eabaf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -941,22 +941,24 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, const dwarf2_debug_info_t* di) { - struct attribute attr; + struct attribute attr; + dwarf2_debug_info_t* type; - if (dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) + return NULL; + if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { - dwarf2_debug_info_t* type; - - type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue); - if (!type) FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); + FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); + return NULL; + } + if (!type->symt) + { + /* load the debug info entity */ + dwarf2_load_one_entry(ctx, type); if (!type->symt) - { - /* load the debug info entity */ - dwarf2_load_one_entry(ctx, type); - } - return type->symt; + FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); } - return NULL; + return type->symt; } static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name)

1 0

Eric Pouech : kernel32: When testing the debugger activation, don' t use unitialized values (clang).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 198054505592a40ee8d92e816a36023e90d3b5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=198054505592a40ee8d92e816… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:58 2011 +0100 kernel32: When testing the debugger activation, don't use unitialized values (clang). --- dlls/kernel32/tests/debugger.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 92e4c43..7f7b052 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -450,6 +450,7 @@ static void test_ExitCode(void) ok(0, "could not open the AeDebug key: %d\n", ret); return; } + else debugger_value.data = NULL; if (debugger_value.data && debugger_value.type == REG_SZ && strstr((char*)debugger_value.data, "winedbg --auto"))

1 0

Eric Pouech : dbghelp: Now that compilers (like clang) start to merge symbols across compilation units, no longer barf about duplicates.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: b10977fc3cdfec0203132b30e0e620f9efda1946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10977fc3cdfec0203132b30e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:23 2011 +0100 dbghelp: Now that compilers (like clang) start to merge symbols across compilation units, no longer barf about duplicates. --- dlls/dbghelp/elf_module.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index c663455..4ea27f6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -767,28 +767,6 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h */ module->sortlist_valid = TRUE; } - else if (strcmp(ste->ht_elt.name, symt->hash_elt.name)) - { - ULONG64 xaddr = 0, xsize = 0; - DWORD kind = -1; - - symt_get_address(&symt->symt, &xaddr); - symt_get_info(module, &symt->symt, TI_GET_LENGTH, &xsize); - symt_get_info(module, &symt->symt, TI_GET_DATAKIND, &kind); - - /* If none of symbols has a correct size, we consider they are both markers - * Hence, we can silence this warning - * Also, we check that we don't have two symbols, one local, the other - * global which is legal - */ - if ((xsize || ste->symp->st_size) && - (kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal)) - FIXME("Duplicate in %s: %s<%08lx-%08x> %s<%s-%s>\n", - debugstr_w(module->module.ModuleName), - ste->ht_elt.name, addr, (unsigned int)ste->symp->st_size, - symt->hash_elt.name, - wine_dbgstr_longlong(xaddr), wine_dbgstr_longlong(xsize)); - } } } /* see comment above */

1 0

Thomas Mullaly : urlmon/tests: Added CoInternetParseUrl tests.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 2f5ca80ccef913454d3260bf54b210dfd18cf519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5ca80ccef913454d3260bf5… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 20 15:40:23 2011 -0400 urlmon/tests: Added CoInternetParseUrl tests. --- dlls/urlmon/tests/misc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index fc1ba53..47ab4f8 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -271,7 +271,8 @@ static const WCHAR url9[] = '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; - +static const WCHAR url11[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','*','.', + 'c','o','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -283,10 +284,13 @@ static const WCHAR wszFile[] = {'f','i','l','e',0}; static const WCHAR wszHttp[] = {'h','t','t','p',0}; static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; +static const WCHAR wszGoogle[] = {'g','o','o','g','l','e','.','*','.','c','o','m',0}; static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszHttpWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.', 'w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR wszHttpGoogle[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e', + '.','*','.','c','o','m',0}; struct parse_test { LPCWSTR url; @@ -308,6 +312,7 @@ static const struct parse_test parse_tests[] = { {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK}, {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL}, + {url11, E_FAIL, url11, E_INVALIDARG, NULL, wszHttp, wszGoogle, S_OK, wszHttpGoogle, S_OK} }; static void test_CoInternetParseUrl(void)

1 0

Thomas Mullaly : shlwapi: Improved UrlGetPart support when parsing host names.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 65d3eab864adac58022af2c6af5f5b31a96f764f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d3eab864adac58022af2c6a… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Thu Mar 17 12:24:26 2011 -0400 shlwapi: Improved UrlGetPart support when parsing host names. --- dlls/shlwapi/tests/url.c | 4 ++++ dlls/shlwapi/url.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0a4dcb3..5a035ac 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -56,6 +56,8 @@ static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; static const char* TEST_URL_3 = "http://foo:bar@localhost:21/internal.php?query=x&return=y"; +static const char* TEST_URL_4 = "http://foo:bar@google.*.com:21/internal.php?query=x&return=y"; + static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; @@ -690,6 +692,8 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); + test_url_part(file_url, URL_PART_HOSTNAME, 0, "h o s t"); test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 6b469e2..b8c51a4 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2049,7 +2049,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) if (isalnumW(*start) || (*start == '-') || (*start == '.') || - (*start == ' ') ) { + (*start == ' ') || + (*start == '*') ) { start++; (*size)++; }

1 0

Thomas Mullaly : urlmon/tests: Added zone domain mapping tests.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: b9308fa06f4bcce4c340e6d9199c52c6b5ad9130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9308fa06f4bcce4c340e6d91… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Fri Mar 11 00:55:31 2011 -0500 urlmon/tests: Added zone domain mapping tests. --- dlls/urlmon/tests/sec_mgr.c | 235 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 234 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9308fa06f4bcce4c340e…

1 0

Thomas Mullaly : urlmon/tests: Added SecurityManager zone mapping cache tests.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: b41d85d773f2c3f65eaa38425bb7a84bba95ea95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41d85d773f2c3f65eaa38425… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed Mar 9 22:03:49 2011 -0500 urlmon/tests: Added SecurityManager zone mapping cache tests. --- dlls/urlmon/tests/sec_mgr.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 1711755..6af2622 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,6 +1,7 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers * Copyright 2009-2010 Detlef Riekenberg + * Copyright 2011 Thomas Mullaly for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,8 @@ #include "initguid.h" +#define URLZONE_CUSTOM URLZONE_USER_MIN+1 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -99,6 +102,8 @@ static const WCHAR security_url2W[] = {'w','i','n','e','t','e','s','t',':','t',' static const WCHAR security_expectedW[] = {'w','i','n','e','t','e','s','t',':','z','i','p',0}; static const WCHAR winetest_to_httpW[] = {'w','i','n','e','t','e','s','t',':','h',0}; +static const char *szZoneMapDomainsKey = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap\\Domains"; + static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', '.','w','i','n','e','t','e','s','t',3,0,0,0}; @@ -453,6 +458,69 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +/* IE (or at least newer versions of it) seem to cache the keys in ZoneMap + * when urlmon.dll is loaded and it doesn't seem to update its cache, unless + * SetZoneMapping is used. + */ +static void test_zone_domain_cache(void) +{ + HRESULT hres; + DWORD res, zone; + IInternetSecurityManager *secmgr = NULL; + HKEY domains, domain; + + static const WCHAR testing_domain_urlW[] = {'h','t','t','p',':','/','/','t','e','s','t','i','n','g','.', + 'd','o','m','a','i','n','/',0}; + + res = RegOpenKeyA(HKEY_CURRENT_USER, szZoneMapDomainsKey, &domains); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + if(res != ERROR_SUCCESS) + return; + + res = RegCreateKeyA(domains, "testing.domain", &domain); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + if(res != ERROR_SUCCESS) { + RegCloseKey(domains); + return; + } + + zone = URLZONE_CUSTOM; + res = RegSetValueExA(domain, "http", 0, REG_DWORD, (BYTE*)&zone, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + RegCloseKey(domain); + + hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); + + zone = URLZONE_INVALID; + hres = IInternetSecurityManager_MapUrlToZone(secmgr, testing_domain_urlW, &zone, 0); + ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); + ok(zone == URLZONE_INTERNET, "Got %d, expected URLZONE_INTERNET\n", zone); + + /* FIXME: Play nice with ZoneMaps that existed before the test is run. */ + res = RegDeleteKeyA(domains, "testing.domain"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + RegCloseKey(domains); + IInternetSecurityManager_Release(secmgr); +} + +static void test_zone_domains(void) +{ + if(is_ie_hardened()) { + skip("IE running in Enhanced Security Configuration\n"); + return; + } else if(!pCreateUri) { + win_skip("Skipping zone domain tests, IE too old\n"); + return; + } + + trace("testing zone domains...\n"); + + test_zone_domain_cache(); +} + static void test_CoInternetCreateZoneManager(void) { IInternetZoneManager *zonemgr = NULL; @@ -1202,6 +1270,7 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_zone_domains(); test_CoInternetCreateZoneManager(); test_CreateZoneEnumerator(); test_GetZoneActionPolicy();

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011