wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Francois Gouget : testbot: CompareTaskStatus() is not really needed. Remove it.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: tools Branch: master Commit: da850add297378c3b21e354894873e10e7a1c953 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da850add297378c3b21e3548… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:06:24 2017 +0100 testbot: CompareTaskStatus() is not really needed. Remove it. The scheduler only cares about queued Tasks so there is no need to compare their Status fields. So the comparison code can easily be inlined like for Steps. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c787e8a..c6eb290 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,11 +404,6 @@ sub CompareJobPriority return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; } -sub CompareTaskStatus -{ - return $b->Status cmp $a->Status || $a->No <=> $b->No; -} - sub min(@) { my $m = shift @_; @@ -543,7 +538,7 @@ sub ScheduleOnHost($$$) my $PrepareNextStep; my $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + my @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM; @@ -591,7 +586,7 @@ sub ScheduleOnHost($$$) my $Step = $SortedSteps[1]; $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM;

1 0

Alexandre Julliard : patches: Also use References: header to find parent patch for expiration.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: tools Branch: master Commit: 2edc6a46c48e80abc64f4e50021b7f9afc8334ec URL: http://source.winehq.org/git/tools.git/?a=commit;h=2edc6a46c48e80abc64f4e50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 11:46:09 2017 +0100 patches: Also use References: header to find parent patch for expiration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 89 +++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/patches/expire b/patches/expire index 513a5b1..759f6c8 100755 --- a/patches/expire +++ b/patches/expire @@ -150,6 +150,7 @@ my $now = time(); my $email_from = "Marvin <testbot\(a)winehq.org>"; my $base_url = "https://source.winehq.org/patches/data"; my %reviews; +my %patches; foreach my $arg (@ARGV) { @@ -159,54 +160,37 @@ foreach my $arg (@ARGV) else { $dir = $arg; } } -sub get_patch_subject($) -{ - my $file = shift; - my $ret; - - return undef unless open PATCH, "<$dir/$file"; - while (<PATCH>) - { - if (/^Subject: (.*)$/) - { - $ret = $1; - last; - } - } - close PATCH; - return $ret; -} - sub get_patch_state($) { my $file = shift; - my $status = "nil"; - my $mtime = 0; - my ($subject, $msgid, $reply); + my %patch; return undef unless open PATCH, "<$dir/$file"; while (<PATCH>) { - if (/^Subject: (.*)$/) { $subject = $1; } - elsif (/^Message-Id: (.*)$/) { $msgid = $1; } - elsif (/^In-Reply-To: (.*)$/) { $reply = $1; } + if (/^Subject: (.*)$/) { $patch{subject} = $1; } + elsif (/^Message-Id: (.*)$/) { $patch{msgid} = $1; } + elsif (/^In-Reply-To: (.*)$/) { push @{$patch{reply}}, $1; } + elsif (/^References: (.*)$/) { push @{$patch{reply}}, split(/\s+/, $1); } last if (/^$/); } while (<PATCH>) { - if (/^diff --git a\//) { $reply = undef; last; } + if (/^diff --git a\//) { delete $patch{reply}; last; } } close PATCH; if (open STATUS, "<$dir/$file.status") { - $status = <STATUS>; - chomp $status; - $mtime = (stat STATUS)[9] unless $status eq "nil"; + $patch{status} = <STATUS>; + chomp $patch{status}; + $patch{mtime} = (stat STATUS)[9] unless $patch{status} eq "nil"; close STATUS; } - $mtime ||= (stat "$dir/$file")[9]; - return ($subject, $msgid, $reply, $status, $mtime); + $patch{file} = $file; + $patch{status} ||= "nil"; + $patch{mtime} ||= (stat "$dir/$file")[9]; + return %patch; } sub get_previous_state($) @@ -363,40 +347,49 @@ EOF } } -# expire current patches +sub assign_expire($); +sub assign_expire($) +{ + my $patch = shift; -my %patches; + return $patch->{expire} if defined $patch->{expire}; + + foreach my $p (@{$patch->{reply}}) + { + next unless defined $patches{$p}; + $patch->{expire} = assign_expire( $patches{$p} ); + return $patch->{expire} if defined $patch->{expire}; + } + + my $limit = $status_expiry{$patch->{status}} || 7; + $patch->{expire} = (($now - $patch->{mtime} - 12*60*60) / (24*60*60) > $limit); + return $patch->{expire}; +} + +# expire current patches opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($subject, $msgid, $reply, $status, $mtime) = get_patch_state( $file ); + my %patch = get_patch_state( $file ); my $prev_status = get_previous_state( $file ); - my $limit = $status_expiry{$status} || 7; - my $expire = (($now - $mtime - 12*60*60) / (24*60*60) > $limit); - notify_state_change( $file, $prev_status, $status ); + notify_state_change( $file, $prev_status, $patch{status} ); - $patches{$msgid} = [ $file, $subject, $reply, $status, $expire ]; + $patches{$patch{msgid}} = \%patch; } closedir DIR; foreach my $p (keys %patches) { - my ($file, $subject, $reply, $status, $expire) = @{$patches{$p}}; - my $orig_status = $status; - - # for replies, inherit expire flag from top parent - while ($reply && $status eq "reply") - { - last unless defined $patches{$reply}; - (undef, undef, $reply, $status, $expire) = @{$patches{$reply}}; - } + my $patch = $patches{$p}; + my $orig_status = $patch->{status}; + my $file = $patch->{file}; - if ($expire) + if (assign_expire( $patch )) { - printf "unlink $file %s %s\n", $orig_status, $subject unless $quiet; + printf "unlink $file %s %s\n", $orig_status, $patch->{subject} unless $quiet; unless ($dry_run) { unlink "$dir/$file";

1 0

Alex Henrie : libport: Fix typo in rintf.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: ef104c3a336661b72a7485adb3d98477e755f6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104c3a336661b72a7485adb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 13 14:16:48 2017 -0700 libport: Fix typo in rintf. Spotted by Joris Huizer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00b..2c0d222 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif

1 0

Nikolay Sivov : quartz/tests: Add a couple of tests for return values ( Coverity).
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: b356673d01c29b9cd283b42e86b78588e5ea4ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b356673d01c29b9cd283b42e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 21:56:39 2017 +0300 quartz/tests: Add a couple of tests for return values (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b5..8bafb14 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop

1 0

Michael Müller : advapi32: Implement GetExplicitEntriesFromAclW.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 07b629e8e4472785809bcdf9820922c2b874c313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b629e8e4472785809bcdf98… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Nov 10 15:50:31 2017 -0600 advapi32: Implement GetExplicitEntriesFromAclW. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 84 ++++++++++++++++++++++-- dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07b629e8e4472785809bc…

1 0

Dmitry Timoshkov : server: Deliver an async io APC to any thread alive in the process.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 9b0c222f39f8c5cd6634394b3aae8804db87d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0c222f39f8c5cd6634394b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 7 11:11:10 2017 +0800 server: Deliver an async io APC to any thread alive in the process. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +----- server/async.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4cbc1e9..cb8b7ce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11292,15 +11292,13 @@ static void iocp_async_read_thread_closesocket(SOCKET src) ok(!ret, "got %d\n", ret); todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); -todo_wine ok(!bytes, "got bytes %u\n", bytes); -todo_wine ok(key == 0x12345678, "got key %#lx\n", key); -todo_wine ok(ovl_iocp == &recv_info.ovl, "got ovl %p\n", ovl_iocp); if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); +todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -11417,7 +11415,6 @@ static void iocp_async_read_thread(SOCKET src, SOCKET dst) Sleep(100); memset(&msg, 0, sizeof(msg)); ret = PeekMessageA(&msg, hwnd, WM_SOCKET, WM_SOCKET, PM_REMOVE); -todo_wine ok(!ret || broken(msg.hwnd == hwnd) /* XP */, "got %04x,%08lx,%08lx\n", msg.message, msg.wParam, msg.lParam); if (ret) /* document XP behaviour */ { @@ -11432,7 +11429,6 @@ todo_wine ovl_iocp = (void *)0xdeadbeef; SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); -todo_wine ok(ret || broken(GetLastError() == WAIT_TIMEOUT) /* XP */, "got %u\n", GetLastError()); if (ret) { diff --git a/server/async.c b/server/async.c index 4e89e1e..4f1bcf1 100644 --- a/server/async.c +++ b/server/async.c @@ -167,7 +167,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; data.async_io.status = status; - thread_queue_apc( NULL, async->thread, &async->obj, &data ); + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); }

