Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 41655: unbreak build of rostests
by tkreuzer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: tkreuzer Date: Sun Jun 28 04:05:51 2009 New Revision: 41655 URL: http://svn.reactos.org/svn/reactos?rev=41655&view=rev Log: unbreak build of rostests Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] Sun Jun 28 04:05:51 2009 @@ -9,6 +9,7 @@ <library>advapi32</library> <library>w32kdll</library> <library>dbghelp</library> + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <file>w32knapi.c</file> <file>osver.c</file> <file>testlist.c</file>

1 0

[cwittich] 41654: fix advapi32 crypt winetests patch sent to wine
by cwittich＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cwittich Date: Sun Jun 28 03:55:29 2009 New Revision: 41654 URL: http://svn.reactos.org/svn/reactos?rev=41654&view=rev Log: fix advapi32 crypt winetests patch sent to wine Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sun Jun 28 03:55:29 2009 @@ -1192,6 +1192,9 @@ TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); + if (*pcbProvName > INT_MAX) + *pcbProvName = INT_MAX; + if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) return FALSE; if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) ) @@ -1314,6 +1317,9 @@ TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); + if (*pcbTypeName > INT_MAX) + *pcbTypeName = INT_MAX; + if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) return FALSE; if ( pszTypeName && !(str = CRYPT_Alloc(bufsize)) ) @@ -1512,6 +1518,9 @@ BOOL ret = FALSE; TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); + + if (*pcbProvName > INT_MAX) + *pcbProvName = INT_MAX; CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &bufsize); if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) )

1 0

