May 2018 - Wine-commits - list.winehq.org

Józef Kucia : dxgi: Factor out d3d11_swapchain_create () function.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 02c49ea3c03b6403204a099587df0d895e36d7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c49ea3c03b6403204a0995… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:26 2018 +0200 dxgi: Factor out d3d11_swapchain_create() function. 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/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 56 ++++-------------------------------------- dlls/dxgi/swapchain.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 51 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 559a834..900906c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,6 +173,8 @@ struct d3d11_swapchain IDXGIOutput *target; }; +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 6986804..5c47c6d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -250,8 +250,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { - struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; @@ -275,22 +273,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - min_buffer_count = 1; - break; - case DXGI_SWAP_EFFECT_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; - min_buffer_count = 2; - break; - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -305,49 +293,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } - if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) - { - ERR("This is not the device we're looking for\n"); - return hr; - } - - if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) - FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) - FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) - FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); - if (fullscreen_desc && fullscreen_desc->Scaling) - FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - - wined3d_desc.backbuffer_width = swapchain_desc->Width; - wined3d_desc.backbuffer_height = swapchain_desc->Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); - wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); - wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.device_window = window; - wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; - wined3d_desc.enable_auto_depth_stencil = FALSE; - wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); - wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; - wined3d_desc.auto_restore_display_mode = TRUE; - - hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, FALSE, &wined3d_swapchain); - IWineDXGIDevice_Release(dxgi_device); - if (FAILED(hr)) + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { - WARN("Failed to create swapchain, hr %#x.\n", hr); + hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); + IWineDXGIDevice_Release(dxgi_device); return hr; } - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); - - return S_OK; + ERR("This is not the device we're looking for.\n"); + return DXGI_ERROR_UNSUPPORTED; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c85b742..7401a2e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -733,3 +733,66 @@ cleanup: IWineDXGIDevice_Release(swapchain->device); return hr; } + +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) +{ + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; + + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + + switch (swapchain_desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; + break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + break; + default: + WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; + wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; + wined3d_desc.enable_auto_depth_stencil = FALSE; + wined3d_desc.auto_depth_stencil_format = 0; + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; + wined3d_desc.auto_restore_display_mode = TRUE; + + if (FAILED(hr = IWineDXGIDevice_create_swapchain(device, &wined3d_desc, FALSE, &wined3d_swapchain))) + { + WARN("Failed to create swapchain, hr %#x.\n", hr); + return hr; + } + + wined3d_mutex_lock(); + *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); + + return S_OK; +}

1 0

Józef Kucia : dxgi: Add IDXGISwapChain3 interface stub for D3D12.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 7d99d74572072ae60f1a5bf9cf986a01be86cec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d99d74572072ae60f1a5bf9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:27 2018 +0200 dxgi: Add IDXGISwapChain3 interface stub for D3D12. 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/dxgi/dxgi_private.h | 7 +- dlls/dxgi/factory.c | 8 + dlls/dxgi/swapchain.c | 546 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 560 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d99d74572072ae60f1a…

1 0

Józef Kucia : odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: e034ba1b591a2b843b902055a51da50c4371cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e034ba1b591a2b843b902055… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:38:42 2018 +0200 odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 862237c..f54674c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -572,7 +572,10 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) ret = SQLGetInstalledDriversW(wbuf, size, &written); if (!ret) + { + heap_free(wbuf); return FALSE; + } *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL);

1 0

Francois Gouget : testbot/build: Add support for test helper dlls and make the patch parser reusable.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 569b5f5b47fdfc0d37f9e8139d3ad4e31be60412 URL: https://source.winehq.org/git/tools.git/?a=commit;h=569b5f5b47fdfc0d37f9e81… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:06:14 2018 +0200 testbot/build: Add support for test helper dlls and make the patch parser reusable. Don't mistake the helper dlls C source files for test units. Also correctly handle patches that add or remove (i.e. rename) a resource file or helper dll. And move the patch parser to its own module so it can be reused, including by processes that don't use / have access to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 19 ++- testbot/lib/WineTestBot/PatchUtils.pm | 224 ++++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Patches.pm | 102 ++-------------- 3 files changed, 247 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=569b5f5b47fdfc0d37f…

1 0

Francois Gouget : testbot/web: Simplify Submit.pl by reusing the patch analyser.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: c8c39093db145febee93744d720a04c5d92e59c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c8c39093db145febee93744… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:06:29 2018 +0200 testbot/web: Simplify Submit.pl by reusing the patch analyser. Also standardize on the TestUnit terminology. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 94 +++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 74 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3b80841..cf85078 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -35,6 +35,7 @@ use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Engine::Notify; +use WineTestBot::PatchUtils; use WineTestBot::Utils; use WineTestBot::VMs; @@ -510,7 +511,7 @@ sub DetermineFileType($$) my $ErrMessage = undef; my $FileType = "unknown"; my $DllBaseName = undef; - my $TestSet = undef; + my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); @@ -563,76 +564,21 @@ sub DetermineFileType($$) if ($FileType eq "unknown") { - if (open (FH, "<$FileName")) + my $Impacts = GetPatchImpact($FileName); + if ($Impacts->{UnitCount} == 0) { - my $Line; - my $PatchFound = !1; - my $PrevPlus = !1; - my $PrevMinus = !1; - while (defined($Line = <FH>)) - { - if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) - { - $FileType = "patch$1"; - my $ThisDllBaseName = $2; - my $ThisTestSet = $3; - if ($ThisTestSet =~ m/^(.*)\.c$/) - { - $ThisTestSet = $1; - } - else - { - $ThisTestSet = undef; - } - - if ((defined($DllBaseName) && $DllBaseName ne $ThisDllBaseName) || - (defined($TestSet) && defined($ThisTestSet) && - $TestSet ne $ThisTestSet)) - { - $ErrMessage = "Patch contains changes to multiple tests"; - } - else - { - if (defined($ThisDllBaseName)) - { - $DllBaseName = $ThisDllBaseName; - } - if (defined($ThisTestSet)) - { - $TestSet = $ThisTestSet; - } - } - } - elsif ($Line =~ m/^\+\+\+ /) - { - if ($PrevMinus) - { - $PatchFound = 1; - $PrevMinus = !1; - } - $PrevPlus = 1; - } - elsif ($Line =~ m/^--- /) - { - if ($PrevPlus) - { - $PatchFound = 1; - $PrevPlus = !1; - } - $PrevMinus = 1; - } - else - { - $PrevPlus = !1; - $PrevMinus = !1; - } - } - close FH; - - if ($FileType eq "unknown" && $PatchFound) - { - $ErrMessage = "Patch doesn't affect tests"; - } + $ErrMessage = "Patch doesn't affect tests"; + } + elsif ($Impacts->{UnitCount} > 1) + { + $ErrMessage = "Patch contains changes to multiple tests"; + } + else + { + my $TestInfo = (values %{$Impacts->{Tests}})[0]; + $FileType = $TestInfo->{Type}; + $DllBaseName = $TestInfo->{Module}; + $TestUnit = (keys %{$TestInfo->{Units}})[0]; } } elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") @@ -641,7 +587,7 @@ sub DetermineFileType($$) $FileType = "unknown"; } - return ($ErrMessage, $FileType, $DllBaseName, $TestSet); + return ($ErrMessage, $FileType, $DllBaseName, $TestUnit); } sub OnPage1Next($) @@ -686,7 +632,7 @@ sub OnPage1Next($) } close OUTFILE; - my ($ErrMessage, $FileType, $DllBaseName, $TestSet) = $self->DetermineFileType($StagingFile); + my ($ErrMessage, $FileType, $DllBaseName, $TestUnit) = $self->DetermineFileType($StagingFile); if (defined($ErrMessage)) { $self->{ErrField} = "File"; @@ -712,9 +658,9 @@ sub OnPage1Next($) } $self->{TestExecutable} .= "_test.exe"; } - if (defined($TestSet)) + if (defined($TestUnit)) { - $self->{CmdLineArg} = $TestSet; + $self->{CmdLineArg} = $TestUnit; } } else

1 0

