mirror of
https://github.com/reactos/reactos.git
synced 2025-06-01 07:28:19 +00:00
[FORMATTING] Fix indentation, no code change
svn path=/trunk/; revision=41653
This commit is contained in:
parent
36526f9157
commit
1fc4b3e8ca
1 changed files with 200 additions and 193 deletions
|
@ -70,49 +70,56 @@ HDC hSystemBM;
|
||||||
/* GDI stock objects */
|
/* GDI stock objects */
|
||||||
|
|
||||||
static LOGPEN WhitePen =
|
static LOGPEN WhitePen =
|
||||||
{ PS_SOLID, { 0, 0 }, RGB(255,255,255) };
|
{ PS_SOLID, { 0, 0 }, RGB(255,255,255) };
|
||||||
|
|
||||||
static LOGPEN BlackPen =
|
static LOGPEN BlackPen =
|
||||||
{ PS_SOLID, { 0, 0 }, RGB(0,0,0) };
|
{ PS_SOLID, { 0, 0 }, RGB(0,0,0) };
|
||||||
|
|
||||||
static LOGPEN NullPen =
|
static LOGPEN NullPen =
|
||||||
{ PS_NULL, { 0, 0 }, 0 };
|
{ PS_NULL, { 0, 0 }, 0 };
|
||||||
|
|
||||||
static LOGFONTW OEMFixedFont =
|
static LOGFONTW OEMFixedFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New"
|
||||||
|
}; //Bitstream Vera Sans Mono
|
||||||
|
|
||||||
static LOGFONTW AnsiFixedFont =
|
static LOGFONTW AnsiFixedFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New"
|
||||||
|
}; //Bitstream Vera Sans Mono
|
||||||
|
|
||||||
static LOGFONTW AnsiVarFont =
|
static LOGFONTW AnsiVarFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
||||||
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" };
|
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif"
|
||||||
|
};
|
||||||
|
|
||||||
static LOGFONTW SystemFont =
|
static LOGFONTW SystemFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New"
|
||||||
|
}; //Bitstream Vera Sans
|
||||||
|
|
||||||
static LOGFONTW DeviceDefaultFont =
|
static LOGFONTW DeviceDefaultFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif"
|
||||||
|
}; //Bitstream Vera Sans
|
||||||
|
|
||||||
static LOGFONTW SystemFixedFont =
|
static LOGFONTW SystemFixedFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New"
|
||||||
|
}; //Bitstream Vera Sans Mono
|
||||||
|
|
||||||
/* FIXME: Is this correct? */
|
/* FIXME: Is this correct? */
|
||||||
static LOGFONTW DefaultGuiFont =
|
static LOGFONTW DefaultGuiFont =
|
||||||
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
|
{ 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
|
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif"
|
||||||
|
}; //Bitstream Vera Sans
|
||||||
|
|
||||||
HGDIOBJ StockObjects[NB_STOCK_OBJECTS];
|
HGDIOBJ StockObjects[NB_STOCK_OBJECTS];
|
||||||
|
|
||||||
static
|
static
|
||||||
HPEN
|
HPEN
|
||||||
FASTCALL
|
FASTCALL
|
||||||
IntCreateStockPen( DWORD dwPenStyle,
|
IntCreateStockPen(DWORD dwPenStyle,
|
||||||
DWORD dwWidth,
|
DWORD dwWidth,
|
||||||
ULONG ulBrushStyle,
|
ULONG ulBrushStyle,
|
||||||
ULONG ulColor)
|
ULONG ulColor)
|
||||||
|
@ -217,9 +224,9 @@ IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors)
|
||||||
ASSERT(Elements);
|
ASSERT(Elements);
|
||||||
ASSERT(Colors);
|
ASSERT(Colors);
|
||||||
|
|
||||||
for(i = 0; i < nColors; i++)
|
for (i = 0; i < nColors; i++)
|
||||||
{
|
{
|
||||||
if((UINT)(*Elements) < NUM_SYSCOLORS)
|
if ((UINT)(*Elements) < NUM_SYSCOLORS)
|
||||||
{
|
{
|
||||||
gpsi->argbSystem[*Elements] = *Colors;
|
gpsi->argbSystem[*Elements] = *Colors;
|
||||||
IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors);
|
IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors);
|
||||||
|
@ -238,13 +245,13 @@ IntGetSysColorBrushes(HBRUSH *pahBrushes, UINT nBrushes)
|
||||||
|
|
||||||
ASSERT(pahBrushes);
|
ASSERT(pahBrushes);
|
||||||
|
|
||||||
if(nBrushes > NUM_SYSCOLORS)
|
if (nBrushes > NUM_SYSCOLORS)
|
||||||
{
|
{
|
||||||
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < nBrushes; i++)
|
for (i = 0; i < nBrushes; i++)
|
||||||
{
|
{
|
||||||
pahBrushes[i] = gpsi->ahbrSystem[i];
|
pahBrushes[i] = gpsi->ahbrSystem[i];
|
||||||
}
|
}
|
||||||
|
@ -265,13 +272,13 @@ IntGetSysColorPens(HPEN *Pens, UINT nPens)
|
||||||
|
|
||||||
ASSERT(Pens);
|
ASSERT(Pens);
|
||||||
|
|
||||||
if(nPens > NUM_SYSCOLORS)
|
if (nPens > NUM_SYSCOLORS)
|
||||||
{
|
{
|
||||||
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < nPens; i++)
|
for (i = 0; i < nPens; i++)
|
||||||
{
|
{
|
||||||
*(Pens++) = gpsi->SysColorPens[i];
|
*(Pens++) = gpsi->SysColorPens[i];
|
||||||
}
|
}
|
||||||
|
@ -287,14 +294,14 @@ IntGetSysColors(COLORREF *Colors, UINT nColors)
|
||||||
|
|
||||||
ASSERT(Colors);
|
ASSERT(Colors);
|
||||||
|
|
||||||
if(nColors > NUM_SYSCOLORS)
|
if (nColors > NUM_SYSCOLORS)
|
||||||
{
|
{
|
||||||
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
col = &gpsi->argbSystem[0];
|
col = &gpsi->argbSystem[0];
|
||||||
for(i = 0; i < nColors; i++)
|
for (i = 0; i < nColors; i++)
|
||||||
{
|
{
|
||||||
*(Colors++) = *(col++);
|
*(Colors++) = *(col++);
|
||||||
}
|
}
|
||||||
|
@ -314,18 +321,18 @@ CreateSysColorObjects(VOID)
|
||||||
UINT i;
|
UINT i;
|
||||||
LOGPEN Pen;
|
LOGPEN Pen;
|
||||||
|
|
||||||
for(i = 0; i < NUM_SYSCOLORS; i++)
|
for (i = 0; i < NUM_SYSCOLORS; i++)
|
||||||
{
|
{
|
||||||
gpsi->argbSystem[i] = SysColors[i];
|
gpsi->argbSystem[i] = SysColors[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the syscolor brushes */
|
/* Create the syscolor brushes */
|
||||||
for(i = 0; i < NUM_SYSCOLORS; i++)
|
for (i = 0; i < NUM_SYSCOLORS; i++)
|
||||||
{
|
{
|
||||||
if(gpsi->ahbrSystem[i] == NULL)
|
if (gpsi->ahbrSystem[i] == NULL)
|
||||||
{
|
{
|
||||||
gpsi->ahbrSystem[i] = IntGdiCreateSolidBrush(SysColors[i]);
|
gpsi->ahbrSystem[i] = IntGdiCreateSolidBrush(SysColors[i]);
|
||||||
if(gpsi->ahbrSystem[i] != NULL)
|
if (gpsi->ahbrSystem[i] != NULL)
|
||||||
{
|
{
|
||||||
GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->ahbrSystem[i]);
|
GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->ahbrSystem[i]);
|
||||||
}
|
}
|
||||||
|
@ -336,13 +343,13 @@ CreateSysColorObjects(VOID)
|
||||||
Pen.lopnStyle = PS_SOLID;
|
Pen.lopnStyle = PS_SOLID;
|
||||||
Pen.lopnWidth.x = 0;
|
Pen.lopnWidth.x = 0;
|
||||||
Pen.lopnWidth.y = 0;
|
Pen.lopnWidth.y = 0;
|
||||||
for(i = 0; i < NUM_SYSCOLORS; i++)
|
for (i = 0; i < NUM_SYSCOLORS; i++)
|
||||||
{
|
{
|
||||||
if(gpsi->SysColorPens[i] == NULL)
|
if (gpsi->SysColorPens[i] == NULL)
|
||||||
{
|
{
|
||||||
Pen.lopnColor = SysColors[i];
|
Pen.lopnColor = SysColors[i];
|
||||||
gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor);
|
gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor);
|
||||||
if(gpsi->SysColorPens[i] != NULL)
|
if (gpsi->SysColorPens[i] != NULL)
|
||||||
{
|
{
|
||||||
GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]);
|
GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue