Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[tkreuzer] 28457: some tests for NtGdiDoPalette

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 23 04:19:00 2007 New Revision: 28457 URL: http://svn.reactos.org/svn/reactos?rev=28457&view=rev Log: some tests for NtGdiDoPalette Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Thu Aug 23 04:19:00 2007 @@ -1,0 +1,264 @@ +#include "../w32knapi.h" + +W32KAPI +LONG +APIENTRY +NtGdiDoPalette( + IN HPALETTE hpal, + IN WORD iStart, + IN WORD cEntries, + IN PALETTEENTRY *pPalEntries, + IN DWORD iFunc, + IN BOOL bInbound +) +{ + return (LONG)Syscall(L"NtGdiDoPalette", 6, &hpal); +} + +HPALETTE +CreateTestPalette() +{ + struct + { + LOGPALETTE logpal; + PALETTEENTRY entry[5]; + } palstruct = + { {0x300,5, + { {1,2,3,0} }}, + { {22,33,44,PC_RESERVED}, + {11,55,77,PC_EXPLICIT}, + {00,77,66,PC_RESERVED | PC_NOCOLLAPSE}, + {12,34,56,78}} }; + + return CreatePalette((LOGPALETTE*)&palstruct); +} + +INT +Test_NtGdiDoPalette_GdiPalAnimate(PTESTINFO pti) +{ + HPALETTE hPal; + PALETTEENTRY palEntries[5] = { + {0,0,0,0}, + {0xff,0xff,0xff,0}, + {0x33,0x66,0x99,0}, + {0x25,0x84,0x14,0}, + {0x12,0x34,0x56,0x11}}; + PALETTEENTRY palEntries2[5]; + + /* Test stock palette */ + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiDoPalette(GetStockObject(DEFAULT_PALETTE), 0, 1, palEntries, GdiPalAnimate, FALSE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + + /* Test pEntries = NULL */ + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalAnimate, TRUE) == 0); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalAnimate, FALSE) == 0); + DeleteObject(hPal); + + /* Test PC_RESERVED */ + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, TRUE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 1, 5, palEntries, GdiPalAnimate, TRUE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 2, 5, palEntries, GdiPalAnimate, TRUE) == 1); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 3, 5, palEntries, GdiPalAnimate, TRUE) == 1); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 4, 5, palEntries, GdiPalAnimate, TRUE) == 0); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 5, 5, palEntries, GdiPalAnimate, TRUE) == 0); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, FALSE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 3, 5, palEntries, GdiPalAnimate, FALSE) == 1); + DeleteObject(hPal); + + /* Test if entries are set correctly */ + hPal = CreateTestPalette(); + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, TRUE); + NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE); + RTEST(palEntries2[0].peRed == 1); + RTEST(palEntries2[0].peGreen == 2); + RTEST(palEntries2[0].peBlue == 3); + RTEST(palEntries2[0].peFlags == 0); + RTEST(palEntries2[1].peRed == palEntries[1].peRed); + RTEST(palEntries2[1].peGreen == palEntries[1].peGreen); + RTEST(palEntries2[1].peBlue == palEntries[1].peBlue); + RTEST(palEntries2[1].peFlags == palEntries[1].peFlags); + RTEST(palEntries2[2].peRed == 11); + RTEST(palEntries2[2].peGreen == 55); + RTEST(palEntries2[2].peBlue == 77); + TEST(palEntries2[2].peFlags == PC_EXPLICIT); + RTEST(palEntries2[3].peRed == palEntries[3].peRed); + RTEST(palEntries2[3].peGreen == palEntries[3].peGreen); + RTEST(palEntries2[3].peBlue == palEntries[3].peBlue); + RTEST(palEntries2[3].peFlags == palEntries[3].peFlags); + DeleteObject(hPal); + + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GdiPalSetEntries(PTESTINFO pti) +{ + HPALETTE hPal; + PALETTEENTRY palEntries[5] = { + {0,0,0,0}, + {0xff,0xff,0xff,0}, + {0x33,0x66,0x99,0}, + {0x25,0x84,0x14,0}, + {0x12,0x34,0x56,0x11}}; + PALETTEENTRY palEntries2[5]; + + hPal = CreateTestPalette(); + + /* Test invalid handle */ + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiDoPalette((HPALETTE)23, 0, 1, palEntries, GdiPalSetEntries, TRUE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* Test system palette */ + RTEST(NtGdiDoPalette(GetStockObject(DEFAULT_PALETTE), 0, 1, palEntries, GdiPalSetEntries, TRUE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + RTEST(NtGdiDoPalette(hPal, 0, 1, palEntries, GdiPalSetEntries, TRUE) == 1); + RTEST(NtGdiDoPalette(hPal, 0, 2, palEntries, GdiPalSetEntries, TRUE) == 2); + RTEST(NtGdiDoPalette(hPal, 0, 3, palEntries, GdiPalSetEntries, TRUE) == 3); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE) == 5); + RTEST(NtGdiDoPalette(hPal, 0, 6, palEntries, GdiPalSetEntries, TRUE) == 5); + RTEST(NtGdiDoPalette(hPal, 3, 6, palEntries, GdiPalSetEntries, TRUE) == 2); +// TEST(NtGdiDoPalette(hPal, 4, 23247, palEntries, GdiPalSetEntries, TRUE) == 0); + + /* Test bInbound == FALSE */ + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE); + ZeroMemory(palEntries2, sizeof(palEntries2)); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalSetEntries, FALSE) == 5); + /* we should get the old values returned in our buffer! */ + TEST(memcmp(palEntries2, palEntries, sizeof(palEntries)) == 0); + + /* check what we have in our palette now */ + ZeroMemory(palEntries2, sizeof(palEntries2)); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE) == 5); + TEST(memcmp(palEntries2, palEntries, sizeof(palEntries)) == 0); + + RTEST(NtGdiDoPalette(hPal, 0, 4, palEntries2, GdiPalSetEntries, TRUE) == 4); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* Test if entries are set correctly */ + hPal = CreateTestPalette(); + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE); + NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE); + RTEST(palEntries2[0].peRed == 0); + RTEST(palEntries2[0].peGreen == 0); + RTEST(palEntries2[0].peBlue == 0); + RTEST(palEntries2[0].peFlags == 0); + + /* Test that the buffer was not changed */ + + /* Test pEntries = NULL */ + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, TRUE) == 0); + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GdiPalGetEntries(PTESTINFO pti) +{ + HPALETTE hPal; + + hPal = CreateTestPalette(); + + /* Test pEntries = NULL */ + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, TRUE) == 0); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 2, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 20, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, -20, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 2, 0, NULL, GdiPalGetEntries, FALSE) == 5); + + +// Test flags 0xf0 + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GetSystemPalette(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GetBIBColorTable(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_SetDIBColorTable(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + + +INT +Test_NtGdiDoPalette(PTESTINFO pti) +{ + INT ret; + + ret = Test_NtGdiDoPalette_GdiPalAnimate(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GdiPalSetEntries(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GdiPalGetEntries(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GetSystemPalette(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GetBIBColorTable(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_SetDIBColorTable(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Thu Aug 23 04:19:00 2007 @@ -9,7 +9,7 @@ #include "ntgdi/NtGdiArcInternal.c" #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" -//#include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" @@ -29,7 +29,7 @@ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, -// { L"NtGdiDoPalette", Test_NtGdiDoPalette }, + { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits },

