Module: wine Branch: master Commit: 47b6392b44dca86b8c61daa902bd35e73cca5e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b6392b44dca86b8c61daa902...
Author: Francois Gouget fgouget@free.fr Date: Sun May 27 13:24:21 2007 +0200
ddraw: Fix the name of DDSPD_IUNKNOWNPOINTER.
---
dlls/ddraw/tests/dsurface.c | 14 +++++++------- include/ddraw.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 2d3f620..adafb87 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2163,15 +2163,15 @@ static void PrivateDataTest(void) }
/* This fails */ - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 0, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 0, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 5, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 5, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *) * 2, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr);
ref = getref((IUnknown *) lpDD); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref + 1, "Object reference is %d, expected %d\n", ref2, ref + 1); @@ -2179,14 +2179,14 @@ static void PrivateDataTest(void) ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref);
- hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, surface7, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, surface7, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref);
- hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); hr = IDirectDrawSurface7_GetPrivateData(surface7, &IID_IDirectDrawSurface7, &ptr, &size); ok(hr == DD_OK, "IDirectDrawSurface7_GetPrivateData failed with %08x\n", hr); diff --git a/include/ddraw.h b/include/ddraw.h index 0585ee6..4572d08 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -251,7 +251,7 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL; #define DDGFS_ISFLIPDONE 2L
/* dwFlags for IDirectDrawSurface7::SetPrivateData */ -#define DDSPD_IUNKNOWNPTR 1L +#define DDSPD_IUNKNOWNPOINTER 1L #define DDSPD_VOLATILE 2L
/* DDSCAPS.dwCaps */
-
Alexandre Julliard