[PATCH 6/9] programs/schtasks/tests: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 programs/schtasks/tests/Makefile.in |    1 -
 programs/schtasks/tests/schtasks.c  |   42 ++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in
index 23cb744ff15..dcf641c4b13 100644
--- a/programs/schtasks/tests/Makefile.in
+++ b/programs/schtasks/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = schtasks.exe
 IMPORTS   = ole32

diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c
index c0f4ce78365..c1168d4b209 100644
--- a/programs/schtasks/tests/schtasks.c
+++ b/programs/schtasks/tests/schtasks.c
@@ -74,7 +74,7 @@ static DWORD _run_command(unsigned line, const char *cmd)

strcpy(command, cmd);
     r = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
-    ok_(__FILE__,line)(r, "CreateProcess failed: %u\n", GetLastError());
+    ok_(__FILE__,line)(r, "CreateProcess failed: %lu\n", GetLastError());
     if(!r) return -1;

ret = WaitForSingleObject(pi.hProcess, 10000);
@@ -83,7 +83,7 @@ static DWORD _run_command(unsigned line, const char *cmd)
         TerminateProcess(pi.hProcess, -1);

r = GetExitCodeProcess(pi.hProcess, &ret);
-    ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %u\n", GetLastError());
+    ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %lu\n", GetLastError());

CloseHandle(pi.hThread);
     CloseHandle(pi.hProcess);
@@ -107,7 +107,7 @@ static void _register_task(unsigned line, const char *task_name_a)

hres = ITaskFolder_RegisterTask(root, task_name, xml, TASK_CREATE, empty, empty,
                                     TASK_LOGON_NONE, empty, &task);
-    ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08x\n", hres);
+    ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08lx\n", hres);
     HeapFree(GetProcessHeap(), 0, task_name);
     HeapFree(GetProcessHeap(), 0, xml);

@@ -123,7 +123,7 @@ static void _unregister_task(unsigned line, const char *task_name_a)
     task_name = a2w(task_name_a);

hres = ITaskFolder_DeleteTask(root, task_name, 0);
-    ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08x\n", hres);
+    ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08lx\n", hres);

HeapFree(GetProcessHeap(), 0, task_name);
 }
@@ -141,7 +141,7 @@ static void create_file(const char *file_name, const char *data)
         return;

r = WriteFile(file, data, strlen(data), &size, NULL);
-    ok(r, "WriteFile failed: %u\n", GetLastError());
+    ok(r, "WriteFile failed: %lu\n", GetLastError());
     CloseHandle(file);
 }

@@ -153,17 +153,17 @@ static BOOL initialize_task_service(void)
     hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER,
                             &IID_ITaskService, (void **)&service);
     if(hres != S_OK) {
-        ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08x\n", hres);
+        ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08lx\n", hres);
         win_skip("Task service not available\n");
         return FALSE;
     }

V_VT(&empty) = VT_EMPTY;
     hres = ITaskService_Connect(service, empty, empty, empty, empty);
-    ok(hres == S_OK, "Connect failed: %08x\n", hres);
+    ok(hres == S_OK, "Connect failed: %08lx\n", hres);

hres = ITaskService_GetFolder(service, NULL, &root);
-    ok(hres == S_OK, "GetFolder error %08x\n", hres);
+    ok(hres == S_OK, "GetFolder error %08lx\n", hres);
     return TRUE;
 }

@@ -180,51 +180,51 @@ START_TEST(schtasks)
     }

r = run_command("schtasks");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

register_task("winetest");

r = run_command("schtasks /change /tn winetest /enable");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

unregister_task("winetest");

r = run_command("schtasks /change /tn winetest /enable");
-    ok(r == 1, "r = %u\n", r);
+    ok(r == 1, "r = %lu\n", r);

register_task("wine\test\winetest");

r = run_command("schtasks /CHANGE /tn wine\test\winetest /enable");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

r = run_command("schtasks /delete /f /tn wine\test\winetest");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

r = run_command("schtasks /Change /tn wine\test\winetest /enable");
-    ok(r == 1, "r = %u\n", r);
+    ok(r == 1, "r = %lu\n", r);

create_file("test.xml", xml_a);

r = run_command("schtasks /create /xml test.xml /tn wine\winetest");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

r = run_command("schtasks /change /tn wine\winetest /enable");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

r = run_command("schtasks /create /xml test.xml /f /tn wine\winetest");
-    ok(r == 0, "r = %u\n", r); /* task already exists, but /f argument provided */
+    ok(r == 0, "r = %lu\n", r); /* task already exists, but /f argument provided */

r = run_command("schtasks /create /xml test.xml /tn wine\winetest");
-    ok(r == 1, "r = %u\n", r); /* task already exists */
+    ok(r == 1, "r = %lu\n", r); /* task already exists */

r = run_command("schtasks /create /tn wine\winetest");
-    ok(r == E_FAIL, "r = %x\n", r); /* missing arguments */
+    ok(r == E_FAIL, "r = %lx\n", r); /* missing arguments */

r = run_command("schtasks /Delete /f /tn wine\winetest");
-    ok(r == 0, "r = %u\n", r);
+    ok(r == 0, "r = %lu\n", r);

r = DeleteFileA("test.xml");
-    ok(r, "DeleteFileA failed: %u\n", GetLastError());
+    ok(r, "DeleteFileA failed: %lu\n", GetLastError());

ITaskFolder_DeleteFolder(root, wine_testW, 0);
     ITaskFolder_DeleteFolder(root, wineW, 0);