Author: jimtabor Date: Sat Jan 5 22:35:03 2008 New Revision: 31614
URL: http://svn.reactos.org/svn/reactos?rev=31614&view=rev Log: Fixed regression in RealizePalette, found by Stefan100.
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/color.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stubs... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Sat Jan 5 22:35:03 2008 @@ -239,14 +239,13 @@
/* - * @unimplemented + * @implemented */ UINT STDCALL UserRealizePalette ( HDC hDC ) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallOneParam((DWORD) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE); }
/*
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Jan 5 22:35:03 2008 @@ -170,13 +170,6 @@ CONST LPPOLYTEXTW txt, int Count);
-/* Call UserRealizePalette. */ -UINT -STDCALL -NtGdiRealizePalette ( - HDC hDC - ); - /* Should be done in user-mode. */ BOOL STDCALL
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 (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Jan 5 22:35:03 2008 @@ -644,6 +644,7 @@ #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 #define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 #define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 +#define ONEPARAM_ROUTINE_REALIZEPALETTE 0x35 #define ONEPARAM_ROUTINE_RELEASEDC 0x39 DWORD NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/include/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/color.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/color.h Sat Jan 5 22:35:03 2008 @@ -14,6 +14,6 @@ COLORREF STDCALL COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color); INT STDCALL COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col); INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved); - +UINT STDCALL NtGdiRealizePalette (HDC);
#endif /* _WIN32K_COLOR_H */
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jan 5 22:35:03 2008 @@ -475,6 +475,9 @@ } case ONEPARAM_ROUTINE_RELEASEDC: RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE)); + + case ONEPARAM_ROUTINE_REALIZEPALETTE: + RETURN (NtGdiRealizePalette((HDC) Param)); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param);
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Jan 5 22:35:03 2008 @@ -729,7 +729,6 @@ NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 NtGdiPolyTextOut 3 -NtGdiRealizePalette 1 NtGdiRemoveFontResource 1 # # ReactOS only system calls