January 2007 - Wine-Commits

Francois Gouget : gdi32/tests: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 51ab5c33c8253987096651018dff1d4a1a0046c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ab5c33c8253987096651018… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 21:49:04 2007 +0100 gdi32/tests: Print GetLastError() in decimal with '%u'. --- dlls/gdi32/tests/gdiobj.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c7588fd..bd7a065 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -44,55 +44,55 @@ static void test_gdi_objects(void) SetLastError(0); hp = SelectObject(NULL, GetStockObject(BLACK_PEN)); ok(!hp && GetLastError() == ERROR_INVALID_HANDLE, - "SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, 0x%08x\n", + "SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, %u\n", hp, GetLastError()); /* With a valid DC and a NULL object, the call returns 0 but does not SetLastError() */ SetLastError(0); hp = SelectObject(hdc, NULL); ok(!hp && !GetLastError(), - "SelectObject(NULL obj) expected 0, NO_ERROR, got %p, 0x%08x\n", + "SelectObject(NULL obj) expected 0, NO_ERROR, got %p, %u\n", hp, GetLastError()); /* The DC is unaffected by the NULL SelectObject */ SetLastError(0); hp = SelectObject(hdc, GetStockObject(BLACK_PEN)); ok(hp && !GetLastError(), - "SelectObject(post NULL) expected non-null, NO_ERROR, got %p, 0x%08x\n", + "SelectObject(post NULL) expected non-null, NO_ERROR, got %p, %u\n", hp, GetLastError()); /* GetCurrentObject does not SetLastError() on a null object */ SetLastError(0); hp = GetCurrentObject(NULL, OBJ_PEN); ok(!hp && !GetLastError(), - "GetCurrentObject(NULL DC) expected 0, NO_ERROR, got %p, 0x%08x\n", + "GetCurrentObject(NULL DC) expected 0, NO_ERROR, got %p, %u\n", hp, GetLastError()); /* DeleteObject does not SetLastError() on a null object */ ret = DeleteObject(NULL); ok( !ret && !GetLastError(), - "DeleteObject(NULL obj), expected 0, NO_ERROR, got %d, 0x%08x\n", + "DeleteObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", ret, GetLastError()); /* GetObject does not SetLastError() on a null object */ SetLastError(0); i = GetObjectA(NULL, sizeof(buff), buff); ok (!i && !GetLastError(), - "GetObject(NULL obj), expected 0, NO_ERROR, got %d, 0x%08x\n", + "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); /* GetObjectType does SetLastError() on a null object */ SetLastError(0); i = GetObjectType(NULL); ok (!i && GetLastError() == ERROR_INVALID_HANDLE, - "GetObjectType(NULL obj), expected 0, ERROR_INVALID_HANDLE, got %d, 0x%08x\n", + "GetObjectType(NULL obj), expected 0, ERROR_INVALID_HANDLE, got %d, %u\n", i, GetLastError()); /* UnrealizeObject does not SetLastError() on a null object */ SetLastError(0); i = UnrealizeObject(NULL); ok (!i && !GetLastError(), - "UnrealizeObject(NULL obj), expected 0, NO_ERROR, got %d, 0x%08x\n", + "UnrealizeObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); ReleaseDC(NULL, hdc); @@ -113,7 +113,7 @@ static DWORD WINAPI thread_proc(void *pa struct hgdiobj_event *hgdiobj_event = (struct hgdiobj_event *)param; hgdiobj_event->hdc = CreateDC("display", NULL, NULL, NULL); - ok(hgdiobj_event->hdc != NULL, "CreateDC error %d\n", GetLastError()); + ok(hgdiobj_event->hdc != NULL, "CreateDC error %u\n", GetLastError()); hgdiobj_event->hgdiobj1 = CreatePen(PS_DASHDOTDOT, 17, RGB(1, 2, 3)); ok(hgdiobj_event->hgdiobj1 != 0, "Failed to create pen\n"); @@ -123,7 +123,7 @@ static DWORD WINAPI thread_proc(void *pa SetEvent(hgdiobj_event->ready_event); ok(WaitForSingleObject(hgdiobj_event->stop_event, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %d\n", GetLastError()); + "WaitForSingleObject error %u\n", GetLastError()); ok(!GetObject(hgdiobj_event->hgdiobj1, sizeof(lp), &lp), "GetObject should fail\n"); @@ -141,18 +141,18 @@ static void test_thread_objects(void) INT ret; hgdiobj_event.stop_event = CreateEvent(NULL, 0, 0, NULL); - ok(hgdiobj_event.stop_event != NULL, "CreateEvent error %d\n", GetLastError()); + ok(hgdiobj_event.stop_event != NULL, "CreateEvent error %u\n", GetLastError()); hgdiobj_event.ready_event = CreateEvent(NULL, 0, 0, NULL); - ok(hgdiobj_event.ready_event != NULL, "CreateEvent error %d\n", GetLastError()); + ok(hgdiobj_event.ready_event != NULL, "CreateEvent error %u\n", GetLastError()); hthread = CreateThread(NULL, 0, thread_proc, &hgdiobj_event, 0, &tid); - ok(hthread != NULL, "CreateThread error %d\n", GetLastError()); + ok(hthread != NULL, "CreateThread error %u\n", GetLastError()); ok(WaitForSingleObject(hgdiobj_event.ready_event, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %d\n", GetLastError()); + "WaitForSingleObject error %u\n", GetLastError()); ok(GetObject(hgdiobj_event.hgdiobj1, sizeof(lp), &lp) == sizeof(lp), - "GetObject error %d\n", GetLastError()); + "GetObject error %u\n", GetLastError()); ok(lp.lopnStyle == PS_DASHDOTDOT, "wrong pen style %d\n", lp.lopnStyle); ok(lp.lopnWidth.x == 17, "wrong pen width.y %d\n", lp.lopnWidth.x); ok(lp.lopnWidth.y == 0, "wrong pen width.y %d\n", lp.lopnWidth.y); @@ -161,20 +161,20 @@ static void test_thread_objects(void) ret = GetDeviceCaps(hgdiobj_event.hdc, TECHNOLOGY); ok(ret == DT_RASDISPLAY, "GetDeviceCaps(TECHNOLOGY) should return DT_RASDISPLAY not %d\n", ret); - ok(DeleteObject(hgdiobj_event.hgdiobj1), "DeleteObject error %d\n", GetLastError()); - ok(DeleteDC(hgdiobj_event.hdc), "DeleteDC error %d\n", GetLastError()); + ok(DeleteObject(hgdiobj_event.hgdiobj1), "DeleteObject error %u\n", GetLastError()); + ok(DeleteDC(hgdiobj_event.hdc), "DeleteDC error %u\n", GetLastError()); type = GetObjectType(hgdiobj_event.hgdiobj2); ok(type == OBJ_REGION, "GetObjectType returned %u\n", type); SetEvent(hgdiobj_event.stop_event); ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %d\n", GetLastError()); + "WaitForSingleObject error %u\n", GetLastError()); CloseHandle(hthread); type = GetObjectType(hgdiobj_event.hgdiobj2); ok(type == OBJ_REGION, "GetObjectType returned %u\n", type); - ok(DeleteObject(hgdiobj_event.hgdiobj2), "DeleteObject error %d\n", GetLastError()); + ok(DeleteObject(hgdiobj_event.hgdiobj2), "DeleteObject error %u\n", GetLastError()); CloseHandle(hgdiobj_event.stop_event); CloseHandle(hgdiobj_event.ready_event);

1 0

Francois Gouget : shell32/tests: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 947b71aeb0ac32077760ee67dea5313dc08bfac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947b71aeb0ac32077760ee67d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 21:48:19 2007 +0100 shell32/tests: Print GetLastError() in decimal with '%u'. --- dlls/shell32/tests/shlfolder.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b5b8029..4606fff 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -109,7 +109,7 @@ static void test_ParseDisplayName(void) if (!pSHGetSpecialFolderPathW || !pILFindLastID) goto finished; bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); - ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %d\n", GetLastError()); + ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished; hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); @@ -294,7 +294,7 @@ static void test_BindToObject(void) #endif cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); - ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %08x\n", GetLastError()); + ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %u\n", GetLastError()); if (cChars == 0 || cChars >= MAX_PATH) { IShellFolder_Release(psfMyComputer); return; @@ -356,14 +356,14 @@ static void test_GetDisplayName(void) /* First creating a directory in MyDocuments and a file in this directory. */ result = pSHGetSpecialFolderPathW(NULL, wszTestDir, CSIDL_PERSONAL, FALSE); - ok(result, "SHGetSpecialFolderPathW failed! Last error: %08x\n", GetLastError()); + ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) return; PathAddBackslashW(wszTestDir); lstrcatW(wszTestDir, wszDirName); WideCharToMultiByte(CP_ACP, 0, wszTestDir, -1, szTestDir, MAX_PATH, 0, 0); result = CreateDirectoryA(szTestDir, NULL); - ok(result, "CreateDirectoryA failed! Last error: %08x\n", GetLastError()); + ok(result, "CreateDirectoryA failed! Last error: %u\n", GetLastError()); if (!result) return; lstrcpyW(wszTestFile, wszTestDir); @@ -372,7 +372,7 @@ static void test_GetDisplayName(void) WideCharToMultiByte(CP_ACP, 0, wszTestFile, -1, szTestFile, MAX_PATH, 0, 0); hTestFile = CreateFileA(szTestFile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - ok((hTestFile != INVALID_HANDLE_VALUE), "CreateFileA failed! Last error: %08x\n", GetLastError()); + ok((hTestFile != INVALID_HANDLE_VALUE), "CreateFileA failed! Last error: %u\n", GetLastError()); if (hTestFile == INVALID_HANDLE_VALUE) return; CloseHandle(hTestFile); @@ -439,7 +439,7 @@ static void test_GetDisplayName(void) /* SHGetPathFromIDListW still works, although the file is not present anymore. */ result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %08x\n", GetLastError()); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); if(!pSHBindToParent) return; @@ -781,11 +781,11 @@ static void test_SHGetPathFromIDList(voi /* Calling SHGetPathFromIDList with an empty pidl should return the desktop folder's path. */ result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); - ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %08x\n", GetLastError()); + ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; result = SHGetPathFromIDListW(pidlEmpty, wszPath); - ok(result, "SHGetPathFromIDListW failed! Last error: %08x\n", GetLastError()); + ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDList didn't return desktop path for empty pidl!\n"); @@ -806,7 +806,7 @@ static void test_SHGetPathFromIDList(voi wszPath[1] = '\0'; result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDList succeeded where it shouldn't!\n"); - ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDList shouldn't set last error! Last error: %08x\n", GetLastError()); + ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDList shouldn't set last error! Last error: %u\n", GetLastError()); ok (!wszPath[0], "Expected empty path\n"); if (result) { IShellFolder_Release(psfDesktop); @@ -816,7 +816,7 @@ static void test_SHGetPathFromIDList(voi IMalloc_Free(ppM, pidlMyComputer); result = pSHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); - ok(result, "SHGetSpecialFolderPathW failed! Last error: %08x\n", GetLastError()); + ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) { IShellFolder_Release(psfDesktop); return; @@ -824,7 +824,7 @@ static void test_SHGetPathFromIDList(voi PathAddBackslashW(wszFileName); lstrcatW(wszFileName, wszTestFile); hTestFile = CreateFileW(wszFileName, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); - ok(hTestFile != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: %08x\n", GetLastError()); + ok(hTestFile != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: %u\n", GetLastError()); if (hTestFile == INVALID_HANDLE_VALUE) { IShellFolder_Release(psfDesktop); return; @@ -859,7 +859,7 @@ static void test_SHGetPathFromIDList(voi } result = SHGetPathFromIDListW(pidlTestFile, wszPath); - ok(result, "SHGetPathFromIDListW failed! Last error: %08x\n", GetLastError()); + ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); IMalloc_Free(ppM, pidlTestFile); if (!result) return; ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); @@ -982,7 +982,7 @@ static HRESULT WINAPI InitPropertyBag_IP if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); - ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! x%08x\n", GetLastError()); + ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return E_INVALIDARG; V_BSTR(pVar) = SysAllocString(wszPath); @@ -1078,7 +1078,7 @@ static void test_FolderShortcut(void) { } result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); - ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! 0x%08x\n", GetLastError()); + ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return; pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); @@ -1224,11 +1224,11 @@ static void test_ITEMIDLIST_format(void) if(!pSHGetSpecialFolderPathW) return; bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); - ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %08x\n", GetLastError()); + ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; bResult = SetCurrentDirectoryW(wszPersonal); - ok(bResult, "SetCurrentDirectory failed! Last error: %d\n", GetLastError()); + ok(bResult, "SetCurrentDirectory failed! Last error: %u\n", GetLastError()); if (!bResult) return; hr = SHGetDesktopFolder(&psfDesktop); @@ -1257,7 +1257,7 @@ static void test_ITEMIDLIST_format(void) WideCharToMultiByte(CP_ACP, 0, wszFile[i], -1, szFile, MAX_PATH, NULL, NULL); hFile = CreateFileW(wszFile[i], GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_FLAG_WRITE_THROUGH, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%d)\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%u)\n", GetLastError()); if (hFile == INVALID_HANDLE_VALUE) { IShellFolder_Release(psfPersonal); return;

1 0

Francois Gouget : localspl/tests: Print GetLastError() in decimal with '%u' .
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 591f107cb550770a04eee40d95b78a451893a345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591f107cb550770a04eee40d9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 21:48:04 2007 +0100 localspl/tests: Print GetLastError() in decimal with '%u'. --- dlls/localspl/tests/localmon.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=591f107cb550770a04eee…

1 0

Francois Gouget : version/tests: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: f3e7c5380a5817b381fe8b5b2d55b2a62b79b55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e7c5380a5817b381fe8b5b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 21:47:39 2007 +0100 version/tests: Print GetLastError() in decimal with '%u'. --- dlls/version/tests/info.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 3a5f2c0..82bce5b 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -33,7 +33,7 @@ (ERROR_BAD_PATHNAME == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME (98)/" \ "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got 0x%08x\n", GetLastError()); + "expected, got %u\n", GetLastError()); #define EXPECT_INVALID__NOT_FOUND \ ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ @@ -41,7 +41,7 @@ (ERROR_INVALID_PARAMETER == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER (98)/" \ "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got 0x%08x\n", GetLastError()); + "expected, got %u\n", GetLastError()); static void test_info_size(void) { DWORD hdl, retval; @@ -87,7 +87,7 @@ static void test_info_size(void) "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08x\n", retval); ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), - "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got 0x%08x\n", + "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); hdl = 0x55555555; @@ -97,7 +97,7 @@ static void test_info_size(void) "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08x\n", retval); ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), - "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got 0x%08x\n", + "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); ok( hdl == 0L, "Handle wrong! 0L expected, got 0x%08x\n", hdl); @@ -111,7 +111,7 @@ static void test_info_size(void) (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || (MY_LAST_ERROR == GetLastError()), "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND " - "(XP)/0x%08x (NT4) expected, got 0x%08x\n", MY_LAST_ERROR, GetLastError()); + "(XP)/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); /* test a currently loaded executable */ if(GetModuleFileNameA(NULL, mypath, MAX_PATH)) { @@ -122,7 +122,7 @@ static void test_info_size(void) "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08x\n", retval); ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), - "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got 0x%08x\n", + "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); ok( hdl == 0L, "Handle wrong! 0L expected, got 0x%08x\n", hdl); @@ -144,7 +144,7 @@ static void test_info_size(void) "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08x\n", retval); ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), - "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got 0x%08x\n", + "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); ok( hdl == 0L, "Handle wrong! 0L expected, got 0x%08x\n", hdl); @@ -186,7 +186,7 @@ static void test_info(void) "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08x\n", retval); ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), - "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got 0x%08x\n", + "Last error wrong! NO_ERROR/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); ok( hdl == 0L, "Handle wrong! 0L expected, got 0x%08x\n", hdl); @@ -204,21 +204,21 @@ static void test_info(void) /* this test crashes on WinNT4 */ boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, 0); - ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = %d\n", GetLastError()); + ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = %u\n", GetLastError()); ok ((GetLastError() == ERROR_INVALID_DATA) || (GetLastError() == ERROR_BAD_PATHNAME) || (GetLastError() == NO_ERROR), "Last error wrong! ERROR_INVALID_DATA/ERROR_BAD_PATHNAME (ME)/" - "NO_ERROR (95) expected, got 0x%08x\n", + "NO_ERROR (95) expected, got %u\n", GetLastError()); } boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo ); - ok (boolret, "GetFileVersionInfoA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (boolret, "GetFileVersionInfoA failed: GetLastError = %u\n", GetLastError()); if (!boolret) goto cleanup; boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength ); - ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); if (!boolret) goto cleanup; @@ -234,7 +234,7 @@ static void test_info(void) /* this test crashes on WinNT4 */ boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, 0); - ok (boolret, "VerQueryValue failed: GetLastError = 0x%08x\n", GetLastError()); + ok (boolret, "VerQueryValue failed: GetLastError = %u\n", GetLastError()); } cleanup: @@ -355,13 +355,13 @@ static void test_32bit_win(void) /* Get the VS_FIXEDFILEINFO information, this must be the same for both A- and W-Calls */ retA = VerQueryValueA( pVersionInfoA, rootA, (LPVOID *)&pBufA, &uiLengthA ); - ok (retA, "VerQueryValueA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retA, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); if (is_unicode_enabled) { retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); - ok (retW, "VerQueryValueW failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", @@ -372,13 +372,13 @@ static void test_32bit_win(void) /* Get some VarFileInfo information, this must be the same for both A- and W-Calls */ retA = VerQueryValueA( pVersionInfoA, varfileinfoA, (LPVOID *)&pBufA, &uiLengthA ); - ok (retA, "VerQueryValueA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retA, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); ok( !memcmp(pBufA, WineVarFileInfoA, uiLengthA), "The VarFileInfo should have matched 0904e404 (non case sensitive)\n"); if (is_unicode_enabled) { retW = VerQueryValueW( pVersionInfoW, varfileinfoW, (LPVOID *)&pBufW, &uiLengthW ); - ok (retW, "VerQueryValueW failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok( uiLengthA == uiLengthW, "The size of the VarFileInfo information should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW); ok( !memcmp(pBufA, pBufW, uiLengthA), "Both values should be the same, they aren't\n"); @@ -387,18 +387,18 @@ static void test_32bit_win(void) /* Get some StringFileInfo information, this will be ANSI for A-Calls and Unicode for W-Calls */ retA = VerQueryValueA( pVersionInfoA, FileDescriptionA, (LPVOID *)&pBufA, &uiLengthA ); - ok (retA, "VerQueryValueA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retA, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); ok( !lstrcmpA(WineFileDescriptionA, pBufA), "FileDescription should have been 'Wine version test'\n"); /* Test a second time */ retA = VerQueryValueA( pVersionInfoA, FileDescriptionA, (LPVOID *)&pBufA, &uiLengthA ); - ok (retA, "VerQueryValueA failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retA, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); ok( !lstrcmpA(WineFileDescriptionA, pBufA), "FileDescription should have been 'Wine version test'\n"); if (is_unicode_enabled) { retW = VerQueryValueW( pVersionInfoW, FileDescriptionW, (LPVOID *)&pBufW, &uiLengthW ); - ok (retW, "VerQueryValueW failed: GetLastError = 0x%08x\n", GetLastError()); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok( !lstrcmpW(WineFileDescriptionW, pBufW), "FileDescription should have been 'Wine version test' (unicode)\n"); }

1 0

appdb/ include/filter.php unit_test/run_tests. ...
by WineHQ Jan. 6, 2007

Jan. 6, 2007

ChangeSet ID: 30860 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/06 00:27:51 Modified files: include : filter.php unit_test : run_tests.php Added files: unit_test : test_filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> filter_gpc() should report success or failure, a higher level function should take care of calling out to an error page. Add a unit test for filter_gpc() and test filtering success, failure and test that the filtering of html and normal strings properly preserves tags for html strings and strips them from normal strings Patch: http://cvs.winehq.org/patch.py?id=30860 Old revision New revision Changes Path 1.12 1.13 +29 -7 appdb/include/filter.php 1.8 1.9 +2 -0 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_filter.php

1 0

appdb/include note.php
by WineHQ Jan. 6, 2007

Jan. 6, 2007

ChangeSet ID: 30859 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/06 00:21:41 Modified files: include : note.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Note desription can contain html so rename it from sDescription to shDescription so the filtering doesn't remove html tags Patch: http://cvs.winehq.org/patch.py?id=30859 Old revision New revision Changes Path 1.21 1.22 +11 -11 appdb/include/note.php Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.21 appdb/include/note.php:1.22 --- appdb/include/note.php:1.21 6 Jan 2007 6:21:41 -0000 +++ appdb/include/note.php 6 Jan 2007 6:21:41 -0000 @@ -15,7 +15,7 @@ class Note { var $iAppId; var $iVersionId; var $sTitle; - var $sDescription; + var $shDescription; var $iSubmitterId; var $sSubmitTime; @@ -39,7 +39,7 @@ class Note { $this->iAppId = $oRow->appId; $this->iVersionId = $oRow->versionId; $this->sTitle = $oRow->noteTitle; - $this->sDescription = $oRow->noteDesc; + $this->shDescription = $oRow->noteDesc; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; } @@ -56,12 +56,12 @@ class Note { { $hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc, submitterId) ". "VALUES('?', '?', '?', '?')", - $this->iVersionId, $this->sTitle, $this->sDescription, $_SESSION['current']->iUserId); + $this->iVersionId, $this->sTitle, $this->shDescription, $_SESSION['current']->iUserId); if($hResult) { $this->note(mysql_insert_id()); - $sWhatChanged = "Description is:\n".$this->sDescription.".\n\n"; + $sWhatChanged = "Description is:\n".$this->shDescription.".\n\n"; $this->SendNotificationMail("add", $sWhatChanged); return true; } @@ -92,12 +92,12 @@ class Note { $sWhatChanged .= "Title was changed from ".$oNote->sTitle." to ".$this->sTitle.".\n\n"; } - if ($this->sDescription && $this->sDescription!=$oNote->sDescription) + if ($this->shDescription && $this->shDescription!=$oNote->shDescription) { if (!query_parameters("UPDATE appNotes SET noteDesc = '?' WHERE noteId = '?'", - $this->sDescription, $this->iNoteId)) + $this->shDescription, $this->iNoteId)) return false; - $sWhatChanged .= "Description was changed from\n ".$oNote->sDescription."\n to \n".$this->sDescription.".\n\n"; + $sWhatChanged .= "Description was changed from\n ".$oNote->shDescription."\n to \n".$this->shDescription.".\n\n"; } if ($this->iVersionId && $this->iVersionId!=$oNote->iVersionId) @@ -157,7 +157,7 @@ class Note { $sMsg .= "Subject: ".$this->sTitle."\n"; $sMsg .= "\n"; $sMsg .= "Note contents:\n"; - $sMsg .= $this->sDescription."\n"; + $sMsg .= $this->shDescription."\n"; $sMsg .= "\n"; $sMsg .= "Because:\n"; if($aClean['sReplyText']) @@ -204,7 +204,7 @@ class Note { $shOutput .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; $shOutput .= "<tr bgcolor=\"".$sColor."\" align=\"center\" valign=\"top\"><td><b>".$sTitle."</b></td></tr>\n"; $shOutput .= "<tr><td class=\"note\">\n"; - $shOutput .= $this->sDescription; + $shOutput .= $this->shDescription; $shOutput .= "</td></tr>\n"; if(!$bDisplayOnly) @@ -242,7 +242,7 @@ class Note { echo ' <td class=color0><input size=80% type="text" name="sNoteTitle" type="text" value="'.$this->sTitle.'"></td></tr>',"\n"; echo '<tr><td class=color4>Description</td><td class=color0>', "\n"; echo '<p style="width:700px">', "\n"; - echo '<textarea cols="80" rows="20" id="editor" name="sNoteDesc">'.$this->sDescription.'</textarea>',"\n"; + echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; echo '<tr><td colspan="2" align="center" class="color3">',"\n"; @@ -258,7 +258,7 @@ class Note { $this->iVersionId = $aValues['iVersionId']; $this->iAppId = $aValues['iAppId']; $this->sTitle = $aValues['sNoteTitle']; - $this->sDescription = $aValues['sNoteDesc']; + $this->shDescription = $aValues['shNoteDesc']; } } ?>

1 0

appdb/include filter.php
by WineHQ Jan. 5, 2007

Jan. 5, 2007

ChangeSet ID: 30858 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/05 23:30:31 Modified files: include : filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix filtering of html, we shouldn't be running htmlspecialchars() on html code that needs to be preserved without modification Patch: http://cvs.winehq.org/patch.py?id=30858 Old revision New revision Changes Path 1.11 1.12 +1 -1 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.11 appdb/include/filter.php:1.12 --- appdb/include/filter.php:1.11 6 Jan 2007 5:30:31 -0000 +++ appdb/include/filter.php 6 Jan 2007 5:30:31 -0000 @@ -52,7 +52,7 @@ function filter_gpc() switch($aKeys[$i][1]) { case "h": // HTML string - $aClean[$aKeys[$i]] = trim(htmlspecialchars($_REQUEST[$aKeys[$i]])); + $aClean[$aKeys[$i]] = trim($_REQUEST[$aKeys[$i]]); // if there is no content and no image, make the variable empty if(strip_tags($aClean[$aKeys[$i]],'<img>')=="") $aClean[$aKeys[$i]] = "";

1 0

appdb/include incl.php
by WineHQ Jan. 5, 2007

Jan. 5, 2007

ChangeSet ID: 30857 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/05 23:03:58 Modified files: include : incl.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix session errors that occur when filtering detects a problem by moving filtering to the end of incl.php and after we setup the session. Patch: http://cvs.winehq.org/patch.py?id=30857 Old revision New revision Changes Path 1.40 1.41 +4 -5 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.40 appdb/include/incl.php:1.41 --- appdb/include/incl.php:1.40 6 Jan 2007 5: 3:58 -0000 +++ appdb/include/incl.php 6 Jan 2007 5: 3:58 -0000 @@ -81,11 +81,6 @@ if(isset($_REQUEST['mode'])) } /* End backwards compatibility code */ - -// include filter.php to filter all REQUEST input -require(BASE."include/filter.php"); - - // create arrays $sidebar_func_list = array(); $help_list = array(); @@ -295,4 +290,8 @@ if(!isset($_SESSION['current'])) // if we are debugging we need to see all errors if($_SESSION['current']->showDebuggingInfos()) error_reporting(E_ALL ^ E_NOTICE); + +// include filter.php to filter all REQUEST input +require(BASE."include/filter.php"); + ?>

1 0

appdb/include filter.php
by WineHQ Jan. 5, 2007

Jan. 5, 2007

ChangeSet ID: 30856 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/05 22:34:13 Modified files: include : filter.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix filtering by comparing strpos identically with 0 using === instead of just equality with == Patch: http://cvs.winehq.org/patch.py?id=30856 Old revision New revision Changes Path 1.10 1.11 +2 -2 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.10 appdb/include/filter.php:1.11 --- appdb/include/filter.php:1.10 6 Jan 2007 4:34:13 -0000 +++ appdb/include/filter.php 6 Jan 2007 4:34:13 -0000 @@ -14,7 +14,7 @@ function filter_gpc() // Special cases for variables that don't fit our filtering scheme // don't filter the AppDB session cookie and MAX_FILE_SIZE // and the DialogX values that xinha uses - if(strpos($aKeys[$i], "Dialog") == 0) // Xinha variables + if(strpos($aKeys[$i], "Dialog") === 0) // Xinha variables { // copy the key over to the clean array // NOTE: we do not strip html tags or trim any Xinha variables @@ -24,7 +24,7 @@ function filter_gpc() continue; // go to the next entry } else if($aKeys[$i] == "whq_appdb" || ($aKeys[$i] == "MAX_FILE_SIZE") || ($aKeys[$i] == "PHPSESSID") - || (strpos($aKeys[$i], "pref_") == 0)) // other variables + || (strpos($aKeys[$i], "pref_")) === 0) // other variables { // copy the key over to the clean array after stripping tags and trimming $aClean[$aKeys[$i]] = trim(strip_tags($_REQUEST[$aKeys[$i]]));

1 0

appdb/ admin/editAppVersion.php include/downlo ...
by WineHQ Jan. 5, 2007

Jan. 5, 2007

ChangeSet ID: 30855 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/05 19:08:35 Modified files: admin : editAppVersion.php include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> processForm needs to be passed the $aClean array Patch: http://cvs.winehq.org/patch.py?id=30855 Old revision New revision Changes Path 1.43 1.44 +1 -1 appdb/admin/editAppVersion.php 1.1 1.2 +1 -1 appdb/include/downloadurl.php Index: appdb/admin/editAppVersion.php diff -u -p appdb/admin/editAppVersion.php:1.43 appdb/admin/editAppVersion.php:1.44 --- appdb/admin/editAppVersion.php:1.43 6 Jan 2007 1: 8:35 -0000 +++ appdb/admin/editAppVersion.php 6 Jan 2007 1: 8:35 -0000 @@ -16,7 +16,7 @@ if(!$_SESSION['current']->hasPriv("admin if(!empty($aClean['sSubmit'])) { process_app_version_changes(true); - downloadurl::processForm($_REQUEST); + downloadurl::processForm($aClean); util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId'])); } else /* or display the webform for making changes */ { Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.1 appdb/include/downloadurl.php:1.2 --- appdb/include/downloadurl.php:1.1 6 Jan 2007 1: 8:35 -0000 +++ appdb/include/downloadurl.php 6 Jan 2007 1: 8:35 -0000 @@ -198,7 +198,7 @@ class downloadurl $sMsg .= "The following changed were made\n\n"; $sMsg .= "$sWhatChanged\n\n"; - mail_appdb("$sEmail, $sSubject, $sMsg"); + mail_appdb($sEmail, $sSubject, $sMsg); } return TRUE;

1 0