Implement GdiEntry13, GdiEntry15, GdiEntry16 (all are party tested)
Modified: trunk/reactos/lib/gdi32/misc/gdientry.c
Modified: trunk/reactos/lib/gdi32/misc/stubs.c
_____
Modified: trunk/reactos/lib/gdi32/misc/gdientry.c
--- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 22:08:29 UTC
(rev 16844)
+++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 22:34:11 UTC
(rev 16845)
@@ -28,6 +28,7 @@
#include "precomp.h"
static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal;
+static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0;
/*
@@ -197,10 +198,61 @@
*
* GDIEntry 12
*/
-VOID STDCALL DdUnattachSurface(
-LPDDRAWI_DDRAWSURFACE_LCL pSurface,
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
-)
+VOID
+STDCALL
+DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface,
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached)
{
NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE)
pSurfaceAttached->hDDSurface);
}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 13
+ */
+ULONG
+STDCALL
+DdQueryDisplaySettingsUniqueness()
+{
+ return RemberDdQueryDisplaySettingsUniquenessID;
+}
+
+
+/*
+ * @implemented
+ *
+ * GDIEntry 15
+ */
+BOOL STDCALL DdSetGammaRamp(
+LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+HDC hdc,
+LPVOID lpGammaRamp
+)
+{
+ if (!pDDraw->lpGbl->hDD)
+ {
+ if (!pDirectDrawGlobalInternal->hDD)
+ {
+ return FALSE;
+ }
+ return
NtGdiDdSetGammaRamp((HANDLE)pDirectDrawGlobalInternal->hDD,hdc,lpGammaRa
mp);
+ }
+
+ return
NtGdiDdSetGammaRamp((HANDLE)pDDraw->lpGbl->hDD,hdc,lpGammaRamp);
+}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 16
+ */
+DWORD STDCALL DdSwapTextureHandles(
+LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
+LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
+)
+{
+ return TRUE;
+}
+
_____
Modified: trunk/reactos/lib/gdi32/misc/stubs.c
--- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 22:08:29 UTC
(rev 16844)
+++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 22:34:11 UTC
(rev 16845)
@@ -3938,20 +3938,9 @@
}
-
/*
* @unimplemented
*/
-ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
HANDLE STDCALL DdGetDxHandle(
LPDDRAWI_DIRECTDRAW_LCL pDDraw,
LPDDRAWI_DDRAWSURFACE_LCL pSurface,
@@ -3963,34 +3952,10 @@
return 0;
}
-/*
- * @unimplemented
- */
-BOOL STDCALL DdSetGammaRamp(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-HDC hdc,
-LPVOID lpGammaRamp
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-/*
- * @unimplemented
- */
-DWORD STDCALL DdSwapTextureHandles(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
+
+
/*
* @unimplemented
*/
Show replies by date