Michael Stefaniuc : dmcompos: Move struct definitions to the files that need them.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 25 08:19:40 CDT 2015
Module: wine
Branch: master
Commit: bf117ec5f418b1e9caa669fb79945938f8e00cb5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf117ec5f418b1e9caa669fb79945938f8e00cb5
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Jun 25 00:41:01 2015 +0200
dmcompos: Move struct definitions to the files that need them.
---
dlls/dmcompos/chordmaptrack.c | 8 ++++++++
dlls/dmcompos/dmcompos_private.h | 34 ----------------------------------
dlls/dmcompos/signposttrack.c | 8 ++++++++
3 files changed, 16 insertions(+), 34 deletions(-)
diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c
index c282d9d..6773b9d 100644
--- a/dlls/dmcompos/chordmaptrack.c
+++ b/dlls/dmcompos/chordmaptrack.c
@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST
/*****************************************************************************
* IDirectMusicChordMapTrack implementation
*/
+typedef struct IDirectMusicChordMapTrack {
+ const IUnknownVtbl *UnknownVtbl;
+ const IDirectMusicTrack8Vtbl *TrackVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
+ LONG ref;
+ DMUS_OBJECTDESC *pDesc;
+} IDirectMusicChordMapTrack;
+
/* IDirectMusicChordMapTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface);
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h
index 6a80445..8e67a18 100644
--- a/dlls/dmcompos/dmcompos_private.h
+++ b/dlls/dmcompos/dmcompos_private.h
@@ -43,12 +43,6 @@
#include "dmusics.h"
/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack;
-typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
-
-/*****************************************************************************
* ClassFactory
*/
extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
@@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_
extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-/*****************************************************************************
- * IDirectMusicChordMapTrack implementation structure
- */
-struct IDirectMusicChordMapTrack {
- /* IUnknown fields */
- const IUnknownVtbl *UnknownVtbl;
- const IDirectMusicTrack8Vtbl *TrackVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
- LONG ref;
-
- /* IDirectMusicChordMapTrack fields */
- LPDMUS_OBJECTDESC pDesc;
-};
-
-/*****************************************************************************
- * IDirectMusicSignPostTrack implementation structure
- */
-struct IDirectMusicSignPostTrack {
- /* IUnknown fields */
- const IUnknownVtbl *UnknownVtbl;
- const IDirectMusicTrack8Vtbl *TrackVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
- LONG ref;
-
- /* IDirectMusicSignPostTrack fields */
- LPDMUS_OBJECTDESC pDesc;
-};
-
/**********************************************************************
* Dll lifetime tracking declaration for dmcompos.dll
*/
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index 0fe9c4b..ed7b706 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST
/*****************************************************************************
* IDirectMusicSignPostTrack implementation
*/
+typedef struct IDirectMusicSignPostTrack {
+ const IUnknownVtbl *UnknownVtbl;
+ const IDirectMusicTrack8Vtbl *TrackVtbl;
+ const IPersistStreamVtbl *PersistStreamVtbl;
+ LONG ref;
+ DMUS_OBJECTDESC *pDesc;
+} IDirectMusicSignPostTrack;
+
/* IDirectMusicSignPostTrack IUnknown part: */
static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);
More information about the wine-cvs
mailing list