Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56495: [GDI32_APITEST] - Comment out a broken test (works only on 32bpp) - Fix MSVC warning
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 12:32:11 2012 New Revision: 56495 URL: http://svn.reactos.org/svn/reactos?rev=56495&view=rev Log: [GDI32_APITEST] - Comment out a broken test (works only on 32bpp) - Fix MSVC warning Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c trunk/rostests/apitests/gdi32/SetPixel.c Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] Fri May 4 12:32:11 2012 @@ -12,7 +12,7 @@ void Test_SetDCPenColor() { HDC hScreenDC, hDC; - HBITMAP hbmp; + HBITMAP hbmp, hbmpOld; // Test an incorrect DC SetLastError(ERROR_SUCCESS); @@ -49,13 +49,15 @@ hbmp = CreateBitmap(10, 10, 1, 32, NULL); ok(hbmp != 0, "CreateBitmap failed, skipping tests\n"); if (!hbmp) return; - - SelectObject(hDC, hbmp); + hbmpOld = SelectObject(hDC, hbmp); +#if 0 // this only works on 32 bpp screen resolution + ok(hbmpOld != NULL, "\n"); SelectObject(hDC, GetStockObject(DC_PEN)); SetDCPenColor(hDC, 0x123456); MoveToEx(hDC, 0, 0, NULL); LineTo(hDC, 10, 0); ok(GetPixel(hDC, 5, 0) == 0x123456, "\n"); +#endif // Delete the DC DeleteDC(hDC); Modified: trunk/rostests/apitests/gdi32/SetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] Fri May 4 12:32:11 2012 @@ -71,7 +71,7 @@ HDC hdc; HPALETTE hpal, hpalOld; PULONG pulBits; - ULONG i; + USHORT i; /* Initialize the BITMAPINFO */ pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

[tfaber] 56494: [KERNEL32_APITEST] - Add a test checking that GetModuleFileName returns a full path See issue #6786 for more details.
by tfaber＠svn.reactos.org 04 May '12

04 May '12

Author: tfaber Date: Fri May 4 12:31:47 2012 New Revision: 56494 URL: http://svn.reactos.org/svn/reactos?rev=56494&view=rev Log: [KERNEL32_APITEST] - Add a test checking that GetModuleFileName returns a full path See issue #6786 for more details. Added: trunk/rostests/apitests/kernel32/GetModuleFileName.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Fri May 4 12:31:47 2012 @@ -4,11 +4,12 @@ list(APPEND SOURCE GetCurrentDirectory.c GetDriveType.c + GetModuleFileName.c SetCurrentDirectory.c testlist.c) add_executable(kernel32_apitest ${SOURCE}) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) -add_importlibs(kernel32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(kernel32_apitest gdi32 user32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET kernel32_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/kernel32/GetModuleFileName.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetModu… ============================================================================== --- trunk/rostests/apitests/kernel32/GetModuleFileName.c (added) +++ trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] Fri May 4 12:31:47 2012 @@ -1,0 +1,129 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for GetModuleFileName + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#define UNICODE +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include <shlwapi.h> + +static +VOID +StartChild(char **argv) +{ + BOOL Success; + WCHAR Path[MAX_PATH]; + PWSTR FileName; + PWSTR Slash; + WCHAR CommandLine[MAX_PATH]; + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInfo; + DWORD Ret; + int Length; + + Length = MultiByteToWideChar(CP_ACP, + 0, + argv[0], + -1, + Path, + sizeof(Path) / sizeof(WCHAR)); + + FileName = wcsrchr(Path, '\\'); + Slash = wcsrchr(Path, L'/'); + if (Slash && (!FileName || Slash > FileName)) + FileName = Slash; + + if (FileName) + { + /* It's an absolute path. Set it as current dir and get the file name */ + FileName++; + FileName[-1] = L'\0'; + + Success = SetCurrentDirectory(Path); + ok(Success == TRUE, "SetCurrentDirectory failed for path '%ls'\n", Path); + + trace("Starting '%ls' in path '%ls'\n", FileName, Path); + } + else + { + FileName = Path; + trace("Starting '%ls', which is already relative\n", FileName); + } + + swprintf(CommandLine, L"\"%ls\" GetModuleFileName relative", FileName); + + RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + + Success = CreateProcess(FileName, + CommandLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInfo); + if (!Success) + { + skip("CreateProcess failed with %lu\n", GetLastError()); + return; + } + CloseHandle(ProcessInfo.hThread); + Ret = WaitForSingleObject(ProcessInfo.hProcess, 30 * 1000); + ok(Ret == WAIT_OBJECT_0, "WaitForSingleObject returns %lu\n", Ret); + CloseHandle(ProcessInfo.hProcess); +} + +static +VOID +TestGetModuleFileNameA(VOID) +{ + CHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Relative; + + Length = GetModuleFileNameA(NULL, Buffer, sizeof(Buffer)); + ok(Length != 0, "Length = %lu\n", Length); + ok(Length < sizeof(Buffer), "Length = %lu\n", Length); + ok(Buffer[Length] == 0, "Buffer not null terminated\n"); + Relative = PathIsRelativeA(Buffer); + ok(Relative == FALSE, "GetModuleFileNameA returned relative path: %s\n", Buffer); +} + +static +VOID +TestGetModuleFileNameW(VOID) +{ + WCHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Relative; + + Length = GetModuleFileNameW(NULL, Buffer, sizeof(Buffer) / sizeof(WCHAR)); + ok(Length != 0, "Length = %lu\n", Length); + ok(Length < sizeof(Buffer) / sizeof(WCHAR), "Length = %lu\n", Length); + ok(Buffer[Length] == 0, "Buffer not null terminated\n"); + Relative = PathIsRelativeW(Buffer); + ok(Relative == FALSE, "GetModuleFileNameA returned relative path: %ls\n", Buffer); +} + +START_TEST(GetModuleFileName) +{ + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + if (argc < 3) + StartChild(argv); + else + { + TestGetModuleFileNameA(); + TestGetModuleFileNameW(); + } +} Propchange: trunk/rostests/apitests/kernel32/GetModuleFileName.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Fri May 4 12:31:47 2012 @@ -7,12 +7,14 @@ extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); +extern void func_GetModuleFileName(void); extern void func_SetCurrentDirectory(void); const struct test winetest_testlist[] = { { "GetCurrentDirectory", func_GetCurrentDirectory }, { "GetDriveType", func_GetDriveType }, + { "GetModuleFileName", func_GetModuleFileName }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { 0, 0 }

