ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dvideo.dll forgets to set the DDSD_CAPS flag, just assume it set. 

Output more debug info on failure.
This commit is contained in:
Marcus Meissner 2001-01-29 00:31:50 +00:00 committed by Alexandre Julliard
parent 9977e53eb4
commit 9bed6988a4
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/ddraw/ddraw/main.c
View File

@ -470,14 +470,20 @@ Main_DirectDraw_CreateSurface(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
TRACE("(%p)->(%p,%p,%p)\n",This,pDDSD,ppSurf,pUnkOuter); TRACE("(%p)->(%p,%p,%p)\n",This,pDDSD,ppSurf,pUnkOuter);
TRACE("Requested Caps: 0x%lx\n", pDDSD->ddsCaps.dwCaps); TRACE("Requested Caps: 0x%lx\n", pDDSD->ddsCaps.dwCaps);
if (pUnkOuter != NULL) if (pUnkOuter != NULL) {
FIXME("outer != NULL?\n");
return CLASS_E_NOAGGREGATION; /* unchecked */ return CLASS_E_NOAGGREGATION; /* unchecked */
}
if (!(pDDSD->dwFlags & DDSD_CAPS)) if (!(pDDSD->dwFlags & DDSD_CAPS)) {
return DDERR_INVALIDPARAMS; /* unchecked */ /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */
pDDSD->dwFlags |= DDSD_CAPS;
}
if (ppSurf == NULL) if (ppSurf == NULL) {
FIXME("You want to get back a surface? Don't give NULL ptrs!\n");
return E_POINTER; /* unchecked */ return E_POINTER; /* unchecked */
}
if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
{ {
@ -511,7 +517,10 @@ Main_DirectDraw_CreateSurface(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
hr = create_offscreen(This, pDDSD, ppSurf, pUnkOuter); hr = create_offscreen(This, pDDSD, ppSurf, pUnkOuter);
} }
if (FAILED(hr)) return hr; if (FAILED(hr)) {
FIXME("failed surface creation with code 0x%08lx\n",hr);
return hr;
}
return DD_OK; return DD_OK;
} }