Author: sginsberg Date: Sun Jan 18 06:20:51 2009 New Revision: 38887
URL: http://svn.reactos.org/svn/reactos?rev=38887&view=rev Log: - Fix warnings in ros' tests
Modified: trunk/rostests/dibtests/palbitblt/pal.c trunk/rostests/dibtests/palbitblt/palbitblt.rbuild trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild trunk/rostests/tests/regqueryvalue/regqueryvalue.c trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild trunk/rostests/tests/subclass/subclass.c trunk/rostests/tests/subclass/subclass.rbuild trunk/rostests/win32/kernel32/queuetest/queuetest.c trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild
Modified: trunk/rostests/dibtests/palbitblt/pal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/pal.c?r... ============================================================================== --- trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -77,7 +77,7 @@ DoBlt(hBM); }
-void InitBitmap(HANDLE *hBM){ +void InitBitmap(HBITMAP *hBM){ HPALETTE PalHan; HWND ActiveWindow; HDC hDC;
Modified: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/palbitb... ============================================================================== --- trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true" stdlib="host"> +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" stdlib="host"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library>
Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdiD... ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -34,7 +34,7 @@ retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0");
- pCanCreateSurface.lpDDSurfaceDesc = &desc; + pCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&desc; desc.dwSize = sizeof(DDSURFACEDESC2);
retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface);
Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdiD... ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -54,10 +54,7 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC2 D3dTextureFormats[100]; - DWORD NumHeaps = 0; VIDEOMEMORY vmList; - DWORD NumFourCC = 0; - DWORD FourCC = 0;
/* clear data */ memset(&vmList,0,sizeof(VIDEOMEMORY));
Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/win32k... ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings ="true" > +<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe"> <include base="win32kdxtest">.</include> <library>kernel32</library> <library>user32</library>
Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regque... ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -10,7 +10,7 @@ PWCHAR WcharResult; WCHAR ValueNameWC[100]; PCHAR CharResult; - HANDLE RegKey; + HKEY RegKey; int i;
if( argc < 2 ) { @@ -56,7 +56,7 @@ return 7; }
- RegQueryValueExA( RegKey, argv[2], NULL, NULL, CharResult, &ResultSize ); + RegQueryValueExA( RegKey, argv[2], NULL, NULL, (PBYTE)CharResult, &ResultSize );
printf( " char Value: %s\n", CharResult ); fflush( stdout );
Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regque... ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe" allowwarnings="true"> +<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library>
Modified: trunk/rostests/tests/subclass/subclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/subclass/subclass.c?... ============================================================================== --- trunk/rostests/tests/subclass/subclass.c [iso-8859-1] (original) +++ trunk/rostests/tests/subclass/subclass.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -15,7 +15,6 @@ int nCmdShow) { WNDCLASSW wc; - MSG msg; HWND hWnd; WCHAR WindowTextW[256]; char WindowTextA[256]; @@ -32,11 +31,11 @@ wc.cbWndExtra = 0; if (RegisterClassW(&wc) == 0) { - fprintf(stderr, "RegisterClassW failed (last error 0x%X)\n", + fprintf(stderr, "RegisterClassW failed (last error 0x%lu)\n", GetLastError()); return 1; } - printf("Unicode class registered, WndProc = 0x%08x\n", wc.lpfnWndProc); + printf("Unicode class registered, WndProc = 0x%p\n", wc.lpfnWndProc);
hWnd = CreateWindowA("UnicodeClass", "Unicode Window", @@ -51,7 +50,7 @@ NULL); if (hWnd == NULL) { - fprintf(stderr, "CreateWindowA failed (last error 0x%X)\n", + fprintf(stderr, "CreateWindowA failed (last error 0x%lu)\n", GetLastError()); return 1; } @@ -61,7 +60,7 @@ printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string "%S"\n", WindowTextW); @@ -69,43 +68,43 @@ printf("Calling GetWindowTextA\n"); if (! GetWindowTextA(hWnd, WindowTextA, sizeof(WindowTextA) / sizeof(WindowTextA[0]))) { - fprintf(stderr, "GetWindowTextA failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextA failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextA returned Ansi string "%s"\n", WindowTextA); printf("\n");
SavedWndProcW = (WNDPROC) GetWindowLongW(hWnd, GWL_WNDPROC); - printf("GetWindowLongW returned 0x%08x\n", SavedWndProcW); + printf("GetWindowLongW returned 0x%p\n", SavedWndProcW); SavedWndProcA = (WNDPROC) GetWindowLongA(hWnd, GWL_WNDPROC); - printf("GetWindowLongA returned 0x%08x\n", SavedWndProcA); + printf("GetWindowLongA returned 0x%p\n", SavedWndProcA); printf("\n");
- printf("Subclassing window using SetWindowLongW, new WndProc 0x%08x\n", UnicodeSubclassProc); + printf("Subclassing window using SetWindowLongW, new WndProc 0x%p\n", UnicodeSubclassProc); SetWindowLongW(hWnd, GWL_WNDPROC, (LONG) UnicodeSubclassProc); - printf("After subclass, IsWindowUnicode %s, WndProcA 0x%08x, WndProcW 0x%08x\n", + printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), GetWindowLongW(hWnd, GWL_WNDPROC));
printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string "%S"\n", WindowTextW); printf("\n");
- printf("Subclassing window using SetWindowLongA, new WndProc 0x%08x\n", AnsiSubclassProc); + printf("Subclassing window using SetWindowLongA, new WndProc 0x%p\n", AnsiSubclassProc); SetWindowLongA(hWnd, GWL_WNDPROC, (LONG) AnsiSubclassProc); - printf("After subclass, IsWindowUnicode %s, WndProcA 0x%08x, WndProcW 0x%08x\n", + printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), GetWindowLongW(hWnd, GWL_WNDPROC));
printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string "%S"\n", WindowTextW);
Modified: trunk/rostests/tests/subclass/subclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/subclass/subclass.rb... ============================================================================== --- trunk/rostests/tests/subclass/subclass.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/subclass/subclass.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe" allowwarnings="true"> +<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library>
Modified: trunk/rostests/win32/kernel32/queuetest/queuetest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/queuetest/q... ============================================================================== --- trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -15,7 +15,7 @@ #define TestProc(n) \ DWORD CALLBACK TestProc##n(void *ctx)\ {\ - printf("TestProc%d thread 0x%x context 0x%p\n", n, GetCurrentThreadId(), ctx);\ + printf("TestProc%d thread 0x%lu context 0x%p\n", n, GetCurrentThreadId(), ctx);\ return 0;\ }
Modified: trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/queuetest/q... ============================================================================== --- trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe" allowwarnings="true"> +<module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <file>queuetest.c</file>