[reactos] 01/01: [UXTHEME_WINETEST] Sync with Wine Staging 4.0. CORE-15682

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df86f782fe1604564c24…

commit 4df86f782fe1604564c24d264ff8569d58976b55
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Mon Feb 4 13:07:25 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Mon Feb 4 13:07:25 2019 +0100

    [UXTHEME_WINETEST] Sync with Wine Staging 4.0. CORE-15682
---
 modules/rostests/winetests/uxtheme/system.c | 50 +++++++++--------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/modules/rostests/winetests/uxtheme/system.c
b/modules/rostests/winetests/uxtheme/system.c
index d52927935d..1cfafb30e2 100644
--- a/modules/rostests/winetests/uxtheme/system.c
+++ b/modules/rostests/winetests/uxtheme/system.c
@@ -77,7 +77,6 @@ static void test_GetWindowTheme(void)
 {
     HTHEME    hTheme;
     HWND      hWnd;
-    BOOL    bDestroyed;
 
     SetLastError(0xdeadbeef);
     hTheme = GetWindowTheme(NULL);
@@ -89,7 +88,7 @@ static void test_GetWindowTheme(void)
 
     /* Only do the bare minimum to get a valid hwnd */
     hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0,
0, 0, NULL);
-    if (!hWnd) return;
+    ok(hWnd != NULL, "Failed to create a test window.\n");
 
     SetLastError(0xdeadbeef);
     hTheme = GetWindowTheme(hWnd);
@@ -98,17 +97,13 @@ static void test_GetWindowTheme(void)
         "Expected 0xdeadbeef, got 0x%08x\n",
         GetLastError());
 
-    bDestroyed = DestroyWindow(hWnd);
-    if (!bDestroyed)
-        trace("Window %p couldn't be destroyed : 0x%08x\n",
-            hWnd, GetLastError());
+    DestroyWindow(hWnd);
 }
 
 static void test_SetWindowTheme(void)
 {
     HRESULT hRes;
     HWND    hWnd;
-    BOOL    bDestroyed;
 
     hRes = SetWindowTheme(NULL, NULL, NULL);
 todo_wine
@@ -116,15 +111,12 @@ todo_wine
 
     /* Only do the bare minimum to get a valid hwnd */
     hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0,
0, 0, NULL);
-    if (!hWnd) return;
+    ok(hWnd != NULL, "Failed to create a test window.\n");
 
     hRes = SetWindowTheme(hWnd, NULL, NULL);
     ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
 
-    bDestroyed = DestroyWindow(hWnd);
-    if (!bDestroyed)
-        trace("Window %p couldn't be destroyed : 0x%08x\n",
-            hWnd, GetLastError());
+    DestroyWindow(hWnd);
 }
 
 static void test_OpenThemeData(void)
@@ -133,7 +125,6 @@ static void test_OpenThemeData(void)
     HWND      hWnd;
     BOOL      bThemeActive;
     HRESULT   hRes;
-    BOOL      bDestroyed;
     BOOL      bTPDefined;
 
     WCHAR szInvalidClassList[] =
{'D','E','A','D','B','E','E','F',
0 };
@@ -278,10 +269,7 @@ static void test_OpenThemeData(void)
             GetLastError());
     }
 
-    bDestroyed = DestroyWindow(hWnd);
-    if (!bDestroyed)
-        trace("Window %p couldn't be destroyed : 0x%08x\n",
-            hWnd, GetLastError());
+    DestroyWindow(hWnd);
 }
 
 static void test_OpenThemeDataEx(void)
@@ -289,7 +277,6 @@ static void test_OpenThemeDataEx(void)
     HTHEME    hTheme;
     HWND      hWnd;
     BOOL      bThemeActive;
-    BOOL      bDestroyed;
 
     WCHAR szInvalidClassList[] =
{'D','E','A','D','B','E','E','F',
0 };
     WCHAR szButtonClassList[]  =
{'B','u','t','t','o','n', 0 };
@@ -423,10 +410,7 @@ static void test_OpenThemeDataEx(void)
             "Expected ERROR_SUCCESS, got 0x%08x\n",
             GetLastError());
 
-    bDestroyed = DestroyWindow(hWnd);
-    if (!bDestroyed)
-        trace("Window %p couldn't be destroyed : 0x%08x\n",
-            hWnd, GetLastError());
+    DestroyWindow(hWnd);
 }
 
 static void test_GetCurrentThemeName(void)
@@ -463,9 +447,8 @@ static void test_GetCurrentThemeName(void)
         ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got
0x%08x\n", hRes);
 
     /* The same is true if the number of characters is too small for Color and/or Size
*/
-    hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR),
-                                currentColor, 2,
-                                currentSize,  sizeof(currentSize)  / sizeof(WCHAR));
+    hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, 2,
+                               currentSize,  ARRAY_SIZE(currentSize));
     if (bThemeActive)
         todo_wine
             ok(hRes == E_NOT_SUFFICIENT_BUFFER ||
@@ -475,7 +458,7 @@ static void test_GetCurrentThemeName(void)
         ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got
0x%08x\n", hRes);
 
     /* Given number of characters is correct */
-    hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL,
0, NULL, 0);
+    hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), NULL, 0, NULL,
0);
     if (bThemeActive)
         ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
     else
@@ -491,26 +474,23 @@ static void test_GetCurrentThemeName(void)
             "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes);
  
     /* The too large case is only for the theme name, not for color name or size name */
-    hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR),
-                                currentColor, sizeof(currentTheme),
-                                currentSize,  sizeof(currentSize)  / sizeof(WCHAR));
+    hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor,
+                               sizeof(currentTheme), currentSize, 
ARRAY_SIZE(currentSize));
     if (bThemeActive)
         ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
     else
         ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got
0x%08x\n", hRes);
 
-    hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR),
-                                currentColor, sizeof(currentTheme) / sizeof(WCHAR),
-                                currentSize,  sizeof(currentSize));
+    hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor,
+                               ARRAY_SIZE(currentTheme), currentSize, 
sizeof(currentSize));
     if (bThemeActive)
         ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
     else
         ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got
0x%08x\n", hRes);
 
     /* Correct call */
-    hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR),
-                                currentColor, sizeof(currentColor) / sizeof(WCHAR),
-                                currentSize,  sizeof(currentSize)  / sizeof(WCHAR));
+    hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor,
+                               ARRAY_SIZE(currentColor), currentSize, 
ARRAY_SIZE(currentSize));
     if (bThemeActive)
         ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
     else