Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[jimtabor] 31230: Add CAPS1 capability flags, not found in sdk. Source is from wine.
by jimtabor＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: jimtabor Date: Sat Dec 15 11:39:27 2007 New Revision: 31230 URL: http://svn.reactos.org/svn/reactos?rev=31230&view=rev Log: Add CAPS1 capability flags, not found in sdk. Source is from wine. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Sat Dec 15 11:39:27 2007 @@ -117,6 +117,20 @@ #define GCABCW_NOFLOAT 0x0001 #define GCABCW_INDICES 0x0002 +/* CAPS1 support */ +//#define C1_TRANSPARENT 0x0001 +#define TC_TT_ABLE 0x0002 +#define C1_TT_CR_ANY 0x0004 +#define C1_EMF_COMPLIANT 0x0008 +#define C1_DIBENGINE 0x0010 +#define C1_GAMMA_RAMP 0x0040 +#define C1_REINIT_ABLE 0x0080 +#define C1_GLYPH_INDEX 0x0100 +#define C1_BIT_PACKED 0x0200 +#define C1_BYTE_PACKED 0x0400 +#define C1_COLORCURSOR 0x0800 +#define C1_CMYK_ABLE 0x1000 +#define C1_SLOW_CARD 0x2000 /* TYPES *********************************************************************/

1 0

[jimtabor] 31229: Start using gdi shared handle table.
by jimtabor＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: jimtabor Date: Sat Dec 15 11:08:11 2007 New Revision: 31229 URL: http://svn.reactos.org/svn/reactos?rev=31229&view=rev Log: Start using gdi shared handle table. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/main/dllmain.c trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sat Dec 15 11:08:11 2007 @@ -10,9 +10,11 @@ /* DATA **********************************************************************/ extern PGDI_TABLE_ENTRY GdiHandleTable; +extern PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable; extern HANDLE hProcessHeap; extern HANDLE CurrentProcessId; extern DWORD GDI_BatchLimit; +extern PDEVCAPS GdiDevCaps; typedef INT (CALLBACK* EMFPLAYPROC)( Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Sat Dec 15 11:08:11 2007 @@ -11,6 +11,7 @@ extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; +PDEVCAPS GdiDevCaps = NULL; /* * GDI32.DLL doesn't have an entry point. The initialization is done by a call @@ -36,6 +37,8 @@ /* map the gdi handle table to user space */ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiDevCaps = &GdiSharedHandleTable->DevCaps; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; } Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sat Dec 15 11:08:11 2007 @@ -406,7 +406,6 @@ } /* PRIVATE FUNCTIONS *********************************************************/ -static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0; BOOL WINAPI @@ -987,8 +986,7 @@ STDCALL DdQueryDisplaySettingsUniqueness() { - /* FIXME share memory */ - return RemberDdQueryDisplaySettingsUniquenessID; + return GdiSharedHandleTable->flDeviceUniq; } /* Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Sat Dec 15 11:08:11 2007 @@ -29,6 +29,7 @@ #include "precomp.h" PGDI_TABLE_ENTRY GdiHandleTable = NULL; +PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable = NULL; HANDLE CurrentProcessId = NULL; DWORD GDI_BatchLimit = 1;

1 0

