Author: jimtabor Date: Sun Dec 21 20:52:47 2008 New Revision: 38258
URL: http://svn.reactos.org/svn/reactos?rev=38258&view=rev Log: - Start populating server information structure. This fixes the icon issues with other languages.
Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c
Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -670,13 +670,13 @@ { ColorBits = 1; } - else if (g_psi->SystemMetrics[SM_SAMEDISPLAYFORMAT] || (cFlag & LR_VGACOLOR) ) + else if (cFlag & LR_VGACOLOR) { ColorBits = 4; } else { - ColorBits = 0; + ColorBits = g_psi->BitsPixel; }
if(bIcon)
Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -277,6 +277,19 @@ COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive + // + RECTL rcScreen; + WORD BitCount; + WORD dmLogPixels; + BYTE BitsPixel; + BYTE Planes; + WORD reserved; + DWORD PUSIFlags; + ULONG uCaretWidth; + LANGID UILangID; + UINT LastRITWasKeyboard : 1; + UINT bKeyboardPref : 1; + DWORD TimeTick; DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -314,6 +314,11 @@
NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); + + // FIXME! Move these to a update routine. + gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); + gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel;
return TRUE; }