Author: greatlrd
Date: Mon Jul 17 20:27:13 2006
New Revision: 23126
URL:
http://svn.reactos.org/svn/reactos?rev=23126&view=rev
Log:
more code, from alex patch I got over one year ago, thanks alex for all help and for all
code he wrote.
and sorry for the mess at moment in the file. it will be pretty large update to this file,
for the patch have been lying on my
harddisk for some time.
Modified:
trunk/reactos/dll/win32/gdi32/misc/gdientry.c
Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 20:27:13 2006
@@ -776,9 +776,72 @@
}
+/*
+ * @implemented
+ *
+ * GDIEntry 5
+ */
+BOOL
+WINAPI
+DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal)
+{
+ BOOL Return = FALSE;
+
+ /* Make sure there is one */
+ if (pSurfaceLocal->hDDSurface)
+ {
+ /* Delete it */
+ Return = NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface);
+ pSurfaceLocal->hDDSurface = 0;
+ }
+
+ return Return;
+}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 6
+ */
+BOOL
+WINAPI
+DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
+ HWND hWnd)
+{
+ /* Call win32k directly */
+ return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd);
+}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 7
+ */
+HDC
+WINAPI
+DdGetDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
+ LPPALETTEENTRY pColorTable)
+{
+ /* Call win32k directly */
+ return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface);
+}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 8
+ */
+BOOL
+WINAPI
+DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal)
+{
+ /* Call win32k directly */
+ return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface);
+}
/*
* @unimplemented
+ * GDIEntry 9
*/
HBITMAP
STDCALL
@@ -796,63 +859,6 @@
/*
* @implemented
*
- * GDIEntry 5
- */
-BOOL
-STDCALL
-DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal)
-{
- if (!pSurfaceLocal->hDDSurface)
- {
- return FALSE;
- }
-
- return NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface);
-}
-
-/*
- * @implemented
- *
- * GDIEntry 6
- */
-BOOL
-STDCALL
-DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
- HWND hWnd)
-{
- return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd);
-}
-
-/*
- * @implemented
- *
- * GDIEntry 7
- */
-HDC STDCALL DdGetDC(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
-LPPALETTEENTRY pColorTable
-)
-{
- return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface);
-}
-
-/*
- * @implemented
- *
- * GDIEntry 8
- */
-BOOL STDCALL DdReleaseDC(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
-)
-{
- return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface);
-}
-
-
-
-/*
- * @implemented
- *
* GDIEntry 10
*/
BOOL
@@ -865,6 +871,7 @@
pbNewMode);
}
+
/*
* @implemented
*
@@ -903,12 +910,14 @@
*
* GDIEntry 12
*/
-VOID
-STDCALL
+VOID
+STDCALL
DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface,
LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached)
{
- NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE)
pSurfaceAttached->hDDSurface);
+ /* Call win32k */
+ NtGdiDdUnattachSurface((HANDLE)pSurface->hDDSurface,
+ (HANDLE)pSurfaceAttached->hDDSurface);
}
/*
@@ -965,20 +974,21 @@
hdc,
lpGammaRamp);
}
-
/*
* @implemented
*
* GDIEntry 16
*/
-DWORD STDCALL DdSwapTextureHandles(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
-)
-{
- return TRUE;
-}
-
-
-
+DWORD
+WINAPI
+DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
+ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2)
+{
+ /* Always returns success */
+ return TRUE;
+}
+
+
+
+