[jimtabor] 31228: Add new items to gdi handle table. Added cfont and user space share gdi handle table.
by jimtabor＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: jimtabor Date: Sat Dec 15 10:03:51 2007 New Revision: 31228 URL: http://svn.reactos.org/svn/reactos?rev=31228&view=rev Log: Add new items to gdi handle table. Added cfont and user space share gdi handle table. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Sat Dec 15 10:03:51 2007 @@ -21,6 +21,7 @@ /* GDI handle table can hold 0x10000 handles */ #define GDI_HANDLE_COUNT 0x10000 #define GDI_GLOBAL_PROCESS (0x0) +#define GDI_CFONT_MAX 16 /* Handle Masks and shifts */ #define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) @@ -212,6 +213,19 @@ LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; + +// +// User space only structure! +// +typedef struct __GDI_SHARED_HANDLE_TABLE // Must match win32k/include/gdiobj.h +{ + GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; // Handle table. + DEVCAPS DevCaps; // Shared device capabilities. + FLONG flDeviceUniq; // Device settings uniqueness. + PVOID pvLangPack; // Lanuage Pack. + CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. + DWORD dwCsbSupported1; // OEM code-page bitfield. +} GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; typedef struct _RGNATTR { Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Sat Dec 15 10:03:51 2007 @@ -128,8 +128,11 @@ typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; typedef LONG FIX; -/* FIXME: Unknown; easy to guess, usually based on public types and converted */ -typedef struct _REALIZATION_INFO REALIZATION_INFO, *PREALIZATION_INFO; +typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE +{ + DWORD dwCsbDefault[2]; + DWORD dwCsbSupported0; +} REALIZATION_INFO, *PREALIZATION_INFO; typedef struct _WIDTHDATA { @@ -240,6 +243,26 @@ FLOAT f; ULONG l; } gxf_long; + +typedef struct _CFONT +{ + struct _CFONT *pcfNext; + HFONT hf; + ULONG cRef; // Count of all pointers to this CFONT. + FLONG fl; + LONG lHeight; // Precomputed logical height. + HDC hdc; // HDC of realization. 0 for display. + EFLOAT_S efM11; // efM11 of WtoD of DC of realization + EFLOAT_S efM22; // efM22 of WtoD of DC of realization + EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) + EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) + WIDTHDATA wd; + FLONG flInfo; + USHORT sWidth[256]; // Widths in pels. + ULONG ulAveWidth; // bogus average used by USER + TMW_INTERNAL tmw; // cached metrics + LOCALESIGNATURE lsLocSig; // font signature information +} CFONT, *PCFONT; // // GDI Batch structures. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Sat Dec 15 10:03:51 2007 @@ -16,8 +16,11 @@ */ ////////////////////////////////////////////////////////////////////////////// GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; - DEVCAPS DevCaps; // Device Capabilities - // Font data + DEVCAPS DevCaps; // Device Capabilities + FLONG flDeviceUniq; // Device settings uniqueness. + PVOID pvLangPack; // Lanuage Pack. + CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. + DWORD dwCsbSupported1; // OEM code-page bitfield. ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists;

1 0

[dchapyshev] 31227: - Add some dialogs
by dchapyshev＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: dchapyshev Date: Sat Dec 15 09:35:55 2007 New Revision: 31227 URL: http://svn.reactos.org/svn/reactos?rev=31227&view=rev Log: - Add some dialogs Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…

1 0

[tkreuzer] 31226: - use own version of GdiQueryTable() instead of relying on gdi32.dll - more tests for NtGdiGetDIBitsInternal
by tkreuzer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: tkreuzer Date: Sat Dec 15 07:35:16 2007 New Revision: 31226 URL: http://svn.reactos.org/svn/reactos?rev=31226&view=rev Log: - use own version of GdiQueryTable() instead of relying on gdi32.dll - more tests for NtGdiGetDIBitsInternal Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c Sat Dec 15 07:35:16 2007 @@ -26,8 +26,15 @@ Test_NtGdiGetDIBitsInternal(PTESTINFO pti) { HBITMAP hBitmap; - BITMAPINFO bi; + struct + { + BITMAPINFO bi; + RGBQUAD Colors[20]; + } bmp; +// BITMAPINFO bi; INT ScreenBpp; + BITMAPCOREINFO bic; + DWORD data[20*16]; HDC hDCScreen = GetDC(NULL); ASSERT(hDCScreen != NULL); @@ -48,21 +55,74 @@ RTEST(GetLastError() == ERROR_SUCCESS); SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetDIBitsInternal((HDC)2345, hBitmap, 0, 15, NULL, &bi, 0, 0, 0) == 0); + RTEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 0, NULL, NULL, 0, 0, 0) == 0); RTEST(GetLastError() == ERROR_SUCCESS); SetLastError(ERROR_SUCCESS); - ZeroMemory(&bi, sizeof(BITMAPINFO)); - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - RTEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS, - DIB_BitmapMaxBitsSize(&bi, 15), 0) > 0); + RTEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, NULL, NULL, 0, 0, 0) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + ZeroMemory(&bmp, sizeof(bmp)); + bmp.bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + FillMemory(&bmp.Colors, sizeof(bmp.Colors), 0x44); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal((HDC)0, hBitmap, 0, 15, NULL, &bmp.bi, 0, 0, 0) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + TEST(bmp.Colors[0].rgbRed == 0x44); + + ZeroMemory(&bmp, sizeof(bmp)); + bmp.bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + FillMemory(&bmp.Colors, sizeof(bmp.Colors), 0x44); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal((HDC)2345, hBitmap, 0, 15, NULL, &bmp.bi, 0, 0, 0) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + TEST(bmp.Colors[0].rgbRed == 0x44); + + ZeroMemory(&bmp, sizeof(bmp)); + bmp.bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + FillMemory(&bmp.Colors, sizeof(bmp.Colors), 0x44); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, NULL, &bmp.bi, DIB_RGB_COLORS, + DIB_BitmapMaxBitsSize(&bmp.bi, 15), 0) > 0); RTEST(GetLastError() == ERROR_SUCCESS); ScreenBpp = GetDeviceCaps(hDCScreen, BITSPIXEL); - RTEST(bi.bmiHeader.biWidth == 16); - RTEST(bi.bmiHeader.biHeight == 16); - RTEST(bi.bmiHeader.biBitCount == ScreenBpp); - RTEST(bi.bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8)); + + RTEST(bmp.bi.bmiHeader.biWidth == 16); + RTEST(bmp.bi.bmiHeader.biHeight == 16); + RTEST(bmp.bi.bmiHeader.biBitCount == ScreenBpp); + RTEST(bmp.bi.bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8)); + + TEST(bmp.Colors[0].rgbRed == 0x44); + + /* Test with pointer */ +// ZeroMemory(&bmp.bi, sizeof(BITMAPINFO)); + bmp.bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); +// FillMemory(&bmp.Colors, sizeof(bmp.Colors), 0x11223344); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, (void*)data, &bmp.bi, DIB_RGB_COLORS, + DIB_BitmapMaxBitsSize(&bmp.bi, 15), 0) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + RTEST(bmp.bi.bmiHeader.biWidth == 16); + RTEST(bmp.bi.bmiHeader.biHeight == 16); + RTEST(bmp.bi.bmiHeader.biBitCount == ScreenBpp); + RTEST(bmp.bi.bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8)); + + TEST(bmp.Colors[0].rgbRed != 0x44); + + /* Test a BITMAPCOREINFO structure */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bic, sizeof(BITMAPCOREINFO)); + bic.bmciHeader.bcSize = sizeof(BITMAPCOREHEADER); + TEST(NtGdiGetDIBitsInternal(hDCScreen, hBitmap, 0, 15, NULL, (PBITMAPINFO)&bic, DIB_RGB_COLORS, + DIB_BitmapMaxBitsSize((PBITMAPINFO)&bic, 15), 0) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + ReleaseDC(NULL, hDCScreen); DeleteObject(hBitmap); Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Sat Dec 15 07:35:16 2007 @@ -3,6 +3,15 @@ HINSTANCE g_hInstance; HMODULE g_hModule = NULL; PGDI_TABLE_ENTRY GdiHandleTable; + +static +PGDI_TABLE_ENTRY +MyGdiQueryTable() +{ + PTEB pTeb = NtCurrentTeb(); + PPEB pPeb = pTeb->ProcessEnvironmentBlock; + return pPeb->GdiSharedHandleTable; +} static DWORD STDCALL IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) @@ -59,7 +68,6 @@ int nCmdShow) { g_hInstance = hInstance; - GDIQUERYPROC GdiQueryTable; printf("Win32k native API test\n"); @@ -73,12 +81,7 @@ return -1; } - GdiQueryTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); - if(!GdiQueryTable) - { - return -1; - } - GdiHandleTable = GdiQueryTable(); + GdiHandleTable = MyGdiQueryTable(); if(!GdiHandleTable) { return -1; Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Sat Dec 15 07:35:16 2007 @@ -32,8 +32,6 @@ INT nParams; } SYCALL_ENTRY, *PSYSCALL_ENTRY; -typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); - extern HINSTANCE g_hInstance; extern HMODULE g_hModule; extern PGDI_TABLE_ENTRY GdiHandleTable;