1 0

[tkreuzer] 56493: [GDI32_APITEST] Fix gcc build
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 12:10:15 2012 New Revision: 56493 URL: http://svn.reactos.org/svn/reactos?rev=56493&view=rev Log: [GDI32_APITEST] Fix gcc build Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Fri May 4 12:10:15 2012 @@ -25,7 +25,7 @@ } _SEH2_END; - ok(bResult == bExp, "line %ld: Wrong result, expected %ld, got %ld\n", + ok(bResult == bExp, "line %ld: Wrong result, expected %d, got %d\n", ulLine, bExp, bResult); ok(GetLastError() == dwErrExp,"line %ld: Wrong error, expected %lx, got %lx\n", ulLine, dwErrExp, GetLastError());

1 0

[tkreuzer] 56492: [GDI32_APITEST] - Add tests for GetDIBColorTable and SetPixel, - Add more tests for CreateBitmap, GetPixel, PatBlt
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 11:40:36 2012 New Revision: 56492 URL: http://svn.reactos.org/svn/reactos?rev=56492&view=rev Log: [GDI32_APITEST] - Add tests for GetDIBColorTable and SetPixel, - Add more tests for CreateBitmap, GetPixel, PatBlt Added: trunk/rostests/apitests/gdi32/GetDIBColorTable.c (with props) trunk/rostests/apitests/gdi32/SetPixel.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/CreateBitmap.c trunk/rostests/apitests/gdi32/GetPixel.c trunk/rostests/apitests/gdi32/PatBlt.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Fri May 4 11:40:36 2012 @@ -37,6 +37,7 @@ GdiSetAttrs.c GetClipRgn.c GetCurrentObject.c + GetDIBColorTable.c GetDIBits.c GetObject.c GetRandomRgn.c @@ -48,9 +49,11 @@ PatBlt.c Rectangle.c SelectObject.c + SetBrushOrgEx.c SetDCPenColor.c SetDIBits.c SetMapMode.c + SetPixel.c SetSysColors.c SetWindowExtEx.c SetWorldTransform.c Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -11,6 +11,85 @@ #define DEFAULT_BITMAP 21 +void Test_CreateBitmap_Params() +{ + HBITMAP hbmp; + + /* All of these should get us the default bitmap */ + hbmp = CreateBitmap(0, 0, 0, 0, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + hbmp = CreateBitmap(1, 0, 0, 0, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + hbmp = CreateBitmap(0, 1, 0, 0, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + hbmp = CreateBitmap(0, 1, 1, 0, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + hbmp = CreateBitmap(0, 1, 63, 33, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + hbmp = CreateBitmap(0, -4, -32, 233, NULL); + ok(hbmp == GetStockObject(21), "should get the default bitmap\n"); + + SetLastError(0); + hbmp = CreateBitmap(1, -1, 1, 0, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(-1, 1, 1, 0, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(-1, 1, 1, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(1, -1, 1, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Check if an overflow in cPlanes * cBitsPixel is handled */ + SetLastError(0); + hbmp = CreateBitmap(1, 1, 2, 0x80000004, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Check for maximum width */ + hbmp = CreateBitmap(0x7FFFFFF, 1, 1, 1, NULL); + ok(hbmp != 0, "\n"); + DeleteObject(hbmp); + SetLastError(0); + hbmp = CreateBitmap(0x8000000, 1, 1, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Check for maximum height */ + hbmp = CreateBitmap(1, 0x1FFFFF00, 1, 1, NULL); + ok(hbmp != 0, "\n"); + DeleteObject(hbmp); + SetLastError(0); + hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(0); + + /* Check for overflow in width * height */ + hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL); + ok(hbmp != 0, "\n"); + DeleteObject(hbmp); + SetLastError(0); + hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(0); + + /* Check huge allocation */ + SetLastError(0); + hbmp = CreateBitmap(0x2000, 0x20000, 32, 1, NULL); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + +} + void Test_CreateBitmap() { HBITMAP hbmp; @@ -20,10 +99,8 @@ hbmp = CreateBitmap(0, 0, 0, 0, NULL); ok(hbmp != 0, "should get a 1x1 bitmap\n"); ok(hbmp == GetStockObject(DEFAULT_BITMAP), "\n"); - result = GetObject(hbmp, sizeof(bitmap), &bitmap); ok(result > 0, "result = %d\n", result); - ok(bitmap.bmType == 0, "bmType = %ld\n", bitmap.bmType); ok(bitmap.bmWidth == 1, "bmWidth = %ld\n", bitmap.bmWidth); ok(bitmap.bmHeight == 1, "bmHeight = %ld\n", bitmap.bmHeight); @@ -31,19 +108,27 @@ ok(bitmap.bmPlanes == 1, "bmPlanes = %d\n", bitmap.bmPlanes); ok(bitmap.bmBitsPixel == 1, "bmBitsPixel = %d\n", bitmap.bmBitsPixel); ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits); - DeleteObject(hbmp); - hbmp = CreateBitmap(1, -1, 1, 0, NULL); - ok(hbmp == 0, "\n"); + hbmp = CreateBitmap(1, 2, 1, 1, NULL); + ok(hbmp != 0, "should get a 1x2 bitmap\n"); + result = GetObject(hbmp, sizeof(bitmap), &bitmap); + ok(result > 0, "result = %d\n", result); + ok(bitmap.bmType == 0, "bmType = %ld\n", bitmap.bmType); + ok(bitmap.bmWidth == 1, "bmWidth = %ld\n", bitmap.bmWidth); + ok(bitmap.bmHeight == 2, "bmHeight = %ld\n", bitmap.bmHeight); + ok(bitmap.bmWidthBytes == 2, "bmWidthBytes = %ld\n", bitmap.bmWidthBytes); + ok(bitmap.bmPlanes == 1, "bmPlanes = %d\n", bitmap.bmPlanes); + ok(bitmap.bmBitsPixel == 1, "bmBitsPixel = %d\n", bitmap.bmBitsPixel); + ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits); + DeleteObject(hbmp); - hbmp = CreateBitmap(-1, 1, 1, 0, NULL); - ok(hbmp == 0, "\n"); } START_TEST(CreateBitmap) { + Test_CreateBitmap_Params(); Test_CreateBitmap(); } Added: trunk/rostests/apitests/gdi32/GetDIBColorTable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBColorTable.c (added) +++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -1,0 +1,105 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ... + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_GetDIBColorTable() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG bmiColors[8]; + } bmibuffer; + BITMAPINFO *pbmi = (PVOID)&bmibuffer; + HBITMAP hbmp, hbmpOld; + HDC hdc; + PBYTE pjBits; + UINT cColors; + ULONG aulColors[257]; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + SetLastError(0); + cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); + ok_long(cColors, 2); + ok_err(0); + + hbmp = CreateBitmap(1, 1, 1, 1, NULL); + ok(hbmp != 0, "\n"); + hbmpOld = SelectObject(hdc, hbmp); + ok(hbmpOld != 0, "Failed to select bitmap\n"); + cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); + ok_long(cColors, 2); + ok_err(0); + SelectObject(hdc, hbmpOld); + DeleteObject(hbmp); + + /* Initialize a BITMAPINFO */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = 2; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 8; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 1; + pbmi->bmiHeader.biYPelsPerMeter = 1; + pbmi->bmiHeader.biClrUsed = 3; + pbmi->bmiHeader.biClrImportant = 0; + bmibuffer.bmiColors[0] = 0xff0000; + bmibuffer.bmiColors[1] = 0x00ff00; + bmibuffer.bmiColors[2] = 0x0000ff; + + hbmp = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBits, 0, 0 ); + ok( hbmp != NULL, "error=%ld\n", GetLastError() ); + SelectObject(hdc, hbmp); + + cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); + ok_long(cColors, 256); + ok_long(aulColors[0], 0xff0000); + ok_long(aulColors[1], 0x00ff00); + ok_long(aulColors[2], 0x0000ff); + ok_long(aulColors[3], 0x000000); + + + cColors = SetDIBColorTable(hdc, 0, 4, (RGBQUAD*)aulColors); + ok_long(cColors, 4); + + aulColors[3] = 0x000F0F; + cColors = SetDIBColorTable(hdc, 0, 4, (RGBQUAD*)aulColors); + ok_long(cColors, 4); + + cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); + ok_long(cColors, 256); + ok_long(aulColors[0], 0xff0000); + ok_long(aulColors[1], 0x00ff00); + ok_long(aulColors[2], 0x0000ff); + ok_long(aulColors[3], 0x000F0F); + + + SelectObject(hdc, GetStockObject(21)); + DeleteObject(hbmp); + + bmibuffer.bmiColors[0] = 1; + bmibuffer.bmiColors[1] = 2; + bmibuffer.bmiColors[2] = 3; + + hbmp = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (PVOID*)&pjBits, 0, 0 ); + ok( hbmp != NULL, "error=%ld\n", GetLastError() ); + SelectObject(hdc, hbmp); + + +} + +START_TEST(GetDIBColorTable) +{ + Test_GetDIBColorTable(); +} + Propchange: trunk/rostests/apitests/gdi32/GetDIBColorTable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/GetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -28,6 +28,13 @@ color = GetPixel(hdc, 1, 0); ok(color == 0, "Wrong color at 1,0 : 0x%08x\n", (UINT)color); + SetBkColor(hdc, 0x0000FF); + SetTextColor(hdc, 0x00FF00); + color = GetPixel(hdc, 0, 0); + ok(color == 0xFFFFFF, "Wrong color at 0,0 : 0x%08x\n", (UINT)color); + color = GetPixel(hdc, 1, 0); + ok(color == 0, "Wrong color at 1,0 : 0x%08x\n", (UINT)color); + SetBkColor(hdc, 0x12345678); SetTextColor(hdc, 0x87654321); color = GetPixel(hdc, 0, 0); Modified: trunk/rostests/apitests/gdi32/PatBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -12,6 +12,68 @@ HBITMAP ghbmpTarget; PULONG gpulTargetBits; HDC hdcTarget; + +void Test_PatBlt_Params() +{ + BOOL ret; + ULONG i, rop; + HDC hdc; + + /* Test a rop that contains only the operation index */ + ret = PatBlt(hdcTarget, 0, 0, 1, 1, PATCOPY & 0x00FF0000); + ok_long(ret, 1); + + /* Test an invalid rop */ + SetLastError(0); + ok_long(PatBlt(hdcTarget, 0, 0, 1, 1, SRCCOPY) , 0); + ok_err(0); + + /* Test all rops */ + for (i = 0; i < 256; i++) + { + rop = i << 16; + ret = PatBlt(hdcTarget, 0, 0, 1, 1, rop); + + /* Only these should succeed (they use no source) */ + if ((i == 0) || (i == 5) || (i == 10) || (i == 15) || (i == 80) || + (i == 85) || (i == 90) || (i == 95) || (i == 160) || (i == 165) || + (i == 170) || (i == 175) || (i == 240) || (i == 245) || + (i == 250) || (i == 255)) + { + ok(ret == 1, "index %ld failed, but should succeed\n", i); + } + else + { + ok(ret == 0, "index %ld succeeded, but should fail\n", i); + } + } + + /* Test quaternary rop, the background part is simply ignored */ + ret = PatBlt(hdcTarget, 0, 0, 1, 1, MAKEROP4(PATCOPY, PATINVERT)); + ok_long(ret, 1); + ret = PatBlt(hdcTarget, 0, 0, 1, 1, MAKEROP4(PATCOPY, SRCCOPY)); + ok_long(ret, 1); + ret = PatBlt(hdcTarget, 0, 0, 1, 1, MAKEROP4(SRCCOPY, PATCOPY)); + ok_long(ret, 0); + + /* Test an info DC */ + hdc = CreateICA("DISPLAY", NULL, NULL, NULL); + ok(hdc != 0, "\n"); + SetLastError(0); + ok_long(PatBlt(hdc, 0, 0, 1, 1, PATCOPY), 1); + ok_err(0); + DeleteDC(hdc); + + /* Test a mem DC without selecting a bitmap */ + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "\n"); + ok_long(PatBlt(hdc, 0, 0, 1, 1, PATCOPY), 1); + ok_err(0); + DeleteDC(hdc); + + + +} void Test_BrushOrigin() { @@ -100,6 +162,10 @@ return; } + Test_PatBlt_Params(); + Test_BrushOrigin(); + + } Added: trunk/rostests/apitests/gdi32/SetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/SetPixel.c (added) +++ trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -1,0 +1,187 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetPixel + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +static struct +{ + WORD palVersion; + WORD palNumEntries; + PALETTEENTRY logpalettedata[8]; +} gpal = +{ + 0x300, 8, + { + { 0x10, 0x20, 0x30, PC_NOCOLLAPSE }, + { 0x20, 0x30, 0x40, PC_NOCOLLAPSE }, + { 0x30, 0x40, 0x50, PC_NOCOLLAPSE }, + { 0x40, 0x50, 0x60, PC_NOCOLLAPSE }, + { 0x50, 0x60, 0x70, PC_NOCOLLAPSE }, + { 0x60, 0x70, 0x80, PC_NOCOLLAPSE }, + { 0x70, 0x80, 0x90, PC_NOCOLLAPSE }, + { 0x80, 0x90, 0xA0, PC_NOCOLLAPSE }, + } +}; + +void Test_SetPixel_Params() +{ + HDC hdc; + + SetLastError(0); + ok_long(SetPixel(0, 0, 0, RGB(255,255,255)), -1); + ok_err(ERROR_INVALID_HANDLE); + + /* Test an info DC */ + hdc = CreateICA("DISPLAY", NULL, NULL, NULL); + ok(hdc != 0, "\n"); + SetLastError(0); + ok_long(SetPixel(hdc, 0, 0, 0), -1); + ok_long(SetPixel(hdc, 0, 0, RGB(255,255,255)), -1); + ok_err(0); + DeleteDC(hdc); + + /* Test a mem DC without selecting a bitmap */ + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "\n"); + SetLastError(0); + ok_long(SetPixel(hdc, 0, 0, 0), -1); + ok_err(0); + DeleteDC(hdc); + + /* Test deleted DC */ + ok_long(SetPixel(hdc, 0, 0, 0), -1); + +} + +void Test_SetPixel_PAL() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD bmiColors[8]; + } bmibuffer; + BITMAPINFO *pbmi = (PVOID)&bmibuffer; + HBITMAP hbmp; + HDC hdc; + HPALETTE hpal, hpalOld; + PULONG pulBits; + ULONG i; + + /* Initialize the BITMAPINFO */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 1; + pbmi->bmiHeader.biHeight = 1; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 8; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 1; + pbmi->bmiHeader.biYPelsPerMeter = 1; + pbmi->bmiHeader.biClrUsed = 8; + pbmi->bmiHeader.biClrImportant = 0; + for( i = 0; i < 8; i++ ) + { + bmibuffer.bmiColors[i] = i + 1; + } + + /* Create a memory DC */ + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + /* Create a DIB section and select it */ + hbmp = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (PVOID*)&pulBits, 0, 0 ); + ok(hbmp != NULL, "CreateDIBSection failed with error %ld\n", GetLastError()); + ok(SelectObject(hdc, hbmp) != 0, "SelectObject failed\n"); + + ok_long(SetPixel(hdc, 0, 0, 0), 0); + ok_long(pulBits[0], 8); + ok_long(SetPixel(hdc, 0, 0, 1), 0); + ok_long(pulBits[0], 8); + ok_long(SetPixel(hdc, 0, 0, RGB(255,255,255)), 0xc0dcc0); + ok_long(pulBits[0], 7); + + ok_long(SetPixel(hdc, 0, 0, RGB(255,0,0)), 0x80); + ok_long(pulBits[0], 0); + + /* Test DIBINDEX */ + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(0)), 0x80); + ok_long(pulBits[0], 0); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(1)), 0x8000); + ok_long(pulBits[0], 1); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(7)), 0xc0dcc0); + ok_long(pulBits[0], 7); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(8)), 0); + ok_long(pulBits[0], 8); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(126)), 0); + ok_long(pulBits[0], 126); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(0x123456)), 0); + ok_long(pulBits[0], 0x56); + + /* Test PALETTEINDEX */ + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(0)), 0); + ok_long(pulBits[0], 8); + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(1)), 0x80); + ok_long(pulBits[0], 0); + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(2)), 0x8000); + ok_long(pulBits[0], 1); + + /* Delete the DIB section */ + DeleteObject(hbmp); + + + /* Initialize the logical palette and select it */ + hpal = CreatePalette((LOGPALETTE*)&gpal); + hpalOld = SelectPalette(hdc, hpal, FALSE); + ok(hpalOld != NULL, "error=%ld\n", GetLastError()); + + + /* Create a DIB section and select it */ + hbmp = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (PVOID*)&pulBits, 0, 0 ); + ok(hbmp != NULL, "CreateDIBSection failed with error %ld\n", GetLastError()); + ok(SelectObject(hdc, hbmp) != 0, "SelectObject failed\n"); + + ok_long(SetPixel(hdc, 0, 0, 0), 0); + ok_long(pulBits[0], 8); + + ok_long(SetPixel(hdc, 0, 0, RGB(255,0,0)), 0x605040); + ok_long(pulBits[0], 2); + + /* Test DIBINDEX */ + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(0)), 0x403020); + ok_long(pulBits[0], 0); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(1)), 0x504030); + ok_long(pulBits[0], 1); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(7)), 0x302010); + ok_long(pulBits[0], 7); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(8)), 0); + ok_long(pulBits[0], 8); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(126)), 0); + ok_long(pulBits[0], 126); + ok_long(SetPixel(hdc, 0, 0, DIBINDEX(0x123456)), 0); + ok_long(pulBits[0], 0x56); + + /* Test PALETTEINDEX */ + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(0)), 0x302010); + ok_long(pulBits[0], 7); + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(1)), 0x403020); + ok_long(pulBits[0], 0); + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(253)), 0x302010); + ok_long(pulBits[0], 7); + ok_long(SetPixel(hdc, 0, 0, PALETTEINDEX(254)), 0x302010); + ok_long(pulBits[0], 7); + + +} + +START_TEST(SetPixel) +{ + Test_SetPixel_Params(); + Test_SetPixel_PAL(); +} + Propchange: trunk/rostests/apitests/gdi32/SetPixel.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Fri May 4 11:40:36 2012 @@ -39,6 +39,7 @@ extern void func_GdiSetAttrs(void); extern void func_GetClipRgn(void); extern void func_GetCurrentObject(void); +extern void func_GetDIBColorTable(void); extern void func_GetDIBits(void); extern void func_GetPixel(void); extern void func_GetObject(void); @@ -50,9 +51,11 @@ extern void func_PatBlt(void); extern void func_Rectangle(void); extern void func_SelectObject(void); +extern void func_SetBrushOrgEx(void); extern void func_SetDCPenColor(void); extern void func_SetDIBits(void); extern void func_SetMapMode(void); +extern void func_SetPixel(void); extern void func_SetSysColors(void); extern void func_SetWindowExtEx(void); extern void func_SetWorldTransform(void); @@ -93,6 +96,7 @@ { "GdiSetAttrs", func_GdiSetAttrs }, { "GetClipRgn", func_GetClipRgn }, { "GetCurrentObject", func_GetCurrentObject }, + { "GetDIBColorTable", func_GetDIBColorTable }, { "GetDIBits", func_GetDIBits }, { "GetPixel", func_GetPixel }, { "GetObject", func_GetObject }, @@ -104,9 +108,11 @@ { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, { "SelectObject", func_SelectObject }, + { "SetBrushOrgEx", func_SetBrushOrgEx }, { "SetDCPenColor", func_SetDCPenColor }, { "SetDIBits", func_SetDIBits }, { "SetMapMode", func_SetMapMode }, + { "SetPixel", func_SetPixel }, { "SetSysColors", func_SetSysColors }, { "SetWindowExtEx", func_SetWindowExtEx }, { "SetWorldTransform", func_SetWorldTransform },

1 0

[tkreuzer] 56491: [NTOSKRNL] - Fix amd64 build - Fix some MSVC/amd64 warnings
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 11:32:07 2012 New Revision: 56491 URL: http://svn.reactos.org/svn/reactos?rev=56491&view=rev Log: [NTOSKRNL] - Fix amd64 build - Fix some MSVC/amd64 warnings Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -869,7 +869,7 @@ MmLockSectionSegment(Segment); Segment->RawLength.QuadPart = NewSize->QuadPart; Segment->Length.QuadPart = MAX(Segment->Length.QuadPart, - PAGE_ROUND_UP(Segment->RawLength.LowPart)); + (LONG64)PAGE_ROUND_UP(Segment->RawLength.QuadPart)); MmUnlockSectionSegment(Segment); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -1738,12 +1738,16 @@ /* Was the PDE invalid */ if (PointerPde->u.Long == 0) { +#if (_MI_PAGING_LEVELS == 2) /* Find the system double-mapped PDE that describes this mapping */ SystemMapPde = &MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)]; /* Make it valid */ ASSERT(SystemMapPde->u.Hard.Valid == 1); MI_WRITE_VALID_PDE(PointerPde, *SystemMapPde); +#else + ASSERT(FALSE); +#endif } /* Dereference the PDE and the PTE */ @@ -1791,7 +1795,8 @@ IN PVOID Base, OUT PCONTROL_AREA *ControlArea) { - ULONG Hash, Size, Count = 0, Entry; + ULONG Hash, Size, Count = 0; + ULONG_PTR Entry; PAGED_CODE(); /* Compute the hash for this entry and loop trying to find it */ @@ -1846,7 +1851,7 @@ /* Clear the bits for this mapping */ RtlClearBits(Session->SystemSpaceBitMap, - ((ULONG_PTR)MappedBase - (ULONG_PTR)Session->SystemSpaceViewStart) >> 16, + (ULONG)(((ULONG_PTR)MappedBase - (ULONG_PTR)Session->SystemSpaceViewStart) >> 16), Size); /* Convert the size from a bit size into the actual size */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -3579,7 +3579,7 @@ // PointerPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(FoundVad, StartingAddress >> PAGE_SHIFT); LastPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(FoundVad, EndingAddress >> PAGE_SHIFT); - QuotaCharge = LastPte - PointerPte + 1; + QuotaCharge = (ULONG)(LastPte - PointerPte + 1); KeAcquireGuardedMutexUnsafe(&MmSectionCommitMutex); // Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=564… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -125,7 +125,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - ULONG Entry; + ULONG_PTR Entry; Offset = MemoryArea->Data.SectionData.ViewOffset.QuadPart + ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress); @@ -134,8 +134,8 @@ /* * Get or create a pageop */ - Entry = MmGetPageEntrySectionSegment - (MemoryArea->Data.SectionData.Segment, (PLARGE_INTEGER)&Offset); + Entry = MmGetPageEntrySectionSegment(MemoryArea->Data.SectionData.Segment, + (PLARGE_INTEGER)&Offset); if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) { MmUnlockSectionSegment(MemoryArea->Data.SectionData.Segment); @@ -430,7 +430,7 @@ where n is between 0 and 255. When such an rmap exists, it specifies a segment rmap in which the process part is a pointer to a slice of a section page table, and the low 8 bits of the address represent a page index in the -page table slice. Together, this information is used by +page table slice. Together, this information is used by MmGetSectionAssociation to determine which page entry points to this page in the segment page table. Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -1163,7 +1163,7 @@ NTSTATUS NTAPI MiReadPage(PMEMORY_AREA MemoryArea, - ULONG SegOffset, + ULONG_PTR SegOffset, PPFN_NUMBER Page) /* * FUNCTION: Read a page for a section backed memory area. @@ -1685,7 +1685,7 @@ */ MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - + /* * Wait for any other operations to complete */ @@ -2418,7 +2418,7 @@ + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); /* - * An MM_WAIT_ENTRY is ok in this case... It'll just count as + * An MM_WAIT_ENTRY is ok in this case... It'll just count as * IS_SWAP_FROM_SSE and we'll do the right thing. */ Page = MmGetPfnForProcess(Process, Address);

