September 2018 - Wine-Commits

Henri Verbeet : wined3d: Store the wined3d creation flags for NO3D adapters as well.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: b1d6d47c0c01d7d14ab74f10720758708e4f070b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d6d47c0c01d7d14ab74f10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 02:13:21 2018 +0330 wined3d: Store the wined3d creation flags for NO3D adapters as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abe81de..f7ef5c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2463,7 +2463,14 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = wined3d_adapter_no3d_create_context, }; -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) +static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + + d3d_info->wined3d_creation_flags = wined3d_creation_flags; +} + +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const struct wined3d_gpu_description gpu_description = { @@ -2485,6 +2492,8 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) adapter->shader_backend = &none_shader_backend; adapter->adapter_ops = &wined3d_adapter_no3d_ops; + wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags); + return TRUE; } @@ -2510,7 +2519,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) - return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_no3d_init(adapter, wined3d_creation_flags); return wined3d_adapter_gl_init(adapter, wined3d_creation_flags); }

1 0

Józef Kucia : d3d11: Trace skipped DXBC chunks.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 508512312cd1f6959a2e2cbe107b64fcdd14cc63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508512312cd1f6959a2e2cbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 25 10:33:24 2018 +0200 d3d11: Trace skipped DXBC chunks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/shader.c | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3049193..e26554a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -47,10 +47,8 @@ #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') -#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') -#define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index c8d512f..759c570 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -136,12 +136,8 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * } break; - case TAG_RDEF: - case TAG_STAT: - break; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); + TRACE("Skipping chunk %s.\n", debugstr_an((const char *)&tag, 4)); break; }

1 0

Francois Gouget : testbot/web: Avoid race conditions when submitting jobs.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: tools Branch: master Commit: 1597fda2afd17798ab6ed558fa9b686e074805aa URL: https://source.winehq.org/git/tools.git/?a=commit;h=1597fda2afd17798ab6ed55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 16:58:05 2018 +0200 testbot/web: Avoid race conditions when submitting jobs. Rename the patch so one instance of Submit.pl gets exclusive access to it and only one job gets created. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 52 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ae4aca3..9ad8fd5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -745,13 +745,9 @@ sub OnPrev($) return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } -sub OnSubmit($) +sub SubmitJob($$$) { - my ($self) = @_; - - return !1 if (!$self->Validate()); - my $BaseName = $self->ValidateAndGetFileName("FileName"); - return !1 if (!$BaseName); + my ($self, $BaseName, $Staging) = @_; # See also Patches::Submit() in lib/WineTestBot/Patches.pm @@ -778,11 +774,7 @@ sub OnSubmit($) # Add steps and tasks for the 32 and 64-bit tests my $FileType = $self->GetParam("FileType"); my $Impacts; - if ($FileType eq "patch") - { - my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - $Impacts = GetPatchImpacts($TmpStagingFullPath); - } + $Impacts = GetPatchImpacts($Staging) if ($FileType eq "patch"); my $BuildStep; foreach my $Bits ("32", "64") @@ -913,8 +905,7 @@ sub OnSubmit($) } # Stage the test patch/executable so the job can pick it up - my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - if (!rename($TmpStagingFullPath, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) + if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) { $self->{ErrMessage} = "Could not stage '$BaseName': $!\n"; return !1; @@ -943,6 +934,41 @@ sub OnSubmit($) exit; } +sub OnSubmit($) +{ + my ($self) = @_; + + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); + + # Rename the staging file to avoid race conditions if the user clicks on + # Submit multiple times + my $OldStaging = $self->GetTmpStagingFullPath($BaseName); + my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $BaseName); + if (!defined $Staging) + { + $self->{ErrMessage} = "Could not rename '$BaseName': $!"; + return !1; + } + if (!unlink $OldStaging) + { + unlink $Staging; + $self->{ErrMessage} = $!{ENOENT} ? + "$BaseName has already been submitted or has expired" : + "Could not remove the staging '$BaseName' file: $!"; + return !1; + } + + if (!$self->SubmitJob($BaseName, $Staging)) + { + # Restore the file for the next attempt + rename($Staging, $OldStaging); + return !1; + } + return 1; +} + sub OnShowAllVMs($) { my ($self) = @_;

