- Wine-Devel - list.winehq.org

[PATCH] d3dx9/tests: Remove the fallback NAN definition.
by Zebediah Figura March 5, 2021

March 5, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dx9_36/tests/mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 42deb32b934..e981f3623ce 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -29,16 +29,6 @@ #include "rmxftmpl.h" #include "rmxfguid.h" -#ifndef NAN -/* From wine/port.h */ -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace -- 2.20.1

2 1

[PATCH 1/9] dwrite/tests: Test IDWriteTextFormat with nonexistent font
by Giovanni Mascellani March 5, 2021

March 5, 2021

From: Lucian Poston <lucianposton(a)pm.me> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index cc4079faa14..35d54ae41f0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3356,6 +3356,43 @@ todo_wine ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + /* nonexistent font */ + hr = IDWriteFactory_CreateTextFormat(factory, L"Blah!", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, L"en-us", &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"A", 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 4, "got %u\n", count); + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width); + ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n", + metrics.widthIncludingTrailingWhitespace, width); +todo_wine + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); +todo_wine + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } -- 2.30.1

2 11

[tools] testbot/LogUtils: Fix handling of subtest lines.
by Francois Gouget March 5, 2021

March 5, 2021

Add support for garbled subtest lines. Let _CheckUnit() issue an error if they are misplaced. This also ensure the error message contains all the necessary information, such as the module name. Take the subtest line into account even if it looks like it is misplaced: the _CheckUnit() error is sufficient to indicate something is wrong. Tweak the _CheckUnit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 19 +++++++------------ testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4e9b733c0..ed5dd74d4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -381,7 +381,7 @@ sub _CheckUnit($$$$) # Only report the first misplaced message to avoid duplicate errors. if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type line for $Unit", $Cur); $Cur->{IsBroken} = 1; } } @@ -557,19 +557,14 @@ sub ParseWineTestReport($$$) $Cur->{GroupLineNo} = $LineNo; $Cur->{Group} = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); - if ($Cur->{Units}->{$Unit}) - { - $Cur->{Units}->{$SubUnit} = 1; - $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); - } - else - { - _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); - } - $LogInfo->{IsWineTest} = 1; + _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 27ca12f1d..eefbbc0c4 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -80,7 +80,7 @@ n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures n 0 amstream:amstream has unaccounted for failure messages n 0 amstream:amstream returned success despite having failures -n 0 atl:registrar contains a misplaced test summary message for alien +n 0 atl:registrar contains a misplaced test summary line for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages n 0 cmd.exe:batch has unaccounted for todo messages @@ -90,13 +90,13 @@ n 0 comctl32:dpa returned a non-zero exit code despite reporting no failures n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) -n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:monthcal contains a misplaced todo line for security n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) n 0 comctl32:treeview returned success despite having failures -n 0 comctl32:updown contains a misplaced failure message for vorlon -n 0 shadow has a misplaced black subtest line +n 0 comctl32:updown contains a misplaced failure line for vorlon +n 0 comdlg32:filedlg contains a misplaced black subtest line for shadow n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS ----- -- 2.20.1

1 0

[tools] winetest/dissect: Fix handling of subtest lines.
by Francois Gouget March 5, 2021

March 5, 2021

Add support for garbled subtest lines. Link to the corresponding source line. Call add_test_line() so they show up in the HTML-ized report. Let check_unit() issue an error if they are misplaced. Tweak the check_unit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 7f4f3271d..797c204b3 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -480,7 +480,7 @@ sub check_unit($$) my ($l_unit, $l_type) = @_; if (!$units{$l_unit} and !$broken) { - add_test_line("end", "Misplaced $l_type message"); + add_test_line("end", "Misplaced $l_type line"); $extra_failures++; $broken = 1; } @@ -609,19 +609,17 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) { - my ($l_unit, $l_subunit) = ($1, $2); - if ($units{$l_unit}) - { - $units{$l_subunit} = 1; - $units_re = join("|", keys %units); - } - else - { - add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); - $extra_failures++; - } + my ($pollution, $l_unit, $l_num, $l_text, $l_subunit) = ($1, $2, $3, $4, $5); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + check_unit($l_unit, "subtest"); + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or -- 2.20.1

1 0

[tools] testbot/LogUtils: Simplify matching the WineRun* errors.
by Francois Gouget March 5, 2021

March 5, 2021

They now start with the script name and the ':error:' prefix. Remove the 'Could not create' regexp since it actually corresponds to a VM-side 'Task:' error which is already taken into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bdba8dad0..4e9b733c0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,11 +106,8 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The main testbot.log errors - $Line =~ /^An error occurred while / or - $Line =~ /^Could not create / or - $Line =~ /^Giving up after \d+ run$s$$/ or - $Line =~ /^The (?:build|task) timed out$/) + # The testbot.log errors + $Line =~ /:error: /) { return "error"; } -- 2.20.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud March 5, 2021

March 5, 2021

Add aclui translation and fix typo in winecfg Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7f33637cf23..9ada91f8700 100644 --- a/po/nl.po +++ b/po/nl.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Beveiliging" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Gebruikersnaam:" +msgstr "&Groeps- of gebruikersnamen:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geel" +msgstr "Toestaan" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Weigeren" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Toegang geweigerd" +msgstr "Rechten voor %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -16169,7 +16163,7 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " -"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"is gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " "programma de standaardinstellingen of programmaspecifieke instellingen " "gebruikt worden." -- 2.30.1