1 0

[tfaber] 56490: [KERNEL32] - Fix SetCurrentDirectoryA to return success when setting the current directory again See issue #6874 for more details.
by tfaber＠svn.reactos.org 04 May '12

04 May '12

Author: tfaber Date: Fri May 4 10:32:49 2012 New Revision: 56490 URL: http://svn.reactos.org/svn/reactos?rev=56490&view=rev Log: [KERNEL32] - Fix SetCurrentDirectoryA to return success when setting the current directory again See issue #6874 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Fri May 4 10:32:49 2012 @@ -1372,7 +1372,7 @@ /* Create the string that describes the output buffer from the caller */ CallerBuffer.Length = 0; CallerBuffer.Buffer = lpBuffer; - + /* How much space does the caller have? */ if (nBufferLength <= UNICODE_STRING_MAX_CHARS) { @@ -1407,7 +1407,7 @@ Status); DbgPrint(" Path = %wZ\n", &PathString); } - + /* Check if the failure was due to a small buffer */ if (Status == STATUS_BUFFER_TOO_SMALL) { @@ -1425,7 +1425,7 @@ { /* It worked! Write the file part now */ if (lpFilePart) *lpFilePart = &lpBuffer[FilePartSize]; - + /* Convert the final result length */ Result = CallerBuffer.Length / sizeof(WCHAR); } @@ -2205,7 +2205,7 @@ DirName = Basep8BitStringToStaticUnicodeString(lpPathName); if (!DirName) return FALSE; - if (CheckForSameCurdir(DirName)) return FALSE; + if (CheckForSameCurdir(DirName)) return TRUE; Status = RtlSetCurrentDirectory_U(DirName); if (NT_SUCCESS(Status)) return TRUE;

