Saulius Krasuckas : mscms: Move repetitive code to helper macros.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Dec 13 12:24:54 CST 2005


Module: wine
Branch: refs/heads/master
Commit: 2302d2b470d91b408ec51be5feeef44773060825
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2302d2b470d91b408ec51be5feeef44773060825

Author: Saulius Krasuckas <saulius2 at ar.fi.lt>
Date:   Tue Dec 13 18:12:34 2005 +0100

mscms: Move repetitive code to helper macros.

---

 dlls/mscms/tests/profile.c |  106 +++++++++++++++++---------------------------
 1 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 5b0d86f..223dbc1 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -439,46 +439,35 @@ static void test_GetCountColorProfileEle
     }
 }
 
+#define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK)        \
+do {                                                                            \
+    size = dwSz;                                                                \
+    SetLastError(0);                                                            \
+    ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\
+    GLE = GetLastError();                                                       \
+    ok( !ret && GLE_OK,                                                         \
+        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );   \
+} while (0)
+
 static void test_GetStandardColorSpaceProfileA(void)
 {
     BOOL ret;
-    DWORD size, GLE;
+    DWORD size, sizeP, GLE;
     CHAR oldprofile[MAX_PATH];
     CHAR newprofile[MAX_PATH];
 
+    sizeP = sizeof(newprofile);
+
     /* Parameter checks */
 
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, NULL );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
-        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED), 
-        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
-
-    size = 0;
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileA( NULL, 0, NULL, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), 
-        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
-
-    size = sizeof(newprofile);
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && GLE == ERROR_FILE_NOT_FOUND, 
-        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
+    todo_wine 
+    fail_GSCSPA(machine,  0, newprofile, &size, 0,     (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
+    todo_wine 
+    fail_GSCSPA(NULL,     0, newprofile, NULL,  0,     (GLE == ERROR_INVALID_PARAMETER));
+    todo_wine 
+    fail_GSCSPA(NULL,     0, NULL,       &size, 0,     (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND));
+    todo_wine 
+    fail_GSCSPA(NULL,     0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND));
 
     /* Functional checks */
 
@@ -504,46 +493,35 @@ static void test_GetStandardColorSpacePr
     }
 }
 
+#define fail_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK)        \
+do {                                                                            \
+    size = dwSz;                                                                \
+    SetLastError(0);                                                            \
+    ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\
+    GLE = GetLastError();                                                       \
+    ok( !ret && GLE_OK,                                                         \
+        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );   \
+} while (0)
+
 static void test_GetStandardColorSpaceProfileW(void)
 {
     BOOL ret;
-    DWORD size, GLE;
+    DWORD size, sizeP, GLE;
     WCHAR oldprofile[MAX_PATH];
     WCHAR newprofile[MAX_PATH];
 
+    sizeP = sizeof(newprofile);
+
     /* Parameter checks */
 
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, NULL );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
-        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileW( machineW, 0, newprofile, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
-        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
-
-    size = 0;
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileW( NULL, 0, NULL, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), 
-        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
-
-    size = sizeof(newprofile);
-
-    SetLastError(0);
-    ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, &size );
-    GLE = GetLastError();
-    todo_wine
-    ok( !ret && GLE == ERROR_FILE_NOT_FOUND, 
-        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
+    todo_wine 
+    fail_GSCSPW(machineW,  0, newprofile, &size, 0,     (GLE == ERROR_INVALID_PARAMETER));
+    todo_wine 
+    fail_GSCSPW(NULL,      0, newprofile, NULL,  0,     (GLE == ERROR_INVALID_PARAMETER));
+    todo_wine 
+    fail_GSCSPW(NULL,      0, NULL,       &size, 0,     (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND));
+    todo_wine 
+    fail_GSCSPW(NULL,      0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND));
 
     /* Functional checks */
 




More information about the wine-cvs mailing list