Rebase against d6d0d96402b9c187877f11da173f8fbbf62ba072.

This commit is contained in:
Sebastian Lackner
2016-08-13 05:24:18 +02:00
parent c46fab6261
commit 436e1adc84
4 changed files with 6 additions and 63 deletions

View File

@@ -1,26 +0,0 @@
From 173e27263954c449c3657701e9d7489c603f1306 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:37 +0200
Subject: shell32/tests: Avoid misleading indentation warnings.
---
dlls/shell32/tests/shellole.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
index e8cf744..99f0ccb 100644
--- a/dlls/shell32/tests/shellole.c
+++ b/dlls/shell32/tests/shellole.c
@@ -872,7 +872,9 @@ static void test_SHCreateSessionKey(void)
}
if (0) /* crashes on native */
+{
hr = pSHCreateSessionKey(KEY_READ, NULL);
+}
hkey = (HKEY)0xdeadbeef;
hr = pSHCreateSessionKey(0, &hkey);
--
2.9.0

View File

@@ -1,26 +0,0 @@
From f590ced17854c6830cd15b63e757ef5798095cb1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:52 +0200
Subject: shlwapi/tests: Avoid misleading indentation warnings.
---
dlls/shlwapi/tests/ordinal.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 74cad7d..b26fd4f 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -3225,7 +3225,9 @@ static void test_IUnknown_GetClassID(void)
HRESULT hr;
if (0) /* crashes on native systems */
+{
hr = pIUnknown_GetClassID(NULL, NULL);
+}
memset(&clsid, 0xcc, sizeof(clsid));
memset(&clsid3, 0xcc, sizeof(clsid3));
--
2.9.0