1 0

Dmitry Timoshkov : server: Make it possible to deliver an APC to any thread alive in the process.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 288814a4d84d139f37a486964f2a599664e37618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288814a4d84d139f37a486964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 7 11:10:02 2017 +0800 server: Make it possible to deliver an APC to any thread alive in the process. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 4 ++-- server/thread.c | 7 +++++-- server/thread.h | 2 +- server/timer.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/async.c b/server/async.c index cf7a434..4e89e1e 100644 --- a/server/async.c +++ b/server/async.c @@ -167,7 +167,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; data.async_io.status = status; - thread_queue_apc( async->thread, &async->obj, &data ); + thread_queue_apc( NULL, async->thread, &async->obj, &data ); } else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); } @@ -373,7 +373,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[0] = async->data.apc_context; data.user.args[1] = async->data.iosb; data.user.args[2] = 0; - thread_queue_apc( async->thread, NULL, &data ); + thread_queue_apc( NULL, async->thread, NULL, &data ); } else if (async->data.apc_context) add_async_completion( async, async->data.apc_context, status, total ); diff --git a/server/thread.c b/server/thread.c index 2c864a6..858b450 100644 --- a/server/thread.c +++ b/server/thread.c @@ -926,6 +926,9 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr { struct list *queue; + if (thread && thread->state == TERMINATED && process) + thread = NULL; + if (!thread) /* find a suitable thread inside the process */ { struct thread *candidate; @@ -977,14 +980,14 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr } /* queue an async procedure call */ -int thread_queue_apc( struct thread *thread, struct object *owner, const apc_call_t *call_data ) +int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ) { struct thread_apc *apc; int ret = 0; if ((apc = create_apc( owner, call_data ))) { - ret = queue_apc( NULL, thread, apc ); + ret = queue_apc( process, thread, apc ); release_object( apc ); } return ret; diff --git a/server/thread.h b/server/thread.h index 1d81d61..09d8260 100644 --- a/server/thread.h +++ b/server/thread.h @@ -120,7 +120,7 @@ extern void remove_queue( struct object *obj, struct wait_queue_entry *entry ); extern void kill_thread( struct thread *thread, int violent_death ); extern void break_thread( struct thread *thread ); extern void wake_up( struct object *obj, int max ); -extern int thread_queue_apc( struct thread *thread, struct object *owner, const apc_call_t *call_data ); +extern int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ); extern void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_type type ); extern int thread_add_inflight_fd( struct thread *thread, int client, int server ); extern int thread_get_inflight_fd( struct thread *thread, int client ); diff --git a/server/timer.c b/server/timer.c index c8b4fa8..3a786fb 100644 --- a/server/timer.c +++ b/server/timer.c @@ -122,7 +122,7 @@ static void timer_callback( void *private ) } else data.type = APC_NONE; /* wake up only */ - if (!thread_queue_apc( timer->thread, &timer->obj, &data )) + if (!thread_queue_apc( NULL, timer->thread, &timer->obj, &data )) { release_object( timer->thread ); timer->thread = NULL;

1 0

Marcus Meissner : shell32: Avoid a crash in testsuite.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 5350eea78dec539919babcdd6ca841117e24f24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5350eea78dec539919babcdd6… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 13 13:31:31 2017 +0100 shell32: Avoid a crash in testsuite. This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9825c3a..ce3b1a3 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1088,6 +1088,9 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); + + if (disp == NULL) goto skip_disp_tests; + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1165,6 +1168,7 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } +skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead;

1 0

Alexandre Julliard : kernel32: Keep the sublanguage specified by the script name when looking for the default.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: c5a39bd98f5388d48b728d19ce466665fa37bfbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a39bd98f5388d48b728d19c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 19:43:13 2017 +0100 kernel32: Keep the sublanguage specified by the script name when looking for the default. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 38 +++++++++++++++++++++----------------- dlls/kernel32/tests/locale.c | 24 +++++++++++------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 47d0c89..53bd8a4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -362,31 +362,36 @@ static UINT find_charset( const WCHAR *name ) return 0; } -static WORD get_default_sublang(LCID lang) +static LANGID get_default_sublang( LANGID lang ) { - switch (PRIMARYLANGID(lang)) + switch (lang) { - case LANG_SPANISH: - return SUBLANG_SPANISH_MODERN; - case LANG_CHINESE: - return SUBLANG_CHINESE_SIMPLIFIED; - default: - return SUBLANG_DEFAULT; + case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); + case MAKELANGID( LANG_CHINESE, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL ): + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_MACAU ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); } + if (SUBLANGID( lang ) == SUBLANG_NEUTRAL) lang = MAKELANGID( PRIMARYLANGID(lang), SUBLANG_DEFAULT ); + return lang; } /*********************************************************************** * find_locale_id_callback */ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, - LPCWSTR name, WORD LangID, LPARAM lParam ) + LPCWSTR name, LANGID lang, LPARAM lParam ) { struct locale_name *data = (struct locale_name *)lParam; WCHAR buffer[128]; int matches = 0; - LCID lcid = MAKELCID( LangID, SORT_DEFAULT ); /* FIXME: handle sort order */ + LCID lcid = MAKELCID( lang, SORT_DEFAULT ); /* FIXME: handle sort order */ - if (PRIMARYLANGID(LangID) == LANG_NEUTRAL) return TRUE; /* continue search */ + if (PRIMARYLANGID(lang) == LANG_NEUTRAL) return TRUE; /* continue search */ /* first check exact name */ if (data->win_name[0] && @@ -435,7 +440,8 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } else /* match default language */ { - if (SUBLANGID(LangID) == get_default_sublang( LangID )) matches++; + LANGID def_lang = data->script ? lang : MAKELANGID( PRIMARYLANGID(lang), LANG_NEUTRAL ); + if (lang == get_default_sublang( def_lang )) matches++; } if (data->codepage) @@ -1720,8 +1726,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) lang_id = LANGIDFROMLCID( lcid ); /* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */ - if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) - lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id )); + if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) lang_id = get_default_sublang( lang_id ); if (!(hrsrc = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, ULongToPtr((lctype >> 4) + 1), lang_id ))) @@ -2846,7 +2851,7 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) langid = LANGIDFROMLCID(lcid); if (SUBLANGID(langid) == SUBLANG_NEUTRAL) { - langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid )); + langid = get_default_sublang( langid ); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); } } @@ -4281,8 +4286,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz /* FIXME: Is it correct to use the system default langid? */ langId = GetSystemDefaultLangID(); - if (SUBLANGID(langId) == SUBLANG_NEUTRAL) - langId = MAKELANGID(PRIMARYLANGID(langId), get_default_sublang( langId )); + if (SUBLANGID(langId) == SUBLANG_NEUTRAL) langId = get_default_sublang( langId ); hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 11a5788..97ed6fa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2781,36 +2781,35 @@ static void test_LocaleNameToLCID(void) /* zh-Hant has LCID 0x7c04, but LocaleNameToLCID actually returns 0x0c04, which is the LCID of zh-HK */ lcid = pLocaleNameToLCID(zhHantW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* check that 0x7c04 also works and is mapped to zh-HK */ ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_CHINESE_TRADITIONAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); todo_wine ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* zh-hant */ lcid = pLocaleNameToLCID(zhhantW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), - "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhantW), - MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT)); + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhantW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); /* zh-Hans has LCID 0x0004, but LocaleNameToLCID actually returns 0x0804, which is the LCID of zh-CN */ lcid = pLocaleNameToLCID(zhHansW, 0); /* check that LocaleNameToLCID actually returns 0x0804 */ - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); - todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); /* check that 0x0004 also works and is mapped to zh-CN */ ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE, SUBLANG_NEUTRAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); @@ -2820,12 +2819,11 @@ static void test_LocaleNameToLCID(void) /* zh-hans */ lcid = pLocaleNameToLCID(zhhansW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), - "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhansW), - MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT)); + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhansW), ret); - todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhansW), wine_dbgstr_w(buffer)); } }

1 0

Alexandre Julliard : kernel32: Also match script name when looking for a locale.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: de7e687801e3e66c27c0b9822767e37f52d93c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7e687801e3e66c27c0b9822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 19:04:04 2017 +0100 kernel32: Also match script name when looking for a locale. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 64966e5..47d0c89 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -406,6 +406,24 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (strcmpiW( buffer, data->lang )) return TRUE; matches++; /* language name matched */ + if (data->script) + { + if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, + buffer, sizeof(buffer)/sizeof(WCHAR) )) + { + const WCHAR *p = buffer; + unsigned int len = strlenW( data->script ); + while (*p) + { + if (!strncmpiW( p, data->script, len ) && (!p[len] || p[len] == ';')) break; + if (!(p = strchrW( p, ';'))) goto done; + p++; + } + if (!*p) goto done; + matches++; /* script matched */ + } + } + if (data->country) { if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, @@ -489,16 +507,24 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) strcpyW( name->win_name, name->lang ); *p++ = 0; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; - if (*p == '-') + if ((p = strpbrkW( p, winsepW )) && *p == '-') { *p++ = 0; name->script = name->country; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; + p = strpbrkW( p, winsepW ); + } + if (p) + { + *p++ = 0; + name->modifier = p; + } + /* second value can be script or country, check length to resolve the ambiguity */ + if (!name->script && strlenW( name->country ) == 4) + { + name->script = name->country; + name->country = NULL; } - *p++ = 0; - name->modifier = p; } else /* Unix format */ {

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
44
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 November 2017