Francois Gouget : testbot/build: Rely on Wine' s makefiles and simplify Build.pl.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 603027bebc8d118f767e5cf83eb17246258bf9e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=603027bebc8d118f767e5cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:09:15 2018 +0200 testbot/build: Rely on Wine's makefiles and simplify Build.pl. Assume the dependencies in Wine's makefiles work and let them decide whether to re-run configure, update include files or rebuild some dlls before the test executable, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 185 ++++++--------------------------------------- 1 file changed, 25 insertions(+), 160 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index ce27baa..c72489c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -70,57 +70,34 @@ sub FatalError(@) exit 1; } -sub ApplyPatch($$$) +sub ApplyPatch($) { - my ($PatchFile, $PatchType, $BaseName) = @_; - - my $NeedBuildNative = !1; - my $NeedMakeMakefiles = !1; - my $NeedMakefile = 0; - my $NeedMakeInclude = !1; - my $NeedBuildDeps = !1; - my $NeedImplib = !1; - my $NeedAutoconf = !1; - my $NeedConfigure = !1; + my ($PatchFile) = @_; + + my ($NeedMakeMakefiles, $NeedAutoconf, $HasConfigure, $NeedBuildNative); if (open (FH, "<$PatchFile")) { my $Line; while (defined($Line = <FH>) && - (! $NeedBuildNative || ! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || - ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) + (!$NeedMakeMakefiles || !$NeedAutoconf || !$HasConfigure || + !$NeedBuildNative)) { - if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) - { - $NeedMakefile = 1; - } - elsif ($Line =~ m=^diff.*include/.*\.idl=) - { - $NeedMakeInclude = 1; - } - elsif ($Line =~ m=^diff.*\.spec=) - { - $NeedBuildDeps = 1; - } - elsif ($PatchType eq "dlls" && $Line =~ m=^diff.*$BaseName/Makefile\.in=) - { - $NeedImplib = 1; - } - elsif ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) + if ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) { $NeedAutoconf = 1; } elsif ($Line =~ m=^diff.*configure=) { - $NeedConfigure = 1; + $HasConfigure = 1; } elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || $Line =~ m=diff.*tools/make_makefiles=) { - $NeedMakeMakefiles = $NeedConfigure = 1; + $NeedMakeMakefiles = 1; } elsif ($Line =~ m=^diff.*tools/makedep\.c=) { - $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; + $NeedMakeMakefiles = $NeedBuildNative = 1; } elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) { @@ -138,7 +115,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); + return -1; } if ($NeedMakeMakefiles) @@ -150,41 +127,24 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); + return -1; } } - if ($NeedAutoconf && ! $NeedConfigure) + if ($NeedAutoconf && !$HasConfigure) { InfoMsg "Running autoconf\n"; system("( cd $DataDir/wine && set -x && " . - " autoconf --output configure configure.ac " . + " autoconf " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative); - } - $NeedConfigure = 1; - } - - if ($NeedImplib) - { - if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in")) - { - $NeedImplib = !1; - my $Line; - while (defined($Line = <FH>) && ! $NeedImplib) - { - $NeedImplib = ($Line =~ m/^\s*IMPORTLIB\s*=.*$BaseName/) - } - close FH; + return -1; } } - return ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative); + return $NeedBuildNative; } my $ncpus; @@ -203,9 +163,6 @@ sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . - " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -218,94 +175,9 @@ sub BuildNative() return 1; } -sub BuildTestExecutable($$$$$$$$) +sub BuildTestExecutable($$$) { - my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, $NeedImplib) = @_; - - if ($NeedConfigure) - { - InfoMsg "Reconfigure $Bits-bit crossbuild\n"; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; - return !1; - } - } - - if ($NeedMakeInclude || $NeedConfigure) - { - InfoMsg "Recreating include/Makefile\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus include/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Recreation of include/Makefile failed\n"; - return !1; - } - - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus include " . - ") >> $LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Make in include dir failed\n"; - return !1; - } - } - - if ($NeedImplib || $NeedConfigure) - { - InfoMsg "Rebuilding $BaseName import lib\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $PatchType/$BaseName/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; - } - else - { - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - InfoMsg "Make of import library failed\n"; - } - } - } - - if ($NeedMakefile || $NeedConfigure) - { - InfoMsg "Recreating tests/Makefile\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $PatchType/$BaseName/tests/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Recreation of tests/Makefile failed\n"; - return !1; - } - } - - if ($NeedBuildDeps) - { - InfoMsg "Making build dependencies\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus __builddeps__ " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Making build dependencies failed\n"; - return !1; - } - } + my ($BaseName, $PatchType, $Bits) = @_; my $TestsDir = "$PatchType/$BaseName/tests"; my $TestExecutable = "$TestsDir/$BaseName"; @@ -316,13 +188,13 @@ sub BuildTestExecutable($$$$$$$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Making test executable\n"; + InfoMsg "Building the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus -C $TestsDir " . + " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { - LogMsg "Make failed\n"; + LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; return !1; } if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") @@ -408,9 +280,8 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative) = ApplyPatch($PatchFile, $PatchType, $BaseName); -if ($NeedMakefile < 0) +my $NeedBuildNative = ApplyPatch($PatchFile); +if ($NeedBuildNative < 0) { exit(1); } @@ -426,17 +297,11 @@ if ($NeedBuildNative) } } -if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, - $NeedConfigure, 0 < $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, - $NeedImplib)) +if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) { exit(1); } -if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64, - $NeedConfigure, 0 < $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, - $NeedImplib)) +if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64)) { exit(1); }

1 0