17 years, 4 months

[tkreuzer] 28456: win32k syscall dlls for win xp and 2k

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 23 01:49:49 2007 New Revision: 28456 URL: http://svn.reactos.org/svn/reactos?rev=28456&view=rev Log: win32k syscall dlls for win xp and 2k Added: trunk/rostests/apitests/w32kdll/directory.rbuild trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild trunk/rostests/apitests/w32kdll/w32kdll_ros/ trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.S trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild Removed: trunk/rostests/apitests/w32kdll/main.c trunk/rostests/apitests/w32kdll/w32kdll.def trunk/rostests/apitests/w32kdll/w32kdll.rbuild Modified: trunk/rostests/apitests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… Added: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… Removed: trunk/rostests/apitests/w32kdll/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/main.c?r… Removed: trunk/rostests/apitests/w32kdll/w32kdll.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll.… Removed: trunk/rostests/apitests/w32kdll/w32kdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll.… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…

17 years, 4 months

[jimtabor] 28455: - Removed NtGdiGetDIBits from w32ksvc.db and updated ntgdibad.h. - Created support function for GetDIBits when calling NtGdiGetDIBitsInternal. - Connected the gdi32 parts.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 22 23:45:06 2007 New Revision: 28455 URL: http://svn.reactos.org/svn/reactos?rev=28455&view=rev Log: - Removed NtGdiGetDIBits from w32ksvc.db and updated ntgdibad.h. - Created support function for GetDIBits when calling NtGdiGetDIBitsInternal. - Connected the gdi32 parts. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 22 23:45:06 2007 @@ -369,7 +369,7 @@ GetDCOrgEx@8 GetDCPenColor@4 GetDIBColorTable@16=NtGdiGetDIBColorTable@16 -GetDIBits@28=NtGdiGetDIBits@28 +GetDIBits@28 GetDeviceCaps@8=NtGdiGetDeviceCaps@8 GetDeviceGammaRamp@8 GetEnhMetaFileA@4 Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Wed Aug 22 23:45:06 2007 @@ -1,4 +1,31 @@ #include "precomp.h" + +/* + * Return the full scan size for a bitmap. + * + * Based on Wine and Windows Graphics Prog pg 595 + */ +UINT +FASTCALL +DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) +{ + UINT MaxBits = 0; + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; + MaxBits = Core->bcBitCount * Core->bcPlanes * Core->bcWidth; + } + else /* assume BITMAPINFOHEADER */ + { + if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) + return Info->bmiHeader.biSizeImage; + MaxBits = Info->bmiHeader.biBitCount * Info->bmiHeader.biPlanes * Info->bmiHeader.biWidth; + } + // Planes are over looked by Yuan. I guess assumed always 1. + MaxBits = (MaxBits + 31) / 32; // ScanLineSize = (Width * bitcount + 31)/32 + return (MaxBits * ScanLines); // ret the full Size. +} /* * @implemented @@ -144,3 +171,27 @@ FALSE, NULL); } + + +INT +STDCALL +GetDIBits( + HDC hDC, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + LPVOID lpvBits, + LPBITMAPINFO lpbmi, + UINT uUsage + ) +{ + return NtGdiGetDIBitsInternal(hDC, + hbmp, + uStartScan, + cScanLines, + lpvBits, + lpbmi, + uUsage, + DIB_BitmapMaxBitsSize( lpbmi, cScanLines ), + 0); +} Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 22 23:45:06 2007 @@ -317,20 +317,6 @@ RGBQUAD * Colors ); -/* Use NtGdiGetDIBitsInternal. */ -INT -STDCALL -NtGdiGetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO bi, - UINT Usage - ); - - /* Meta are user-mode. */ HENHMETAFILE STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Wed Aug 22 23:45:06 2007 @@ -1007,14 +1007,14 @@ bi.bmiHeader.biYPelsPerMeter = 0; bi.bmiHeader.biClrUsed = 0; - ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS); + ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS, 0, 0); size = bi.bmiHeader.biSizeImage + sizeof(BITMAPINFOHEADER); hCBData = ExAllocatePool(PagedPool, size); memcpy(hCBData, &bi, sizeof(BITMAPINFOHEADER)); - ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS); + ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); UserReleaseDC(NULL, hdc, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Aug 22 23:45:06 2007 @@ -352,13 +352,15 @@ /* Converts a device-dependent bitmap to a DIB */ INT STDCALL -NtGdiGetDIBits(HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO Info, - UINT Usage) +NtGdiGetDIBitsInternal(HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + LPBYTE Bits, + LPBITMAPINFO Info, + UINT Usage, + UINT MaxBits, + UINT MaxInfo) { BITMAPOBJ *BitmapObj; SURFOBJ *DestSurfObj; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 22 23:45:06 2007 @@ -180,7 +180,7 @@ NtGdiGetDeviceCaps 2 NtGdiGetDeviceGammaRamp 2 # NtGdiGetDeviceCapsAll 2 -# NtGdiGetDIBitsInternal 9 +NtGdiGetDIBitsInternal 9 # NtGdiGetETM 2 # NtGdiGetEudcTimeStampEx 3 NtGdiGetFontData 5 @@ -782,7 +782,6 @@ NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2 NtGdiGetDIBColorTable 4 -NtGdiGetDIBits 7 NtGdiGetEnhMetaFile 1 NtGdiGetEnhMetaFileBits 3 NtGdiGetEnhMetaFileDescription 3

