[PATCH 0/3] 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.

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

[Davide Beatrici]

From: Davide Beatrici

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);

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

[Davide Beatrici]

From: Davide Beatrici

---
 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 cd5b5a25a55..98216ce9e2c 100644
--- a/dlls/mmdevapi/mmdevapi_private.h
+++ b/dlls/mmdevapi/mmdevapi_private.h
@@ -18,6 +18,8 @@

#include "unixlib.h"

+#include <endpointvolume.h>
+#include <spatialaudioclient.h>
 #include <winternl.h>

#include <wine/list.h>

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

[Davide Beatrici]

From: Davide Beatrici

---
 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 {

[Huw Davies (＠huw)]

I should have asked this earlier, but do we need a separate `mmdevdrv.h`, or could that go in `mmdevapi_private.h`?

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/mmdevapi_private.h:
> #include "unixlib.h"

This already existed, but we would normally have the local includes below the global ones.

[Davide Beatrici (＠davidebeatrici)]

> I should have asked this earlier, but do we need a separate `mmdevdrv.h`, or could that go in `mmdevapi_private.h`?

We could indeed merge the first into the latter once no drivers include it anymore.

[Davide Beatrici (＠davidebeatrici)]

On Thu Apr 13 10:33:52 2023 +0000, Huw Davies wrote:
> This already existed, but we would normally have the local includes
> below the global ones.

My preferred order would be like this:

1. Local
2. Standard
3. Other

An advantage of including the local headers first is that it ensures they're complete (i.e. include everything their content requires).

However, consistency could definitely be considered more important. On that note, should I also adhere to the quotes vs angle brackets convention in this MR?

[Huw Davies (＠huw)]

On Thu Apr 13 19:48:09 2023 +0000, Davide Beatrici wrote:
> > I should have asked this earlier, but do we need a separate
>
> `mmdevdrv.h`, or could that go in `mmdevapi_private.h`?
> We could indeed merge the first into the latter once no drivers include
> it anymore.

Ok fine.  Your quoting is fine too.

[Davide Beatrici (＠davidebeatrici)]

On Thu Apr 13 19:48:21 2023 +0000, Huw Davies wrote:
> Ok fine.  Your quoting is fine too.

Should I just swap the includes order then?

[Huw Davies (＠huw)]

On Thu Apr 13 19:49:46 2023 +0000, Davide Beatrici wrote:
> Should I just swap the includes order then?

Yes please.