Francois Gouget : testbot/build: Rely on Wine' s makefiles and simplify Reconfig.pl.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 34dd35b033170686a264fb86567e98f934bf0854 URL: https://source.winehq.org/git/tools.git/?a=commit;h=34dd35b033170686a264fb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:10:01 2018 +0200 testbot/build: Rely on Wine's makefiles and simplify Reconfig.pl. The 'make depend' step is not needed. Also add a comment to explain why we rebuild from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 7b0755a..322638e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -144,10 +144,11 @@ sub BuildTestLauncher() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -166,10 +167,11 @@ sub BuildCross($) my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); + + # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0)

1 0

Alexandre Julliard : Wine release 3.9
by Alexandre Julliard 25 May '18

25 May '18

Module: website Branch: master Commit: 035f93ad5be5573b61a4e91ac600c30baeeaa687 URL: https://source.winehq.org/git/website.git/?a=commit;h=035f93ad5be5573b61a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:41:29 2018 +0200 Wine release 3.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018052501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018052501.xml b/news/en/2018052501.xml new file mode 100644 index 0000000..463dd1d --- /dev/null +++ b/news/en/2018052501.xml @@ -0,0 +1,17 @@ +<news> +<date>May 25, 2018</date> +<title>Wine 3.9 Released</title> +<body> + The Wine development release 3.9 is now available. + <a href="{$root}/announce/3.9">What's new</a> in this release: +<ul> + <li>OpenGL core contexts enabled by default in Direct 3D.</li> + <li>Beginnings of Direct 3D 12 implementation using vkd3d.</li> + <li>More support for the Task Scheduler.</li> + <li>Some more Task Dialog support.</li> + <li>Better arrow support in GdiPlus.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.9 : Alexandre Julliard : Release 3.9
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: refs/tags/wine-3.9 Tag: 0bcc25fc88131d726401979c68d64567157d4c55 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0bcc25fc88131d726401979c68d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:38:57 2018 +0200 Release 3.9

1 0

Jacek Caban : ole32: Use queried interface destination context for marshaling RemQueryInterface result.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: df6b7324dfee383643b5913edb5bc8d544737292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6b7324dfee383643b5913e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:29 2018 +0200 ole32: Use queried interface destination context for marshaling RemQueryInterface result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 12 +++++++++--- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 451a58a..5f604d4 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -73,7 +73,8 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s struct ifstub *stub; HRESULT hr; - TRACE("oid=%s, stubbuffer=%p, iid=%s\n", wine_dbgstr_longlong(m->oid), sb, debugstr_guid(iid)); + TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%x\n", wine_dbgstr_longlong(m->oid), sb, + debugstr_guid(iid), dest_context); stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); if (!stub) return NULL; @@ -704,18 +705,23 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, USHORT successful_qis = 0; APARTMENT *apt; struct stub_manager *stubmgr; + struct ifstub *ifstub; + DWORD dest_context; + void *dest_context_data; TRACE("(%p)->(%s, %d, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); - hr = ipid_to_stub_manager(ripid, &apt, &stubmgr); + hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; + IRpcChannelBuffer_GetDestCtx(ifstub->chan, &dest_context, &dest_context_data); + *ppQIResults = CoTaskMemAlloc(sizeof(REMQIRESULT) * cIids); for (i = 0; i < cIids; i++) { HRESULT hrobj = marshal_object(apt, &(*ppQIResults)[i].std, &iids[i], - stubmgr->object, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); + stubmgr->object, dest_context, dest_context_data, MSHLFLAGS_NORMAL); if (hrobj == S_OK) successful_qis++; (*ppQIResults)[i].hResult = hrobj; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 41d8717..e71cbdb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -449,7 +449,6 @@ static HRESULT WINAPI RpcStubBuffer_Invoke(IRpcStubBuffer *iface, RPCOLEMESSAGE hr = IRpcChannelBuffer_GetDestCtx(_pRpcChannelBuffer, &dest_context, &dest_context_data); ok(hr == S_OK, "GetDestCtx failed: %08x\n", hr); -todo_wine ok(dest_context == MSHCTX_INPROC, "desc_context = %x\n", dest_context); ok(!dest_context_data, "desc_context_data = %p\n", dest_context_data); @@ -1295,9 +1294,7 @@ static void test_marshal_channel_buffer(void) SET_EXPECT(Invoke); SET_EXPECT(GetWindow); hr = IOleWindow_GetWindow(ole_window, &hwnd); -todo_wine ok(hr == S_OK, "GetWindow failed: %08x\n", hr); -todo_wine ok(hwnd == (HWND)0xdeadbeef, "hwnd = %p\n", hwnd); CHECK_CALLED(Invoke); CHECK_CALLED(GetWindow);

1 0