Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Start populating server information structure. This fixes the icon issues with other languages.

Browse source 
svn path=/trunk/; revision=38258
This commit is contained in:
James Tabor 2008-12-22 02:52:47 +00:00
parent e48fb0b04c
commit 955a660368
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/user32/windows/icon.c
View file

@ -670,13 +670,13 @@ LookupIconIdFromDirectoryEx(PBYTE xdir,
{ {
ColorBits = 1; ColorBits = 1;
} }
else if (g_psi->SystemMetrics[SM_SAMEDISPLAYFORMAT] || (cFlag & LR_VGACOLOR) ) else if (cFlag & LR_VGACOLOR)
{ {
ColorBits = 4; ColorBits = 4;
} }
else else
{ {
ColorBits = 0; ColorBits = g_psi->BitsPixel;
} }
if(bIcon) if(bIcon)

13
reactos/include/reactos/win32k/ntuser.h
View file

@ -277,6 +277,19 @@ typedef struct _SERVERINFO
COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor
HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush
HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive 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; DWORD SrvEventActivity;
} SERVERINFO, *PSERVERINFO; } SERVERINFO, *PSERVERINFO;

5
reactos/subsystems/win32/win32k/ntuser/winsta.c
View file

@ -315,6 +315,11 @@ co_IntInitializeDesktopGraphics(VOID)
NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT));
IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); 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; return TRUE;
} }