Yuxuan Shui : dmband: Move band.c to dmusic.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 09c6f48b1295b900df5a7d104996e0e69b7f23b0
URL:    https://gitlab.winehq.org/wine/wine/-/commit/09c6f48b1295b900df5a7d104996e0e...

Author: Yuxuan Shui 
Date:   Wed Jan 31 15:48:30 2024 +0000

dmband: Move band.c to dmusic.

---

dlls/dmband/bandtrack.c        |  1 +
 dlls/dmband/dmband_main.c      |  1 +
 dlls/dmband/dmband_private.h   | 10 ----------
 dlls/dmusic/Makefile.in        |  1 +
 dlls/{dmband => dmusic}/band.c |  3 +--
 dlls/dmusic/dmusic_band.h      | 25 +++++++++++++++++++++++++
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index b410cf81d3a..45346ad1f7a 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -17,6 +17,7 @@
  */

#include "dmband_private.h"
+#include "dmusic_band.h"
 #include "dmobject.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmband);
diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index 55f979e3fbc..43790fbff61 100644
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -20,6 +20,7 @@
 #include "initguid.h"
 #include "dmband_private.h"
 #include "rpcproxy.h"
+#include "dmusic_band.h"
 #include "dmobject.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmband);
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 48c5ec02aeb..3b2617322fe 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -20,21 +20,16 @@
 #ifndef __WINE_DMBAND_PRIVATE_H
 #define __WINE_DMBAND_PRIVATE_H

-#include <stdio.h>
 #include <stdarg.h>
-#include <string.h>

#define COBJMACROS

#include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "wingdi.h"
-#include "winuser.h"

#include "wine/debug.h"
 #include "wine/list.h"
-#include "winreg.h"
 #include "objbase.h"

#include "dmusici.h"
@@ -44,11 +39,6 @@
 /*****************************************************************************
  * ClassFactory
  */
-extern HRESULT create_dmband(REFIID riid, void **ret_iface);
 extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface);

-extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection);
-extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance,
-        IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);
-
 #endif	/* __WINE_DMBAND_PRIVATE_H */
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index 8e1c07e90a7..446eca15543 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = dmusic.dll
 IMPORTS   = dxguid uuid ole32 advapi32 dsound user32 winmm

SOURCES = \
+	band.c \
    buffer.c \
    clock.c \
    collection.c \
diff --git a/dlls/dmband/band.c b/dlls/dmusic/band.c
similarity index 99%
rename from dlls/dmband/band.c
rename to dlls/dmusic/band.c
index 78ec68ae035..370b85c2941 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmusic/band.c
@@ -17,8 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "dmband_private.h"
-#include "dmobject.h"
+#include "dmusic_private.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmband);

diff --git a/dlls/dmusic/dmusic_band.h b/dlls/dmusic/dmusic_band.h
new file mode 100644
index 00000000000..e189acb7230
--- /dev/null
+++ b/dlls/dmusic/dmusic_band.h
@@ -0,0 +1,25 @@
+/* DirectMusicBand Private Include
+ *
+ * Copyright (C) 2024 Yuxuan Shui for CodeWeavers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "dmusici.h"
+
+extern HRESULT create_dmband(REFIID riid, void **ret_iface);
+extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection);
+extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance,
+        IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);