17 years, 4 months

[janderwald] 28454: - fix description by Pierre Schweitzer (heis spiter at hotmail com)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 22 22:29:20 2007 New Revision: 28454 URL: http://svn.reactos.org/svn/reactos?rev=28454&view=rev Log: - fix description by Pierre Schweitzer (heis spiter at hotmail com) Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Wed Aug 22 22:29:20 2007 @@ -14,7 +14,7 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> - <application name="Thunderbird"> + <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> <version>1.5.0.9</version>

17 years, 4 months

[hpoussin] 28453: Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Aug 22 19:06:43 2007 New Revision: 28453 URL: http://svn.reactos.org/svn/reactos?rev=28453&view=rev Log: Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild Added: trunk/reactos/ReactOS-generic.rbuild - copied, changed from r28429, trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild Copied: trunk/reactos/ReactOS-generic.rbuild (from r28429, trunk/reactos/ReactOS-i386.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?p2=… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Wed Aug 22 19:06:43 2007 @@ -1,59 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> - +<project name="ReactOS" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> <define name="_REACTOS_" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> <if property="DBG" value="1"> <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> + <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - </if> - - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <linkerflag>-enable-stdcall-fixup</linkerflag> <include>.</include> <include>include</include> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=28… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Wed Aug 22 19:06:43 2007 @@ -7,24 +7,11 @@ </xi:fallback> </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> <define name="_M_IX86" /> <define name="_X86_" /> <define name="__i386__" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> <if property="GDB" value="0"> <if property="OPTIMIZE" value="1"> @@ -55,52 +42,4 @@ <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include>include/crt</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include>include/reactos/libs</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - </project> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=284… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Wed Aug 22 19:06:43 2007 @@ -7,7 +7,7 @@ </xi:fallback> </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> @@ -17,7 +17,6 @@ <define name="_M_PPC" /> <define name="_PPC_" /> <define name="__PowerPC__" /> - <define name="_REACTOS_" /> <define name="__MINGW_IMPORT" empty="true" /> <define name="stdcall" empty="true" /> <define name="__stdcall__" empty="true" /> @@ -26,69 +25,6 @@ <define name="__cdecl__" empty="true" /> <define name="dllimport" empty="true" /> <compilerflag>-v</compilerflag> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> <compilerflag>-Wpointer-arith</compilerflag> - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>include</include> - <include>include/crt</include> - <include>include/ddk</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - </project>

