February 2022 - Wine-devel - list.winehq.org

[tools 1/3] testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name.
by Francois Gouget 10 Feb '22

10 Feb '22

One could certainly reorder the elements of the snapshot name so '-off' is the last part but it's not always natural. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For now this is just for the TestBot administrator convenience but a later patch will make the snapshot name parsing more modular and the flags (including -off) will be position independent. So ShutDown() will be ready when then. --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 681223f11c..f14d54cd3b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -284,7 +284,7 @@ sub ShutDown() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); - if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off\b/ or !$Domain->IsPoweredOn()) { return 1; -- 2.30.2

1 2

[PATCH 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura 10 Feb '22

10 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

2 4

[PATCH 8/8] msvcp60: Remove basic_istream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 944 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 144 +++--- 2 files changed, 369 insertions(+), 719 deletions(-)

1 0

[PATCH 7/8] msvcp60: Remove basic_iostream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 92 +++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 12 ++--- 2 files changed, 37 insertions(+), 67 deletions(-)

1 0

[PATCH 6/8] msvcp60: Remove basic_ofstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 5/8] msvcp60: Remove basic_ifstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 4/8] msvcp60: Remove basic_fstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 134 +++++++++++++------------------------- dlls/msvcp60/msvcp60.spec | 32 ++++----- 2 files changed, 61 insertions(+), 105 deletions(-)

1 0

[PATCH 3/8] msvcp60: Remove basic_ostringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 2/8] msvcp60: Remove basic_istringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 1/8] msvcp60: Remove basic_stringstream<wchar> code.
by Piotr Caban 10 Feb '22

10 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- basic_stringstream<wchar> is not exported in msvcp60. There are already tons of differences between msvcp60 ios.c and msvcp90 so there's no reason to keep the files as similar as possible. dlls/msvcp60/ios.c | 142 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++--- 2 files changed, 52 insertions(+), 110 deletions(-)

1 0