[tkreuzer] 41653: [FORMATTING] Fix indentation, no code change
by tkreuzer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: tkreuzer Date: Sun Jun 28 03:54:02 2009 New Revision: 41653 URL: http://svn.reactos.org/svn/reactos?rev=41653&view=rev Log: [FORMATTING] Fix indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Sun Jun 28 03:54:02 2009 @@ -30,37 +30,37 @@ static const COLORREF SysColors[] = { - RGB(212, 208, 200), /* COLOR_SCROLLBAR */ - RGB(58, 110, 165), /* COLOR_BACKGROUND */ - RGB(10, 36, 106), /* COLOR_ACTIVECAPTION */ - RGB(128, 128, 128), /* COLOR_INACTIVECAPTION */ - RGB(212, 208, 200), /* COLOR_MENU */ - RGB(255, 255, 255), /* COLOR_WINDOW */ - RGB(0, 0, 0), /* COLOR_WINDOWFRAME */ - RGB(0, 0, 0), /* COLOR_MENUTEXT */ - RGB(0, 0, 0), /* COLOR_WINDOWTEXT */ - RGB(255, 255, 255), /* COLOR_CAPTIONTEXT */ - RGB(212, 208, 200), /* COLOR_ACTIVEBORDER */ - RGB(212, 208, 200), /* COLOR_INACTIVEBORDER */ - RGB(128, 128, 128), /* COLOR_APPWORKSPACE */ - RGB(10, 36, 106), /* COLOR_HIGHLIGHT */ - RGB(255, 255, 255), /* COLOR_HIGHLIGHTTEXT */ - RGB(212, 208, 200), /* COLOR_BTNFACE */ - RGB(128, 128, 128), /* COLOR_BTNSHADOW */ - RGB(128, 128, 128), /* COLOR_GRAYTEXT */ - RGB(0, 0, 0), /* COLOR_BTNTEXT */ - RGB(212, 208, 200), /* COLOR_INACTIVECAPTIONTEXT */ - RGB(255, 255, 255), /* COLOR_BTNHIGHLIGHT */ - RGB(64, 64, 64), /* COLOR_3DDKSHADOW */ - RGB(212, 208, 200), /* COLOR_3DLIGHT */ - RGB(0, 0, 0), /* COLOR_INFOTEXT */ - RGB(255, 255, 225), /* COLOR_INFOBK */ - RGB(181, 181, 181), /* COLOR_UNKNOWN */ - RGB(0, 0, 128), /* COLOR_HOTLIGHT */ - RGB(166, 202, 240), /* COLOR_GRADIENTACTIVECAPTION */ - RGB(192, 192, 192), /* COLOR_GRADIENTINACTIVECAPTION */ - RGB(49, 106, 197), /* COLOR_MENUHILIGHT */ - RGB(236, 233, 216) /* COLOR_MENUBAR */ + RGB(212, 208, 200), /* COLOR_SCROLLBAR */ + RGB(58, 110, 165), /* COLOR_BACKGROUND */ + RGB(10, 36, 106), /* COLOR_ACTIVECAPTION */ + RGB(128, 128, 128), /* COLOR_INACTIVECAPTION */ + RGB(212, 208, 200), /* COLOR_MENU */ + RGB(255, 255, 255), /* COLOR_WINDOW */ + RGB(0, 0, 0), /* COLOR_WINDOWFRAME */ + RGB(0, 0, 0), /* COLOR_MENUTEXT */ + RGB(0, 0, 0), /* COLOR_WINDOWTEXT */ + RGB(255, 255, 255), /* COLOR_CAPTIONTEXT */ + RGB(212, 208, 200), /* COLOR_ACTIVEBORDER */ + RGB(212, 208, 200), /* COLOR_INACTIVEBORDER */ + RGB(128, 128, 128), /* COLOR_APPWORKSPACE */ + RGB(10, 36, 106), /* COLOR_HIGHLIGHT */ + RGB(255, 255, 255), /* COLOR_HIGHLIGHTTEXT */ + RGB(212, 208, 200), /* COLOR_BTNFACE */ + RGB(128, 128, 128), /* COLOR_BTNSHADOW */ + RGB(128, 128, 128), /* COLOR_GRAYTEXT */ + RGB(0, 0, 0), /* COLOR_BTNTEXT */ + RGB(212, 208, 200), /* COLOR_INACTIVECAPTIONTEXT */ + RGB(255, 255, 255), /* COLOR_BTNHIGHLIGHT */ + RGB(64, 64, 64), /* COLOR_3DDKSHADOW */ + RGB(212, 208, 200), /* COLOR_3DLIGHT */ + RGB(0, 0, 0), /* COLOR_INFOTEXT */ + RGB(255, 255, 225), /* COLOR_INFOBK */ + RGB(181, 181, 181), /* COLOR_UNKNOWN */ + RGB(0, 0, 128), /* COLOR_HOTLIGHT */ + RGB(166, 202, 240), /* COLOR_GRADIENTACTIVECAPTION */ + RGB(192, 192, 192), /* COLOR_GRADIENTINACTIVECAPTION */ + RGB(49, 106, 197), /* COLOR_MENUHILIGHT */ + RGB(236, 233, 216) /* COLOR_MENUBAR */ }; #define NUM_SYSCOLORS (sizeof(SysColors) / sizeof(SysColors[0])) @@ -70,81 +70,88 @@ /* GDI stock objects */ static LOGPEN WhitePen = -{ PS_SOLID, { 0, 0 }, RGB(255,255,255) }; + { PS_SOLID, { 0, 0 }, RGB(255,255,255) }; static LOGPEN BlackPen = -{ PS_SOLID, { 0, 0 }, RGB(0,0,0) }; + { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; static LOGPEN NullPen = -{ PS_NULL, { 0, 0 }, 0 }; + { PS_NULL, { 0, 0 }, 0 }; static LOGFONTW OEMFixedFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" + }; //Bitstream Vera Sans Mono static LOGFONTW AnsiFixedFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" + }; //Bitstream Vera Sans Mono static LOGFONTW AnsiVarFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" + }; static LOGFONTW SystemFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" }; //Bitstream Vera Sans + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" + }; //Bitstream Vera Sans static LOGFONTW DeviceDefaultFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" + }; //Bitstream Vera Sans static LOGFONTW SystemFixedFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" + }; //Bitstream Vera Sans Mono /* FIXME: Is this correct? */ static LOGFONTW DefaultGuiFont = -{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" + }; //Bitstream Vera Sans HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; static HPEN FASTCALL -IntCreateStockPen( DWORD dwPenStyle, - DWORD dwWidth, - ULONG ulBrushStyle, - ULONG ulColor) -{ - HPEN hPen; - PBRUSH pbrushPen = PEN_AllocPenWithHandle(); - - if ((dwPenStyle & PS_STYLE_MASK) == PS_NULL) dwWidth = 1; - - pbrushPen->ptPenWidth.x = abs(dwWidth); - pbrushPen->ptPenWidth.y = 0; - pbrushPen->ulPenStyle = dwPenStyle; - pbrushPen->BrushAttr.lbColor = ulColor; - pbrushPen->ulStyle = ulBrushStyle; - pbrushPen->hbmClient = (HANDLE)NULL; - pbrushPen->dwStyleCount = 0; - pbrushPen->pStyle = 0; - pbrushPen->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN; - - switch (dwPenStyle & PS_STYLE_MASK) - { - case PS_NULL: - pbrushPen->flAttrs |= GDIBRUSH_IS_NULL; - break; - - case PS_SOLID: - pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID; - break; - } - hPen = pbrushPen->BaseObject.hHmgr; - PEN_UnlockPen(pbrushPen); - return hPen; +IntCreateStockPen(DWORD dwPenStyle, + DWORD dwWidth, + ULONG ulBrushStyle, + ULONG ulColor) +{ + HPEN hPen; + PBRUSH pbrushPen = PEN_AllocPenWithHandle(); + + if ((dwPenStyle & PS_STYLE_MASK) == PS_NULL) dwWidth = 1; + + pbrushPen->ptPenWidth.x = abs(dwWidth); + pbrushPen->ptPenWidth.y = 0; + pbrushPen->ulPenStyle = dwPenStyle; + pbrushPen->BrushAttr.lbColor = ulColor; + pbrushPen->ulStyle = ulBrushStyle; + pbrushPen->hbmClient = (HANDLE)NULL; + pbrushPen->dwStyleCount = 0; + pbrushPen->pStyle = 0; + pbrushPen->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN; + + switch (dwPenStyle & PS_STYLE_MASK) + { + case PS_NULL: + pbrushPen->flAttrs |= GDIBRUSH_IS_NULL; + break; + + case PS_SOLID: + pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID; + break; + } + hPen = pbrushPen->BaseObject.hHmgr; + PEN_UnlockPen(pbrushPen); + return hPen; } /*! @@ -153,47 +160,47 @@ VOID FASTCALL CreateStockObjects(void) { - UINT Object; - - DPRINT("Beginning creation of stock objects\n"); - - /* Create GDI Stock Objects from the logical structures we've defined */ - - StockObjects[WHITE_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); - StockObjects[DC_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); - StockObjects[LTGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(192,192,192)); - StockObjects[GRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(128,128,128)); - StockObjects[DKGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(64,64,64)); - StockObjects[BLACK_BRUSH] = IntGdiCreateSolidBrush(RGB(0,0,0)); - StockObjects[NULL_BRUSH] = IntGdiCreateNullBrush(); - - StockObjects[WHITE_PEN] = IntCreateStockPen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor); - StockObjects[BLACK_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); - StockObjects[DC_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); - StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); - - StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ - StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); - - (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&AnsiVarFont, (HFONT*)&StockObjects[ANSI_VAR_FONT]); - (void) TextIntCreateFontIndirect(&SystemFont, (HFONT*)&StockObjects[SYSTEM_FONT]); - (void) TextIntCreateFontIndirect(&DeviceDefaultFont, (HFONT*)&StockObjects[DEVICE_DEFAULT_FONT]); - (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); - (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); - - StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)PALETTE_Init(); - - for (Object = 0; Object < NB_STOCK_OBJECTS; Object++) - { - if (NULL != StockObjects[Object]) - { - GDIOBJ_ConvertToStockObj(&StockObjects[Object]); - } - } - - DPRINT("Completed creation of stock objects\n"); + UINT Object; + + DPRINT("Beginning creation of stock objects\n"); + + /* Create GDI Stock Objects from the logical structures we've defined */ + + StockObjects[WHITE_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); + StockObjects[DC_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); + StockObjects[LTGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(192,192,192)); + StockObjects[GRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(128,128,128)); + StockObjects[DKGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(64,64,64)); + StockObjects[BLACK_BRUSH] = IntGdiCreateSolidBrush(RGB(0,0,0)); + StockObjects[NULL_BRUSH] = IntGdiCreateNullBrush(); + + StockObjects[WHITE_PEN] = IntCreateStockPen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor); + StockObjects[BLACK_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[DC_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); + + StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ + StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); + + (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); + (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]); + (void) TextIntCreateFontIndirect(&AnsiVarFont, (HFONT*)&StockObjects[ANSI_VAR_FONT]); + (void) TextIntCreateFontIndirect(&SystemFont, (HFONT*)&StockObjects[SYSTEM_FONT]); + (void) TextIntCreateFontIndirect(&DeviceDefaultFont, (HFONT*)&StockObjects[DEVICE_DEFAULT_FONT]); + (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); + (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); + + StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)PALETTE_Init(); + + for (Object = 0; Object < NB_STOCK_OBJECTS; Object++) + { + if (NULL != StockObjects[Object]) + { + GDIOBJ_ConvertToStockObj(&StockObjects[Object]); + } + } + + DPRINT("Completed creation of stock objects\n"); } /*! @@ -204,150 +211,150 @@ HGDIOBJ APIENTRY NtGdiGetStockObject(INT Object) { - DPRINT("NtGdiGetStockObject index %d\n", Object); - - return ((Object < 0) || (NB_STOCK_OBJECTS <= Object)) ? NULL : StockObjects[Object]; + DPRINT("NtGdiGetStockObject index %d\n", Object); + + return ((Object < 0) || (NB_STOCK_OBJECTS <= Object)) ? NULL : StockObjects[Object]; } BOOL FASTCALL IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors) { - UINT i; - - ASSERT(Elements); - ASSERT(Colors); - - for(i = 0; i < nColors; i++) - { - if((UINT)(*Elements) < NUM_SYSCOLORS) - { - gpsi->argbSystem[*Elements] = *Colors; - IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors); - IntGdiSetSolidPenColor(gpsi->SysColorPens[*Elements], *Colors); - } - Elements++; - Colors++; - } - return nColors > 0; + UINT i; + + ASSERT(Elements); + ASSERT(Colors); + + for (i = 0; i < nColors; i++) + { + if ((UINT)(*Elements) < NUM_SYSCOLORS) + { + gpsi->argbSystem[*Elements] = *Colors; + IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors); + IntGdiSetSolidPenColor(gpsi->SysColorPens[*Elements], *Colors); + } + Elements++; + Colors++; + } + return nColors > 0; } BOOL FASTCALL IntGetSysColorBrushes(HBRUSH *pahBrushes, UINT nBrushes) { - UINT i; - - ASSERT(pahBrushes); - - if(nBrushes > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for(i = 0; i < nBrushes; i++) - { - pahBrushes[i] = gpsi->ahbrSystem[i]; - } - - return nBrushes > 0; + UINT i; + + ASSERT(pahBrushes); + + if (nBrushes > NUM_SYSCOLORS) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < nBrushes; i++) + { + pahBrushes[i] = gpsi->ahbrSystem[i]; + } + + return nBrushes > 0; } HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object) { - return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->ahbrSystem[Object]; + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->ahbrSystem[Object]; } BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens) { - UINT i; - - ASSERT(Pens); - - if(nPens > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for(i = 0; i < nPens; i++) - { - *(Pens++) = gpsi->SysColorPens[i]; - } - - return nPens > 0; + UINT i; + + ASSERT(Pens); + + if (nPens > NUM_SYSCOLORS) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < nPens; i++) + { + *(Pens++) = gpsi->SysColorPens[i]; + } + + return nPens > 0; } BOOL FASTCALL IntGetSysColors(COLORREF *Colors, UINT nColors) { - UINT i; - COLORREF *col; - - ASSERT(Colors); - - if(nColors > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - col = &gpsi->argbSystem[0]; - for(i = 0; i < nColors; i++) - { - *(Colors++) = *(col++); - } - - return nColors > 0; + UINT i; + COLORREF *col; + + ASSERT(Colors); + + if (nColors > NUM_SYSCOLORS) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + col = &gpsi->argbSystem[0]; + for (i = 0; i < nColors; i++) + { + *(Colors++) = *(col++); + } + + return nColors > 0; } DWORD FASTCALL IntGetSysColor(INT nIndex) { - return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : gpsi->argbSystem[nIndex]; + return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : gpsi->argbSystem[nIndex]; } VOID FASTCALL CreateSysColorObjects(VOID) { - UINT i; - LOGPEN Pen; - - for(i = 0; i < NUM_SYSCOLORS; i++) - { - gpsi->argbSystem[i] = SysColors[i]; - } - - /* Create the syscolor brushes */ - for(i = 0; i < NUM_SYSCOLORS; i++) - { - if(gpsi->ahbrSystem[i] == NULL) - { - gpsi->ahbrSystem[i] = IntGdiCreateSolidBrush(SysColors[i]); - if(gpsi->ahbrSystem[i] != NULL) - { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->ahbrSystem[i]); - } - } - } - - /* Create the syscolor pens */ - Pen.lopnStyle = PS_SOLID; - Pen.lopnWidth.x = 0; - Pen.lopnWidth.y = 0; - for(i = 0; i < NUM_SYSCOLORS; i++) - { - if(gpsi->SysColorPens[i] == NULL) - { - Pen.lopnColor = SysColors[i]; - gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor); - if(gpsi->SysColorPens[i] != NULL) - { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]); - } - } - } + UINT i; + LOGPEN Pen; + + for (i = 0; i < NUM_SYSCOLORS; i++) + { + gpsi->argbSystem[i] = SysColors[i]; + } + + /* Create the syscolor brushes */ + for (i = 0; i < NUM_SYSCOLORS; i++) + { + if (gpsi->ahbrSystem[i] == NULL) + { + gpsi->ahbrSystem[i] = IntGdiCreateSolidBrush(SysColors[i]); + if (gpsi->ahbrSystem[i] != NULL) + { + GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->ahbrSystem[i]); + } + } + } + + /* Create the syscolor pens */ + Pen.lopnStyle = PS_SOLID; + Pen.lopnWidth.x = 0; + Pen.lopnWidth.y = 0; + for (i = 0; i < NUM_SYSCOLORS; i++) + { + if (gpsi->SysColorPens[i] == NULL) + { + Pen.lopnColor = SysColors[i]; + gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor); + if (gpsi->SysColorPens[i] != NULL) + { + GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]); + } + } + } } /* EOF */

