dmscript: Move a struct definition to the .c file that uses it.
Michael Stefaniuc
mstefani at redhat.de
Fri May 30 16:03:53 CDT 2014
---
dlls/dmscript/dmscript_private.h | 23 -----------------------
dlls/dmscript/script.c | 13 +++++++++++++
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 082ffa4..551e7b7 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -43,35 +43,12 @@
#include "dmusics.h"
/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl;
-
-/*****************************************************************************
* ClassFactory
*/
extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
-/*****************************************************************************
- * IDirectMusicScriptImpl implementation structure
- */
-struct IDirectMusicScriptImpl {
- IDirectMusicScript IDirectMusicScript_iface;
- const IDirectMusicObjectVtbl *ObjectVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
- LONG ref;
-
- /* IDirectMusicScriptImpl fields */
- IDirectMusicPerformance* pPerformance;
- LPDMUS_OBJECTDESC pDesc;
- DMUS_IO_SCRIPT_HEADER* pHeader;
- DMUS_IO_VERSION* pVersion;
- WCHAR* pwzLanguage;
- WCHAR* pwzSource;
-};
-
/**********************************************************************
* Dll lifetime tracking declaration for dmscript.dll
*/
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 6b9be6f..50394bc 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -34,6 +34,19 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/*****************************************************************************
* IDirectMusicScriptImpl implementation
*/
+typedef struct IDirectMusicScriptImpl {
+ IDirectMusicScript IDirectMusicScript_iface;
+ const IDirectMusicObjectVtbl *ObjectVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
+ LONG ref;
+ IDirectMusicPerformance *pPerformance;
+ DMUS_OBJECTDESC *pDesc;
+ DMUS_IO_SCRIPT_HEADER *pHeader;
+ DMUS_IO_VERSION *pVersion;
+ WCHAR *pwzLanguage;
+ WCHAR *pwzSource;
+} IDirectMusicScriptImpl;
+
static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);
--
1.8.3.1
More information about the wine-patches
mailing list