diff --git a/rostests/dibtests/palbitblt/pal.c b/rostests/dibtests/palbitblt/pal.c index 786eb301872..b1af6a537d0 100644 --- a/rostests/dibtests/palbitblt/pal.c +++ b/rostests/dibtests/palbitblt/pal.c @@ -77,7 +77,7 @@ void UpdatePalette(HBITMAP hBM){ DoBlt(hBM); } -void InitBitmap(HANDLE *hBM){ +void InitBitmap(HBITMAP *hBM){ HPALETTE PalHan; HWND ActiveWindow; HDC hDC; diff --git a/rostests/dibtests/palbitblt/palbitblt.rbuild b/rostests/dibtests/palbitblt/palbitblt.rbuild index 8364b438788..badd99acf01 100644 --- a/rostests/dibtests/palbitblt/palbitblt.rbuild +++ b/rostests/dibtests/palbitblt/palbitblt.rbuild @@ -1,4 +1,4 @@ - + kernel32 user32 diff --git a/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c b/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c index 0bc6e4c27eb..bab5f4d7194 100644 --- a/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c +++ b/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c @@ -34,7 +34,7 @@ test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal) 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); diff --git a/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c b/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c index 1b6960890bd..c0e4886d745 100644 --- a/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c +++ b/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c @@ -54,10 +54,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) 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)); diff --git a/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild b/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild index ed1253bb8e8..5b4c06c058b 100644 --- a/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild +++ b/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild @@ -1,4 +1,4 @@ - + . kernel32 user32 diff --git a/rostests/tests/regqueryvalue/regqueryvalue.c b/rostests/tests/regqueryvalue/regqueryvalue.c index b482cd30276..dd275e6c8ca 100644 --- a/rostests/tests/regqueryvalue/regqueryvalue.c +++ b/rostests/tests/regqueryvalue/regqueryvalue.c @@ -10,7 +10,7 @@ int main( int argc, char **argv ) { PWCHAR WcharResult; WCHAR ValueNameWC[100]; PCHAR CharResult; - HANDLE RegKey; + HKEY RegKey; int i; if( argc < 2 ) { @@ -56,7 +56,7 @@ int main( int argc, char **argv ) { 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 ); diff --git a/rostests/tests/regqueryvalue/regqueryvalue.rbuild b/rostests/tests/regqueryvalue/regqueryvalue.rbuild index 047d85610c1..3b493cf13b9 100644 --- a/rostests/tests/regqueryvalue/regqueryvalue.rbuild +++ b/rostests/tests/regqueryvalue/regqueryvalue.rbuild @@ -1,4 +1,4 @@ - + kernel32 user32 diff --git a/rostests/tests/subclass/subclass.c b/rostests/tests/subclass/subclass.c index db299a440c5..63c4f0e568c 100644 --- a/rostests/tests/subclass/subclass.c +++ b/rostests/tests/subclass/subclass.c @@ -15,7 +15,6 @@ WinMain(HINSTANCE hInstance, int nCmdShow) { WNDCLASSW wc; - MSG msg; HWND hWnd; WCHAR WindowTextW[256]; char WindowTextA[256]; @@ -32,11 +31,11 @@ WinMain(HINSTANCE hInstance, 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 @@ WinMain(HINSTANCE hInstance, 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 @@ WinMain(HINSTANCE hInstance, 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 @@ WinMain(HINSTANCE hInstance, 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); diff --git a/rostests/tests/subclass/subclass.rbuild b/rostests/tests/subclass/subclass.rbuild index b8fcd0f0657..84d1b71676b 100644 --- a/rostests/tests/subclass/subclass.rbuild +++ b/rostests/tests/subclass/subclass.rbuild @@ -1,4 +1,4 @@ - + kernel32 user32 diff --git a/rostests/win32/kernel32/queuetest/queuetest.c b/rostests/win32/kernel32/queuetest/queuetest.c index f198465bc3a..7b629c54900 100644 --- a/rostests/win32/kernel32/queuetest/queuetest.c +++ b/rostests/win32/kernel32/queuetest/queuetest.c @@ -15,7 +15,7 @@ BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); #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;\ } diff --git a/rostests/win32/kernel32/queuetest/queuetest.rbuild b/rostests/win32/kernel32/queuetest/queuetest.rbuild index 7211e75ea32..4b11aed27ea 100644 --- a/rostests/win32/kernel32/queuetest/queuetest.rbuild +++ b/rostests/win32/kernel32/queuetest/queuetest.rbuild @@ -1,4 +1,4 @@ - + kernel32 queuetest.c