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

ddraw: Make the overlay tests pass on Windows 7.

This commit is contained in:
Stefan Dösinger 2011-08-28 17:11:43 +02:00 committed by Alexandre Julliard
parent e0db367aef
commit 6057041deb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/ddraw/tests/overlay.c
View File

@ -96,17 +96,18 @@ static BOOL CreateDirectDraw(void)
static void rectangle_settings(void) { static void rectangle_settings(void) {
IDirectDrawSurface7 *overlay = create_overlay(64, 64, MAKEFOURCC('U','Y','V','Y')); IDirectDrawSurface7 *overlay = create_overlay(64, 64, MAKEFOURCC('U','Y','V','Y'));
HRESULT hr; HRESULT hr, hr2;
RECT rect = {0, 0, 64, 64}; RECT rect = {0, 0, 64, 64};
LONG posx, posy; LONG posx, posy;
/* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. Show that this is wrong */ /* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. This is not true
* in Windows Vista and earlier, but changed in Win7 */
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_SHOW, NULL); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_SHOW, NULL);
ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_HIDE, NULL); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_HIDE, NULL);
ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_SHOW, NULL); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_SHOW, NULL);
ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); ok(hr == DD_OK || hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);
/* Show that the overlay position is the (top, left) coordinate of the dest rectangle */ /* Show that the overlay position is the (top, left) coordinate of the dest rectangle */
rect.top += 16; rect.top += 16;
@ -122,13 +123,21 @@ static void rectangle_settings(void) {
posx, posy, rect.left, rect.top); posx, posy, rect.left, rect.top);
/* Passing a NULL dest rect sets the position to 0/0 . Visually it can be seen that the overlay overlays the whole primary(==screen)*/ /* Passing a NULL dest rect sets the position to 0/0 . Visually it can be seen that the overlay overlays the whole primary(==screen)*/
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); hr2 = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL);
ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); ok(hr2 == DD_OK || hr2 == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);
hr = IDirectDrawSurface7_GetOverlayPosition(overlay, &posx, &posy); hr = IDirectDrawSurface7_GetOverlayPosition(overlay, &posx, &posy);
ok(hr == DD_OK, "IDirectDrawSurface7_GetOverlayPosition failed with hr=0x%08x\n", hr); ok(hr == DD_OK, "IDirectDrawSurface7_GetOverlayPosition failed with hr=0x%08x\n", hr);
ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n", if (SUCCEEDED(hr2))
posx, posy, 0, 0); {
ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n",
posx, posy, 0, 0);
}
else
{
/* Otherwise the position remains untouched */
ok(posx == 32 && posy == 16, "Overlay position is (%d, %d), expected (%d, %d)\n",
posx, posy, 32, 16);
}
/* The position cannot be retrieved when the overlay is not shown */ /* The position cannot be retrieved when the overlay is not shown */
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_HIDE, NULL); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_HIDE, NULL);
ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);