June 2009 - Wine-Commits - list.winehq.org

Detlef Riekenberg : kernel32/tests: Fix failures on localized Windows versions.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 8588748bc88b42f9439f579da305d898299a6ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8588748bc88b42f9439f579da… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 2 23:41:52 2009 +0200 kernel32/tests: Fix failures on localized Windows versions. --- dlls/kernel32/tests/locale.c | 68 +++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2b7a165..8a56100 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -118,45 +118,59 @@ static void InitFunctionPointers(void) static void test_GetLocaleInfoA(void) { int ret; + int len; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); char buffer[BUFFER_SIZE]; - const char * expected; + char expected[BUFFER_SIZE]; ok(lcid == 0x409, "wrong LCID calculated - %d\n", lcid); /* en, ar and zh use SUBLANG_NEUTRAL, but GetLocaleInfo assume SUBLANG_DEFAULT */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); SetLastError(0xdeadbeef); memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(LANG_ENGLISH, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "English (United States)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); - - SetLastError(0xdeadbeef); - memset(buffer, 0, COUNTOF(buffer)); - ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "Arabic (Saudi Arabia)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); - - SetLastError(0xdeadbeef); - memset(buffer, 0, COUNTOF(buffer)); - ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "Chinese (Taiwan)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_ARABIC not installed\n"); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_CHINESE, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_CHINESE not installed\n"); - /* SUBLANG_DEFAULT is not required for GetLocaleInfo */ + /* SUBLANG_DEFAULT is required for mlang.dll, but optional for GetLocaleInfo */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); SetLastError(0xdeadbeef); memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(LANG_GERMAN, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "German (Germany)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + /* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to * partially fill the buffer even if it is too short. See bug 637.

1 0

Francois Gouget : winapi_extract: The old C parser is not needed anymore so remove it.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 7b1158116b67f4cb86917484d5853803a33eb5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1158116b67f4cb86917484d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 2 19:22:41 2009 +0200 winapi_extract: The old C parser is not needed anymore so remove it. --- tools/winapi/winapi_c_parser.pm | 264 -------------------------------- tools/winapi/winapi_extract | 8 +- tools/winapi/winapi_extract_options.pm | 7 +- 3 files changed, 4 insertions(+), 275 deletions(-) diff --git a/tools/winapi/winapi_c_parser.pm b/tools/winapi/winapi_c_parser.pm deleted file mode 100644 index 740d6b7..0000000 --- a/tools/winapi/winapi_c_parser.pm +++ /dev/null @@ -1,264 +0,0 @@ -# -# Copyright 1999, 2000, 2001 Patrik Stridvall -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# - -package winapi_c_parser; - -use strict; - -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); -require Exporter; - -(a)ISA = qw(Exporter); -(a)EXPORT = qw(); -(a)EXPORT_OK = qw(); - -use options qw($options); -use output qw($output); - -use c_function; -use c_type; -use function; -use winapi_function; -use winapi_parser; - -######################################################################## -# new -# -sub new($$) { - my $proto = shift; - my $class = ref($proto) || $proto; - my $self = {}; - bless ($self, $class); - - my $file = \${$self->{FILE}}; - my $create_function = \${$self->{CREATE_FUNCTION}}; - my $create_type = \${$self->{CREATE_TYPE}}; - my $found_comment = \${$self->{FOUND_COMMENT}}; - my $found_declaration = \${$self->{FOUND_DECLARATION}}; - my $found_function = \${$self->{FOUND_FUNCTION}}; - my $found_function_call = \${$self->{FOUND_FUNCTION_CALL}}; - my $found_line = \${$self->{FOUND_LINE}}; - my $found_preprocessor = \${$self->{FOUND_PREPROCESSOR}}; - my $found_statement = \${$self->{FOUND_STATEMENT}}; - my $found_type = \${$self->{FOUND_TYPE}}; - my $found_variable = \${$self->{FOUND_VARIABLE}}; - - $$file = shift; - - $$create_function = sub { return new c_function; }; - $$create_type = sub { return new c_type; }; - $$found_comment = sub { return 1; }; - $$found_declaration = sub { return 1; }; - $$found_function = sub { return 1; }; - $$found_function_call = sub { return 1; }; - $$found_line = sub { return 1; }; - $$found_preprocessor = sub { return 1; }; - $$found_statement = sub { return 1; }; - $$found_type = sub { return 1; }; - $$found_variable = sub { return 1; }; - - return $self; -} - -######################################################################## -# set_found_comment_callback -# -sub set_found_comment_callback($$) { - my $self = shift; - - my $found_comment = \${$self->{FOUND_COMMENT}}; - - $$found_comment = shift; -} - -######################################################################## -# set_found_declaration_callback -# -sub set_found_declaration_callback($$) { - my $self = shift; - - my $found_declaration = \${$self->{FOUND_DECLARATION}}; - - $$found_declaration = shift; -} - -######################################################################## -# set_found_function_callback -# -sub set_found_function_callback($$) { - my $self = shift; - - my $found_function = \${$self->{FOUND_FUNCTION}}; - - $$found_function = shift; -} - -######################################################################## -# set_found_function_call_callback -# -sub set_found_function_call_callback($$) { - my $self = shift; - - my $found_function_call = \${$self->{FOUND_FUNCTION_CALL}}; - - $$found_function_call = shift; -} - -######################################################################## -# set_found_line_callback -# -sub set_found_line_callback($$) { - my $self = shift; - - my $found_line = \${$self->{FOUND_LINE}}; - - $$found_line = shift; -} - -######################################################################## -# set_found_preprocessor_callback -# -sub set_found_preprocessor_callback($$) { - my $self = shift; - - my $found_preprocessor = \${$self->{FOUND_PREPROCESSOR}}; - - $$found_preprocessor = shift; -} - -######################################################################## -# set_found_statement_callback -# -sub set_found_statement_callback($$) { - my $self = shift; - - my $found_statement = \${$self->{FOUND_STATEMENT}}; - - $$found_statement = shift; -} - -######################################################################## -# set_found_type_callback -# -sub set_found_type_callback($$) { - my $self = shift; - - my $found_type = \${$self->{FOUND_TYPE}}; - - $$found_type = shift; -} - -######################################################################## -# set_found_variable_callback -# -sub set_found_variable_callback($$) { - my $self = shift; - - my $found_variable = \${$self->{FOUND_VARIABLE}}; - - $$found_variable = shift; -} - -######################################################################## -# parse_c_file - -sub parse_c_file($$$$) { - my $self = shift; - - my $file = \${$self->{FILE}}; - - my $found_comment = \${$self->{FOUND_COMMENT}}; - my $found_declaration = \${$self->{FOUND_DECLARATION}}; - my $create_function = \${$self->{CREATE_FUNCTION}}; - my $found_function = \${$self->{FOUND_FUNCTION}}; - my $found_function_call = \${$self->{FOUND_FUNCTION_CALL}}; - my $found_line = \${$self->{FOUND_LINE}}; - my $found_preprocessor = \${$self->{FOUND_PREPROCESSOR}}; - my $found_statement = \${$self->{FOUND_STATEMENT}}; - my $found_variable = \${$self->{FOUND_VARIABLE}}; - - my $refcurrent = shift; - my $refline = shift; - my $refcolumn = shift; - - my $_create_function = sub { - return 'function'->new; - }; - - my $_create_type = sub { - return 'type'->new; - }; - - my $_found_function = sub { - my $old_function = shift; - - my $function = new c_function; - - $function->file($old_function->file); - - $function->begin_line($old_function->function_line); - $function->begin_column(0); - $function->end_line($old_function->function_line); - $function->end_column(0); - - $function->linkage($old_function->linkage); - $function->return_type($old_function->return_type); - $function->calling_convention($old_function->calling_convention); - $function->name($old_function->internal_name); - - if(defined($old_function->argument_types)) { - $function->argument_types([@{$old_function->argument_types}]); - } - if(defined($old_function->argument_names)) { - $function->argument_names([@{$old_function->argument_names}]); - } - - $function->statements_line($old_function->statements_line); - $function->statements_column(0); - $function->statements($old_function->statements); - - &$$found_function($function); - }; - - my $_found_preprocessor = sub { - my $directive = shift; - my $argument = shift; - - my $begin_line = 0; - my $begin_column = 0; - my $preprocessor = "#$directive $argument"; - - &$$found_preprocessor($begin_line, $begin_column, $preprocessor); - }; - - my $_found_type = sub { - my $type = shift; - }; - - winapi_parser::parse_c_file($$file, { - # c_comment_found => $found_c_comment, - # cplusplus_comment_found => $found_cplusplus_comment, - function_create => $_create_function, - function_found => $_found_function, - preprocessor_found => $_found_preprocessor, - type_create => $_create_type, - type_found => $_found_type, - }); -} - -1; diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index a7608c1..1d165b9 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -41,7 +41,6 @@ use c_parser; use function; use type; -use winapi_c_parser; use winapi_function; use vars qw($win16api $win32api @winapis); @@ -223,12 +222,7 @@ foreach my $file (@h_files, @c_files) { if($_) { $max_line++; } } - my $parser; - if (!$options->old) { - $parser = new c_parser($file); - } else { - $parser = new winapi_c_parser($file); - } + my $parser = new c_parser($file); my $function; my $line; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index c647ed2..0e5754e 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -40,15 +40,14 @@ my %options_long = ( "win16" => { default => 1, description => "Win16 extraction" }, "win32" => { default => 1, description => "Win32 extraction" }, - "old" => { default => 0, description => "use the old parser" }, "headers" => { default => 0, description => "parse the .h files as well" }, - "implemented" => { default => 0, parent => "old", description => "implemented functions extraction" }, + "implemented" => { default => 0, description => "implemented functions extraction" }, "pseudo-implemented" => { default => 0, parent => "implemented", description => "pseudo implemented functions extraction" }, "struct" => { default => 0, parent => "headers", description => "struct extraction" }, - "stub-statistics" => { default => 0, parent => "old", description => "stub statistics" }, + "stub-statistics" => { default => 0, description => "stub statistics" }, "pseudo-stub-statistics" => { default => 0, parent => "stub-statistics", description => "pseudo stub statistics" }, - "winetest" => { default => 0, parent => "old", description => "winetest extraction" }, + "winetest" => { default => 0, description => "winetest extraction" }, ); my %options_short = (

1 0

Paul Vriens : ole32/tests: Move common variables to the top.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 08a6e0c2d48da57cfaae04edd388e522bb3ae7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a6e0c2d48da57cfaae04edd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 2 21:40:31 2009 +0200 ole32/tests: Move common variables to the top. --- dlls/ole32/tests/storage32.c | 31 ++++--------------------------- 1 files changed, 4 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 438913c..9bfc16c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -33,6 +33,10 @@ DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) +static const WCHAR szPrefix[] = { 's','t','g',0 }; +static const WCHAR szDot[] = { '.',0 }; +WCHAR filename[MAX_PATH]; + static void test_hglobal_storage_stat(void) { ILockBytes *ilb = NULL; @@ -67,9 +71,6 @@ static void test_hglobal_storage_stat(void) static void test_create_storage_modes(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; HRESULT r; @@ -228,13 +229,10 @@ static void test_create_storage_modes(void) static void test_storage_stream(void) { static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; static const WCHAR longname[] = { 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; @@ -389,10 +387,7 @@ static BOOL is_existing_file(LPCWSTR filename) static void test_open_storage(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; static const WCHAR szNonExist[] = { 'n','o','n','e','x','i','s','t',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL, *stg2 = NULL; HRESULT r; DWORD stgm; @@ -564,9 +559,6 @@ static void test_open_storage(void) static void test_storage_suminfo(void) { - static const WCHAR szDot[] = { '.',0 }; - static const WCHAR szPrefix[] = { 's','t','g',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; IPropertySetStorage *propset = NULL; IPropertyStorage *ps = NULL; @@ -678,9 +670,6 @@ static void test_storage_suminfo(void) static void test_storage_refcount(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; IStorage *stgprio = NULL; HRESULT r; @@ -805,9 +794,6 @@ static void test_storage_refcount(void) static void test_writeclassstg(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; HRESULT r; CLSID temp_cls; @@ -855,9 +841,6 @@ static void test_writeclassstg(void) static void test_streamenum(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; @@ -933,9 +916,6 @@ static void test_streamenum(void) static void test_transact(void) { - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg = NULL, *stg2 = NULL; HRESULT r; IStream *stm = NULL; @@ -1347,9 +1327,6 @@ static void test_simple(void) { /* Tests for STGM_SIMPLE mode */ - static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR szDot[] = { '.',0 }; - WCHAR filename[MAX_PATH]; IStorage *stg; HRESULT r; IStream *stm;

1 0

Aric Stewart : shlwapi: Simplify UrlCombine case 2 with tests.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 9339be641c6e5cfe6dfebe282fcf13d37579a25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9339be641c6e5cfe6dfebe282… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 2 11:31:50 2009 -0500 shlwapi: Simplify UrlCombine case 2 with tests. --- dlls/shlwapi/tests/url.c | 23 ++++++++++++++++++++++- dlls/shlwapi/url.c | 22 +--------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 80aee98..f135f2a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -263,7 +263,28 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"}, {"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"}, {"mk:@MSITStore:dir/test.chm::dir/index.html", "image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}, - {"mk:@MSITStore:dir/test.chm::dir/dir2/index.html", "../image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"} + {"mk:@MSITStore:dir/test.chm::dir/dir2/index.html", "../image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}, + /* UrlCombine case 2 tests. Schemes do not match */ + {"outbind://xxxxxxxxx","http://wine1/dir",0, S_OK,"http://wine1/dir"}, + {"xxxx://xxxxxxxxx","http://wine2/dir",0, S_OK,"http://wine2/dir"}, + {"ftp://xxxxxxxxx/","http://wine3/dir",0, S_OK,"http://wine3/dir"}, + {"outbind://xxxxxxxxx","http://wine4/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"http://wine4/dir"}, + {"xxx://xxxxxxxxx","http://wine5/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"http://wine5/dir"}, + {"ftp://xxxxxxxxx/","http://wine6/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"http://wine6/dir"}, + {"http://xxxxxxxxx","outbind://wine7/dir",0, S_OK,"outbind://wine7/dir"}, + {"xxx://xxxxxxxxx","ftp://wine8/dir",0, S_OK,"ftp://wine8/dir"}, + {"ftp://xxxxxxxxx/","xxx://wine9/dir",0, S_OK,"xxx://wine9/dir"}, + {"http://xxxxxxxxx","outbind://wine10/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"outbind://wine10/dir"}, + {"xxx://xxxxxxxxx","ftp://wine11/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"ftp://wine11/dir"}, + {"ftp://xxxxxxxxx/","xxx://wine12/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"xxx://wine12/dir"}, + {"http://xxxxxxxxx","outbind:wine13/dir",0, S_OK,"outbind:wine13/dir"}, + {"xxx://xxxxxxxxx","ftp:wine14/dir",0, S_OK,"ftp:wine14/dir"}, + {"ftp://xxxxxxxxx/","xxx:wine15/dir",0, S_OK,"xxx:wine15/dir"}, + {"outbind://xxxxxxxxx/","http:wine16/dir",0, S_OK,"http:wine16/dir"}, + {"http://xxxxxxxxx","outbind:wine17/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"outbind:wine17/dir"}, + {"xxx://xxxxxxxxx","ftp:wine18/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"ftp:wine18/dir"}, + {"ftp://xxxxxxxxx/","xxx:wine19/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"xxx:wine19/dir"}, + {"outbind://xxxxxxxxx/","http:wine20/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"http:wine20/dir"} }; /* ################ */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4a39726..6498862 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -129,19 +129,6 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) return URL_SCHEME_UNKNOWN; } -static BOOL URL_JustLocation(LPCWSTR str) -{ - while(*str && (*str == '/')) str++; - if (*str) { - while (*str && ((*str == '-') || - (*str == '.') || - isalnumW(*str))) str++; - if (*str == '/') return FALSE; - } - return TRUE; -} - - /************************************************************************* * @ [SHLWAPI.1] * @@ -608,7 +595,6 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, DWORD len, res1, res2, process_case = 0; LPWSTR work, preliminary, mbase, mrelative; static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; - static const WCHAR single_slash[] = {'/','\0'}; HRESULT ret; TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n", @@ -768,14 +754,8 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, strcatW(preliminary, mrelative); break; - case 2: /* - * Same as case 1, but if URL_PLUGGABLE_PROTOCOL was specified - * and pszRelative starts with "//", then append a "/" - */ + case 2: /* case where pszRelative replaces scheme, and location */ strcpyW(preliminary, mrelative); - if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) && - URL_JustLocation(relative.pszSuffix)) - strcatW(preliminary, single_slash); break; case 3: /*

1 0

Damjan Jovanovic : winemenubuilder: Ignore wine.desktop managed file types.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 77e0ee9013c0e97fa2cce2d6e4a43e2418a460a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e0ee9013c0e97fa2cce2d6e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 2 19:15:58 2009 +0200 winemenubuilder: Ignore wine.desktop managed file types. --- programs/winemenubuilder/winemenubuilder.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index a86d207..462456a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1549,6 +1549,20 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } +static BOOL is_extension_blacklisted(LPCWSTR extension) +{ + /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ + static const WCHAR comW[] = {'.','c','o','m',0}; + static const WCHAR exeW[] = {'.','e','x','e',0}; + static const WCHAR msiW[] = {'.','m','s','i',0}; + + if (!strcmpiW(extension, comW) || + !strcmpiW(extension, exeW) || + !strcmpiW(extension, msiW)) + return TRUE; + return FALSE; +} + static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { struct list *nativeMimeTypes = NULL; @@ -1581,7 +1595,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.') + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL;

1 0

Francois Gouget : winedbg & appwiz.cpl: Use SUBLANG_NEUTRAL for German.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 05a4d26c472edaa5480829084893d068726d9d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a4d26c472edaa5480829084… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 2 19:18:26 2009 +0200 winedbg & appwiz.cpl: Use SUBLANG_NEUTRAL for German. --- dlls/appwiz.cpl/De.rc | 2 +- programs/winedbg/rsrc_De.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 3030cd1..b85d43e 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -21,7 +21,7 @@ #pragma code_page(65001) -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index ccc616b..25ab276 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.rc @@ -20,7 +20,7 @@ #pragma code_page(65001) -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_DEBUG_POPUP MENU BEGIN

1 0

Paul Vriens : ole32/tests: Fix a crash on NT4 and below.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 27485d9b53b707bc66e2b6ebc4c3ead4ee57290b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27485d9b53b707bc66e2b6ebc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 2 22:47:46 2009 +0200 ole32/tests: Fix a crash on NT4 and below. --- dlls/ole32/tests/storage32.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eb923a5..e561861 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1367,6 +1367,12 @@ static void test_simple(void) IStorage_Release(stg); r = StgOpenStorage( filename, NULL, STGM_SIMPLE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg); + if (r == STG_E_INVALIDFLAG) + { + win_skip("Flag combination is not supported on NT4 and below\n"); + DeleteFileA(filenameA); + return; + } ok(r == S_OK, "got %08x\n", r); r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm);

1 0

Paul Vriens : ole32/tests: Run more tests on Win9x by using A-functions.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: df24ec66dd0a05d0001252b109c65b5c823a226e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df24ec66dd0a05d0001252b10… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 2 22:09:15 2009 +0200 ole32/tests: Run more tests on Win9x by using A-functions. --- dlls/ole32/tests/storage32.c | 119 ++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df24ec66dd0a05d000125…

1 0

Francois Gouget : ntdll/tests: Fix the trailing '\n' of a skip() call.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: ac831d5ab57e13aaef5b3e3a5598fd242dcc4285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac831d5ab57e13aaef5b3e3a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 2 19:17:15 2009 +0200 ntdll/tests: Fix the trailing '\n' of a skip() call. --- dlls/ntdll/tests/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index aefce8b..400bd71 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -641,7 +641,7 @@ static void test_debugger(void) if(!pNtGetContextThread || !pNtSetContextThread || !pNtReadVirtualMemory || !pNtTerminateProcess) { - skip("NtGetContextThread, NtSetContextThread, NtReadVirtualMemory or NtTerminateProcess not found\n)"); + skip("NtGetContextThread, NtSetContextThread, NtReadVirtualMemory or NtTerminateProcess not found\n"); return; }

1 0

Francois Gouget : winapi_extract: --spec-files has been broken for a long time and does not seem to be useful so remove it .
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 0ab4df02d64a98419e5dc81fc618934f7bcd1f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab4df02d64a98419e5dc81fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 2 19:22:18 2009 +0200 winapi_extract: --spec-files has been broken for a long time and does not seem to be useful so remove it. --- tools/winapi/winapi_extract | 110 +------------------------------ tools/winapi/winapi_extract_options.pm | 1 - 2 files changed, 4 insertions(+), 107 deletions(-) diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 7c4a394..a7608c1 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -45,14 +45,14 @@ use winapi_c_parser; use winapi_function; use vars qw($win16api $win32api @winapis); -if ($options->spec_files || $options->implemented || $options->stub_statistics || $options->winetest) { +if ($options->implemented || $options->stub_statistics || $options->winetest) { require winapi; import winapi qw($win16api $win32api @winapis); } my %module2entries; my %module2spec_file; -if($options->spec_files || $options->winetest) { +if($options->winetest) { local $_; foreach my $spec_file (get_spec_files("winelib")) { @@ -194,7 +194,7 @@ if($options->headers) { } my @c_files = (); -if($options->spec_files || $options->pseudo_implemented || $options->pseudo_stub_statistics) { +if($options->pseudo_implemented || $options->pseudo_stub_statistics) { @c_files = $options->c_files; @c_files = files_skip(@c_files); @c_files = files_filter("winelib", @c_files); @@ -299,7 +299,7 @@ foreach my $file (@h_files, @c_files) { $old_function->statements_line($function->statements_line); $old_function->statements($function->statements); - if($options->spec_files || $options->winetest) { + if($options->winetest) { documentation_specifications($old_function); } @@ -445,108 +445,6 @@ sub output_function($$$$$) { } } -if($options->spec_files) { - foreach my $winapi (@winapis) { - my $type = $winapi->name; - - if($type eq "win16" && !$options->win16) { next; } - if($type eq "win32" && !$options->win32) { next; } - - foreach my $module ($winapi->all_modules) { - my $spec_file = $module2spec_file{$module}; - - if(!defined($spec_file) || !defined($type)) { - $output->write("$module: doesn't exist\n"); - next; - } - - $spec_file .= "2"; - - $output->progress("$spec_file"); - open(OUT, "> $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n"; - - if(exists($specifications{$module}{init})) { - my $function = $specifications{$module}{init}{function}; - print OUT "init " . $function->internal_name . "\n"; - } - print OUT "\n"; - - my %debug_channels; - if(exists($specifications{$module}{init})) { - my $function = $specifications{$module}{init}{function}; - foreach my $debug_channel (@{$function->debug_channels}) { - $debug_channels{$debug_channel}++; - } - } - foreach my $ordinal (sort {$a <=> $b} keys(%{$specifications{$module}{fixed}})) { - my $function = $specifications{$module}{fixed}{$ordinal}{function}; - foreach my $debug_channel (@{$function->debug_channels}) { - $debug_channels{$debug_channel}++; - } - } - foreach my $name (sort(keys(%{$specifications{$module}{unfixed}}))) { - my $function = $specifications{$module}{unfixed}{$name}{function}; - foreach my $debug_channel (@{$function->debug_channels}) { - $debug_channels{$debug_channel}++; - } - } - foreach my $name (sort(keys(%{$specifications{$module}{unknown}}))) { - my $function = $specifications{$module}{unknown}{$name}{function}; - foreach my $debug_channel (@{$function->debug_channels}) { - $debug_channels{$debug_channel}++; - } - } - - my @debug_channels = sort(keys(%debug_channels)); - if($#debug_channels >= 0) { - print OUT "debug_channels (" . join(" ", @debug_channels) . ")\n"; - print OUT "\n"; - } - - my $empty = 1; - - if(!$empty) { - print OUT "\n"; - $empty = 1; - } - foreach my $external_name (sort(keys(%{$specifications{$module}{unknown}}))) { - my $entry = $specifications{$module}{unknown}{$external_name}; - my $ordinal = $entry->{ordinal}; - my $function = $entry->{function}; - print OUT "# "; - output_function(\*OUT, $type, $ordinal, $external_name, $function); - $empty = 0; - } - - if(!$empty) { - print OUT "\n"; - $empty = 1; - } - foreach my $ordinal (sort {$a <=> $b} keys(%{$specifications{$module}{fixed}})) { - my $entry = $specifications{$module}{fixed}{$ordinal}; - my $external_name = $entry->{external_name}; - my $function = $entry->{function}; - output_function(\*OUT, $type, $ordinal, $external_name, $function); - $empty = 0; - } - - if(!$empty) { - print OUT "\n"; - $empty = 1; - } - foreach my $external_name (sort(keys(%{$specifications{$module}{unfixed}}))) { - my $entry = $specifications{$module}{unfixed}{$external_name}; - my $ordinal = $entry->{ordinal}; - my $function = $entry->{function}; - output_function(\*OUT, $type, $ordinal, $external_name, $function); - $empty = 0; - } - - close(OUT); - } - } -} - if($options->stub_statistics) { foreach my $winapi (@winapis) { my $type = $winapi->name; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index ae940f2..c647ed2 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -46,7 +46,6 @@ my %options_long = ( "implemented" => { default => 0, parent => "old", description => "implemented functions extraction" }, "pseudo-implemented" => { default => 0, parent => "implemented", description => "pseudo implemented functions extraction" }, "struct" => { default => 0, parent => "headers", description => "struct extraction" }, - "spec-files" => { default => 0, parent => "old", description => "spec files extraction" }, "stub-statistics" => { default => 0, parent => "old", description => "stub statistics" }, "pseudo-stub-statistics" => { default => 0, parent => "stub-statistics", description => "pseudo stub statistics" }, "winetest" => { default => 0, parent => "old", description => "winetest extraction" },

1 0