[ros-diffs] [greatlrd] 37682: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Thu Nov 27 02:55:13 2008
New Revision: 37682

URL: http://svn.reactos.org/svn/reactos?rev=37682&view=rev
Log:
convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak

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

Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c?rev=37682&r1=37681&r2=37682&view=diff
==============================================================================
--- 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] Thu Nov 27 02:55:13 2008
@@ -1834,6 +1834,7 @@
     GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0);
     DeleteObject(hbmp);
     pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER));
+    DeleteDC(hdc);
     /* End dectect RGB bit mask */
 
     if (pHalInfo)
@@ -1903,8 +1904,32 @@
 
         // FIXME pHalInfo->ddCaps DDCORECAPS
 
+        RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS));
+        pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS);
+
+        // FIXME fill in with wined3d caps here */
+        // WINED3DCAPS WineCaps;
+        //pWineD3d->GetDeviceCaps(0,&WineCaps);
+
+        /* example value and member that need be fill in */
+        // pHalInfo->ddCaps.dwCaps                  : 0x94427bc1
+        // pHalInfo->ddCaps.dwCaps2                 : 0x004afe78
+        // pHalInfo->ddCaps.dwCKeyCaps              : 0x0003a311
+        // pHalInfo->ddCaps.dwFXCaps                : 0x27f95420
+        // pHalInfo->ddCaps.dwMaxVisibleOverlays    : 0x00000001
+        // pHalInfo->ddCaps.dwNumFourCCCodes        : 0x0000001c
+        // pHalInfo->ddCaps.ddsCaps.dwCaps          : 0x30c272fc
+        // pHalInfo->ddCaps.dwMinOverlayStretch     : 0x00000020
+        // pHalInfo->ddCaps.dwMaxOverlayStretch     : 0x0007d000
+        // pHalInfo->ddCaps.dwMinLiveVideoStretch   : 0x00000020
+        // pHalInfo->ddCaps.dwMaxLiveVideoStretch   : 0x00003e80
+        // pHalInfo->ddCaps.dwMinHwCodecStretch     : 0x00000020
+        // pHalInfo->ddCaps.dwMaxHwCodecStretch     : 0x00003e80
+        // pHalInfo->ddCaps.dwSVBCaps               : 0x80000040
+
         /* always force rope 0x1000 for hal it mean only source copy is supported */
         pHalInfo->ddCaps.dwRops[6] = 0x1000;
+        
 
         pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo;