[PATCH 3/5] ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl.
Henri Verbeet
hverbeet at codeweavers.com
Tue Sep 13 13:02:25 CDT 2011
This also makes ddraw7_Initialize() a little more sane, although it's probably
just never called by anything.
---
dlls/ddraw/ddraw.c | 13 ++-----------
dlls/ddraw/ddraw_private.h | 3 ---
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 3e3bf60..f981cf5 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1674,18 +1674,9 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface,
*****************************************************************************/
static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid)
{
- IDirectDrawImpl *This = impl_from_IDirectDraw7(iface);
-
- TRACE("iface %p, guid %s.\n", iface, debugstr_guid(Guid));
+ FIXME("iface %p, guid %s stub!\n", iface, debugstr_guid(Guid));
- if(This->initialized)
- {
- return DDERR_ALREADYINITIALIZED;
- }
- else
- {
- return DD_OK;
- }
+ return DDERR_ALREADYINITIALIZED;
}
static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 80dd53d..e0706fc 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -88,9 +88,6 @@ struct IDirectDrawImpl
struct wined3d_device *wined3d_device;
BOOL d3d_initialized;
- /* Misc ddraw fields */
- BOOL initialized;
-
/* DirectDraw things, which are not handled by WineD3D */
DWORD cooperative_level;
--
1.7.3.4
More information about the wine-patches
mailing list