17 years, 4 months

[jimtabor] 28452: Removed NtUserReleaseDC, replaced it with CallOneParam.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 22 18:12:55 2007 New Revision: 28452 URL: http://svn.reactos.org/svn/reactos?rev=28452&view=rev Log: Removed NtUserReleaseDC, replaced it with CallOneParam. Modified: trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c Wed Aug 22 18:12:55 2007 @@ -89,9 +89,8 @@ if (!hDC) return FALSE; // Null hDC return zero. GdiReleaseDC ( hDC ); // Release locals. - // Win 3.1 throw back, hWnd should be ignored and not used. - // Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); - return NtUserReleaseDC(hWnd, hDC); + // Win 3.1 throw back, hWnd is ignored and not used. + return NtUserCallOneParam( (DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Aug 22 18:12:55 2007 @@ -280,9 +280,6 @@ LONG NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); - -INT NTAPI -NtUserReleaseDC(HWND hWnd, HDC hDc); BOOL NTAPI NtUserGetWindowRect(HWND hWnd, LPRECT Rect); @@ -460,6 +457,7 @@ #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 #define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 #define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 +#define ONEPARAM_ROUTINE_RELEASEDC 0x39 DWORD NTAPI NtUserCallOneParam( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Aug 22 18:12:55 2007 @@ -427,6 +427,8 @@ RETURN(TRUE); } } + case ONEPARAM_ROUTINE_RELEASEDC: + RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE)); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Wed Aug 22 18:12:55 2007 @@ -632,24 +632,6 @@ } -// Win 3.1 throw back, hWnd should be ignored and not used. -// Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); -INT STDCALL -NtUserReleaseDC(HWND hWnd, HDC hDc) -{ - DECLARE_RETURN(INT); - - DPRINT("Enter NtUserReleaseDC\n"); - UserEnterExclusive(); - - RETURN(UserReleaseDC(NULL, hDc, FALSE)); - -CLEANUP: - DPRINT("Leave NtUserReleaseDC, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - /*********************************************************************** * DceFreeDCE */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 22 18:12:55 2007 @@ -741,7 +741,6 @@ NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 -NtUserReleaseDC 2 NtUserRegisterClassEx 6 NtUserRegisterClipboardFormat 1 NtUserSendMessage 5

