wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Francois Gouget : testbot: Check the current snapshot in LibvirtTool checkidle.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 98ec6ba6d7aa219201a2defda745af4febfbeef0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=98ec6ba6d7aa219201a2def… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:54:29 2018 +0100 testbot: Check the current snapshot in LibvirtTool checkidle. If the snapshot does not match then the current VM instance is not actually using the hypervisor domain so mark it off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 670c553..12eaa66 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -320,9 +320,12 @@ sub CheckIdle() my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); FatalError("$ErrMessage\n") if (defined $ErrMessage); - return PowerOff() if ($SnapshotName ne $VM->IdleSnapshot); - return ChangeStatus("dirty", "idle", "done"); + # If the snapshot does not match then the virtual machine may be used by + # another VM instance. So don't touch it. All that counts is that this + # VM instance is not running. + my $NewStatus = ($SnapshotName eq $VM->IdleSnapshot) ? "idle" : "off"; + return ChangeStatus("dirty", $NewStatus, "done"); } sub Revert() diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d893e49..f098639 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -433,9 +433,9 @@ sub _RunVMTool($$$) =item C<RunCheckIdle()> -If the virtual machine state matches that of this VM instance, sets its status -to idle. If not the VM is simply marked as off. While this is happening the -VM status is set to dirty so the job scheduler does not try to use it. +If the hypervisor domain state matches that of this VM instance, sets its +status to idle. If not the VM is simply marked as off. While this is happening +the VM status is set to dirty so the job scheduler does not try to use it. This operation can take a long time so it is performed in a separate process.

1 0

Francois Gouget : testbot/Janitor: Remove a spurious leading 0 in a log message.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 00112a1ed9e0a692b04fd0fa59b673b8a9212e36 URL: https://source.winehq.org/git/tools.git/?a=commit;h=00112a1ed9e0a692b04fd0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:40:30 2018 +0100 testbot/Janitor: Remove a spurious leading 0 in a log message. The leading 0 is a convention only used to communicate with the Engine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 382408d..d8a9650 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -258,7 +258,7 @@ if (opendir(my $dh, "$DataDir/staging")) } else { - LogMsg "0Unable to open '$DataDir/staging': $!"; + LogMsg "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups

1 0

Zebediah Figura : winetest/dissect: Stop complaining if a test file doesn' t match the current test.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 53356b3d3fa5d2cc648e50a8abd7826d1ea1cc4c URL: https://source.winehq.org/git/tools.git/?a=commit;h=53356b3d3fa5d2cc648e50a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 09:56:12 2018 -0600 winetest/dissect: Stop complaining if a test file doesn't match the current test. Now that we have support for custom dlls in e.g. dlls/msi/tests/custom.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9635f0a..7416317 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,6 @@ while ($line = <IN>) { add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or @@ -635,7 +634,6 @@ while ($line = <IN>) { add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or

1 0

Józef Kucia : wined3d: Try harder to reacquire context.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 7b62a970e9ad3b4179394cf54f0232475fe2388a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b62a970e9ad3b4179394cf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:37 2018 +0100 wined3d: Try harder to reacquire context. 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/wined3d/context.c | 55 +++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index df41689..32126b7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4170,6 +4170,26 @@ static void context_setup_target(struct wined3d_context *context, context_set_render_offscreen(context, render_offscreen); } +static void context_activate(struct wined3d_context *context, + struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + context_enter(context); + context_update_window(context); + context_setup_target(context, texture, sub_resource_idx); + if (!context->valid) + return; + + if (context != context_get_current()) + { + if (!context_set_current(context)) + ERR("Failed to activate the new context.\n"); + } + else if (context->needs_set) + { + context_set_gl_context(context); + } +} + struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { @@ -4228,21 +4248,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, context = swapchain_get_context(device->swapchains[0]); } - context_enter(context); - context_update_window(context); - context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) - return context; - - if (context != current_context) - { - if (!context_set_current(context)) - ERR("Failed to activate the new context.\n"); - } - else if (context->needs_set) - { - context_set_gl_context(context); - } + context_activate(context, texture, sub_resource_idx); return context; } @@ -4250,16 +4256,23 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_context *context_reacquire(const struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_context *current_context; + struct wined3d_context *acquired_context; + + wined3d_from_cs(device->cs); if (!context || context->tid != GetCurrentThreadId()) return NULL; - current_context = context_acquire(device, context->current_rt.texture, - context->current_rt.sub_resource_idx); - if (current_context != context) - ERR("Acquired context %p instead of %p.\n", current_context, context); - return current_context; + if (context->current_rt.texture) + { + context_activate(context, context->current_rt.texture, context->current_rt.sub_resource_idx); + return context; + } + + acquired_context = context_acquire(device, NULL, 0); + if (acquired_context != context) + ERR("Acquired context %p instead of %p.\n", acquired_context, context); + return acquired_context; } void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state,

1 0

