[PATCH 0/1] MR1289: uuid: Add propkey.h.

[Alex Henrie (＠alexhenrie)]

Needed to compile Tera Term.

[PATCH 1/1] uuid: Add propkey.h.

[Alex Henrie]

From: Alex Henrie

Needed to compile Tera Term.
---
 dlls/dsound/dsound_main.c     | 3 ++-
 dlls/winealsa.drv/mmdevdrv.c  | 2 +-
 dlls/winepulse.drv/mmdevdrv.c | 2 +-
 libs/uuid/uuid.c              | 1 +
 programs/winecfg/audio.c      | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 215588393d8..69cbec72ea3 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -55,10 +55,11 @@
 #include "oleidl.h"
 #include "shobjidl.h"
 #include "strmif.h"
+#include "propkey.h"

#include "initguid.h"
+#include "propkeydef.h"
 #include "ksmedia.h"
-#include "propkey.h"
 #include "devpkey.h"

#include "dsound_private.h"
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 03499a3e40e..0f373c1626d 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -28,9 +28,9 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "propsys.h"
+#include "propkey.h"
 #include "initguid.h"
 #include "ole2.h"
-#include "propkey.h"
 #include "mmdeviceapi.h"
 #include "devpkey.h"
 #include "mmsystem.h"
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index d1d9eee068b..9f59b233658 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -36,11 +36,11 @@
 #include "dshow.h"
 #include "dsound.h"
 #include "propsys.h"
+#include "propkey.h"

#include "initguid.h"
 #include "ks.h"
 #include "ksmedia.h"
-#include "propkey.h"
 #include "mmdeviceapi.h"
 #include "audioclient.h"
 #include "endpointvolume.h"
diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c
index 1ba0397414e..ce97520eee0 100644
--- a/libs/uuid/uuid.c
+++ b/libs/uuid/uuid.c
@@ -92,6 +92,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 #include "comsvcs.h"
 #include "directmanipulation.h"
 #include "devguid.h"
+#include "propkey.h"

#define __WINE_INIT_NPI_MODULEID
 #include "netiodef.h"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index cd73703a0dd..3387e5843a0 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -40,8 +40,9 @@
 #include <mmddk.h>

#include "ole2.h"
-#include "initguid.h"
 #include "propkey.h"
+#include "initguid.h"
+#include "propkeydef.h"
 #include "devpkey.h"
 #include "mmdeviceapi.h"
 #include "audioclient.h"

[PATCH 1/1] uuid: Add propkey.h.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125885

Your paranoid android.

=== debian11 (32 bit report) ===

d3drm:
d3drm.c:4228: Test failed: Cannot create IDirect3DRMDevice2 interface, hr 0x8007000e.
d3drm.c:4230: Test failed: expected ref3 > ref1, got ref1 = 1 , ref3 = 1.
d3drm.c:4234: Test failed: expected cref2 > cref1, got cref1 = 1 , cref2 = 1.
Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x004116a1).

ntdll:
pipe.c:1751: Test failed: pipe is not signaled

=== debian11 (build log) ===

0530:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.

[PATCH 0/1] MR1289: uuid: Add propkey.h. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.