17 years, 4 months

[arty] 28451: Bug found by arty, thanks to alex for helping fix it: Process termination fixes part 1: don't suicide our process when we're killing a sibling. - Clarify the use of KillByHandle. It does *not* mean "suicide". - In fact, we had considered the use of KillByHandle backward, that is, our process would commit suicide if it was killing a sibling process. - Make suicide contingent on killing the same process. - Properly handle DBG_TERMINATE_PROCESS semidocumented debugger hack.

by arty＠svn.reactos.org

Author: arty Date: Wed Aug 22 11:28:45 2007 New Revision: 28451 URL: http://svn.reactos.org/svn/reactos?rev=28451&view=rev Log: Bug found by arty, thanks to alex for helping fix it: Process termination fixes part 1: don't suicide our process when we're killing a sibling. - Clarify the use of KillByHandle. It does *not* mean "suicide". - In fact, we had considered the use of KillByHandle backward, that is, our process would commit suicide if it was killing a sibling process. - Make suicide contingent on killing the same process. - Properly handle DBG_TERMINATE_PROCESS semidocumented debugger hack. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Wed Aug 22 11:28:45 2007 @@ -57,6 +57,10 @@ #define PSTRACE(x, ...) DPRINT(__VA_ARGS__); #define PSREFTRACE(x) #endif + +#define PspSetProcessFlag(Process, Flag) \ + InterlockedOr((PLONG)&Process->Flags, Flag) + // // Maximum Count of Notification Routines Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=284… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Wed Aug 22 11:28:45 2007 @@ -1108,12 +1108,21 @@ PSTRACE(PS_KILL_DEBUG, "ProcessHandle: %p ExitStatus: %p\n", ProcessHandle, ExitStatus); - /* Remember how we will kill it */ - KillByHandle = (ProcessHandle != NULL); + /* Were we passed a process handle? */ + if (ProcessHandle) + { + /* Yes we were, use it */ + KillByHandle = TRUE; + } + else + { + /* We weren't... we assume this is suicide */ + KillByHandle = FALSE; + ProcessHandle = NtCurrentProcess(); + } /* Get the Process Object */ - Status = ObReferenceObjectByHandle((KillByHandle) ? - ProcessHandle : NtCurrentProcess(), + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_TERMINATE, PsProcessType, KeGetPreviousMode(), @@ -1138,9 +1147,8 @@ return STATUS_PROCESS_IS_TERMINATING; } - /* Set the delete flag */ - if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, - PSF_PROCESS_DELETE_BIT); + /* Set the delete flag, unless the process is comitting suicide */ + if (KillByHandle) PspSetProcessFlag(Process, PSF_PROCESS_DELETE_BIT); /* Get the first thread */ Status = STATUS_NOTHING_TO_TERMINATE; @@ -1169,23 +1177,22 @@ ExReleaseRundownProtection(&Process->RundownProtect); /* Check if we are killing ourselves */ - if (Process != CurrentProcess) - { - /* Check for the DBG_TERMINATE_PROCESS exit code */ - if (ExitStatus == DBG_TERMINATE_PROCESS) - { - /* Disable debugging on this process */ - DbgkClearProcessDebugObject(Process, NULL); - } - } - /* Make sure that we got a handle */ - else if (KillByHandle) - { - /* Dereference the project */ - ObDereferenceObject(Process); - - /* Terminate ourselves */ - PspTerminateThreadByPointer(CurrentThread, ExitStatus, TRUE); + if (Process == CurrentProcess) + { + /* Also make sure the caller gave us our handle */ + if (KillByHandle) + { + /* Dereference the project */ + ObDereferenceObject(Process); + + /* Terminate ourselves */ + PspTerminateThreadByPointer(CurrentThread, ExitStatus, TRUE); + } + } + else if (ExitStatus == DBG_TERMINATE_PROCESS) + { + /* Disable debugging on this process */ + DbgkClearProcessDebugObject(Process, NULL); } /* Check if there was nothing to terminate, or if we have a Debug Port */

17 years, 4 months

[jimtabor] 28450: Win32 User32 rewrite example.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 22 06:54:22 2007 New Revision: 28450 URL: http://svn.reactos.org/svn/reactos?rev=28450&view=rev Log: Win32 User32 rewrite example. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Wed Aug 22 06:54:22 2007 @@ -5006,6 +5006,30 @@ NULL != Tpm ? &Tpm->rcExclude : NULL); } +// +// Example for the Win32/User32 rewrite. +// Def = TrackPopupMenuEx@24=NtUserTrackPopupMenuEx@24 +// +// +BOOL +STDCALL +NEWTrackPopupMenu( + HMENU Menu, + UINT Flags, + int x, + int y, + int Reserved, + HWND Wnd, + CONST RECT *Rect) +{ + return NtUserTrackPopupMenuEx( Menu, + Flags, + x, + y, + Wnd, + NULL); // LPTPMPARAMS is null +} + /* * @implemented

17 years, 4 months

[jimtabor] 28449: Cleanup, dont call inside SEH with SEH. IntGdiModifyWorldTransform calls DC_UpdateXforms which calls DCU_UpdateUserXForms and it calls SEH. Moved NtGdiFlush to dcutil.c

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 22 03:27:44 2007 New Revision: 28449 URL: http://svn.reactos.org/svn/reactos?rev=28449&view=rev Log: Cleanup, dont call inside SEH with SEH. IntGdiModifyWorldTransform calls DC_UpdateXforms which calls DCU_UpdateUserXForms and it calls SEH. Moved NtGdiFlush to dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/paintobj.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Wed Aug 22 03:27:44 2007 @@ -200,7 +200,6 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } - DC_UpdateXforms(pDc); return TRUE; } @@ -445,8 +444,6 @@ { ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); - - Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); } _SEH_HANDLE { @@ -454,7 +451,8 @@ } _SEH_END; - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); + // Safe to handle kernel mode data. + Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); DC_UnlockDc(dc); return Ret; } @@ -503,7 +501,6 @@ dc->Dc_Attr.ptlViewportOrg.x += XOffset; dc->Dc_Attr.ptlViewportOrg.y += YOffset; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; } @@ -554,7 +551,6 @@ dc->Dc_Attr.ptlWindowOrg.y += YOffset; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -683,7 +679,6 @@ } DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } return PrevMapMode; @@ -756,7 +751,6 @@ DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -808,7 +802,6 @@ dc->Dc_Attr.ptlViewportOrg.y = Y; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -872,7 +865,6 @@ dc->Dc_Attr.szlWindowExt.cy = YExtent; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -924,7 +916,6 @@ dc->Dc_Attr.ptlWindowOrg.y = Y; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 22 03:27:44 2007 @@ -2540,6 +2540,7 @@ /* Create inverse of world-to-viewport transformation */ dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Wed Aug 22 03:27:44 2007 @@ -47,3 +47,11 @@ return TRUE; } + +VOID +APIENTRY +NtGdiFlush(VOID) +{ + UNIMPLEMENTED; +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Wed Aug 22 03:27:44 2007 @@ -23,13 +23,6 @@ #define NDEBUG #include <debug.h> -VOID -APIENTRY -NtGdiFlush(VOID) -{ - UNIMPLEMENTED; -} - DWORD APIENTRY NtGdiGetBoundsRect( Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Wed Aug 22 03:27:44 2007 @@ -453,7 +453,6 @@ dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; IntGdiModifyWorldTransform( dc, &xform, MWT_MAX+1 ); dc->Dc_Attr.iGraphicsMode = graphicsMode; -// DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); return TRUE; } return FALSE;