1 0

Francois Gouget : testbot: Retry updating the wine / build VMs after a timeout.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: tools Branch: master Commit: fc9d4d6ccf7e33bf93c41ce122327925a3f773d2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc9d4d6ccf7e33bf93c41ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 16:57:55 2018 +0200 testbot: Retry updating the wine / build VMs after a timeout. In case of a regular build failure, retrying is pointless. But in case of a timeout the VM host may be less busy next time and since the snapshot is unchanged we can retry. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index a58cc42..02eee8c 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -481,4 +481,7 @@ if ($NewStatus eq 'completed') # Wrap up # -WrapUpAndExit($NewStatus, undef, $TaskTimedOut); +# In case of a regular build failure retrying is pointless. But in case of a +# timeout the VM host may be less busy next time and since the snapshot is +# unchanged we can retry. +WrapUpAndExit($NewStatus, $TaskTimedOut, $TaskTimedOut);

1 0

Francois Gouget : testbot: Better check for the "No build or test VM" disposition.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: tools Branch: master Commit: d70d002ded822c29a63a8f97ec62aa9fd43199cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=d70d002ded822c29a63a8f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 16:58:15 2018 +0200 testbot: Better check for the "No build or test VM" disposition. Use a direct test instead of an indirect one. Also the $Impacts->{UnitCount} field has been renamed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 469fedc..96e4a0d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -266,7 +266,7 @@ sub Submit($$$) if ($NewJob->Steps->IsEmpty()) { # This may be a Wine patch but there is no suitable VM to test it! - if ($Impacts->{UnitCount}) + if ($BuildVMs->IsEmpty() and $WineVMs->IsEmpty()) { $self->Disposition("No build or test VM!"); }

1 0

Francois Gouget : testbot: Let VM scripts identify the last part of a patchset.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: tools Branch: master Commit: cb8a8fabe2c14add78ff9391b9461175e68fda7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=cb8a8fabe2c14add78ff939… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 12:07:30 2018 +0200 testbot: Let VM scripts identify the last part of a patchset. For patchsets (and subsets thereof) the Engine calls GetPatchImpacts() at least once with only the last part. This allows it to know exactly what the last part modifies and thus what needs to be retested. However the VM scripts only have the full patchset so they don't know what the last part is. Thus they are forced to rerun every test touched by the full patchset. So the TestBot now adds a marker before the last part, allowing GetPatchImpacts() to identify it. Note that it does not use '---' as that marker may or may not be present depending on how the patch was formatted for emailing (and can be ambiguous too). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 76 ++++++++++++++++++++--------- testbot/lib/WineTestBot/Patches.pm | 5 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 5 ++ 3 files changed, 60 insertions(+), 26 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b7307e5..f03cc40 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,8 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts LastPartSeparator UpdateWineData + GetBuildTimeout); use List::Util qw(min max); @@ -150,6 +151,11 @@ my $IgnoredPathsRe = join('|', 'tools/winemaker/', ); +sub LastPartSeparator() +{ + return "===== TestBot: Last patchset part =====\n"; +} + sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; @@ -261,9 +267,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpacts($;$) +sub GetPatchImpacts($) { - my ($PatchFileName, $PastImpacts) = @_; + my ($PatchFileName) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -281,25 +287,7 @@ sub GetPatchImpacts($;$) }; _LoadWineFiles(); - if ($PastImpacts) - { - # Update the list of Wine files so we correctly recognize patchset parts - # that modify new Wine files. - my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; - - foreach my $PastInfo (values %{$PastImpacts->{Tests}}) - { - foreach my $File (keys %{$PastInfo->{Files}}) - { - _HandleFile($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); - } - } - } - + my $PastImpacts; my ($Path, $Change); while (my $Line = <$fh>) { @@ -332,6 +320,50 @@ sub GetPatchImpacts($;$) $Path = undef; $Change = ""; } + elsif ($Line eq LastPartSeparator()) + { + # All the diffs so far belongs to previous parts of this patchset. + # But: + # - Only the last part must be taken into account to determine if a + # rebuild and testing is needed. + # - Yet if a rebuild is needed the previous parts' patches will impact + # the scope of the rebuild so that information must be preserved. + # So save current impacts in $PastImpacts and reset the current state. + $PastImpacts = {}; + + # Build a copy of the Wine files list reflecting the current situation. + $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; + $Impacts->{NewFiles} = {}; + $Impacts->{DeletedFiles} = {}; + + # The modules impacted by previous parts will still need to be built, + # but only if the last part justifies a build. So make a backup. + $PastImpacts->{BuildModules} = $Impacts->{BuildModules}; + $Impacts->{BuildModules} = {}; + + # Also backup the build-related fields. + foreach my $Field ("Autoconf", "MakeMakefiles", + "PatchedRoot", "PatchedModules", "PatchedTests") + { + $PastImpacts->{$Field} = $Impacts->{$Field}; + $Impacts->{$Field} = undef; + } + + # Reset the status of all test unit files to not modified. + foreach my $TestInfo (values %{$Impacts->{Tests}}) + { + foreach my $File (keys %{$TestInfo->{Files}}) + { + if ($TestInfo->{Files}->{$File} ne "rm") + { + $TestInfo->{Files}->{$File} = 0; + } + } + } + $Impacts->{ModuleUnitCount} = $Impacts->{TestUnitCount} = 0; + } else { $Path = undef; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 0387543..469fedc 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,10 +132,7 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $PastImpacts; - $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); - + my $Impacts = GetPatchImpacts($PatchFileName); if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and !$Impacts->{PatchedTests}) { diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 3ac8c53..286b393 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -42,6 +42,7 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use WineTestBot::Config; +use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -116,6 +117,10 @@ sub SubmitSubset($$$) last; } + if ($PartNo == $MaxPart and $PartNo > 1) + { + print $CombinedFile LastPartSeparator(); + } if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { print $CombinedFile $_ for (<$PartFile>);

1 0

André Hentschel : wininet/tests: Skip tests when querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT fails (newer win10).
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 065ab77fc1433ef648ad4a31ecc1090959d7df19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065ab77fc1433ef648ad4a31… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 18 20:23:46 2018 +0200 wininet/tests: Skip tests when querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT fails (newer win10). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ace8512..9ec4902 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5569,6 +5569,12 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) size = sizeof(info); res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size); + if (!res) + { + win_skip("Querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT failed, skipping tests\n"); + return; + } + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); ok(size == sizeof(info), "size = %u\n", size);

