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

ddraw: Do not restore the display mode from inside SetCooperativeLevel.

This commit is contained in:
Johan Gill 2010-04-16 23:04:41 +02:00 committed by Alexandre Julliard
parent ebfedceaeb
commit 7c90c1a0b5
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ddraw/ddraw.c
View File

@ -264,8 +264,8 @@ IDirectDrawImpl_AddRef(IDirectDraw7 *iface)
void void
IDirectDrawImpl_Destroy(IDirectDrawImpl *This) IDirectDrawImpl_Destroy(IDirectDrawImpl *This)
{ {
/* Clear the cooplevel to restore window and display mode */
IDirectDraw7_SetCooperativeLevel((IDirectDraw7 *)This, NULL, DDSCL_NORMAL); IDirectDraw7_SetCooperativeLevel((IDirectDraw7 *)This, NULL, DDSCL_NORMAL);
IDirectDraw7_RestoreDisplayMode((IDirectDraw7 *)This);
/* Destroy the device window if we created one */ /* Destroy the device window if we created one */
if(This->devicewindow != 0) if(This->devicewindow != 0)
@ -441,9 +441,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface,
/* Switching from fullscreen? */ /* Switching from fullscreen? */
if(This->cooperative_level & DDSCL_FULLSCREEN) if(This->cooperative_level & DDSCL_FULLSCREEN)
{ {
/* Restore the display mode */
IDirectDraw7_RestoreDisplayMode(iface);
This->cooperative_level &= ~DDSCL_FULLSCREEN; This->cooperative_level &= ~DDSCL_FULLSCREEN;
This->cooperative_level &= ~DDSCL_EXCLUSIVE; This->cooperative_level &= ~DDSCL_EXCLUSIVE;
This->cooperative_level &= ~DDSCL_ALLOWMODEX; This->cooperative_level &= ~DDSCL_ALLOWMODEX;

44
dlls/ddraw/tests/ddrawmodes.c
View File

@ -37,6 +37,8 @@ static HWND hwnd;
static int modes_cnt; static int modes_cnt;
static int modes_size; static int modes_size;
static LPDDSURFACEDESC modes; static LPDDSURFACEDESC modes;
static RECT rect_before_create;
static RECT rect_after_delete;
static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID);
static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID);
@ -83,6 +85,8 @@ static BOOL createdirectdraw(void)
{ {
HRESULT rc; HRESULT rc;
SetRect(&rect_before_create, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
rc = DirectDrawCreate(NULL, &lpDD, NULL); rc = DirectDrawCreate(NULL, &lpDD, NULL);
ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", rc); ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", rc);
if (!lpDD) { if (!lpDD) {
@ -95,11 +99,16 @@ static BOOL createdirectdraw(void)
static void releasedirectdraw(void) static void releasedirectdraw(void)
{ {
if( lpDD != NULL ) if( lpDD != NULL )
{ {
IDirectDraw_Release(lpDD); IDirectDraw_Release(lpDD);
lpDD = NULL; lpDD = NULL;
} SetRect(&rect_after_delete, 0, 0,
GetSystemMetrics(SM_CXSCREEN),
GetSystemMetrics(SM_CYSCREEN));
ok(EqualRect(&rect_before_create, &rect_after_delete) != 0,
"Original display mode was not restored\n");
}
} }
static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription,
@ -414,11 +423,36 @@ static void setdisplaymode(int i)
scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom);
if (!EqualRect(&scrn, &orig_rect)) if (!EqualRect(&scrn, &orig_rect))
{ {
HRESULT rect_result;
/* Check that the client rect was resized */ /* Check that the client rect was resized */
rc = GetClientRect(hwnd, &test); rc = GetClientRect(hwnd, &test);
ok(rc!=0, "GetClientRect returned %x\n", rc); ok(rc!=0, "GetClientRect returned %x\n", rc);
rc = EqualRect(&scrn, &test); rc = EqualRect(&scrn, &test);
todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); todo_wine ok(rc!=0, "Fullscreen window has wrong size\n");
/* Check that switching to normal cooperative level
does not restore the display mode */
rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL);
ok(rc==DD_OK, "SetCooperativeLevel returned %x\n", rc);
SetRect(&test, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
rect_result = EqualRect(&scrn, &test);
ok(rect_result!=0, "Setting cooperative level to DDSCL_NORMAL changed the display mode\n");
/* Go back to fullscreen */
rc = IDirectDraw_SetCooperativeLevel(lpDD,
hwnd, DDSCL_ALLOWMODEX | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n",rc);
/* If the display mode was changed, set the correct mode
to avoid irrelevant failures */
if (rect_result == 0)
{
rc = IDirectDraw_SetDisplayMode(lpDD,
modes[i].dwWidth, modes[i].dwHeight,
U1(modes[i].ddpfPixelFormat).dwRGBBitCount);
ok(DD_OK==rc, "SetDisplayMode returned: %x\n",rc);
}
} }
ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(GetClipCursor(&r), "GetClipCursor() failed\n");
/* ddraw sets clip rect here to the screen size, even for /* ddraw sets clip rect here to the screen size, even for