[ros-diffs] [cwittich] 18690: fix warnings in winetests

fix warnings in winetests
Modified: trunk/reactos/regtests/winetests/kernel32/console.c
Modified: trunk/reactos/regtests/winetests/kernel32/path.c
Modified: trunk/reactos/regtests/winetests/ntdll/large_int.c
Modified: trunk/reactos/regtests/winetests/ntdll/rtlstr.c
  _____  

Modified: trunk/reactos/regtests/winetests/kernel32/console.c
--- trunk/reactos/regtests/winetests/kernel32/console.c	2005-10-22
20:12:42 UTC (rev 18689)
+++ trunk/reactos/regtests/winetests/kernel32/console.c	2005-10-22
20:42:20 UTC (rev 18690)
@@ -74,8 +74,8 @@

 
     c.X = c.Y = 0;
     ok(SetConsoleCursorPosition(0, c) == 0, "No handle\n");
-    ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting
%u got %lu\n",
-       ERROR_INVALID_HANDLE, GetLastError());
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting
%lu got %lu\n",
+       (DWORD) ERROR_INVALID_HANDLE, (DWORD) GetLastError());
 
     c.X = c.Y = 0;
     ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in
upper-left\n");
@@ -89,26 +89,26 @@
     c.X = sbSize.X;
     c.Y = sbSize.Y - 1;
     ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %u got %lu\n",
-       ERROR_INVALID_PARAMETER, GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %lu got %lu\n",
+       (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError());
 
     c.X = sbSize.X - 1;
     c.Y = sbSize.Y;
     ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %u got %lu\n",
-       ERROR_INVALID_PARAMETER, GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %lu got %lu\n",
+       (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError());
 
     c.X = -1;
     c.Y = 0;
     ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %u got %lu\n",
-       ERROR_INVALID_PARAMETER, GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %lu got %lu\n",
+       (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError());
 
     c.X = 0;
     c.Y = -1;
     ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n");
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %u got %lu\n",
-       ERROR_INVALID_PARAMETER, GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError:
expecting %lu got %lu\n",
+       (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError());
 }
 
 static void testWriteSimple(HANDLE hCon, COORD sbSize)
  _____  

Modified: trunk/reactos/regtests/winetests/kernel32/path.c
--- trunk/reactos/regtests/winetests/kernel32/path.c	2005-10-22
20:12:42 UTC (rev 18689)
+++ trunk/reactos/regtests/winetests/kernel32/path.c	2005-10-22
20:42:20 UTC (rev 18690)
@@ -251,13 +251,13 @@

     ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't
have\n");
     if(valid) {
       ok(passfail.longerror==ERROR_FILE_NOT_FOUND,
-         "%s: GetLongPathA returned %ld and not %d\n",
-         errstr,passfail.longerror,ERROR_FILE_NOT_FOUND);
+         "%s: GetLongPathA returned %ld and not %ld\n",
+         errstr,passfail.longerror,(DWORD) ERROR_FILE_NOT_FOUND);
     } else {
       ok(passfail.longerror==ERROR_INVALID_NAME ||
          passfail.longerror==ERROR_FILE_NOT_FOUND,
-         "%s: GetLongPathA returned %ld and not %d or %d'\n",
-         errstr,
passfail.longerror,ERROR_INVALID_NAME,ERROR_FILE_NOT_FOUND);
+         "%s: GetLongPathA returned %ld and not %ld or %ld'\n",
+         errstr, passfail.longerror,(DWORD)
ERROR_INVALID_NAME,(DWORD)ERROR_FILE_NOT_FOUND);
     }
   }
 }
  _____  

Modified: trunk/reactos/regtests/winetests/ntdll/large_int.c
--- trunk/reactos/regtests/winetests/ntdll/large_int.c	2005-10-22
20:12:42 UTC (rev 18689)
+++ trunk/reactos/regtests/winetests/ntdll/large_int.c	2005-10-22
20:42:20 UTC (rev 18690)
@@ -390,23 +390,23 @@

     value = largeint2str[0].value;
     result = pRtlLargeIntegerToChar(&value, 20,
largeint2str[0].MaximumLength, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %x\n",
-       largeint2str[0].value, 20, largeint2str[0].MaximumLength,
result, STATUS_INVALID_PARAMETER);
+       "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %lx\n",
+       largeint2str[0].value, 20, largeint2str[0].MaximumLength,
result, (DWORD) STATUS_INVALID_PARAMETER);
 
     result = pRtlLargeIntegerToChar(&value, 20, 0, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %x\n",
-       largeint2str[0].value, 20, largeint2str[0].MaximumLength,
result, STATUS_INVALID_PARAMETER);
+       "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %lx\n",
+       largeint2str[0].value, 20, largeint2str[0].MaximumLength,
result, (DWORD) STATUS_INVALID_PARAMETER);
 
     result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0,