1 0

[tkreuzer] 41652: Update SERVERINFO, PFNCLIENT, PFNCLIENTWORKER to Windows 7 version, add OEMBITMAPINFO, DPISERVERINFO, PERUSERSERVERINFO Add -fms-extensions compilerflag to user32, win32k, csrss, win32csr.
by tkreuzer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: tkreuzer Date: Sun Jun 28 03:33:57 2009 New Revision: 41652 URL: http://svn.reactos.org/svn/reactos?rev=41652&view=rev Log: Update SERVERINFO, PFNCLIENT, PFNCLIENTWORKER to Windows 7 version, add OEMBITMAPINFO, DPISERVERINFO, PERUSERSERVERINFO Add -fms-extensions compilerflag to user32, win32k, csrss, win32csr. Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -102,7 +102,7 @@ GetConnected(); // FIXME("Global Sever Data -> %x\n",g_psi); if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; - return g_psi->SystemMetrics[nIndex]; + return g_psi->aiSysMet[nIndex]; } Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -11,7 +11,7 @@ <library>win32ksys</library> <library>pseh</library> <library>ntdll</library> - + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269 <directory name="include"> <pch>user32.h</pch> Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -63,7 +63,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->SysColors[nIndex]; + return g_psi->argbSystem[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); @@ -93,7 +93,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->SysColorBrushes[nIndex]; + return g_psi->ahbrSystem[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); 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 [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -206,43 +206,51 @@ typedef struct _PFNCLIENT { - PROC pfnScrollBarC; - PROC pfnDefWndC; - PROC pfnMenuC; - PROC pfnDesktopC; - PROC pfnDefWnd1C; - PROC pfnDefWnd2C; - PROC pfnDefWnd3C; - PROC pfnButtomC; - PROC pfnComboBoxC; - PROC pfnComboListBoxC; - PROC pfnDefDlgC; - PROC pfnEditC; - PROC pfnListBoxC; - PROC pfnMDIClientC; - PROC pfnStaticC; - PROC pfnImeC; - PROC pfnHkINLPCWPSTRUCT; - PROC pfnHkINLPCWPRETSTRUCT; - PROC pfnDispatchHookC; - PROC pfnDispatchDefC; + WNDPROC pfnScrollBarWndProc; + WNDPROC pfnTitleWndProc; + WNDPROC pfnMenuWndProc; + WNDPROC pfnDesktopWndProc; + WNDPROC pfnDefWindowProc; + WNDPROC pfnMessageWindowProc; + WNDPROC pfnSwitchWindowProc; + WNDPROC pfnButtonWndProc; + WNDPROC pfnComboBoxWndProc; + WNDPROC pfnComboListBoxProc; + WNDPROC pfnDialogWndProc; + WNDPROC pfnEditWndProc; + WNDPROC pfnListBoxWndProc; + WNDPROC pfnMDIClientWndProc; + WNDPROC pfnStaticWndProc; + WNDPROC pfnImeWndProc; + WNDPROC pfnGhostWndProc; + WNDPROC pfnHkINLPCWPSTRUCT; + WNDPROC pfnHkINLPCWPRETSTRUCT; + WNDPROC pfnDispatchHook; + WNDPROC pfnDispatchDefWindowProc; + WNDPROC pfnDispatchMessage; + WNDPROC pfnMDIActivateDlgProc; } PFNCLIENT, *PPFNCLIENT; typedef struct _PFNCLIENTWORKER { - PROC pfnButtonCW; - PROC pfnComboBoxCW; - PROC pfnComboListBoxCW; - PROC pfnDefDlgCW; - PROC pfnEditCW; - PROC pfnListBoxCW; - PROC pfnMDIClientCW; - PROC pfnStaticCW; - PROC pfnImeCW; + WNDPROC pfnButtonWndProc; + WNDPROC pfnComboBoxWndProc; + WNDPROC pfnComboListBoxProc; + WNDPROC pfnDialogWndProc; + WNDPROC pfnEditWndProc; + WNDPROC pfnListBoxWndProc; + WNDPROC pfnMDIClientWndProc; + WNDPROC pfnStaticWndProc; + WNDPROC pfnImeWndProc; + WNDPROC pfnGhostWndProc; + WNDPROC pfnCtfHookProc; } PFNCLIENTWORKER, *PPFNCLIENTWORKER; +struct _WND; +typedef LONG_PTR (NTAPI *PFN_FNID)(struct _WND*, UINT, WPARAM, LPARAM, ULONG_PTR); // FNID's for NtUserSetWindowFNID, NtUserMessageCall +#define FNID_FIRST 0x029A #define FNID_SCROLLBAR 0x029A #define FNID_ICONTITLE 0x029B #define FNID_MENU 0x029C @@ -269,8 +277,10 @@ #define FNID_UNKNOWN 0x02B6 #define FNID_SENDNOTIFYMESSAGE 0x02B7 #define FNID_SENDMESSAGECALLBACK 0x02B8 - - +#define FNID_LAST 0x02B9 + +#define FNID_NUM FNID_LAST - FNID_FIRST + 1 + #define FNID_DDEML 0x2000 // Registers DDEML #define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. // Seen during WM_CREATE on error exit too. @@ -302,37 +312,106 @@ #define ICLS_NOTUSED 23 #define ICLS_END 31 +#define COLOR_LAST COLOR_MENUBAR +#define MAX_MB_STRINGS 11 + #define SRVINFO_METRICS 0x0020 -typedef struct _SERVERINFO -{ - DWORD SRVINFO_Flags; - DWORD SystemMetrics[SM_CMETRICS]; // System Metrics - COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor - HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush - HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive - HBRUSH hbrGray; - POINTL ptCursor; - // - DWORD cxSysFontChar; - DWORD cySysFontChar; - DWORD cxMsgFontChar; - DWORD cyMsgFontChar; - TEXTMETRICW tmSysFont; - // - RECTL rcScreen; - WORD BitCount; - WORD dmLogPixels; - BYTE BitsPixel; - BYTE Planes; - WORD reserved; - DWORD PUSIFlags; // PERUSERSERVERINFO Flags. - ULONG uCaretWidth; - LANGID UILangID; - UINT LastRITWasKeyboard : 1; - UINT bKeyboardPref : 1; - DWORD TimeTick; - DWORD SrvEventActivity; +typedef struct tagOEMBITMAPINFO +{ + INT x; + INT y; + INT cx; + INT cy; +} OEMBITMAPINFO, *POEMBITMAPINFO; + +typedef struct tagMBSTRING +{ + WCHAR szName[15]; + UINT uID; + UINT uStr; +} MBSTRING, *PMBSTRING; + +typedef struct tagDPISERVERINFO +{ + INT gclBorder; /* 000 */ + HFONT hCaptionFont; /* 004 */ + HFONT hMsgFont; /* 008 */ + INT cxMsgFontChar; /* 00C */ + INT cyMsgFontChar; /* 010 */ + UINT wMaxBtnSize; /* 014 */ +} DPISERVERINFO, *PDPISERVERINFO; + +typedef struct _PERUSERSERVERINFO +{ + INT aiSysMet[SM_CMETRICS]; + ULONG argbSystemUnmatched[COLOR_LAST+1]; + COLORREF argbSystem[COLOR_LAST+1]; + HBRUSH ahbrSystem[COLOR_LAST+1]; + HBRUSH hbrGray; + POINT ptCursor; + POINT ptCursorReal; + DWORD dwLastRITEventTickCount; + INT nEvents; + UINT dtScroll; + UINT dtLBSearch; + UINT dtCaretBlink; + UINT ucWheelScrollLines; + UINT ucWheelScrollChars; + INT wMaxLeftOverlapChars; + INT wMaxRightOverlapChars; + INT cxSysFontChar; + INT cySysFontChar; + TEXTMETRICW tmSysFont; + DPISERVERINFO dpiSystem; + HICON hIconSmWindows; + HICON hIcoWindows; + DWORD dwKeyCache; + DWORD dwAsyncKeyCache; + ULONG cCaptures; + OEMBITMAPINFO oembmi[93]; + RECT rcScreenReal; + USHORT BitCount; + USHORT dmLogPixels; + BYTE Planes; + BYTE BitsPixel; + ULONG PUSIFlags; + UINT uCaretWidth; + USHORT UILangID; + DWORD dwLastSystemRITEventTickCountUpdate; + ULONG adwDBGTAGFlags[35]; + DWORD dwTagCount; + DWORD dwRIPFlags; +} PERUSERSERVERINFO, *PPERUSERSERVERINFO; + +typedef struct tagSERVERINFO +{ + DWORD dwSRVIFlags; + ULONG_PTR cHandleEntries; + PFN_FNID mpFnidPfn[FNID_NUM]; +// WNDPROC aStoCidPfn[7]; +// USHORT mpFnid_serverCBWndProc[31]; + PFNCLIENT apfnClientA; + PFNCLIENT apfnClientW; + PFNCLIENTWORKER apfnClientWorker; + ULONG cbHandleTable; + ATOM atomSysClass[ICLS_NOTUSED+1]; + DWORD dwDefaultHeapBase; + DWORD dwDefaultHeapSize; + UINT uiShellMsg; + MBSTRING MBStrings[MAX_MB_STRINGS]; + ATOM atomIconSmProp; + ATOM atomIconProp; + ATOM atomContextHelpIdProp; + ATOM atomFrostedWindowProp; + CHAR acOemToAnsi[256]; + CHAR acAnsiToOem[256]; + DWORD dwInstalledEventHooks; + PERUSERSERVERINFO; +/////////////////////////////// + /* Reactos specific fields */ + DWORD SrvEventActivity; + HPEN SysColorPens[COLOR_MENUBAR+1]; } SERVERINFO, *PSERVERINFO; #define CTI_INSENDMESSAGE 0x0002 @@ -407,7 +486,7 @@ MSG msgDbcsCB; ULONG Win32ClientInfo3[28]; /* It's just a pointer reference not to be used w the structure in user space. */ - PPROCESSINFO ppi; + PPROCESSINFO ppi; } CLIENTINFO, *PCLIENTINFO; /* Make sure it fits exactly into the TEB */ @@ -444,7 +523,7 @@ DWORD recipients; HDESK hDesk; HWND hWnd; - LUID luid; + LUID luid; } BROADCASTPARM, *PBROADCASTPARM; PW32THREADINFO GetW32ThreadInfo(VOID); @@ -1774,7 +1853,7 @@ NTSTATUS NTAPI NtUserInitializeClientPfnArrays( - PPFNCLIENT pfnClientA, + PPFNCLIENT pfnClientA, PPFNCLIENT pfnClientW, PPFNCLIENTWORKER pfnClientWorker, HINSTANCE hmodUser); Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -6,6 +6,7 @@ <include base="csrss">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>nt</library> <library>ntdll</library> <library>smdll</library> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> <include base="console">.</include> + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>ntdll</library> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -45,7 +45,7 @@ CurInfo = NULL; } - piSysMet = (INT*)gpsi->SystemMetrics; + piSysMet = gpsi->aiSysMet; /* Screen sizes */ piSysMet[SM_CXSCREEN] = Width; @@ -172,7 +172,7 @@ piSysMet[90] = 0; #endif - gpsi->SRVINFO_Flags |= SRVINFO_METRICS; + gpsi->dwSRVIFlags |= SRVINFO_METRICS; Setup = TRUE; if (NT_SUCCESS(Status)) @@ -193,7 +193,7 @@ /* Get metrics from array */ if (Index < SM_CMETRICS) { - return gpsi->SystemMetrics[Index]; + return gpsi->aiSysMet[Index]; } /* Handle special values */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -232,7 +232,7 @@ Result = gspv.bMouseBtnSwap; gspv.bMouseBtnSwap = Param ? TRUE : FALSE; - gpsi->SystemMetrics[SM_SWAPBUTTON] = gspv.bMouseBtnSwap; + gpsi->aiSysMet[SM_SWAPBUTTON] = gspv.bMouseBtnSwap; RETURN(Result); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -857,8 +857,8 @@ /* Verify the new values */ if (rcWorkArea.left < 0 || rcWorkArea.top < 0 || - rcWorkArea.right > gpsi->SystemMetrics[SM_CXSCREEN] || - rcWorkArea.bottom > gpsi->SystemMetrics[SM_CYSCREEN] || + rcWorkArea.right > gpsi->aiSysMet[SM_CXSCREEN] || + rcWorkArea.bottom > gpsi->aiSysMet[SM_CYSCREEN] || rcWorkArea.right <= rcWorkArea.left || rcWorkArea.bottom <= rcWorkArea.top) return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -322,7 +322,7 @@ gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); // Font is realized and this dc was previously set to internal DC_ATTR. - gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, &gpsi->cySysFontChar); + gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw; return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -28,7 +28,7 @@ #include <debug.h> -static COLORREF SysColors[] = +static const COLORREF SysColors[] = { RGB(212, 208, 200), /* COLOR_SCROLLBAR */ RGB(58, 110, 165), /* COLOR_BACKGROUND */ @@ -221,8 +221,8 @@ { if((UINT)(*Elements) < NUM_SYSCOLORS) { - gpsi->SysColors[*Elements] = *Colors; - IntGdiSetSolidBrushColor(gpsi->SysColorBrushes[*Elements], *Colors); + gpsi->argbSystem[*Elements] = *Colors; + IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors); IntGdiSetSolidPenColor(gpsi->SysColorPens[*Elements], *Colors); } Elements++; @@ -246,7 +246,7 @@ for(i = 0; i < nBrushes; i++) { - pahBrushes[i] = gpsi->SysColorBrushes[i]; + pahBrushes[i] = gpsi->ahbrSystem[i]; } return nBrushes > 0; @@ -255,7 +255,7 @@ HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object) { - return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->SysColorBrushes[Object]; + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->ahbrSystem[Object]; } BOOL FASTCALL @@ -293,7 +293,7 @@ return FALSE; } - col = &gpsi->SysColors[0]; + col = &gpsi->argbSystem[0]; for(i = 0; i < nColors; i++) { *(Colors++) = *(col++); @@ -305,7 +305,7 @@ DWORD FASTCALL IntGetSysColor(INT nIndex) { - return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : gpsi->SysColors[nIndex]; + return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : gpsi->argbSystem[nIndex]; } VOID FASTCALL @@ -316,18 +316,18 @@ for(i = 0; i < NUM_SYSCOLORS; i++) { - gpsi->SysColors[i] = SysColors[i]; + gpsi->argbSystem[i] = SysColors[i]; } /* Create the syscolor brushes */ for(i = 0; i < NUM_SYSCOLORS; i++) { - if(gpsi->SysColorBrushes[i] == NULL) + if(gpsi->ahbrSystem[i] == NULL) { - gpsi->SysColorBrushes[i] = IntGdiCreateSolidBrush(SysColors[i]); - if(gpsi->SysColorBrushes[i] != NULL) + gpsi->ahbrSystem[i] = IntGdiCreateSolidBrush(SysColors[i]); + if(gpsi->ahbrSystem[i] != NULL) { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorBrushes[i]); + GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->ahbrSystem[i]); } } } Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jun 28 03:33:57 2009 @@ -9,6 +9,7 @@ <include base="freetype">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <define name="LANGPACK" /> <define name="_WIN32K_" /> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269

1 0

[tkreuzer] 41651: Don't save/change/restore the DC pen in IntDrawScrollInterior, where it's not used at all.
by tkreuzer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: tkreuzer Date: Sun Jun 28 03:12:22 2009 New Revision: 41651 URL: http://svn.reactos.org/svn/reactos?rev=41651&view=rev Log: Don't save/change/restore the DC pen in IntDrawScrollInterior, where it's not used at all. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jun 28 03:12:22 2009 @@ -99,7 +99,6 @@ INT ThumbSize = ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop; INT ThumbTop = ScrollBarInfo->xyThumbTop; RECT Rect; - HPEN hSavePen; HBRUSH hSaveBrush, hBrush; BOOL TopSelected = FALSE, BottomSelected = FALSE; @@ -124,7 +123,6 @@ hBrush = DefWndControlColor(hDC, CTLCOLOR_SCROLLBAR); } - hSavePen = SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME)); hSaveBrush = SelectObject(hDC, hBrush); /* Calculate the scroll rectangle */ @@ -150,7 +148,6 @@ Rect.bottom - Rect.top, PATCOPY); /* Cleanup and return */ - SelectObject(hDC, hSavePen); SelectObject(hDC, hSaveBrush); return; } @@ -207,7 +204,6 @@ DrawEdge(hDC, &Rect, EDGE_RAISED, BF_RECT | BF_MIDDLE); /* Cleanup */ - SelectObject(hDC, hSavePen); SelectObject(hDC, hSaveBrush); }

1 0

[ros-arm-bringup] 41650: - Copying from destination to destination isn't very smart. - Fix bug when creating the physical memory descriptor block.
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:51:23 2009 New Revision: 41650 URL: http://svn.reactos.org/svn/reactos?rev=41650&view=rev Log: - Copying from destination to destination isn't very smart. - Fix bug when creating the physical memory descriptor block. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sun Jun 28 02:51:23 2009 @@ -260,7 +260,7 @@ // Copy the old buffer into the new, then free it // RtlCopyMemory(NewBuffer->Run, - NewBuffer->Run, + Buffer->Run, sizeof(PHYSICAL_MEMORY_RUN) * Run); ExFreePool(Buffer);

1 0

[ros-arm-bringup] 41649: - Actually it seems MmGetPhysicalMemoryRanges uses the MmPhysicalMemoryBlock, so go ahead and implement that function. - Thanks to Matthieu Suiche (http://www.msuiche.net/2008/09/17/retrieving-mmphysicalmemoryblock-regardless-of-the-nt-version/). - Move physical.c into ARM3 and call it dynamic.c since these functions are for Dynamic Memory (Hotplug) for Server 2003. - Remove the old copyright header, as copy-pasting 5 DDK function definitions and rewriting them to say UN
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:39:03 2009 New Revision: 41649 URL: http://svn.reactos.org/svn/reactos?rev=41649&view=rev Log: - Actually it seems MmGetPhysicalMemoryRanges uses the MmPhysicalMemoryBlock, so go ahead and implement that function. - Thanks to Matthieu Suiche (http://www.msuiche.net/2008/09/17/retrieving-mmphysicalmemoryblock-regardle…). - Move physical.c into ARM3 and call it dynamic.c since these functions are for Dynamic Memory (Hotplug) for Server 2003. - Remove the old copyright header, as copy-pasting 5 DDK function definitions and rewriting them to say UNIMPLEMENTED isn't much of a copyright. Added: trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c - copied, changed from r41647, trunk/reactos/ntoskrnl/mm/physical.c Removed: trunk/reactos/ntoskrnl/mm/physical.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c (from r41647, trunk/reactos/ntoskrnl/mm/physical.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/physical.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c [iso-8859-1] Sun Jun 28 02:39:03 2009 @@ -1,16 +1,20 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/physical.c - * PURPOSE: Physical Memory Manipulation Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/dynamic.c + * PURPOSE: ARM Memory Manager Dynamic Physical Memory Support + * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#line 15 "ARMÂ³::DYNAMIC" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" /* FUNCTIONS *****************************************************************/ @@ -63,12 +67,61 @@ } /* - * @unimplemented + * @implemented */ PPHYSICAL_MEMORY_RANGE NTAPI MmGetPhysicalMemoryRanges(VOID) { - UNIMPLEMENTED; - return 0; + ULONG Size, i; + PPHYSICAL_MEMORY_RANGE Entry, Buffer; + KIRQL OldIrql; + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + // + // Calculate how much memory we'll need + // + Size = sizeof(PHYSICAL_MEMORY_RANGE) * (MmPhysicalMemoryBlock->NumberOfRuns + 1); + + // + // Allocate a copy + // + Entry = Buffer = ExAllocatePoolWithTag(NonPagedPool, Size, 'hPmM'); + if (!Buffer) return NULL; + + // + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Make sure it hasn't changed before we had acquired the lock + // + ASSERT(Size == (sizeof(PHYSICAL_MEMORY_RANGE) * + (MmPhysicalMemoryBlock->NumberOfRuns + 1))); + + // + // Now loop our block + // + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + // + // Copy the data, but format it into bytes + // + Entry->BaseAddress.QuadPart = MmPhysicalMemoryBlock->Run[i].BasePage << PAGE_SHIFT; + Entry->NumberOfBytes.QuadPart = MmPhysicalMemoryBlock->Run[i].PageCount << PAGE_SHIFT; + Entry++; + } + + // + // Last entry is empty + // + Entry->BaseAddress.QuadPart = 0; + Entry->NumberOfBytes.QuadPart = 0; + + // + // Release the lock and return + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return Buffer; } Removed: trunk/reactos/ntoskrnl/mm/physical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/physical.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/physical.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/physical.c (removed) @@ -1,74 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/physical.c - * PURPOSE: Physical Memory Manipulation Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmAddPhysicalMemory (IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMarkPhysicalMemoryAsBad(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMarkPhysicalMemoryAsGood(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmRemovePhysicalMemory(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -PPHYSICAL_MEMORY_RANGE -NTAPI -MmGetPhysicalMemoryRanges(VOID) -{ - UNIMPLEMENTED; - return 0; -} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 28 02:39:03 2009 @@ -360,6 +360,7 @@ </directory> </if> <directory name="ARM3"> + <file>dynamic.c</file> <file>hypermap.c</file> <file>init.c</file> <file>iosup.c</file> @@ -384,7 +385,6 @@ <file>pagefile.c</file> <file>pageop.c</file> <file>pe.c</file> - <file>physical.c</file> <file>pool.c</file> <file>ppool.c</file> <file>procsup.c</file>

1 0

[ros-arm-bringup] 41648: - Call MmArmInitSystem for a second time, this time in Phase 1. - This will call MmInitializeMemoryLimits (now implemented) which will go ahead and create the MmPhysicalMemoryBlock. - This block contains the physical memory "runs" that are valid on the system, allowing the PFN database to differentiate between valid and non-valid RAM (instead of marking things as "BIOS"). - Also this will come in handy later for various utilities.
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:16:47 2009 New Revision: 41648 URL: http://svn.reactos.org/svn/reactos?rev=41648&view=rev Log: - Call MmArmInitSystem for a second time, this time in Phase 1. - This will call MmInitializeMemoryLimits (now implemented) which will go ahead and create the MmPhysicalMemoryBlock. - This block contains the physical memory "runs" that are valid on the system, allowing the PFN database to differentiate between valid and non-valid RAM (instead of marking things as "BIOS"). - Also this will come in handy later for various utilities. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -108,11 +108,15 @@ // ULONG MxPfnAllocation; - // // The ARMÂ³ PFN Database // PMMPFN MmArmPfnDatabase; + +// +// This structure describes the different pieces of RAM-backed address space +// +PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; /* PRIVATE FUNCTIONS **********************************************************/ @@ -137,6 +141,142 @@ MmGlobalKernelPageDirectory[Pde] = ((PULONG)PAGEDIRECTORY_MAP)[Pde]; Pde++; } +} + +PPHYSICAL_MEMORY_DESCRIPTOR +NTAPI +MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PBOOLEAN IncludeType) +{ + PLIST_ENTRY NextEntry; + ULONG Run = 0, InitialRuns = 0; + PFN_NUMBER NextPage = -1, PageCount = 0; + PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + + // + // Scan the memory descriptors + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // For each one, increase the memory allocation estimate + // + InitialRuns++; + NextEntry = NextEntry->Flink; + } + + // + // Allocate the maximum we'll ever need + // + Buffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + + sizeof(PHYSICAL_MEMORY_RUN) * + (InitialRuns - 1), + 'lMmM'); + if (!Buffer) return NULL; + + // + // For now that's how many runs we have + // + Buffer->NumberOfRuns = InitialRuns; + + // + // Now loop through the descriptors again + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // Grab each one, and check if it's one we should include + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if ((MdBlock->MemoryType < LoaderMaximum) && + (IncludeType[MdBlock->MemoryType])) + { + // + // Add this to our running total + // + PageCount += MdBlock->PageCount; + + // + // Check if the next page is described by the next descriptor + // + if (MdBlock->BasePage == NextPage) + { + // + // Combine it into the same physical run + // + ASSERT(MdBlock->PageCount != 0); + Buffer->Run[Run - 1].PageCount += MdBlock->PageCount; + NextPage += MdBlock->PageCount; + } + else + { + // + // Otherwise just duplicate the descriptor's contents + // + Buffer->Run[Run].BasePage = MdBlock->BasePage; + Buffer->Run[Run].PageCount = MdBlock->PageCount; + NextPage = Buffer->Run[Run].BasePage + Buffer->Run[Run].PageCount; + + // + // And in this case, increase the number of runs + // + Run++; + } + } + + // + // Try the next descriptor + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // We should not have been able to go past our initial estimate + // + ASSERT(Run <= Buffer->NumberOfRuns); + + // + // Our guess was probably exaggerated... + // + if (InitialRuns > Run) + { + // + // Allocate a more accurately sized buffer + // + NewBuffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + + sizeof(PHYSICAL_MEMORY_RUN) * + (Run - 1), + 'lMmM'); + if (NewBuffer) + { + // + // Copy the old buffer into the new, then free it + // + RtlCopyMemory(NewBuffer->Run, + NewBuffer->Run, + sizeof(PHYSICAL_MEMORY_RUN) * Run); + ExFreePool(Buffer); + + // + // Now use the new buffer + // + Buffer = NewBuffer; + } + } + + // + // Write the final numbers, and return it + // + Buffer->NumberOfRuns = Run; + Buffer->NumberOfPages = PageCount; + return Buffer; } NTSTATUS @@ -152,6 +292,8 @@ PVOID NonPagedPoolExpansionVa, BaseAddress; NTSTATUS Status; ULONG OldCount; + BOOLEAN IncludeType[LoaderMaximum]; + ULONG i; BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; High.QuadPart = -1; @@ -565,6 +707,36 @@ MiSyncARM3WithROS(MmNonPagedPoolStart, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); } + else + { + // + // Instantiate memory that we don't consider RAM/usable + // We use the same exclusions that Windows does, in order to try to be + // compatible with WinLDR-style booting + // + for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; + IncludeType[LoaderBad] = FALSE; + IncludeType[LoaderFirmwarePermanent] = FALSE; + IncludeType[LoaderSpecialMemory] = FALSE; + IncludeType[LoaderBBTMemory] = FALSE; + + // + // Build the physical memory block + // + MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, + IncludeType); + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + // + // Dump it for debugging + // + PPHYSICAL_MEMORY_RUN Run; + Run = &MmPhysicalMemoryBlock->Run[i]; + DPRINT1("PHYSICAL RAM [0x%08p to 0x%08p]\n", + Run->BasePage << PAGE_SHIFT, + (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + } + } // // Always return success for now Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -28,6 +28,19 @@ MiNotMapped } MI_PFN_CACHE_ATTRIBUTE, *PMI_PFN_CACHE_ATTRIBUTE; +typedef struct _PHYSICAL_MEMORY_RUN +{ + ULONG BasePage; + ULONG PageCount; +} PHYSICAL_MEMORY_RUN, *PPHYSICAL_MEMORY_RUN; + +typedef struct _PHYSICAL_MEMORY_DESCRIPTOR +{ + ULONG NumberOfRuns; + ULONG NumberOfPages; + PHYSICAL_MEMORY_RUN Run[1]; +} PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR; + extern MMPTE HyperTemplatePte; extern ULONG MmSizeOfNonPagedPoolInBytes; @@ -36,6 +49,7 @@ extern PVOID MmNonPagedPoolExpansionStart; extern PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; extern PMMPTE MiFirstReservedZeroingPte; +extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -376,7 +376,7 @@ MmInitializePageList(); // - // Initialize ARMÂ³ + // Initialize ARMÂ³ in phase 0 // MmArmInitSystem(0, KeLoaderBlock); @@ -391,6 +391,11 @@ /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); } BOOLEAN

1 0

[spetreolle] 41647: Taskmgr didn't build without compilation units, moving PerfDataGet to perfdata functions fixes it.
by spetreolle＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: spetreolle Date: Sun Jun 28 02:05:53 2009 New Revision: 41647 URL: http://svn.reactos.org/svn/reactos?rev=41647&view=rev Log: Taskmgr didn't build without compilation units, moving PerfDataGet to perfdata functions fixes it. Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfdata.h trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -901,3 +901,18 @@ return ThreadCount; } + +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData) +{ + BOOL bSuccessful = FALSE; + + EnterCriticalSection(&PerfDataCriticalSection); + if (Index < ProcessCount) + { + *lppData = pPerfData + Index; + bSuccessful = TRUE; + } + LeaveCriticalSection(&PerfDataCriticalSection); + return bSuccessful; +} + Modified: trunk/reactos/base/applications/taskmgr/perfdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -60,6 +60,7 @@ void PerfDataUninitialize(void); void PerfDataRefresh(void); +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); ULONG PerfDataGetProcessCount(void); ULONG PerfDataGetProcessorUsage(void); ULONG PerfDataGetProcessorSystemUsage(void); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -52,7 +52,6 @@ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); -BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); @@ -454,20 +453,6 @@ } } -BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData) -{ - BOOL bSuccessful = FALSE; - - EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - { - *lppData = pPerfData + Index; - bSuccessful = TRUE; - } - LeaveCriticalSection(&PerfDataCriticalSection); - return bSuccessful; -} - void AddProcess(ULONG Index) { LPPROCESS_PAGE_LIST_ITEM pData;

1 0

[jimtabor] 41646: - Fix callback set and changed data. Process hooks if we are hooked.
by jimtabor＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: jimtabor Date: Sun Jun 28 00:52:33 2009 New Revision: 41646 URL: http://svn.reactos.org/svn/reactos?rev=41646&view=rev Log: - Fix callback set and changed data. Process hooks if we are hooked. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sun Jun 28 00:52:33 2009 @@ -480,6 +480,8 @@ case HCBT_SYSCOMMAND: case HCBT_DESTROYWND: case HCBT_QS: + wParam = Common->wParam; + lParam = Common->lParam; break; default: ERR("HCBT_ not supported = %d\n", Common->Code); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sun Jun 28 00:52:33 2009 @@ -401,7 +401,7 @@ case HCBT_CLICKSKIPPED: ArgumentLength += sizeof(MOUSEHOOKSTRUCT); break; -/* ATM pass on */ +/* ATM pass on */ case HCBT_KEYSKIPPED: case HCBT_MINMAX: case HCBT_SETFOCUS: @@ -469,7 +469,7 @@ case HCBT_CREATEWND: Common->lParam = (LPARAM) (Extra - (PCHAR) Common); CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) Extra; - CbtCreatewndExtra->Cs = *(CbtCreateWnd->lpcs); + RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; Extra = (PCHAR) (CbtCreatewndExtra + 1); RtlCopyMemory(Extra, WindowName.Buffer, WindowName.Length); @@ -581,7 +581,22 @@ { if (CbtCreatewndExtra) { - CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + _SEH2_TRY + { /* + The parameters could have been changed, include the coordinates + and dimensions of the window. We copy it back. + */ + CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + CbtCreateWnd->lpcs->x = CbtCreatewndExtra->Cs.x; + CbtCreateWnd->lpcs->y = CbtCreatewndExtra->Cs.y; + CbtCreateWnd->lpcs->cx = CbtCreatewndExtra->Cs.cx; + CbtCreateWnd->lpcs->cy = CbtCreatewndExtra->Cs.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = 0; + } + _SEH2_END; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jun 28 00:52:33 2009 @@ -1883,18 +1883,22 @@ Cs.dwExStyle = dwExStyle; CbtCreate.lpcs = &Cs; CbtCreate.hwndInsertAfter = HWND_TOP; - if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) - { - /* FIXME - Delete window object and remove it from the thread windows list */ - /* FIXME - delete allocated DCE */ - DPRINT1("CBT-hook returned !0\n"); - RETURN( (HWND) NULL); - } - + if (ISITHOOKED(WH_CBT)) + { + if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) + { + /* FIXME - Delete window object and remove it from the thread windows list */ + /* FIXME - delete allocated DCE */ + DPRINT1("CBT-hook returned !0\n"); + RETURN( (HWND) NULL); + } + } x = Cs.x; y = Cs.y; nWidth = Cs.cx; nHeight = Cs.cy; +// FIXME: Need to set the Z order in the window link list if the hook callback changed it! +// hwndInsertAfter = CbtCreate.hwndInsertAfter; /* default positioning for overlapped windows */ if(!(Wnd->Style & (WS_POPUP | WS_CHILD))) @@ -2396,8 +2400,11 @@ { BOOLEAN isChild; PWINDOW Wnd; + HWND hWnd; ASSERT_REFS_CO(Window); // FIXME: temp hack? + + hWnd = Window->hSelf; Wnd = Window->Wnd; @@ -2430,9 +2437,9 @@ IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ - if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) Window->hSelf, 0)) - { - return FALSE; + if (ISITHOOKED(WH_CBT)) + { + if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; } IntEngWindowChanged(Window, WOC_DELETE);

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