From 0e6605ac52798b8baebe2a199a95f65b887c11b0 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Thu, 4 Oct 2012 09:53:31 +0200
Subject: [PATCH] shell32/tests: Some more type consistency fixes for the
 ShellExecute() return value checks.

---
 dlls/shell32/tests/shlexec.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 6cfb2b07b37..ba0e2b8cb35 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -854,7 +854,7 @@ typedef struct
     const char* verb;
     const char* basename;
     int todo;
-    int rc;
+    INT_PTR rc;
 } filename_tests_t;
 
 static filename_tests_t filename_tests[]=
@@ -1136,7 +1136,7 @@ static void test_filename(void)
     char filename[MAX_PATH];
     const filename_tests_t* test;
     char* c;
-    int rc;
+    INT_PTR rc;
 
     test=filename_tests;
     while (test->basename)
@@ -1179,12 +1179,12 @@ static void test_filename(void)
         {
             ok(rc==test->rc ||
                broken(quotedfile && rc == 2), /* NT4 */
-               "%s failed: rc=%d err=%u\n", shell_call,
+               "%s failed: rc=%ld err=%u\n", shell_call,
                rc, GetLastError());
         }
         else todo_wine
         {
-            ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call,
+            ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call,
                rc, GetLastError());
         }
         if (rc == 33)
@@ -1228,12 +1228,12 @@ static void test_filename(void)
             rc=33;
         if ((test->todo & 0x1)==0)
         {
-            ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call,
+            ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call,
                rc, GetLastError());
         }
         else todo_wine
         {
-            ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call,
+            ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call,
                rc, GetLastError());
         }
         if (rc==0)
@@ -1297,7 +1297,7 @@ static void test_filename(void)
          */
         sprintf(filename, "\"%s\\test file.shlexec\"", tmpdir);
         rc=shell_execute(NULL, filename, NULL, NULL);
-        ok(rc > 32, "%s failed: rc=%d err=%u\n", shell_call, rc,
+        ok(rc > 32, "%s failed: rc=%ld err=%u\n", shell_call, rc,
            GetLastError());
         okChildInt("argcA", 5);
         okChildString("argvA3", "Open");