Implemented DxEngGetRedirectionBitmap. Fixed GdiGetSetCopyCount.

svn path=/trunk/; revision=33087

diff --git a/reactos/include/reactos/drivers/directx/dxeng.h b/reactos/include/reactos/drivers/directx/dxeng.h
index 4cca2d8..e473710 100644 (file)
--- a/reactos/include/reactos/drivers/directx/dxeng.h
+++ b/reactos/include/reactos/drivers/directx/dxeng.h
@@ -118,7 +118,7 @@ DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2);
 DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2);
 DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2);
 DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3);
-DWORD DxEngGetRedirectionBitmap(DWORD x1);
+DWORD STDCALL DxEngGetRedirectionBitmap(DWORD x1);
 DWORD DxEngLoadImage(DWORD x1,DWORD x2);
 
 

diff --git a/reactos/include/reactos/win32k/ntgdityp.h b/reactos/include/reactos/win32k/ntgdityp.h
index faf616a..6d0b663 100644 (file)
--- a/reactos/include/reactos/win32k/ntgdityp.h
+++ b/reactos/include/reactos/win32k/ntgdityp.h
@@ -57,7 +57,7 @@ typedef enum _GETDCDWORD
 
 typedef enum _GETSETDCDWORD
 {
-    GdtGetSetCopyCount = 2,
+    GdiGetSetCopyCount = 2,
     GdiGetSetTextAlign,
     GdiGetSetRelAbs,
     GdiGetSetTextCharExtra,

diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
index 2469cb1..ea285ab 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
+++ b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
@@ -822,10 +822,11 @@ DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
 /************************************************************************/
 /* DxEngGetRedirectionBitmap                                            */
 /************************************************************************/
-DWORD DxEngGetRedirectionBitmap(DWORD x1)
+DWORD
+STDCALL
+DxEngGetRedirectionBitmap(DWORD x1)
 {
-    UNIMPLEMENTED;
-    return FALSE;
+    return FALSE; // Normal return.
 }
 
 /************************************************************************/

diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c
index 1bfb80f..5c4ffde 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dc.c
+++ b/reactos/subsystems/win32/win32k/objects/dc.c
@@ -2258,7 +2258,7 @@ NtGdiGetAndSetDCDword(
 
   switch (u)
   {
-    case GdtGetSetCopyCount:
+    case GdiGetSetCopyCount:
       SafeResult = dc->ulCopyCount;
       dc->ulCopyCount = dwIn;
       break;