1 0

[tfaber] 56489: [KERNEL32_APITEST] - Add some tests for GetCurrentDirectory and SetCurrentDirectory
by tfaber＠svn.reactos.org 04 May '12

04 May '12

Author: tfaber Date: Fri May 4 10:28:54 2012 New Revision: 56489 URL: http://svn.reactos.org/svn/reactos?rev=56489&view=rev Log: [KERNEL32_APITEST] - Add some tests for GetCurrentDirectory and SetCurrentDirectory Added: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c (with props) trunk/rostests/apitests/kernel32/SetCurrentDirectory.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Fri May 4 10:28:54 2012 @@ -2,7 +2,9 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE + GetCurrentDirectory.c GetDriveType.c + SetCurrentDirectory.c testlist.c) add_executable(kernel32_apitest ${SOURCE}) Added: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/GetCurrentDirectory.c (added) +++ trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -1,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for GetCurrentDirectory + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtltypes.h> + +static +BOOLEAN +CheckBuffer( + const VOID *Buffer, + SIZE_T Size, + UCHAR Value) +{ + const UCHAR *Array = Buffer; + SIZE_T i; + + for (i = 0; i < Size; i++) + if (Array[i] != Value) + { + trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +BOOLEAN +CheckStringBufferA( + const VOID *Buffer, + SIZE_T Size, + PCSTR Expected, + UCHAR Fill) +{ + const CHAR *Chars = Buffer; + const UCHAR *UChars = Buffer; + SIZE_T Length = strlen(Expected); + SIZE_T i; + + if (Size < Length) + { + ok(0, "Size = %lu, Length = %lu\n", (ULONG)Size, (ULONG)Length); + return FALSE; + } + + for (i = 0; i < Length; i++) + if (Chars[i] != Expected[i]) + { + trace("Expected %x, found %x at offset %lu\n", Expected[i], Chars[i], (ULONG)i); + return FALSE; + } + + ok(Chars[i] == 0, "Expected null terminator, found %x at offset %lu\n", Chars[i], (ULONG)i); + i++; + + for (; i < Size; i++) + if (UChars[i] != Fill) + { + trace("Expected %x, found %x at offset %lu\n", Fill, UChars[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +BOOLEAN +CheckStringBufferW( + const VOID *Buffer, + SIZE_T Size, + PCWSTR Expected, + UCHAR Fill) +{ + const WCHAR *Chars = Buffer; + const UCHAR *UChars = Buffer; + SIZE_T Length = wcslen(Expected); + SIZE_T i; + + if (Size < Length) + { + ok(0, "Size = %lu, Length = %lu\n", (ULONG)Size, (ULONG)Length); + return FALSE; + } + + for (i = 0; i < Length; i++) + if (Chars[i] != Expected[i]) + { + trace("Expected %x, found %x at offset %lu\n", Expected[i], Chars[i], (ULONG)i); + return FALSE; + } + + ok(Chars[i] == 0, "Expected null terminator, found %x at offset %lu\n", Chars[i], (ULONG)i); + i++; + + i *= sizeof(WCHAR); + + for (; i < Size; i++) + if (UChars[i] != Fill) + { + trace("Expected %x, found %x at offset %lu\n", Fill, UChars[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +VOID +TestGetCurrentDirectoryA(VOID) +{ + CHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Ret; + BOOLEAN Okay; + + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectory failed with %lu\n", GetLastError()); + + Length = GetCurrentDirectoryA(0, NULL); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferA(Buffer, sizeof(Buffer), "C:\\", 0x55); + ok(Okay, "CheckStringBufferA failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(0, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(1, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(2, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(3, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(4, Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferA(Buffer, sizeof(Buffer), "C:\\", 0x55); + ok(Okay, "CheckStringBufferA failed\n"); +} + +static +VOID +TestGetCurrentDirectoryW(VOID) +{ + WCHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Ret; + BOOLEAN Okay; + + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectory failed with %lu\n", GetLastError()); + + Length = GetCurrentDirectoryW(0, NULL); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferW(Buffer, sizeof(Buffer), L"C:\\", 0x55); + ok(Okay, "CheckStringBufferW failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(0, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(1, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(2, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(3, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(4, Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferW(Buffer, sizeof(Buffer), L"C:\\", 0x55); + ok(Okay, "CheckStringBufferW failed\n"); +} + +START_TEST(GetCurrentDirectory) +{ + TestGetCurrentDirectoryA(); + TestGetCurrentDirectoryW(); +} Propchange: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/SetCurrentDirectory.c (added) +++ trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -1,0 +1,109 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SetCurrentDirectory + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtltypes.h> + +static +VOID +SetUnrelatedDirectory(VOID) +{ + WCHAR Buffer[MAX_PATH]; + BOOL Ret; + + GetWindowsDirectoryW(Buffer, sizeof(Buffer) / sizeof(WCHAR)); + Ret = SetCurrentDirectoryW(Buffer); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); +} + +static +VOID +TestSetCurrentDirectoryA(VOID) +{ + BOOL Ret; + CHAR Buffer[MAX_PATH]; + DWORD Length; + + SetUnrelatedDirectory(); + + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + /* Same directory - succeeds */ + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + /* Same directory, lowercase - succeeds and does not change case */ + Ret = SetCurrentDirectoryA("c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + SetUnrelatedDirectory(); + + /* Now this one does change case */ + Ret = SetCurrentDirectoryA("c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "c:\\"), "Current directory is %s\n", Buffer); +} + +static +VOID +TestSetCurrentDirectoryW(VOID) +{ + BOOL Ret; + WCHAR Buffer[MAX_PATH]; + DWORD Length; + + SetUnrelatedDirectory(); + + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + /* Same directory - succeeds */ + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + /* Same directory, lowercase - succeeds and does not change case */ + Ret = SetCurrentDirectoryW(L"c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + SetUnrelatedDirectory(); + + /* Now this one does change case */ + Ret = SetCurrentDirectoryW(L"c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"c:\\"), "Current directory is %ls\n", Buffer); +} + +START_TEST(SetCurrentDirectory) +{ + TestSetCurrentDirectoryA(); + TestSetCurrentDirectoryW(); +} Propchange: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -5,11 +5,15 @@ #define STANDALONE #include "wine/test.h" +extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); +extern void func_SetCurrentDirectory(void); const struct test winetest_testlist[] = { - { "GetDriveType", func_GetDriveType }, + { "GetCurrentDirectory", func_GetCurrentDirectory }, + { "GetDriveType", func_GetDriveType }, + { "SetCurrentDirectory", func_SetCurrentDirectory }, { 0, 0 } };

