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

Dump FourCC correctly, print conversion messages, add reference to 

ddraw in DDSurface::GetDDInterface.
This commit is contained in:
Marcus Meissner 2000-06-23 16:50:24 +00:00 committed by Alexandre Julliard
parent 398d8b4e9b
commit 653d57a22a
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/dsurface/main.c
View File

@ -1084,6 +1084,8 @@ HRESULT WINAPI IDirectDrawSurface4Impl_GetDDInterface(
FIXME("(%p)->(%p),stub!\n", This, lplpDD); FIXME("(%p)->(%p),stub!\n", This, lplpDD);
/* Not sure about that... */ /* Not sure about that... */
IDirectDraw_AddRef((LPDIRECTDRAW)This->s.ddraw),
*lplpDD = (void *) This->s.ddraw; *lplpDD = (void *) This->s.ddraw;
return DD_OK; return DD_OK;

10
dlls/ddraw/helper.c
View File

@ -221,8 +221,14 @@ void _dump_pixelformat(void *in) {
DPRINTF("( "); DPRINTF("( ");
_dump_pixelformat_flag(pf->dwFlags); _dump_pixelformat_flag(pf->dwFlags);
if (pf->dwFlags & DDPF_FOURCC) if (pf->dwFlags & DDPF_FOURCC) {
DPRINTF(", dwFourCC : %ld", pf->dwFourCC); DPRINTF(", dwFourCC : %c%c%c%c",
(pf->dwFourCC>>24)&0xff,
(pf->dwFourCC>>16)&0xff,
(pf->dwFourCC>> 8)&0xff,
pf->dwFourCC &0xff
);
}
if (pf->dwFlags & DDPF_RGB) { if (pf->dwFlags & DDPF_RGB) {
char *cmd; char *cmd;
DPRINTF(", RGB bits: %ld, ", pf->u.dwRGBBitCount); DPRINTF(", RGB bits: %ld, ", pf->u.dwRGBBitCount);

7
dlls/ddraw/x11.c
View File

@ -71,7 +71,12 @@ static HRESULT X11_Create( LPDIRECTDRAW *lplpDD ) {
/* At DirectDraw creation, the depth is the default depth */ /* At DirectDraw creation, the depth is the default depth */
depth = DefaultDepthOfScreen(X11DRV_GetXScreen()); depth = DefaultDepthOfScreen(X11DRV_GetXScreen());
_common_depth_to_pixelformat(depth,(LPDIRECTDRAW)ddraw); switch (_common_depth_to_pixelformat(depth,(LPDIRECTDRAW)ddraw)) {
case -2: ERR("no depth conversion mode for depth %d found\n",depth); break;
case -1: WARN("No conversion needed for depth %d.\n",depth); break;
case 0: MESSAGE("Conversion needed from %d.\n",depth); break;
}
ddraw->d.height = MONITOR_GetHeight(&MONITOR_PrimaryMonitor); ddraw->d.height = MONITOR_GetHeight(&MONITOR_PrimaryMonitor);
ddraw->d.width = MONITOR_GetWidth(&MONITOR_PrimaryMonitor); ddraw->d.width = MONITOR_GetWidth(&MONITOR_PrimaryMonitor);
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM