diff --git a/reactos/subsystems/win32/win32k/include/intddraw.h b/reactos/subsystems/win32/win32k/include/intddraw.h
index 598dff33a20..12130da9268 100644
--- a/reactos/subsystems/win32/win32k/include/intddraw.h
+++ b/reactos/subsystems/win32/win32k/include/intddraw.h
@@ -9,10 +9,10 @@
 /* From ddraw.c */
 extern PDRVFN gpDxFuncs;
 
-typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
+typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
 typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *);
 typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID);
-typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL);
+typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*);
 typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA);
 typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA);
 typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
index 95e3b57f248..ff24a038dbf 100644
--- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
+++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
@@ -97,8 +97,7 @@ BOOL
 INTERNAL_CALL
 DD_Cleanup(PVOID ObjectBody)
 {
-    PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody;
-
+    // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody;
     DPRINT1("DD_Cleanup\n");
 
     /* Do not known what the new cleanup code should do at moment */
@@ -175,9 +174,9 @@ NtGdiDxgGenericThunk(ULONG_PTR ulIndex,
     PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL;
     INT i;
 
-    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverState, pfnDxgGenericThunk);
+    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk);
 
-    if (pfnDdGetDriverState == NULL)
+    if (pfnDxgGenericThunk == NULL)
     {
         DPRINT1("Warring no pfnDxgGenericThunk");
         return DDHAL_DRIVER_NOTHANDLED;
@@ -432,7 +431,7 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw,
     }
 
     DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode");
-    return pfnDdSetExclusiveMode(hDirectDrawLocal, puGetAvailDriverMemoryData);
+    return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData);
 
 }