1 0

[arty] 56488: [NTOSKRNL] Account for wait entries delaying a view attribute change and interacting with the machinery in CoW copying code, specifically making CoW insert and revoke a wait while cop...
by arty＠svn.reactos.org 03 May '12

03 May '12

Author: arty Date: Thu May 3 21:05:06 2012 New Revision: 56488 URL: http://svn.reactos.org/svn/reactos?rev=56488&view=rev Log: [NTOSKRNL] Account for wait entries delaying a view attribute change and interacting with the machinery in CoW copying code, specifically making CoW insert and revoke a wait while copying the page, and make the CoW copy function take both pages as arguments rather than relying on the address space. Also alter the MM_WAIT_ENTRY value a bit to take into account an assert that it must have bit 0x800 set. Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Thu May 3 21:05:06 2012 @@ -4,7 +4,7 @@ /* TYPES *********************************************************************/ -#define MM_WAIT_ENTRY 0x7ffff800 +#define MM_WAIT_ENTRY 0x7ffffc00 #define PFN_FROM_SSE(E) ((PFN_NUMBER)((E) >> PAGE_SHIFT)) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) #define MM_IS_WAIT_PTE(E) \ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu May 3 21:05:06 2012 @@ -955,8 +955,8 @@ NTSTATUS NTAPI MiCopyFromUserPage( - PFN_NUMBER Page, - PVOID SourceAddress + PFN_NUMBER NewPage, + PFN_NUMBER OldPage ); NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu May 3 21:05:06 2012 @@ -558,6 +558,7 @@ if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { + DPRINT1("Pte %x (want not 1 and 0x800)\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu May 3 21:05:06 2012 @@ -959,22 +959,24 @@ NTSTATUS NTAPI -MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress) +MiCopyFromUserPage(PFN_NUMBER DestPage, PFN_NUMBER SrcPage) { PEPROCESS Process; - KIRQL Irql; - PVOID TempAddress; - - ASSERT((ULONG_PTR)SourceAddress % PAGE_SIZE == 0); + KIRQL Irql, Irql2; + PVOID DestAddress, SrcAddress; + Process = PsGetCurrentProcess(); - TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); - if (TempAddress == NULL) + DestAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); + SrcAddress = MiMapPageInHyperSpace(Process, SrcPage, &Irql2); + if (DestAddress == NULL || SrcAddress == NULL) { return(STATUS_NO_MEMORY); } - ASSERT((ULONG_PTR)TempAddress % PAGE_SIZE == 0); - RtlCopyMemory(TempAddress, SourceAddress, PAGE_SIZE); - MiUnmapPageInHyperSpace(Process, TempAddress, Irql); + ASSERT((ULONG_PTR)DestAddress % PAGE_SIZE == 0); + ASSERT((ULONG_PTR)SrcAddress % PAGE_SIZE == 0); + RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); + MiUnmapPageInHyperSpace(Process, SrcAddress, Irql2); + MiUnmapPageInHyperSpace(Process, DestAddress, Irql); return(STATUS_SUCCESS); } @@ -1620,6 +1622,7 @@ PMM_REGION Region; ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + SWAPENTRY SwapEntry; DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address); @@ -1699,6 +1702,10 @@ return(STATUS_MM_RESTART_OPERATION); } + MmDeleteRmap(OldPage, Process, PAddress); + MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL); + MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); + /* * Release locks now we have the pageop */ @@ -1720,17 +1727,14 @@ /* * Copy the old page */ - MiCopyFromUserPage(NewPage, PAddress); + MiCopyFromUserPage(NewPage, OldPage); MmLockAddressSpace(AddressSpace); - /* - * Delete the old entry. - */ - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); /* * Set the PTE to point to the new page */ + MmDeletePageFileMapping(Process, PAddress, &SwapEntry); Status = MmCreateVirtualMapping(Process, PAddress, Region->Protect, @@ -1751,7 +1755,7 @@ /* * Unshare the old page. */ - MmDeleteRmap(OldPage, Process, PAddress); + DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); MmInsertRmap(NewPage, Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL); @@ -2388,8 +2392,17 @@ { for (i = 0; i < PAGE_ROUND_UP(RegionSize) / PAGE_SIZE; i++) { + SWAPENTRY SwapEntry; PVOID Address = (char*)BaseAddress + (i * PAGE_SIZE); ULONG Protect = NewProtect; + + /* Wait for a wait entry to disappear */ + do { + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry != MM_WAIT_ENTRY) + break; + MiWaitForPageEvent(Process, Address); + } while (TRUE); /* * If we doing COW for this segment then check if the page is @@ -2404,6 +2417,10 @@ Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + /* + * An MM_WAIT_ENTRY is ok in this case... It'll just count as + * IS_SWAP_FROM_SSE and we'll do the right thing. + */ Page = MmGetPfnForProcess(Process, Address); Protect = PAGE_READONLY;

1 0

[jimtabor] 56487: [Win32k] - Add a define for non window pointers. Help out Timo.
by jimtabor＠svn.reactos.org 03 May '12

03 May '12

Author: jimtabor Date: Thu May 3 20:58:53 2012 New Revision: 56487 URL: http://svn.reactos.org/svn/reactos?rev=56487&view=rev Log: [Win32k] - Add a define for non window pointers. Help out Timo. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu May 3 20:58:53 2012 @@ -638,6 +638,8 @@ /* Entry in the list of thread windows. */ LIST_ENTRY ThreadListEntry; } WND, *PWND; + +#define PWND_BOTTOM ((PWND)1) typedef struct _SBWND { Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu May 3 20:58:53 2012 @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

1 0

[tkreuzer] 56486: - Move NtGdiSetBrushOrg from brush.c to dcobjs.c, since it doesn't really deal with brushes, but with the dc and is related to the brush seletcted into the dc. Cleanup, simplify a...
by tkreuzer＠svn.reactos.org 03 May '12

03 May '12

Author: tkreuzer Date: Thu May 3 18:55:38 2012 New Revision: 56486 URL: http://svn.reactos.org/svn/reactos?rev=56486&view=rev Log: - Move NtGdiSetBrushOrg from brush.c to dcobjs.c, since it doesn't really deal with brushes, but with the dc and is related to the brush seletcted into the dc. Cleanup, simplify and fix the function. - rename IntptlBrushOrigin to DC_vSetBrushOrigin and also move it to dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -484,60 +484,5 @@ return IntGdiCreateSolidBrush(Color); } -/** - * \name NtGdiSetBrushOrg - * - * \brief Sets the brush origin that GDI assigns to - * the next brush an application selects into the specified device context. - * - * @implemented - */ -BOOL -APIENTRY -NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) -{ - PDC dc; - PDC_ATTR pdcattr; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = dc->pdcattr; - - if (Point != NULL) - { - NTSTATUS Status = STATUS_SUCCESS; - POINT SafePoint; - SafePoint.x = pdcattr->ptlBrushOrigin.x; - SafePoint.y = pdcattr->ptlBrushOrigin.y; - _SEH2_TRY - { - ProbeForWrite(Point, sizeof(POINT), 1); - *Point = SafePoint; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - - pdcattr->ptlBrushOrigin.x = XOrg; - pdcattr->ptlBrushOrigin.y = YOrg; - IntptlBrushOrigin(dc, XOrg, YOrg ); - DC_UnlockDc(dc); - - return TRUE; -} /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -1205,17 +1205,6 @@ return TRUE; } -PPOINTL -FASTCALL -IntptlBrushOrigin(PDC pdc, LONG x, LONG y ) -{ - pdc->dclevel.ptlBrushOrigin.x = x; - pdc->dclevel.ptlBrushOrigin.y = y; - pdc->ptlFillOrigin.x = pdc->dclevel.ptlBrushOrigin.x + pdc->ptlDCOrig.x; - pdc->ptlFillOrigin.y = pdc->dclevel.ptlBrushOrigin.y + pdc->ptlDCOrig.y; - return &pdc->dclevel.ptlBrushOrigin; -} - static VOID FASTCALL DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio) Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Thu May 3 18:55:38 2012 @@ -159,4 +159,4 @@ VOID FASTCALL IntMirrorWindowOrg(PDC); void FASTCALL IntFixIsotropicMapping(PDC); LONG FASTCALL IntCalcFillOrigin(PDC); -PPOINTL FASTCALL IntptlBrushOrigin(PDC pdc,LONG,LONG); + Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu May 3 18:55:38 2012 @@ -189,6 +189,9 @@ BOOL FASTCALL IntSetDefaultRegion(PDC); BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); +VOID +NTAPI +DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y); FORCEINLINE PDC Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -136,6 +136,71 @@ /* Clear flag */ pdcattr->ulDirty_ &= ~DIRTY_BACKGROUND; +} + +VOID +NTAPI +DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y) +{ + /* Set the brush origin */ + pdc->dclevel.ptlBrushOrigin.x = x; + pdc->dclevel.ptlBrushOrigin.y = y; + + /* Set the fill origin */ + pdc->ptlFillOrigin.x = x + pdc->ptlDCOrig.x; + pdc->ptlFillOrigin.y = y + pdc->ptlDCOrig.y; +} + +/** + * \name NtGdiSetBrushOrg + * + * \brief Sets the brush origin that GDI uses when drawing with pattern + * brushes. The brush origin is relative to the DC origin. + * + * @implemented + */ +BOOL +APIENTRY +NtGdiSetBrushOrg( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _Out_opt_ LPPOINT pptOut) +{ + PDC pdc; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Check if the old origin was requested */ + if (pptOut != NULL) + { + /* Enter SEH for buffer transfer */ + _SEH2_TRY + { + /* Probe and copy the old origin */ + ProbeForWrite(pptOut, sizeof(POINT), 1); + *pptOut = pdc->pdcattr->ptlBrushOrigin; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DC_UnlockDc(pdc); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + } + + /* Call the internal function */ + DC_vSetBrushOrigin(pdc, x, y); + + /* Unlock the DC and return success */ + DC_UnlockDc(pdc); + return TRUE; } HPALETTE Modified: trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdibatch… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -109,7 +109,7 @@ if (!dc) break; pgSBO = (PGDIBSSETBRHORG) pHdr; pdcattr->ptlBrushOrigin = pgSBO->ptlBrushOrigin; - IntptlBrushOrigin(dc, pgSBO->ptlBrushOrigin.x, pgSBO->ptlBrushOrigin.y); + DC_vSetBrushOrigin(dc, pgSBO->ptlBrushOrigin.x, pgSBO->ptlBrushOrigin.y); break; } case GdiBCExtSelClipRgn:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs