Removed various patches (accepted upstream).

This commit is contained in:
Sebastian Lackner
2015-05-05 20:59:51 +02:00
parent ab87b19a87
commit 52e3343bbb
16 changed files with 59 additions and 431 deletions

View File

@@ -1,26 +0,0 @@
From edbc92c9930ae5778ddee9426218f1b4c7ee10bb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 17 Apr 2015 06:49:55 +0200
Subject: wbemprox/tests: Actually test the return value of
IEnumWbemClassObject_Next.
---
dlls/wbemprox/tests/query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 7e031d2..88e8fb4 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -382,7 +382,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services )
return;
}
- IEnumWbemClassObject_Next( result, 10000, 1, &service, &count );
+ hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count );
ok( hr == S_OK, "got %08x\n", hr );
type = 0xdeadbeef;
--
2.3.5

View File

@@ -1,58 +0,0 @@
From 2534d6561452c812cf539c2ca81c464bee83521d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 17 Apr 2015 07:58:06 +0200
Subject: wbemprox/tests: Fix memory leak when tests are skipped.
---
dlls/wbemprox/tests/query.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 88e8fb4..02774db 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -158,7 +158,7 @@ static void test_Win32_Service( IWbemServices *services )
if (hr != S_OK)
{
win_skip( "Win32_Service not available\n" );
- return;
+ goto out;
}
type = 0xdeadbeef;
VariantInit( &state );
@@ -232,6 +232,7 @@ static void test_Win32_Service( IWbemServices *services )
ok( hr == S_OK, "got %08x\n", hr );
if (service) IWbemClassObject_Release( service );
+out:
SysFreeString( empty );
SysFreeString( class );
}
@@ -372,14 +373,14 @@ static void test_Win32_ComputerSystem( IWbemServices *services )
if (!compname[0] || !username[0])
{
skip( "Failed to get user or computer name\n" );
- return;
+ goto out;
}
hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
if (hr != S_OK)
{
win_skip( "Win32_ComputerSystem not available\n" );
- return;
+ goto out;
}
hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count );
@@ -405,6 +406,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services )
IWbemClassObject_Release( service );
IEnumWbemClassObject_Release( result );
+out:
SysFreeString( query );
SysFreeString( wql );
}
--
2.3.5