NULL);
     ok(result == STATUS_BUFFER_OVERFLOW,
-       "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %x\n",
-       largeint2str[0].value, largeint2str[0].base, 0, result,
STATUS_BUFFER_OVERFLOW);
+       "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %lx\n",
+       largeint2str[0].value, largeint2str[0].base, 0, result, (DWORD)
STATUS_BUFFER_OVERFLOW);
 
     result = pRtlLargeIntegerToChar(&value, largeint2str[0].base,
largeint2str[0].MaximumLength, NULL);
     ok(result == STATUS_ACCESS_VIOLATION,
-       "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %x\n",
-       largeint2str[0].value, largeint2str[0].base,
largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION);
+       "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result
%lx, expected: %lx\n",
+       largeint2str[0].value, largeint2str[0].base,
largeint2str[0].MaximumLength, result, (DWORD) STATUS_ACCESS_VIOLATION);
 }
 
 
  _____  

Modified: trunk/reactos/regtests/winetests/ntdll/rtlstr.c
--- trunk/reactos/regtests/winetests/ntdll/rtlstr.c	2005-10-22
20:12:42 UTC (rev 18689)
+++ trunk/reactos/regtests/winetests/ntdll/rtlstr.c	2005-10-22
20:42:20 UTC (rev 18690)
@@ -199,8 +199,8 @@

     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, teststring);
     ok(result == STATUS_SUCCESS,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
-       result, STATUS_SUCCESS);
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n",
+       result, (DWORD) STATUS_SUCCESS);
     ok(uni.Length == 32,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected
%u\n",
        uni.Length, 32);
@@ -230,8 +230,8 @@
     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, teststring2);
     ok(result == STATUS_NAME_TOO_LONG,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
-       result, STATUS_NAME_TOO_LONG);
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n",
+       result, (DWORD) STATUS_NAME_TOO_LONG);
     ok(uni.Length == 12345,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected
%u\n",
        uni.Length, 12345);
@@ -263,8 +263,8 @@
     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, 0);
     ok(result == STATUS_SUCCESS,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
-       result, STATUS_SUCCESS);
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n",
+       result, (DWORD) STATUS_SUCCESS);
     ok(uni.Length == 0,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected
%u\n",
        uni.Length, 0);
@@ -1650,23 +1650,23 @@
 
     result = pRtlIntegerToChar(int2str[0].value, 20,
int2str[0].MaximumLength, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %x\n",
-       int2str[0].value, 20, int2str[0].MaximumLength, result,
STATUS_INVALID_PARAMETER);
+       "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %lx\n",
+       int2str[0].value, 20, int2str[0].MaximumLength, result, (DWORD)
STATUS_INVALID_PARAMETER);
 
     result = pRtlIntegerToChar(int2str[0].value, 20, 0, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %x\n",
-       int2str[0].value, 20, 0, result, STATUS_INVALID_PARAMETER);
+       "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %lx\n",
+       int2str[0].value, 20, 0, result, (DWORD)
STATUS_INVALID_PARAMETER);
 
     result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, 0,
NULL);
     ok(result == STATUS_BUFFER_OVERFLOW,
-       "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %x\n",
-       int2str[0].value, int2str[0].base, 0, result,
STATUS_BUFFER_OVERFLOW);
+       "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %lx\n",
+       int2str[0].value, int2str[0].base, 0, result, (DWORD)
STATUS_BUFFER_OVERFLOW);
 
     result = pRtlIntegerToChar(int2str[0].value, int2str[0].base,
int2str[0].MaximumLength, NULL);
     ok(result == STATUS_ACCESS_VIOLATION,
-       "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %x\n",
-       int2str[0].value, int2str[0].base, int2str[0].MaximumLength,
result, STATUS_ACCESS_VIOLATION);
+       "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx,
expected: %lx\n",
+       int2str[0].value, int2str[0].base, int2str[0].MaximumLength,
result, (DWORD) STATUS_ACCESS_VIOLATION);
 }
 
 static const WCHAR szGuid[] = {
'{','0','1','0','2','0','3','0','4','-',