ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove a wrong behvoir in DdQueryDirectDrawObject aka GdiEntry2

Browse Source 
svn path=/trunk/; revision=26271
This commit is contained in:
Magnus Olsen
2007-04-06 20:54:21 +00:00
parent a6bda507b9
commit 937e866fb2
1 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/gdi32/misc/gdientry.c
+2 -37
View File
@@ -554,14 +554,7 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS));
RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3);
/* Check if we got a list pointer */
if (pvmList)
{
/* Allocate memory for it */
VidMemList = LocalAlloc(LMEM_ZEROINIT,
sizeof(VIDEOMEMORY) *
pHalInfo->vmiData.dwNumHeaps);
}
pvmList = NULL;
/* Do the query */
if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD),
@@ -577,7 +570,6 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
pdwFourCC))
{
/* We failed, free the memory and return */
if (VidMemList) LocalFree(VidMemList);
return FALSE;
}
@@ -621,7 +613,7 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign;
pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign;
pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign;
pHalInfo->vmiData.dwNumHeaps = dwNumHeaps;
pHalInfo->vmiData.dwNumHeaps = 0;
pHalInfo->vmiData.pvmList = pvmList;
RtlCopyMemory( &pHalInfo->ddCaps, &HalInfo.ddCaps,sizeof(DDCORECAPS ));
@@ -783,33 +775,6 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
/* FIXME: Check for D3D Buffer Callbacks */
/* Check if we have a video memory list */
if (VidMemList)
{
/* Start a loop here */
PVIDEOMEMORY VidMem = VidMemList;
/* Loop all the heaps we have */
while (dwNumHeaps--)
{
/* Copy from one format to the other */
pvmList->dwFlags = VidMem->dwFlags;
pvmList->fpStart = VidMem->fpStart;
pvmList->fpEnd = VidMem->fpEnd;
pvmList->ddsCaps = VidMem->ddsCaps;
pvmList->ddsCapsAlt = VidMem->ddsCapsAlt;
pvmList->dwHeight = VidMem->dwHeight;
/* Advance in both structures */
pvmList++;
VidMem++;
}
/* Free our structure */
LocalFree(VidMemList);
}
return TRUE;
}