1 0

[tkreuzer] 31225: - use own version of GdiQueryTable() instead of relying on gdi32.dll - CrateFont -> CreateFontA - A bunch of tests for SelectObject
by tkreuzer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: tkreuzer Date: Sat Dec 15 07:22:19 2007 New Revision: 31225 URL: http://svn.reactos.org/svn/reactos?rev=31225&view=rev Log: - use own version of GdiQueryTable() instead of relying on gdi32.dll - CrateFont -> CreateFontA - A bunch of tests for SelectObject Modified: trunk/rostests/apitests/gdi32api/gdi.h trunk/rostests/apitests/gdi32api/gdi32api.c trunk/rostests/apitests/gdi32api/gdi32api.h trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/gdi32api/tests/SelectObject.c Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h (original) +++ trunk/rostests/apitests/gdi32api/gdi.h Sat Dec 15 07:22:19 2007 @@ -128,7 +128,11 @@ ULONG ulForegroundClr; #if (_WIN32_WINNT >= 0x0500) - unsigned unk020_00000000[4]; // 020 + COLORREF crBrushClr; // 020 + ULONG ulBrushClr; + COLORREF crPenClr; + ULONG ulPenClr; + #endif int iCS_CP; // 030 int iGraphicsMode; @@ -149,10 +153,10 @@ long lIcmMode; unsigned hcmXform; // 060 HCOLORSPACE hColorSpace; - unsigned unk068_00000000; + FLONG flIcmFlags; unsigned IcmBrushColor; unsigned IcmPenColor; // 070 - unsigned unk074_00000000; + PVOID pvLIcm; #endif long flTextAlign; // 078 @@ -167,7 +171,10 @@ MATRIX mxDeviceToWorld; // 0D0 MATRIX mxWorldToPage; // 10C - unsigned unk048_00000000[8]; // 148 + EFLOAT_S efM11PtoD; + EFLOAT_S efM22PtoD; + EFLOAT_S efDxPtoD; + EFLOAT_S efDyPtoD; int iMapMode; // 168 @@ -186,8 +193,11 @@ POINT ptlBrushOrigin; // 1a8 unsigned unk1b0_00000000[2]; // 1b0 - unsigned RectRegionFlag; // 1b4 - RECT VisRectRegion; // 1b8 + RGNATTR VisRectRegion; + +// unsigned unk1b0_00000000[2]; // 1b0 +// unsigned RectRegionFlag; // 1b4 +// RECT VisRectRegion; // 1b8 } DC_ATTR, *PDC_ATTR; Modified: trunk/rostests/apitests/gdi32api/gdi32api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi32api.c (original) +++ trunk/rostests/apitests/gdi32api/gdi32api.c Sat Dec 15 07:22:19 2007 @@ -9,22 +9,24 @@ return TRUE; } +static +PGDI_TABLE_ENTRY +MyGdiQueryTable() +{ + PTEB pTeb = NtCurrentTeb(); + PPEB pPeb = pTeb->ProcessEnvironmentBlock; + return pPeb->GdiSharedHandleTable; +} + int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - GDIQUERYPROC GdiQueryTable; - g_hInstance = hInstance; - GdiQueryTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); - if(!GdiQueryTable) - { - return -1; - } - GdiHandleTable = GdiQueryTable(); + GdiHandleTable = MyGdiQueryTable(); if(!GdiHandleTable) { return -1; Modified: trunk/rostests/apitests/gdi32api/gdi32api.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi32api.h (original) +++ trunk/rostests/apitests/gdi32api/gdi32api.h Sat Dec 15 07:22:19 2007 @@ -1,5 +1,9 @@ #ifndef _GDITEST_H #define _GDITEST_H + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> #include "../apitest.h" #include "gdi.h" Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Sat Dec 15 07:22:19 2007 @@ -308,7 +308,7 @@ BYTE bData[270]; FillMemory(&logfonta, sizeof(LOGFONTA), 0x77); - hFont = CreateFont(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + hFont = CreateFontA(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_CHARACTER_PRECIS, CLIP_CHARACTER_PRECIS, ANTIALIASED_QUALITY, DEFAULT_PITCH, "testfont"); TEST(hFont); Modified: trunk/rostests/apitests/gdi32api/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SelectObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SelectObject.c Sat Dec 15 07:22:19 2007 @@ -1,6 +1,142 @@ INT Test_SelectObject(PTESTINFO pti) { + HGDIOBJ hOldObj, hNewObj; + HDC hScreenDC, hDC; + PGDI_TABLE_ENTRY pEntry; + PDC_ATTR pDc_Attr; + HANDLE hcmXform; + BYTE bmBits[4] = {0}; + + hScreenDC = GetDC(NULL); + ASSERT (hScreenDC != NULL); + hDC = CreateCompatibleDC(hScreenDC); + ASSERT (hDC != NULL); + + /* Get the Dc_Attr for later testing */ + pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hDC)]; + ASSERT(pEntry); + pDc_Attr = pEntry->UserData; + ASSERT(pDc_Attr); + + /* Test incomplete dc handle doesn't work */ + SetLastError(ERROR_SUCCESS); + hNewObj = GetStockObject(GRAY_BRUSH); + hOldObj = SelectObject((HDC)GDI_HANDLE_GET_INDEX(hDC), hNewObj); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + TEST(hOldObj == NULL); + TEST(pDc_Attr->hbrush == GetStockObject(WHITE_BRUSH)); + SelectObject(hDC, hOldObj); + + /* Test incomplete hobj handle works */ + hNewObj = GetStockObject(GRAY_BRUSH); + hOldObj = SelectObject(hDC, (HGDIOBJ)GDI_HANDLE_GET_INDEX(hNewObj)); + TEST(hOldObj == GetStockObject(WHITE_BRUSH)); + TEST(pDc_Attr->hbrush == hNewObj); + SelectObject(hDC, hOldObj); + + /* Test wrong hobj handle type */ + SetLastError(ERROR_SUCCESS); + hNewObj = GetStockObject(GRAY_BRUSH); + hNewObj = (HGDIOBJ)((UINT_PTR)hNewObj & ~GDI_HANDLE_TYPE_MASK); + hNewObj = (HGDIOBJ)((UINT_PTR)hNewObj | GDI_OBJECT_TYPE_PEN); + hOldObj = SelectObject(hDC, hNewObj); + TEST(GetLastError() == ERROR_SUCCESS); + TEST(hOldObj == NULL); + TEST(pDc_Attr->hbrush == GetStockObject(WHITE_BRUSH)); + + SetLastError(ERROR_SUCCESS); + hNewObj = (HGDIOBJ)0x00761234; + hOldObj = SelectObject(hDC, hNewObj); + TEST(hOldObj == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + SelectObject(hDC, hOldObj); + + /* Test DC */ + SetLastError(ERROR_SUCCESS); + hOldObj = SelectObject(hDC, hScreenDC); + TEST(hOldObj == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test REGION */ + SetLastError(ERROR_SUCCESS); + hNewObj = CreateRectRgn(0,0,0,0); + hOldObj = SelectObject(hDC, hNewObj); + TEST((UINT_PTR)hOldObj == NULLREGION); + DeleteObject(hNewObj); + + hNewObj = CreateRectRgn(0,0,10,10); + TEST((UINT_PTR)SelectObject(hDC, hNewObj) == SIMPLEREGION); + hOldObj = CreateRectRgn(5,5,20,20); + TEST(CombineRgn(hNewObj, hNewObj, hOldObj, RGN_OR) == COMPLEXREGION); + DeleteObject(hOldObj); + TEST((UINT_PTR)SelectObject(hDC, hNewObj) == SIMPLEREGION); // ??? Why this? + DeleteObject(hNewObj); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test BITMAP */ + hNewObj = CreateBitmap(2, 2, 1, 1, &bmBits); + ASSERT(hNewObj != NULL); + hOldObj = SelectObject(hDC, hNewObj); + TEST(GDI_HANDLE_GET_TYPE(hOldObj) == GDI_OBJECT_TYPE_BITMAP); + hOldObj = SelectObject(hDC, hOldObj); + TEST(hOldObj == hNewObj); + + /* Test CLIOBJ */ + + /* Test PATH */ + + /* Test PALETTE */ + SetLastError(ERROR_SUCCESS); + hNewObj = GetStockObject(DEFAULT_PALETTE); + hOldObj = SelectObject(hDC, hNewObj); + TEST(hOldObj == NULL); + TEST(GetLastError() == ERROR_INVALID_FUNCTION); + + /* Test COLORSPACE */ + + /* Test FONT */ + + /* Test PFE */ + + /* Test BRUSH */ + hNewObj = GetStockObject(GRAY_BRUSH); + hOldObj = SelectObject(hDC, hNewObj); + TEST(hOldObj == GetStockObject(WHITE_BRUSH)); + TEST(pDc_Attr->hbrush == hNewObj); + TEST(GDI_HANDLE_GET_TYPE(hOldObj) == GDI_OBJECT_TYPE_BRUSH); + SelectObject(hDC, hOldObj); + + /* Test DC_BRUSH */ + hNewObj = GetStockObject(DC_BRUSH); + hOldObj = SelectObject(hDC, hNewObj); + TEST(pDc_Attr->hbrush == hNewObj); + SelectObject(hDC, hOldObj); + + /* Test BRUSH color xform */ + hcmXform = (HANDLE)pDc_Attr->hcmXform; + + + /* Test EMF */ + + /* test METAFILE */ + + /* Test ENHMETAFILE */ + + /* Test PEN */ + hNewObj = GetStockObject(GRAY_BRUSH); + hOldObj = SelectObject(hDC, hNewObj); + TEST(hOldObj == GetStockObject(WHITE_BRUSH)); + TEST(pDc_Attr->hbrush == hNewObj); + TEST(GDI_HANDLE_GET_TYPE(hOldObj) == GDI_OBJECT_TYPE_BRUSH); + SelectObject(hDC, hOldObj); + + + /* Test EXTPEN */ + + /* Test METADC */ + + return APISTATUS_NORMAL; }

1 0

[tkreuzer] 31224: - fix type field calculation in GDIOBJ_CovertToStockObject - add some DPRINTs on problems
by tkreuzer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: tkreuzer Date: Sat Dec 15 05:08:23 2007 New Revision: 31224 URL: http://svn.reactos.org/svn/reactos?rev=31224&view=rev Log: - fix type field calculation in GDIOBJ_CovertToStockObject - add some DPRINTs on problems Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Sat Dec 15 05:08:23 2007 @@ -640,6 +640,7 @@ if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); + DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); KeRosDumpStackFrames(NULL, 20); } else @@ -685,8 +686,8 @@ DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject); if(!IsObjectDead(hObject)) { - return NULL != hObject - ? GDIOBJ_FreeObj(GdiHandleTable, hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; + return NULL != hObject + ? GDIOBJ_FreeObj(GdiHandleTable, hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; } else { @@ -1123,8 +1124,13 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK); - OldType |= GDI_HANDLE_GET_UPPER(hObj) >> GDI_ENTRY_UPPER_SHIFT; + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); + /* We are currently not using bits 24..31 (flags) of the type field, but for compatibility + we copy them as we can't get them from the handle */ + OldType |= Entry->Type & GDI_ENTRY_FLAGS_MASK; /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ NewType = OldType | GDI_ENTRY_STOCK_MASK; @@ -1197,6 +1203,7 @@ else { DPRINT1("Attempted to convert object 0x%x that is deleted! Should never get here!!!\n", hObj); + DPRINT1("OldType = 0x%x, Entry->Type = 0x%x, NewType = 0x%x, Entry->KernelData = 0x%x\n", OldType, Entry->Type, NewType, Entry->KernelData); } } else if(PrevProcId == LockedProcessId) @@ -1323,6 +1330,7 @@ else { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); + DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); } } else if(PrevProcId == LockedProcessId)

1 0

[tkreuzer] 31223: add a bitmask for the flags in the gdi objects type field
by tkreuzer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: tkreuzer Date: Sat Dec 15 05:07:43 2007 New Revision: 31223 URL: http://svn.reactos.org/svn/reactos?rev=31223&view=rev Log: add a bitmask for the flags in the gdi objects type field Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Sat Dec 15 05:07:43 2007 @@ -36,6 +36,7 @@ #define GDI_ENTRY_REUSE_MASK 0x0000ff00 #define GDI_ENTRY_REUSE_INC 0x00000100 #define GDI_ENTRY_BASETYPE_MASK 0x001f0000 +#define GDI_ENTRY_FLAGS_MASK 0xff000000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16

1 0

[tkreuzer] 31222: - add GDI_OBJECT_TYPE_PFE - use own version of GdiQueryTable() instead of relying on gdi32.dll, as vista seems not to support it anymore
by tkreuzer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: tkreuzer Date: Sat Dec 15 03:34:57 2007 New Revision: 31222 URL: http://svn.reactos.org/svn/reactos?rev=31222&view=rev Log: - add GDI_OBJECT_TYPE_PFE - use own version of GdiQueryTable() instead of relying on gdi32.dll, as vista seems not to support it anymore Modified: trunk/rosapps/devutils/gdihv/gdi.h trunk/rosapps/devutils/gdihv/gdihv.c trunk/rosapps/devutils/gdihv/handlelist.c Modified: trunk/rosapps/devutils/gdihv/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdi.h?rev=3… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdi.h (original) +++ trunk/rosapps/devutils/gdihv/gdi.h Sat Dec 15 03:34:57 2007 @@ -48,6 +48,7 @@ #define GDI_OBJECT_TYPE_BITMAP 0x00050000 #define GDI_OBJECT_TYPE_PALETTE 0x00080000 #define GDI_OBJECT_TYPE_FONT 0x000a0000 +#define GDI_OBJECT_TYPE_PFE 0x000c0000 #define GDI_OBJECT_TYPE_BRUSH 0x00100000 #define GDI_OBJECT_TYPE_EMF 0x00210000 #define GDI_OBJECT_TYPE_PEN 0x00300000 Modified: trunk/rosapps/devutils/gdihv/gdihv.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.c?rev… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.c (original) +++ trunk/rosapps/devutils/gdihv/gdihv.c Sat Dec 15 03:34:57 2007 @@ -23,8 +23,16 @@ #include "gdihv.h" HINSTANCE g_hInstance; -GDIQUERYPROC GdiQueryHandleTable; PGDI_TABLE_ENTRY GdiHandleTable = 0; + +static +PGDI_TABLE_ENTRY +MyGdiQueryTable() +{ + PTEB pTeb = NtCurrentTeb(); + PPEB pPeb = pTeb->ProcessEnvironmentBlock; + return pPeb->GdiSharedHandleTable; +} int WINAPI WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, @@ -36,12 +44,7 @@ InitCommonControls(); - GdiQueryHandleTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandle(L"GDI32.DLL"), "GdiQueryTable"); - if(!GdiQueryHandleTable) - { - return -1; - } - GdiHandleTable = GdiQueryHandleTable(); + GdiHandleTable = MyGdiQueryTable(); DialogBoxParam(g_hInstance, MAKEINTRESOURCE(IDD_MAINWND), HWND_DESKTOP, MainWindow_WndProc, 0); Modified: trunk/rosapps/devutils/gdihv/handlelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.c (original) +++ trunk/rosapps/devutils/gdihv/handlelist.c Sat Dec 15 03:34:57 2007 @@ -86,7 +86,7 @@ ((ProcessId == (HANDLE)1) && ((pEntry->Type & GDI_HANDLE_BASETYPE_MASK) == 0)) ) { if (ProcessId == (HANDLE)1 || - ProcessId == (HANDLE)((ULONG)pEntry->ProcessId & 0xfffc)) + ((LONG)ProcessId & 0xfffc) == ((ULONG)pEntry->ProcessId & 0xfffc)) { handle = GDI_HANDLE_CREATE(i, pEntry->Type); index = ListView_GetItemCount(hHandleListCtrl); @@ -178,6 +178,9 @@ case GDI_OBJECT_TYPE_DCE: strText = L"DCE"; break; + case GDI_OBJECT_TYPE_PFE: + strText = L"PFE"; + break; case GDI_OBJECT_TYPE_DONTCARE: strText = L"anything"; break;

1 0

[fireball] 31221: Filip Navara <xnavara at volny dot cz> - Remove unused code from HvGetCellSize(). - Fix situation, when a new cell is allocated with a too small size, resulting in an empty free cell (a cell has to be able to store at least one HCELL_INDEX), then the free list code overrides the next cell after the empty one. - Reenable commented out assert in HvpRemoveFree(), since now it works as expected.
by fireball＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: fireball Date: Sat Dec 15 02:17:43 2007 New Revision: 31221 URL: http://svn.reactos.org/svn/reactos?rev=31221&view=rev Log: Filip Navara <xnavara at volny dot cz> - Remove unused code from HvGetCellSize(). - Fix situation, when a new cell is allocated with a too small size, resulting in an empty free cell (a cell has to be able to store at least one HCELL_INDEX), then the free list code overrides the next cell after the empty one. - Reenable commented out assert in HvpRemoveFree(), since now it works as expected. Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Sat Dec 15 02:17:43 2007 @@ -103,7 +103,6 @@ HCELL_INDEX CellIndex, BOOLEAN HoldingLock) { - LONG CellSize; ULONG CellBlock; ULONG CellLastBlock; @@ -117,10 +116,6 @@ CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; CellLastBlock = ((CellIndex + HV_BLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - - CellSize = HvpGetCellFullSize(RegistryHive, HvGetCell(RegistryHive, CellIndex)); - if (CellSize < 0) - CellSize = -CellSize; RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); @@ -229,7 +224,7 @@ pFreeCellOffset = FreeCellData; } - //ASSERT(FALSE); + ASSERT(FALSE); } static HCELL_INDEX CMAPI @@ -349,8 +344,13 @@ FreeCell = HvpGetCellHeader(RegistryHive, FreeCellOffset); /* Split the block in two parts */ - /* FIXME: There is some minimal cell size that we must respect. */ - if ((ULONG)FreeCell->Size > Size + sizeof(HCELL_INDEX)) + + /* The free block that is created has to be at least + sizeof(HCELL) + sizeof(HCELL_INDEX) big, so that free + cell list code can work. Moreover we round cell sizes + to 16 bytes, so creating a smaller block would result in + a cell that would never be allocated. */ + if ((ULONG)FreeCell->Size > Size + 16) { NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size); NewCell->Size = FreeCell->Size - Size;

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
61
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 December 2007