Józef Kucia : wined3d: Do not allocate framebuffer state structures dynamically.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: d8c0bc82458b9e8b55fc33bba0da597342c15479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c0bc82458b9e8b55fc33bb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:36 2018 +0100 wined3d: Do not allocate framebuffer state structures dynamically. 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/wined3d/context.c | 76 ++++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 30 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c0bc82458b9e8b55fc…

1 0

Józef Kucia : d3d9/tests: Use ARRAY_SIZE() macro.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 3f9857aecb5c494693a6dff6630f54524462dd0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9857aecb5c494693a6dff6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:35 2018 +0100 d3d9/tests: Use ARRAY_SIZE() macro. 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/d3d9/tests/d3d9ex.c | 10 +-- dlls/d3d9/tests/device.c | 4 +- dlls/d3d9/tests/stateblock.c | 16 +++-- dlls/d3d9/tests/visual.c | 149 +++++++++++++++++++++---------------------- 4 files changed, 89 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f9857aecb5c494693a6…

1 0

Józef Kucia : d3d9: Make warning message in d3d9_device_StretchRect() more accurate.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 1c5c550713f5081532475792930276d2469a9a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5c550713f5081532475792… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:34 2018 +0100 d3d9: Make warning message in d3d9_device_StretchRect() more accurate. 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/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e8798a7..aac0961 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1625,7 +1625,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { - WARN("Destination is a texture.\n"); + WARN("Destination is a regular texture.\n"); goto done; }

1 0

Józef Kucia : wined3d: Terminate long debug strings with ellipsis.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: f234ce16be08ad7da3cf27cf4784f4b743a7924c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f234ce16be08ad7da3cf27cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:33 2018 +0100 wined3d: Terminate long debug strings with ellipsis. 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/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a9db5e0..a54e18e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4162,7 +4162,7 @@ static void init_debug_buffer(struct debug_buffer *buffer, const char *default_s buffer->size = ARRAY_SIZE(buffer->str); } -static BOOL debug_append(struct debug_buffer *buffer, const char *str, const char *separator) +static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) { int size; @@ -4172,12 +4172,12 @@ static BOOL debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - return FALSE; + strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + return; } buffer->ptr += size; buffer->size -= size; - return TRUE; } const char *wined3d_debug_resource_access(DWORD access)

1 0

Sebastian Lackner : d3d10_1: Add missing forwards to d3d10.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: c6251b0deb659445c5f03f5a4a7e2906c49726b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6251b0deb659445c5f03f5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 27 04:21:25 2018 +0000 d3d10_1: Add missing forwards to d3d10. Spotted by Jarkko Korpi. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1.spec | 24 ++++++++++++------------ tools/make_specfiles | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 18eb3ac..10edc3f 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -1,24 +1,24 @@ @ stub RevertToOldImplementation -@ stub D3D10CompileEffectFromMemory -@ stub D3D10CompileShader -@ stub D3D10CreateBlob +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory +@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) d3d10.D3D10CompileShader +@ stdcall D3D10CreateBlob(long ptr) d3d10.D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader -@ stub D3D10GetGeometryShaderProfile -@ stub D3D10GetInputAndOutputSignatureBlob -@ stub D3D10GetInputSignatureBlob -@ stub D3D10GetOutputSignatureBlob -@ stub D3D10GetPixelShaderProfile -@ stub D3D10GetShaderDebugInfo +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) d3d10.D3D10DisassembleShader +@ stdcall D3D10GetGeometryShaderProfile(ptr) d3d10.D3D10GetGeometryShaderProfile +@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputAndOutputSignatureBlob +@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputSignatureBlob +@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetOutputSignatureBlob +@ stdcall D3D10GetPixelShaderProfile(ptr) d3d10.D3D10GetPixelShaderProfile +@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3d10.D3D10GetShaderDebugInfo @ stub D3D10GetVersion -@ stub D3D10GetVertexShaderProfile +@ stdcall D3D10GetVertexShaderProfile(ptr) d3d10.D3D10GetVertexShaderProfile @ stub D3D10PreprocessShader -@ stub D3D10ReflectShader +@ stdcall D3D10ReflectShader(ptr long ptr) d3d10.D3D10ReflectShader @ stub D3D10RegisterLayers @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) d3d10.D3D10StateBlockMaskDifference @ stdcall D3D10StateBlockMaskDisableAll(ptr) d3d10.D3D10StateBlockMaskDisableAll diff --git a/tools/make_specfiles b/tools/make_specfiles index 6b59b32..1e8a894 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -75,6 +75,10 @@ my @dll_groups = "msvcp120_app", ], [ + "d3d10", + "d3d10_1", + ], + [ "d3dx10_43", "d3dx10_42", "d3dx10_41",

1 0

Jacek Caban : mshtml: Merge htmltablecell.c into htmltable.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: eb1494cec8952dd2d9bd1081170f9a397a1e8604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1494cec8952dd2d9bd1081… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:38 2018 +0100 mshtml: Merge htmltablecell.c into htmltable.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 484 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablecell.c | 515 -------------------------------------------- 3 files changed, 483 insertions(+), 517 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb1494cec8952dd2d9bd…

1 0

← Newer
1
2
3
4
5
6
7
8
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018