[ros-diffs] [greatlrd] 37654: Convert gdientry 1 to using wined3d

Author: greatlrd
Date: Wed Nov 26 01:58:33 2008
New Revision: 37654

URL: http://svn.reactos.org/svn/reactos?rev=37654&view=rev
Log:
Convert gdientry 1 to using wined3d

Modified:
    branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild
    branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c

Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/…
==============================================================================
--- branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Wed Nov 26 01:58:33
2008
@@ -3,6 +3,9 @@
 	<include base="gdi32">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="LANGPACK" />
+
+
+
 	<library>user32</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
@@ -11,6 +14,13 @@
 	<library>dxguid</library>
 	<library>ntdll</library>
 
+	<if property="REACTX_EMU" value="1">
+		<library>uuid</library>
+		<library>wine</library>		
+		<library>opengl32</library>
+		<library>wined3d</library>
+	</if>
+	
 	<directory name="include">
 		<pch>precomp.h</pch>
 	</directory>

Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/…
==============================================================================
--- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26
01:58:33 2008
@@ -17,6 +17,19 @@
 #include <ntgdi.h>
 #include <d3dhal.h>
 
+
+/* For opengl support */
+#define __WINESRC__
+#define USE_WIN32_OPENGL
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#define D3D_SDK_VERSION 220
+#include "wine/config.h"
+#include "wine/wined3d_interface.h"
+
+
+
+
 /* DATA **********************************************************************/
 
 HANDLE ghDirectDraw;
@@ -57,12 +70,14 @@
 WINAPI
 DdBlt(LPDDHAL_BLTDATA Blt)
 {
+
+
+    /* Fixme for opengl hel emulations */
+    return 0;
+
+#if 0
     HANDLE Surface = 0;
 
-    /* Fixme for opengl hel emulations */
-    return 0;
-
-#if 0
     /* Use the right surface */
     if (Blt->lpDDSrcSurface) 
     {
@@ -1632,9 +1647,7 @@
 DdCreateDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
                          HDC hdc)
 {
-    /* Fixme for opengl hel emulations */
-    return 0;
-#if 0
+
     BOOL Return = FALSE;
 
     /* Check if the global hDC (hdc == 0) is being used */
@@ -1647,7 +1660,8 @@
             if ((hdc = CreateDCW(L"Display", NULL, NULL, NULL)))
             {
                 /* Create the DDraw Object */
-                ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc);
+                //ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc);
+                ghDirectDraw = (HANDLE) WineDirect3DCreate(D3D_SDK_VERSION, 9, NULL);
 
                 /* Delete our DC */
                 DeleteDC(hdc);
@@ -1668,7 +1682,8 @@
     else
     {
         /* Using the per-process object, so create it */
-         pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc);
+         //pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc);
+        pDirectDrawGlobal->hDD = (ULONG_PTR) WineDirect3DCreate(D3D_SDK_VERSION, 9,
NULL);
 
         /* Set the return value */
         Return = pDirectDrawGlobal->hDD ? TRUE : FALSE;
@@ -1676,7 +1691,6 @@
 
     /* Return to caller */
     return Return;
-#endif
 }
 
 /*
@@ -2308,5 +2322,6 @@
 
 
 
-
-
+#undef __WINESRC__
+#undef USE_WIN32_OPENGL
+