[jimtabor] 32435: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): CLeanup win32k. Remove xpstubs.c.
Author: jimtabor Date: Wed Feb 20 23:53:36 2008 New Revision: 32435
URL: http://svn.reactos.org/svn/reactos?rev=32435&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): CLeanup win32k. Remove xpstubs.c.
Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild
Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks.... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Wed Feb 20 23:53:36 2008 @@ -11,43 +11,32 @@ */
/* - * @implemented - * + * @unimplemented */ -INT +int STDCALL -SetDIBitsToDevice( - HDC hDC, - int XDest, - int YDest, - DWORD Width, - DWORD Height, - int XSrc, - int YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *lpbmi, - UINT ColorUse) +SetDIBits(HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) { - return NtGdiSetDIBitsToDeviceInternal(hDC, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)Bits, - (LPBITMAPINFO)lpbmi, - ColorUse, - lpbmi->bmiHeader.biSizeImage, - lpbmi->bmiHeader.biSize, - FALSE, - NULL); + /* FIXME share memory */ + return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); }
+HBITMAP +STDCALL +CreateDIBitmap(HDC hDc, + const BITMAPINFOHEADER *Header, + DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, + UINT ColorUse) +{ + /* FIMXE we need do more thing in user mode */ + return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); +}
/* * @implemented
Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Feb 20 23:53:36 2008 @@ -47,20 +47,41 @@ }
/* - * @unimplemented - */ -int -STDCALL -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - /* FIXME share memory */ - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); + * @implemented + * + */ +INT +STDCALL +SetDIBitsToDevice( + HDC hDC, + int XDest, + int YDest, + DWORD Width, + DWORD Height, + int XSrc, + int YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *lpbmi, + UINT ColorUse) +{ + return NtGdiSetDIBitsToDeviceInternal(hDC, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + (LPBYTE)Bits, + (LPBITMAPINFO)lpbmi, + ColorUse, + lpbmi->bmiHeader.biSizeImage, + lpbmi->bmiHeader.biSize, + FALSE, + NULL); }
/* @@ -1770,17 +1791,6 @@ }
-HBITMAP -STDCALL -CreateDIBitmap(HDC hDc, - const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) -{ - /* FIMXE we need do more thing in user mode */ - return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); -} - /* * @unimplemented */
Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/stu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Feb 20 23:53:36 2008 @@ -2986,4 +2986,12 @@ return FALSE; }
- +BOOL +STDCALL +EngControlSprites( + IN WNDOBJ *pwo, + IN FLONG fl) +{ + UNIMPLEMENTED; + return FALSE; +}
Modified: trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/stu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c Wed Feb 20 23:53:36 2008 @@ -1,20 +1,0 @@ -/* - * Stubs for unimplemented WIN32K.SYS exports that are only available - * in Windows XP and beyond ( i.e. a low priority for us right now ) - */ - -#include <w32k.h> - -#define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); } -#define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) - -BOOL -STDCALL -EngControlSprites( - IN WNDOBJ *pwo, - IN FLONG fl) -{ - UNIMPLEMENTED; - return FALSE; -} -
Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/win... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Wed Feb 20 23:53:36 2008 @@ -170,7 +170,6 @@ </directory> <directory name="stubs"> <file>stubs.c</file> - <file>xpstubs.c</file> </directory> </module> <module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true">
-
jimtabor＠svn.reactos.org