Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): CLeanup win32k. Remove...

svn path=/trunk/; revision=32435

diff --git a/reactos/dll/win32/gdi32/misc/hacks.c b/reactos/dll/win32/gdi32/misc/hacks.c
index d1cdaed..9b70251 100644 (file)
--- a/reactos/dll/win32/gdi32/misc/hacks.c
+++ b/reactos/dll/win32/gdi32/misc/hacks.c
@@ -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

diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index f3d2477..b3d9fa8 100644 (file)
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -47,20 +47,41 @@ StretchDIBits(HDC hdc,
 }
 
 /*
- * @unimplemented
+ * @implemented
+ *
  */
-int
+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);
+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 @@ GdiResetDCEMF(HANDLE SpoolFileHandle,
 }
 
 
-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
  */

diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c
index 48fc1bb..f1febea 100644 (file)
--- a/reactos/subsystems/win32/win32k/stubs/stubs.c
+++ b/reactos/subsystems/win32/win32k/stubs/stubs.c
@@ -2986,4 +2986,12 @@ NtGdiUnmapMemFont(
     return FALSE;
 }
 
-
+BOOL
+STDCALL
+EngControlSprites(
+  IN WNDOBJ  *pwo,
+  IN FLONG  fl)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}

diff --git a/reactos/subsystems/win32/win32k/stubs/xpstubs.c b/reactos/subsystems/win32/win32k/stubs/xpstubs.c
index a4c8576..e69de29 100644 (file)
--- a/reactos/subsystems/win32/win32k/stubs/xpstubs.c
+++ b/reactos/subsystems/win32/win32k/stubs/xpstubs.c
@@ -1,20 +0,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;
-}
-

diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 15ec943..45166e2 100644 (file)
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -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">