[greatlrd] 21581: Fixing some bugs in create overlay. it works now to create a overlay but it does not show it yet
13 Apr
2006
13 Apr
'06
2:12 p.m.
Author: greatlrd
Date: Thu Apr 13 18:12:20 2006
New Revision: 21581
URL: http://svn.reactos.ru/svn/reactos?rev=21581&view=rev
Log:
Fixing some bugs in create overlay. it works now to create a overlay but it does not show
it yet
Modified:
trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
trunk/reactos/dll/directx/ddraw/main/surface_main.c
Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Thu Apr 13 18:12:20 2006
@@ -357,7 +357,7 @@
DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy);
/* FIXME fill the This->DirectDrawGlobal.vmiData right */
}
-
+
//This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(
(HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd);
@@ -469,8 +469,7 @@
if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
- {
- OutputDebugStringA("Create DDSCAPS_PRIMARYSURFACE\n");
+ {
memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC));
That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC);
This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE;
@@ -582,45 +581,36 @@
}
else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
- {
- // DX_STUB_str( "Can not create overlay surface");
- OutputDebugStringA("Create DDSCAPS_OVERLAY\n");
-
+ {
memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC));
memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC));
That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC);
That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT |
DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT;
That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY |
DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP;
-
-
-//
-
That->Surf->mddsdOverlay.dwWidth = pDDSD->dwWidth; //pels;
That->Surf->mddsdOverlay.dwHeight = pDDSD->dwHeight; // lines;
That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers;
- That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize =
sizeof(DDPIXELFORMAT);
- That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB;
- That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32;
-//
-//
+ That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize =
pDDSD->ddpfPixelFormat.dwSize;
+ That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags =
pDDSD->ddpfPixelFormat.dwFlags;
+ That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount =
pDDSD->ddpfPixelFormat.dwRGBBitCount;
+
DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface;
mDdCanCreateSurface.lpDD = &This->mDDrawGlobal;
mDdCanCreateSurface.CanCreateSurface =
This->mCallbacks.HALDD.CanCreateSurface;
mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat;
mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; //
pDDSD;
- if
(This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)==
DDHAL_DRIVER_NOTHANDLED)
- {
- // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create
primary [%08x]", this, rv);
- return DDERR_NOTINITIALIZED;
- }
-
- if (mDdCanCreateSurface.ddRVal != DD_OK)
- {
- return DDERR_NOTINITIALIZED;
- }
+ if
(This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)==
DDHAL_DRIVER_NOTHANDLED)
+ {
+ return DDERR_NOTINITIALIZED;
+ }
+
+ if (mDdCanCreateSurface.ddRVal != DD_OK)
+ {
+ return DDERR_NOTINITIALIZED;
+ }
memset(&That->Surf->mOverlayGlobal, 0,
sizeof(DDRAWI_DDRAWSURFACE_GBL));
@@ -631,46 +621,24 @@
That->Surf->mOverlayGlobal.wHeight =
(WORD)That->Surf->mddsdOverlay.dwHeight;
That->Surf->mOverlayGlobal.lPitch = -1;
That->Surf->mOverlayGlobal.ddpfSurface =
That->Surf->mddsdOverlay.ddpfPixelFormat;
-//
-// // setup front- and backbuffer surfaces
- UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1;
- UINT i;
- for ( i = 0; i < cSurfaces; i++)
- {
- memset(&That->Surf->mOverlayMore[i], 0,
sizeof(DDRAWI_DDRAWSURFACE_MORE));
- That->Surf->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
-
- memset(&That->Surf->mOverlayLocal[i], 0,
sizeof(DDRAWI_DDRAWSURFACE_LCL));
- That->Surf->mOverlayLocal[i].lpGbl =
&That->Surf->mOverlayGlobal;
- That->Surf->mOverlayLocal[i].lpSurfMore =
&That->Surf->mOverlayMore[i];
- That->Surf-> mOverlayLocal[i].dwProcessId = GetCurrentProcessId();
- That->Surf->mOverlayLocal[i].dwFlags = (i == 0) ?
- (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER):
- (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER);
-
- That->Surf->mOverlayLocal[i].dwFlags |=
+
+ memset(&That->Surf->mOverlayMore[0], 0,
sizeof(DDRAWI_DDRAWSURFACE_MORE));
+ That->Surf->mOverlayMore[0].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
+
+ memset(&That->Surf->mOverlayLocal[0], 0,
sizeof(DDRAWI_DDRAWSURFACE_LCL));
+ That->Surf->mOverlayLocal[0].lpGbl =
&That->Surf->mOverlayGlobal;
+ That->Surf->mOverlayLocal[0].lpSurfMore =
&That->Surf->mOverlayMore[0];
+ That->Surf-> mOverlayLocal[0].dwProcessId = GetCurrentProcessId();
+ That->Surf->mOverlayLocal[0].dwFlags =
DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER;
+
+ That->Surf->mOverlayLocal[0].dwFlags |=
DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM|
DDRAWISURF_HASPIXELFORMAT|
DDRAWISURF_HASOVERLAYDATA;
- That->Surf->mOverlayLocal[i].ddsCaps.dwCaps =
That->Surf->mddsdOverlay.ddsCaps.dwCaps;
- That->Surf->mpOverlayLocals[i] =
&That->Surf->mOverlayLocal[i];
- }
-
- for ( i = 0; i < cSurfaces; i++)
- {
- UINT j = (i + 1) % cSurfaces;
-
-
-
-
- if (!DdAttachSurface(That->Surf->mpOverlayLocals[i],
That->Surf->mpOverlayLocals[j]))
- {
- return DD_FALSE;
- }
-
- }
-
+ That->Surf->mOverlayLocal[0].ddsCaps.dwCaps =
That->Surf->mddsdOverlay.ddsCaps.dwCaps;
+ That->Surf->mpOverlayLocals[0] =
&That->Surf->mOverlayLocal[0];
+
DDHAL_CREATESURFACEDATA mDdCreateSurface;
mDdCreateSurface.lpDD = &This->mDDrawGlobal;
@@ -690,6 +658,7 @@
return mDdCreateSurface.ddRVal;
}
+/*
DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay;
mDdUpdateOverlay.lpDD = &This->mDDrawGlobal;
mDdUpdateOverlay.UpdateOverlay =
This->mCallbacks.HALDDSurface.UpdateOverlay;
@@ -717,9 +686,9 @@
{
return mDdUpdateOverlay.ddRVal;
}
-
- That->Surf->mpInUseSurfaceLocals[0] =
That->Surf->mpOverlayLocals[0];
- //That->Surf->mpInUseSurfaceLocals[0] =
&That->Owner->mPrimaryLocal;
+*/
+
+ That->Surf->mpInUseSurfaceLocals[0] =
That->Surf->mpOverlayLocals[0];
return DD_OK;
}
else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER)
Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Thu Apr 13 18:12:20 2006
@@ -440,7 +440,9 @@
{
DX_WINDBG_trace();
- DX_STUB;
+ //DX_STUB;
+ DX_STUB_str("not implement return not lost\n");
+ return DD_OK;
}
HRESULT WINAPI
7012
days inactive
7012
days old
0 comments
1 participants
participants (1)
-
greatlrd＠svn.reactos.org