1 0

Andrew Eikum : winedbg: In gdbproxy file, allow wine paths with spaces.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 52fecef1a237368eee84ebc9b366107ee2509562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52fecef1a237368eee84ebc9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 24 14:35:04 2018 -0500 winedbg: In gdbproxy file, allow wine paths with spaces. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 512e011..025cb38 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1890,7 +1890,7 @@ static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) fd = mkstemps(buf, 0); if (fd == -1) return FALSE; if ((f = fdopen(fd, "w+")) == NULL) return FALSE; - fprintf(f, "file %s\n", wine_path); + fprintf(f, "file \"%s\"\n", wine_path); fprintf(f, "target remote localhost:%d\n", ntohs(port)); fprintf(f, "set prompt Wine-gdb>\\ \n"); /* gdb 5.1 seems to require it, won't hurt anyway */

1 0

Alexandre Julliard : server: Don' t return the process exe file to the client.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 2cab0ec389b9602bd92a932e40658316779a995d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cab0ec389b9602bd92a932e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 19:16:40 2018 +0200 server: Don't return the process exe file to the client. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 10 +++------- include/wine/server_protocol.h | 4 ++-- server/process.c | 3 --- server/protocol.def | 1 - server/request.h | 3 +-- server/trace.c | 3 +-- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 26b2431..a66a708 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -117,7 +117,6 @@ struct builtin_load_info static struct builtin_load_info default_load_info; static struct builtin_load_info *builtin_load_info = &default_load_info; -static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ LIST_ENTRY tls_links = { &tls_links, &tls_links }; @@ -3331,7 +3330,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, PEB *peb = NtCurrentTeb()->Peb; kernel32_start_process = kernel_start; - if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ /* allocate the modref for the main exe (if not already done) */ wm = get_modref( peb->ImageBaseAddress ); @@ -3506,7 +3504,7 @@ void __wine_process_init(void) ANSI_STRING func_name; void (* DECLSPEC_NORETURN CDECL init_func)(void); - main_exe_file = thread_init(); + thread_init(); /* retrieve current umask */ FILE_umask = umask(0777); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 165f083..85ba707 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -73,7 +73,7 @@ extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; -extern HANDLE thread_init(void) DECLSPEC_HIDDEN; +extern void thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern void virtual_init_threading(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8171638..3019a74 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -105,7 +105,7 @@ static inline void get_unicode_string( UNICODE_STRING *str, WCHAR **src, WCHAR * * * Fill the RTL_USER_PROCESS_PARAMETERS structure from the server. */ -static NTSTATUS init_user_process_params( SIZE_T data_size, HANDLE *exe_file ) +static NTSTATUS init_user_process_params( SIZE_T data_size ) { void *ptr; WCHAR *src, *dst; @@ -125,7 +125,6 @@ static NTSTATUS init_user_process_params( SIZE_T data_size, HANDLE *exe_file ) data_size = wine_server_reply_size( reply ); info_size = reply->info_size; env_size = data_size - info_size; - *exe_file = wine_server_ptr_handle( reply->exe_file ); } } SERVER_END_REQ; @@ -273,13 +272,12 @@ static ULONG_PTR get_image_addr(void) * * NOTES: The first allocated TEB on NT is at 0x7ffde000. */ -HANDLE thread_init(void) +void thread_init(void) { TEB *teb; void *addr; BOOL suspend; SIZE_T size, info_size; - HANDLE exe_file = 0; LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; @@ -378,7 +376,7 @@ HANDLE thread_init(void) /* allocate user parameters */ if (info_size) { - init_user_process_params( info_size, &exe_file ); + init_user_process_params( info_size ); } else { @@ -404,8 +402,6 @@ HANDLE thread_init(void) fill_cpu_info(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); - - return exe_file; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 051fbc6..e8611ce 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -785,10 +785,10 @@ struct get_startup_info_request struct get_startup_info_reply { struct reply_header __header; - obj_handle_t exe_file; data_size_t info_size; /* VARARG(info,startup_info,info_size); */ /* VARARG(env,unicode_str); */ + char __pad_12[4]; }; @@ -6531,6 +6531,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 564 +#define SERVER_PROTOCOL_VERSION 565 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index d497626..b512141 100644 --- a/server/process.c +++ b/server/process.c @@ -1261,9 +1261,6 @@ DECL_HANDLER(get_startup_info) if (!info) return; - if (process->exe_file && - !(reply->exe_file = alloc_handle( process, process->exe_file, GENERIC_READ, 0 ))) return; - /* we return the data directly without making a copy so this can only be called once */ reply->info_size = info->info_size; size = info->data_size; diff --git a/server/protocol.def b/server/protocol.def index 9fb38f7..1a76f22 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -778,7 +778,6 @@ struct rawinput_device /* Retrieve the new process startup info */ @REQ(get_startup_info) @REPLY - obj_handle_t exe_file; /* file handle for main exe */ data_size_t info_size; /* size of startup info */ VARARG(info,startup_info,info_size); /* startup information */ VARARG(env,unicode_str); /* environment */ diff --git a/server/request.h b/server/request.h index f498a94..0e3f465 100644 --- a/server/request.h +++ b/server/request.h @@ -756,8 +756,7 @@ C_ASSERT( FIELD_OFFSET(struct new_thread_reply, tid) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_thread_reply, handle) == 12 ); C_ASSERT( sizeof(struct new_thread_reply) == 16 ); C_ASSERT( sizeof(struct get_startup_info_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, exe_file) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 8 ); C_ASSERT( sizeof(struct get_startup_info_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, gui) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, module) == 16 ); diff --git a/server/trace.c b/server/trace.c index a2fe660..7b54c4f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1276,8 +1276,7 @@ static void dump_get_startup_info_request( const struct get_startup_info_request static void dump_get_startup_info_reply( const struct get_startup_info_reply *req ) { - fprintf( stderr, " exe_file=%04x", req->exe_file ); - fprintf( stderr, ", info_size=%u", req->info_size ); + fprintf( stderr, " info_size=%u", req->info_size ); dump_varargs_startup_info( ", info=", min(cur_size,req->info_size) ); dump_varargs_unicode_str( ", env=", cur_size ); }

1 0

Alexandre Julliard : server: Store the process exe file in the process structure.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: d6683d637a2a1e333873cac51907327c09f92959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6683d637a2a1e333873cac5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 19:13:54 2018 +0200 server: Store the process exe file in the process structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 31 ++++++++++++++----------------- server/process.h | 1 + 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/server/process.c b/server/process.c index 186912f..d497626 100644 --- a/server/process.c +++ b/server/process.c @@ -105,7 +105,6 @@ static const struct fd_ops process_fd_ops = struct startup_info { struct object obj; /* object header */ - struct file *exe_file; /* file handle for main exe */ struct process *process; /* created process */ data_size_t info_size; /* size of startup info */ data_size_t data_size; /* size of whole startup data */ @@ -513,6 +512,7 @@ struct process *create_process( int fd, struct thread *parent_thread, int inheri process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; process->idle_event = NULL; + process->exe_file = NULL; process->peb = 0; process->ldt_copy = 0; process->dir_cache = NULL; @@ -617,6 +617,7 @@ static void process_destroy( struct object *obj ) if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); + if (process->exe_file) release_object( process->exe_file ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); free( process->dir_cache ); @@ -665,7 +666,6 @@ static void startup_info_destroy( struct object *obj ) struct startup_info *info = (struct startup_info *)obj; assert( obj->ops == &startup_info_ops ); free( info->data ); - if (info->exe_file) release_object( info->exe_file ); if (info->process) release_object( info->process ); } @@ -823,11 +823,10 @@ static void process_killed( struct process *process ) process->desktop = 0; close_process_handles( process ); cancel_process_asyncs( process ); - if (process->idle_event) - { - release_object( process->idle_event ); - process->idle_event = NULL; - } + if (process->idle_event) release_object( process->idle_event ); + if (process->exe_file) release_object( process->exe_file ); + process->idle_event = NULL; + process->exe_file = NULL; /* close the console attached to this process, if any */ free_console( process ); @@ -1129,17 +1128,9 @@ DECL_HANDLER(new_process) close( socket_fd ); return; } - info->exe_file = NULL; info->process = NULL; info->data = NULL; - if (req->exe_file && - !(info->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) - { - close( socket_fd ); - goto done; - } - info_ptr = get_req_data_after_objattr( objattr, &info->data_size ); info->info_size = min( req->info_size, info->data_size ); @@ -1185,6 +1176,10 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); + if (req->exe_file && + !(process->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) + goto done; + if (parent->job && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) @@ -1266,8 +1261,8 @@ DECL_HANDLER(get_startup_info) if (!info) return; - if (info->exe_file && - !(reply->exe_file = alloc_handle( process, info->exe_file, GENERIC_READ, 0 ))) return; + if (process->exe_file && + !(reply->exe_file = alloc_handle( process, process->exe_file, GENERIC_READ, 0 ))) return; /* we return the data directly without making a copy so this can only be called once */ reply->info_size = info->info_size; @@ -1302,6 +1297,8 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; current->entry_point = req->entry; + if (process->exe_file) release_object( process->exe_file ); + process->exe_file = NULL; generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE ); diff --git a/server/process.h b/server/process.h index ec45388..a12d523 100644 --- a/server/process.h +++ b/server/process.h @@ -83,6 +83,7 @@ struct process enum startup_state startup_state; /* startup state */ struct startup_info *startup_info; /* startup info while init is in progress */ struct event *idle_event; /* event for input idle */ + struct file *exe_file; /* file handle for main exe (during startup only) */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */

1 0