[PATCH v2 0/4] MR2642: mmdevapi: Rename mmdevapi.h to mmdevapi_private.h, add missing includes and typedef to that and mmdevdrv.h.

[Davide Beatrici (＠davidebeatrici)]

This should make it clear it's not an external header.

It could be confused with `mmdeviceapi.h`, in particular.

--
  v2: mmdevapi: Add missing includes and typedef to mmdevdrv.h.
      mmdevapi: Add missing includes to mmdevapi_private.h.
      mmdevapi: Swap includes order in mmdevapi_private.h, for consistency.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2642

[PATCH v2 1/4] mmdevapi: Rename mmdevapi.h to mmdevapi_private.h.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

This should make it clear it's not an external header.

It could be confused with mmdeviceapi.h, in particular.
---
 dlls/mmdevapi/audiovolume.c                      | 2 +-
 dlls/mmdevapi/devenum.c                          | 2 +-
 dlls/mmdevapi/main.c                             | 2 +-
 dlls/mmdevapi/{mmdevapi.h => mmdevapi_private.h} | 0
 dlls/mmdevapi/spatialaudio.c                     | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename dlls/mmdevapi/{mmdevapi.h => mmdevapi_private.h} (100%)

diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c
index bbaba7750b3..b50d30ce07d 100644
--- a/dlls/mmdevapi/audiovolume.c
+++ b/dlls/mmdevapi/audiovolume.c
@@ -35,7 +35,7 @@
 #include "audiopolicy.h"
 #include "spatialaudioclient.h"
 
-#include "mmdevapi.h"
+#include "mmdevapi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
 
diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index 69e13a498cf..47456e3215c 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -37,7 +37,7 @@
 #include "audiopolicy.h"
 #include "spatialaudioclient.h"
 
-#include "mmdevapi.h"
+#include "mmdevapi_private.h"
 #include "devpkey.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index 179c18e422d..f1bbcc7fc3f 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -42,7 +42,7 @@
 #include "winreg.h"
 #include "spatialaudioclient.h"
 
-#include "mmdevapi.h"
+#include "mmdevapi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi_private.h
similarity index 100%
rename from dlls/mmdevapi/mmdevapi.h
rename to dlls/mmdevapi/mmdevapi_private.h
diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c
index d77e0a6755c..8feb8e66ed2 100644
--- a/dlls/mmdevapi/spatialaudio.c
+++ b/dlls/mmdevapi/spatialaudio.c
@@ -37,7 +37,7 @@
 #include "audiopolicy.h"
 #include "spatialaudioclient.h"
 
-#include "mmdevapi.h"
+#include "mmdevapi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2642

[PATCH v2 2/4] mmdevapi: Swap includes order in mmdevapi_private.h, for consistency.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/mmdevapi/mmdevapi_private.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h
index cd5b5a25a55..0bc7045540f 100644
--- a/dlls/mmdevapi/mmdevapi_private.h
+++ b/dlls/mmdevapi/mmdevapi_private.h
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "unixlib.h"
-
 #include <winternl.h>
 
 #include <wine/list.h>
 #include <wine/unixlib.h>
 
+#include "unixlib.h"
+
 extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2642

[PATCH v2 3/4] mmdevapi: Add missing includes to mmdevapi_private.h.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/mmdevapi/mmdevapi_private.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h
index 0bc7045540f..a468890dffd 100644
--- a/dlls/mmdevapi/mmdevapi_private.h
+++ b/dlls/mmdevapi/mmdevapi_private.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <endpointvolume.h>
+#include <spatialaudioclient.h>
 #include <winternl.h>
 
 #include <wine/list.h>
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2642

[PATCH v2 4/4] mmdevapi: Add missing includes and typedef to mmdevdrv.h.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/mmdevapi/mmdevdrv.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index f184f3cecc9..5c26b1b34d8 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -14,6 +14,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <audiopolicy.h>
+#include <mmdeviceapi.h>
+
+#include <wine/list.h>
+
+typedef UINT64 stream_handle;
+
 typedef struct audio_client ACImpl;
 
 typedef struct audio_session {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2642

[Huw Davies (＠huw)]

On Thu Apr 13 19:51:30 2023 +0000, Huw Davies wrote:
> Yes please.
> I really meant that to be part of the adding missing includes commit - i.e. could you squash the second and third commits together?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2642#note_29944