17 years, 4 months

[fireball] 28448: - Allow pci read/writes during proving BAR's size operation (fixes a read/write of 0xFFFFFF.. memory addresses).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 21 23:56:22 2007 New Revision: 28448 URL: http://svn.reactos.org/svn/reactos?rev=28448&view=rev Log: - Allow pci read/writes during proving BAR's size operation (fixes a read/write of 0xFFFFFF.. memory addresses). Modified: branches/olpc/hal/halx86/generic/olpcpci.c Modified: branches/olpc/hal/halx86/generic/olpcpci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/olpcpci… ============================================================================== --- branches/olpc/hal/halx86/generic/olpcpci.c (original) +++ branches/olpc/hal/halx86/generic/olpcpci.c Tue Aug 21 23:56:22 2007 @@ -172,6 +172,7 @@ static ULONG zero_loc = 0; static int bar_probing = 0; /* Set after a write of ~0 to a BAR */ +static ULONG bar_offset = 0; /* what bar */ static ULONG *hdr_addr(const ULONG *hdr, int reg) { @@ -188,7 +189,17 @@ * BAR0), and don't skip the size mask area. */ - addr = (ULONG)hdr + reg + (bar_probing ? -0x10 : 0x20); + if (bar_probing && (bar_offset == reg)) + { + addr = (ULONG)hdr + reg + (bar_probing ? -0x10 : 0x20); + + /* Reset probing for this bar */ + bar_probing = 0; + } + else + { + addr = (ULONG)hdr + reg + 0x20; + } if ( ((ULONG)addr - (ULONG)hdr) >= 0x90 ) { @@ -196,7 +207,6 @@ (ULONG)addr - (ULONG)hdr, bar_probing, reg); } - bar_probing = 0; return (ULONG *)addr; } @@ -261,7 +271,7 @@ } } - ASSERT(len == 1 || len == 2 || len == 4) + ASSERT(len == 1 || len == 2 || len == 4); RtlCopyMemory(value, addr, len); } @@ -274,14 +284,18 @@ * Mostly we just discard writes, but if the write is a size probe * (i.e. writing ~0 to a BAR), we remember it and arrange to return * the appropriate size mask on the next read. This is cheating - * to some extent, because it depends on the fact that the next - * access after such a write will always be a read to the same BAR. + * to some extent, but it's possible to do intermediate read/writes + * when probing BAR's size now. */ if ((reg >= 0x10) && (reg < 0x2c)) { /* Write is to a BAR */ if (*(PULONG)value == ~0) + { + //DbgPrint("OLPC PCI: Probing bar size, devfn %x, reg %x\n", devfn.u.AsULONG, reg); bar_probing = 1; + bar_offset = reg; + } } else { /* * No warning on writes to ROM BAR, CMD, LATENCY_TIMER, @@ -289,6 +303,8 @@ */ if ((reg != 0x30) && (reg != 0x04) && (reg != 0x0d) && (reg != 0x0c) && (reg != 0x44)) + { DbgPrint("OLPC PCI: Config write to devfn %x reg %x value %x\n", devfn, reg, *value); + } } }

17 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007