September 2019 - Wine-devel

[PATCH] ws2_32: Call the completion routine in GetAddrInfoExW.
by Hans Leidekker 27 Sep '19

27 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 20 +++++++---- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d82172aa5b..aa0a164ff9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6997,6 +6997,7 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) struct getaddrinfo_args { OVERLAPPED *overlapped; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine; ADDRINFOEXW **result; char *nodename; char *servname; @@ -7007,6 +7008,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct getaddrinfo_args *args = context; OVERLAPPED *overlapped = args->overlapped; HANDLE event = overlapped->hEvent; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine = args->completion_routine; struct WS_addrinfo *res; int ret; @@ -7023,10 +7025,12 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co HeapFree(GetProcessHeap(), 0, args); overlapped->Internal = ret; + if (completion_routine) completion_routine(ret, 0, overlapped); if (event) SetEvent(event); } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, OVERLAPPED *overlapped) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, + OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -7082,8 +7086,15 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s { struct getaddrinfo_args *args; + if (overlapped->hEvent && completion_routine) + { + ret = WSAEINVAL; + goto end; + } + if (!(args = HeapAlloc(GetProcessHeap(), 0, sizeof(*args)))) goto end; args->overlapped = overlapped; + args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; @@ -7096,7 +7107,6 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s goto end; } - if (local_nodenameW != nodename) HeapFree(GetProcessHeap(), 0, local_nodenameW); WSASetLastError(ERROR_IO_PENDING); @@ -7138,12 +7148,10 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp FIXME("Unsupported hints\n"); if (timeout) FIXME("Unsupported timeout\n"); - if (completion_routine) - FIXME("Unsupported completion_routine\n"); if (handle) FIXME("Unsupported cancel handle\n"); - ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped); + ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped, completion_routine); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; @@ -7181,7 +7189,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL, NULL); WS_freeaddrinfo(hintsA); if (ret) return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e97cd381d0..e4b57cfdda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7617,11 +7617,36 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static struct completion_routine_test +{ + WSAOVERLAPPED *overlapped; + DWORD error; + ADDRINFOEXW **result; + HANDLE event; + DWORD called; +} completion_routine_test; + +static void CALLBACK completion_routine(DWORD error, DWORD byte_count, WSAOVERLAPPED *overlapped) +{ + struct completion_routine_test *test = &completion_routine_test; + + ok(error == test->error, "got %u\n", error); + ok(!byte_count, "got %u\n", byte_count); + ok(overlapped == test->overlapped, "got %p\n", overlapped); + ok(overlapped->Internal == test->error, "got %lu\n", overlapped->Internal); + ok(overlapped->Pointer == test->result, "got %p\n", overlapped->Pointer); + ok(overlapped->hEvent == NULL, "got %p\n", overlapped->hEvent); + + test->called++; + SetEvent(test->event); +} + static void test_GetAddrInfoExW(void) { static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; ADDRINFOEXW *result; OVERLAPPED overlapped; HANDLE event; @@ -7706,6 +7731,53 @@ static void test_GetAddrInfoExW(void) todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ ok(ret == WAIT_TIMEOUT, "wait failed\n"); + /* event + completion routine */ + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == WSAEINVAL, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + + /* completion routine, existing domain */ + result = (void *)0xdeadbeef; + overlapped.hEvent = NULL; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = ERROR_SUCCESS; + completion_routine_test.result = &result; + completion_routine_test.event = event; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + pFreeAddrInfoExW(result); + + /* completion routine, non-existing domain */ + result = (void *)0xdeadbeef; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = WSAHOST_NOT_FOUND; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(nxdomain, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(ret == WSAHOST_NOT_FOUND, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == WSAHOST_NOT_FOUND, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + ok(result == NULL, "got %p\n", result); + WSACloseEvent(event); } -- 2.20.1

2 1

[PATCH] testbot/WineRunReconfig: Restart the TestAgent server if it was updated.
by Francois Gouget 27 Sep '19

27 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 20 ++++++++++++++++++++ testbot/lib/Build/Utils.pm | 9 ++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ddb2208e2..606027182 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -487,6 +487,26 @@ if ($NewStatus eq "completed") FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$BaseName'"); } } + + if ($Summary->{"testagentd"}) + { + # Restart the TestAgent server from the new binary + # Note that the privileged TestAgent server is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + Debug(Elapsed($Start), " Upgrading testagentd from ". $TA->GetVersion() ."\n"); + $TA->Restart(undef); + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); + } + Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + } } $TA->Disconnect(); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9a4590677..50146301a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -196,9 +196,8 @@ sub GetCPUCount() sub BuildNativeTestAgentd() { - # If testagentd already exists it's likely already running - # so don't rebuild it. - return 1 if (-x "$BinDir/build/testagentd"); + my $NativeTestAgentd = "$::RootDir/bin/build/testagentd"; + my $Before = GetMTime($NativeTestAgentd); InfoMsg "\nBuilding the native testagentd\n"; my $CPUCount = GetCPUCount(); @@ -210,6 +209,10 @@ sub BuildNativeTestAgentd() return !1; } + if ($Before != GetMTime($NativeTestAgentd)) + { + LogMsg "Updated testagentd\n"; + } return 1; } -- 2.20.1

1 0

[PATCH] testbot/web: Add a page to create special jobs.
by Francois Gouget 27 Sep '19

27 Sep '19

These can be used to schedule a WineTest run on a specific VM or when the jobs were not created automatically for whatever reason. Note that the web server typically does not own the latest/ files and thus cannot hard-link them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 + testbot/lib/WineTestBot/SpecialJobs.pm | 12 +- testbot/web/admin/SpecialJobs.pl | 265 ++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 testbot/web/admin/SpecialJobs.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e3d2e04d5..613bddde5 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -287,6 +287,8 @@ EOF if (defined($Session) && $Session->User->HasRole("admin")) { print " <li class='top'><p>Admin</p></li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/SpecialJobs.pl"), + "'>Special Jobs</a></p></li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></p></li>\n"; print " <li class='divider'> </li>\n"; diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index c3135671f..0371084ae 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -36,6 +36,8 @@ our @EXPORT = qw(GetReconfigVMs AddReconfigJob GetWindowsTestVMs AddWindowsTestJob GetWineTestVMs AddWineTestJob); +use File::Copy; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Missions; @@ -189,9 +191,13 @@ sub AddWindowsTestJob($$$$$) return "Failed to save the '$Remarks' job: $ErrMessage"; } - # Stage the test file so it can be picked up by the job - if (!link("$DataDir/latest/$LatestBaseName", - "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) + # Stage the test file so it can be picked up by the job. Note that the + # caller may not own the latest files and thus may be unable to hard-link + # them (e.g. web server). + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + my $StagingFileName = "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName"; + if (!link($LatestFileName, $StagingFileName) && + !copy($LatestFileName, $StagingFileName)) { return "Failed to stage $LatestBaseName: $!"; } diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl new file mode 100644 index 000000000..1556b55d1 --- /dev/null +++ b/testbot/web/admin/SpecialJobs.pl @@ -0,0 +1,265 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# WineTestBot special jobs creation page +# +# Copyright 2019 Francois Gouget +# +# 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 + +use strict; + +package SpecialJobsPage; + +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use WineTestBot::Config; +use WineTestBot::Engine::Notify; +use WineTestBot::SpecialJobs; +use WineTestBot::Utils; +use WineTestBot::Log; + + +# +# Page state management +# + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->{JobTemplates} = { + "Build" => {Label => "Update build VMs", + Options => ["No", "All Build VMs"], + VMs => GetReconfigVMs(undef, "build"), + }, + "Win32" => {Label => "Run the 32 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe32", undef), + }, + "Win64" => {Label => "Run the 64 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe64", undef), + }, + "Wine" => {Label => "Update Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetReconfigVMs(undef, "wine"), + }, + "WineTest" => {Label => "Run the WineTest suite on Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetWineTestVMs(undef), + }, + }; + + foreach my $JobName (keys %{$self->{JobTemplates}}) + { + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + my $VMKey = $self->GetParam($JobName); + foreach my $Option (@{$JobTemplate->{Options}}) + { + if ($VMKey eq "*$Option") + { + $JobTemplate->{VMKey} = $VMKey; + last; + } + } + if (!exists $JobTemplate->{VMKey}) + { + foreach my $VM (@{$JobTemplate->{VMs}}) + { + if ($VMKey eq $VM->Name) + { + $JobTemplate->{VMKey} = $VM->Name; + last; + } + } + } + $JobTemplate->{VMKey} ||= "*No"; + } + + $self->SUPER::_initialize($Request, $RequiredRole, undef); +} + + +# +# Page generation +# + +sub GetTitle($) +{ + #my ($self) = @_; + return "Create Special Jobs"; +} + +sub GenerateJobFields($$$$$) +{ + my ($self, $JobName) = @_; + + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + return if (!@{$JobTemplate->{VMs}}); + + print "<div class='ItemProperty'><label>$JobTemplate->{Label}</label>\n", + "<div class='ItemValue'>\n", + "<select name='$JobName' size='1'>\n"; + foreach my $Option (@{$JobTemplate->{Options}}) + { + my $Selected = $JobTemplate->{VMKey} eq "*$Option" ? " selected" : ""; + print "<option value='*", $self->CGI->escapeHTML($Option), + "'$Selected>$Option</option>\n"; + } + foreach my $VM (@{$JobTemplate->{VMs}}) + { + my $Selected = $JobTemplate->{VMKey} eq $VM->Name ? " selected" : ""; + print "<option value='", $self->CGI->escapeHTML($VM->Name), + "'$Selected>", $self->CGI->escapeHTML($VM->Name), "</option>\n"; + } + print "</select> </div></div>\n"; +} + +sub GenerateFields($) +{ + my ($self) = @_; + + $self->GenerateJobFields("Build"); + $self->GenerateJobFields("Win32"); + $self->GenerateJobFields("Win64"); + + $self->GenerateJobFields("Wine"); + $self->GenerateJobFields("WineTest"); + + $self->SUPER::GenerateFields(); +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push @$Actions, "Submit"; + return $Actions; +} + + +# +# Page actions +# + +sub OnSubmit($) +{ + my ($self) = @_; + my $VMKey; + my @Errors = (); + + # Update Build VMs + $VMKey = $self->{JobTemplates}->{Build}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "build"); + push @Errors, "Found no build VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); + } + + # Run 32 bit WineTest + $VMKey = $self->{JobTemplates}->{Win32}->{VMKey}; + if ($VMKey ne "*No") + { + my @BaseJobs = $VMKey eq "*All Base VMs" ? ("base") : + $VMKey eq "*All WineTest VMs" ? ("other") : + $VMKey eq "*All Base and WineTest VMs" ? ("base", "other") : + (undef); + $VMKey = undef if ($VMKey =~ /^\*/); + foreach my $BaseJob (@BaseJobs) + { + my $VMs = GetWindowsTestVMs($VMKey, "exe32", $BaseJob); + push @Errors, "Found no $BaseJob VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + } + + # Run 64 bit WineTest + $VMKey = $self->{JobTemplates}->{Win64}->{VMKey}; + if ($VMKey ne "*No") + { + # Traditionally we don't create separate 'base' and 'other' jobs for + # 64 bit VMs. + my $BaseJob = $VMKey eq "*All Base VMs" ? "base" : + $VMKey eq "*All WineTest VMs" ? "other" : + $VMKey eq "*All Base and WineTest VMs" ? "all" : + undef; + $VMKey = undef if ($VMKey eq "*All Base and WineTest VMs"); + my $VMs = GetWindowsTestVMs($VMKey, "exe64", $BaseJob); + push @Errors, "Found no 64 bit VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Update Wine VMs + $VMKey = $self->{JobTemplates}->{Wine}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "wine"); + push @Errors, "Found no Wine VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "wine"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Run WineTest on Wine + $VMKey = $self->{JobTemplates}->{WineTest}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetWineTestVMs($VMKey); + push @Errors, "Found no Wine VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWineTestJob($VMs, $VMKey); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Notify engine + my $ErrMessage = RescheduleJobs(); + push @Errors, $ErrMessage if (defined $ErrMessage); + + if (@Errors) + { + $self->{ErrMessage} = join("\n", @Errors); + return undef; + } + + $self->Redirect("/"); # does not return + exit; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Submit") + { + return $self->OnSubmit(); + } + + return $self->SUPER::OnAction($Action); +} + + +package main; + +my $Request = shift; + +my $SubmitPage = SpecialJobsPage->new($Request, "admin"); +$SubmitPage->GeneratePage(); -- 2.20.1

1 0

[PATCH] testbot/SpecialJobs: Don't create jobs if given no VM.
by Francois Gouget 27 Sep '19

27 Sep '19

The jobs would have no task! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/SpecialJobs.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index d709e48f7..c3135671f 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -61,6 +61,7 @@ sub GetReconfigVMs($$) sub AddReconfigJob($$$) { my ($VMs, $VMKey, $VMType) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -138,6 +139,7 @@ sub GetWindowsTestVMs($$$) sub AddWindowsTestJob($$$$$) { my ($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -221,6 +223,7 @@ sub GetWineTestVMs($) sub AddWineTestJob($$) { my ($VMs, $VMKey) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); -- 2.20.1

1 0

[PATCH 3/3] winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload.
by Piotr Caban 27 Sep '19

27 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 43 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-)

1 0

[PATCH 2/3] winebus.sys: Don't do anything in iohid_driver_unload if iohid was not initialized.
by Piotr Caban 27 Sep '19

27 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus_iohid.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 1/3] winebus.sys: Don't do anything in udev_driver_unload if udev was not initialized.
by Piotr Caban 27 Sep '19

27 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH] dmime: Improved tracing of the DMUS_OBJECTDESC structure.
by Alistair Leslie-Hughes 27 Sep '19

27 Sep '19

sprintf corupted the output string thus making the output useless. Use TRACE to print each of the member variables. One place used debugstr_DMUS_OBJECTDESC but never printed it. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/audiopath.c | 2 +- dlls/dmime/dmutils.c | 53 ++++++++++++++++++++++++------------------ dlls/dmime/dmutils.h | 2 +- dlls/dmime/graph.c | 2 +- dlls/dmime/segment.c | 2 +- 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 21aaa4d4129..3e7a268cbf8 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -285,7 +285,7 @@ static HRESULT WINAPI path_IDirectMusicObject_ParseDescriptor(IDirectMusicObject desc->guidClass = CLSID_DirectMusicAudioPathConfig; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC (desc); return S_OK; } diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 121e6dc5a46..33f5da99a97 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -41,6 +41,7 @@ #include "dmutils.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); +WINE_DECLARE_DEBUG_CHANNEL(dmime); static HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -143,7 +144,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -430,26 +431,32 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024], *ptr = buffer; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +void dump_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { + if(!TRACE_ON(dmime)) + return; + + if (pDesc) { + TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); + TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); + TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); + if (pDesc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); + if (pDesc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); + if (pDesc->dwValidData & DMUS_OBJ_DATE) + TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); + if (pDesc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); + if (pDesc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); + if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); + if (pDesc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); + } } diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index 187c9ed3d40..e48791a972f 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -56,6 +56,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index fafd4ecffff..95d331f1f5f 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -216,7 +216,7 @@ static HRESULT WINAPI graph_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicGraph; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC (desc); return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 9a9872bd4ce..c804037aef2 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -607,7 +607,7 @@ static HRESULT WINAPI seg_IDirectMusicObject_ParseDescriptor(IDirectMusicObject desc->guidClass = CLSID_DirectMusicSegment; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC (desc); return S_OK; } -- 2.23.0

1 0

[PATCH] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira 27 Sep '19

27 Sep '19

This patch lays the groundwork for autodetecting the user's GeoID in the future, preventing many headaches with programs crashing. See bug #46196: https://bugs.winehq.org/show_bug.cgi?id=46196 Also better error reporting brings these functions to (almost) full conformity with Windows, which is also just nice :) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 191 +++++++++++++++++++++++++---------------- 1 file changed, 116 insertions(+), 75 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d44a2b0916..653cea000d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4347,81 +4347,6 @@ BOOL WINAPI InvalidateNLSCache(void) return FALSE; } -/****************************************************************************** - * GetUserGeoID (KERNEL32.@) - */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) -{ - GEOID ret = GEOID_NOT_AVAILABLE; - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - WCHAR bufferW[40], *end; - DWORD count; - HANDLE hkey, hSubkey = 0; - UNICODE_STRING keyW; - const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - RtlInitUnicodeString( &keyW, nationW ); - count = sizeof(bufferW); - - if(!(hkey = create_registry_key())) return ret; - - switch( GeoClass ){ - case GEOCLASS_NATION: - if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((LPCWSTR)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; - } - - NtClose(hkey); - if (hSubkey) NtClose(hSubkey); - return ret; -} - -/****************************************************************************** - * SetUserGeoID (KERNEL32.@) - */ -BOOL WINAPI SetUserGeoID( GEOID GeoID ) -{ - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW,keyW; - WCHAR bufferW[10]; - OBJECT_ATTRIBUTES attr; - HANDLE hkey; - - if(!(hkey = create_registry_key())) return FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, geoW ); - RtlInitUnicodeString( &keyW, nationW ); - - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) - - { - NtClose(attr.RootDirectory); - return FALSE; - } - - sprintfW(bufferW, formatW, GeoID); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); - NtClose(hkey); - return TRUE; -} - typedef struct { union @@ -4853,6 +4778,122 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * GetUserGeoID (KERNEL32.@) + * Fetches a user's geographic location ID. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION. + * + * RETURNS + * Success: The GeoID for the requested class. + * Failure: GEOID_NOT_AVAILABLE, likely because the GeoID for that class had not been set yet. + * + */ +GEOID WINAPI GetUserGeoID(GEOCLASS GeoClass) +{ + GEOID ret = GEOID_NOT_AVAILABLE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; + WCHAR bufferW[40], *end; + DWORD count; + HANDLE hkey, hSubkey = 0; + UNICODE_STRING keyW; + const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; + count = sizeof(bufferW); + + if (GeoClass == GEOCLASS_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else if(GeoClass == GEOCLASS_REGION) + RtlInitUnicodeString( &keyW, regionW ); + else + return ret; + + if(!(hkey = create_registry_key())) return ret; + + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); + } + + NtClose(hkey); + if (hSubkey) NtClose(hSubkey); + return ret; +} + +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * Sets the user's geographic location ID. + * + * PARAMS + * GeoID [I] The new GeoID. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, if the GeoID was invalid or an unexpected error occured. Call GetLastError() to learn the reason. + * + * NOTES + * GetLastError() will report the following possible error conditions: + * - ERROR_INVALID_PARAMETER: The GeoID was invalid. + * - ERROR_INTERNAL_ERROR: There was an unexpected error. + * + * GeoIDs may be internally classified as LOCATION_BOTH; these are functionally identical to GEOCLASS_REGION, + * and will be set as region ID only, not as a nation. + * + */ +BOOL WINAPI SetUserGeoID(GEOID GeoID) +{ + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(GeoID); + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; + static const WCHAR formatW[] = {'%','i',0}; + UNICODE_STRING nameW,keyW; + WCHAR bufferW[10]; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + + if(!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if(!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, geoW ); + + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else + RtlInitUnicodeString( &keyW, regionW ); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + { + NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } + + sprintfW(bufferW, formatW, geoinfo->id); + NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + NtClose(attr.RootDirectory); + NtClose(hkey); + return TRUE; +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ -- 2.23.0

2 2

[PATCH] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira 27 Sep '19

27 Sep '19

This patch lays the groundwork for autodetecting the user's GeoID in the future, preventing many headaches with programs crashing. See bug #46196: https://bugs.winehq.org/show_bug.cgi?id=46196 Also better error reporting brings these functions to (almost) full conformity with Windows, which is also just nice :) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 191 +++++++++++++++++++++++++---------------- 1 file changed, 116 insertions(+), 75 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d44a2b0916..653cea000d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4347,81 +4347,6 @@ BOOL WINAPI InvalidateNLSCache(void) return FALSE; } -/****************************************************************************** - * GetUserGeoID (KERNEL32.@) - */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) -{ - GEOID ret = GEOID_NOT_AVAILABLE; - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - WCHAR bufferW[40], *end; - DWORD count; - HANDLE hkey, hSubkey = 0; - UNICODE_STRING keyW; - const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - RtlInitUnicodeString( &keyW, nationW ); - count = sizeof(bufferW); - - if(!(hkey = create_registry_key())) return ret; - - switch( GeoClass ){ - case GEOCLASS_NATION: - if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((LPCWSTR)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; - } - - NtClose(hkey); - if (hSubkey) NtClose(hSubkey); - return ret; -} - -/****************************************************************************** - * SetUserGeoID (KERNEL32.@) - */ -BOOL WINAPI SetUserGeoID( GEOID GeoID ) -{ - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW,keyW; - WCHAR bufferW[10]; - OBJECT_ATTRIBUTES attr; - HANDLE hkey; - - if(!(hkey = create_registry_key())) return FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, geoW ); - RtlInitUnicodeString( &keyW, nationW ); - - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) - - { - NtClose(attr.RootDirectory); - return FALSE; - } - - sprintfW(bufferW, formatW, GeoID); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); - NtClose(hkey); - return TRUE; -} - typedef struct { union @@ -4853,6 +4778,122 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * GetUserGeoID (KERNEL32.@) + * Fetches a user's geographic location ID. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION. + * + * RETURNS + * Success: The GeoID for the requested class. + * Failure: GEOID_NOT_AVAILABLE, likely because the GeoID for that class had not been set yet. + * + */ +GEOID WINAPI GetUserGeoID(GEOCLASS GeoClass) +{ + GEOID ret = GEOID_NOT_AVAILABLE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; + WCHAR bufferW[40], *end; + DWORD count; + HANDLE hkey, hSubkey = 0; + UNICODE_STRING keyW; + const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; + count = sizeof(bufferW); + + if (GeoClass == GEOCLASS_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else if(GeoClass == GEOCLASS_REGION) + RtlInitUnicodeString( &keyW, regionW ); + else + return ret; + + if(!(hkey = create_registry_key())) return ret; + + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); + } + + NtClose(hkey); + if (hSubkey) NtClose(hSubkey); + return ret; +} + +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * Sets the user's geographic location ID. + * + * PARAMS + * GeoID [I] The new GeoID. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, if the GeoID was invalid or an unexpected error occured. Call GetLastError() to learn the reason. + * + * NOTES + * GetLastError() will report the following possible error conditions: + * - ERROR_INVALID_PARAMETER: The GeoID was invalid. + * - ERROR_INTERNAL_ERROR: There was an unexpected error. + * + * GeoIDs may be internally classified as LOCATION_BOTH; these are functionally identical to GEOCLASS_REGION, + * and will be set as region ID only, not as a nation. + * + */ +BOOL WINAPI SetUserGeoID(GEOID GeoID) +{ + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(GeoID); + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; + static const WCHAR formatW[] = {'%','i',0}; + UNICODE_STRING nameW,keyW; + WCHAR bufferW[10]; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + + if(!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if(!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, geoW ); + + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else + RtlInitUnicodeString( &keyW, regionW ); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + { + NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } + + sprintfW(bufferW, formatW, geoinfo->id); + NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + NtClose(attr.RootDirectory); + NtClose(hkey); + return TRUE; +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ -- 2.23.0

2 1