1 0

[PATCH 3/3] wbemprox: Make system restore naming consistent with the other method implementations.
by Hans Leidekker March 5, 2021

March 5, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 ++- dlls/wbemprox/sysrestore.c | 10 +++++----- dlls/wbemprox/wbemprox_private.h | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddec2a0daf8..dbf9173d21d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -962,7 +962,8 @@ static const struct record_stdregprov data_stdregprov[] = static const struct record_sysrestore data_sysrestore[] = { - { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } + { NULL, NULL, 0, 0, 0, sysrestore_create, sysrestore_disable, sysrestore_enable, sysrestore_get_last_status, + sysrestore_restore } }; static UINT16 systemenclosure_chassistypes[] = diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index 80950c675bd..f84d9625ae4 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -31,19 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_restore_point( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_create( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; } -HRESULT disable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_disable( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; } -HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_enable( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { VARIANT drive, retval; IWbemClassObject *sig, *out_params = NULL; @@ -93,13 +93,13 @@ HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } -HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_get_last_status( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return E_NOTIMPL; } -HRESULT restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 5ccbed18023..fec67f47e1b 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -258,11 +258,11 @@ HRESULT service_start_service(IWbemClassObject *obj, IWbemContext *context, IWbe HRESULT service_stop_service(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT create_restore_point(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT disable_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT enable_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT get_last_restore_status(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_create(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_disable(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_enable(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_get_last_status(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) { -- 2.30.1

1 0

[PATCH 2/3] wbemprox: Trace the context parameter in method implementations.
by Hans Leidekker March 5, 2021

March 5, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/process.c | 2 +- dlls/wbemprox/reg.c | 14 +++++++------- dlls/wbemprox/security.c | 2 +- dlls/wbemprox/service.c | 8 ++++---- dlls/wbemprox/sysrestore.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index a9057daa384..2f11530da2f 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -68,7 +68,7 @@ HRESULT process_get_owner( IWbemClassObject *obj, IWbemContext *context, IWbemCl IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = create_signature( L"Win32_Process", L"GetOwner", PARAM_OUT, &sig ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index e5a45b1b600..5cdd857a48f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -122,7 +122,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -221,7 +221,7 @@ HRESULT reg_enum_key( IWbemClassObject *obj, IWbemContext *context, IWbemClassOb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -332,7 +332,7 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemContext *context, IWbemClas IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -423,7 +423,7 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -505,7 +505,7 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -588,7 +588,7 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -658,7 +658,7 @@ HRESULT reg_delete_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index 82e45060714..eee8b09369e 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -138,7 +138,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemContext *context, IWbemClas SECURITY_DESCRIPTOR *sd; DWORD sd_size; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = create_signature( L"__SystemSecurity", L"GetSD", PARAM_OUT, &sig ); diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 4c909713dc3..1ee0c9903ec 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -82,7 +82,7 @@ HRESULT service_pause_service( IWbemClassObject *obj, IWbemContext *context, IWb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -127,7 +127,7 @@ HRESULT service_resume_service( IWbemClassObject *obj, IWbemContext *context, IW IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -196,7 +196,7 @@ HRESULT service_start_service( IWbemClassObject *obj, IWbemContext *context, IWb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -241,7 +241,7 @@ HRESULT service_stop_service( IWbemClassObject *obj, IWbemContext *context, IWbe IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index 8092dd7227e..80950c675bd 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -49,7 +49,7 @@ HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); if (hr != S_OK) return hr; -- 2.30.1

1 0

[PATCH 1/3] wbemprox: Fix memory leaks on error paths.
by Hans Leidekker March 5, 2021

March 5, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/reg.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index edcdb1902f1..e5a45b1b600 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -430,7 +430,11 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"GetStringValue", PARAM_OUT, &sig ); if (hr != S_OK) @@ -508,9 +512,18 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = IWbemClassObject_Get( in, L"sValue", 0, &value, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"SetStringValue", PARAM_OUT, &sig ); if (hr != S_OK) @@ -582,9 +595,18 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = IWbemClassObject_Get( in, L"uValue", 0, &value, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"SetDWORDValue", PARAM_OUT, &sig ); if (hr != S_OK) -- 2.30.1

1 0

[PATCH] wbemprox/tests: Use defined name for error code.
by Nikolay Sivov March 5, 2021

March 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/tests/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index da985de01fa..5ad73e7a8ec 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -109,8 +109,8 @@ static void test_IWbemLocator(void) { L"\\\\.", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { L"\\ROOT", WBEM_E_INVALID_NAMESPACE }, - { L"\\\\ROOT", 0x800706ba, TRUE }, - { L"\\\\.ROOT", 0x800706ba, TRUE }, + { L"\\\\ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, + { L"\\\\.ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, { L"\\\\.\\NONE", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\ROOT", S_OK }, { L"\\\\\\.\\ROOT", WBEM_E_INVALID_PARAMETER }, -- 2.30.1

2 1