[PATCH v2 0/1] MR1102: uuid: Add devguid.h.

[Alex Henrie (＠alexhenrie)]

Needed to compile Tera Term.

--
  v2: uuid: Add devguid.h.

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

[PATCH v2 1/1] uuid: Add devguid.h.

[Alex Henrie]

From: Alex Henrie

Needed to compile Tera Term.
---
 dlls/dinput/dinput_main.c     | 2 +-
 dlls/dinput/tests/hid.c       | 2 +-
 dlls/setupapi/tests/devinst.c | 2 +-
 libs/uuid/uuid.c              | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 9738397ef5a..d3db22c70b5 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -43,8 +43,8 @@
 #include "winerror.h"
 #include "objbase.h"
 #include "rpcproxy.h"
-#include "initguid.h"
 #include "devguid.h"
+#include "initguid.h"
 #include "dinputd.h"

#include "dinput_private.h"
diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c
index 6a0d7a52fab..5467af32493 100644
--- a/dlls/dinput/tests/hid.c
+++ b/dlls/dinput/tests/hid.c
@@ -40,6 +40,7 @@
 #include "cfgmgr32.h"
 #include "newdev.h"
 #include "dbt.h"
+#include "devguid.h"

#include "objbase.h"

@@ -51,7 +52,6 @@
 #include "ddk/hidsdi.h"
 #include "ddk/hidpi.h"
 #include "ddk/hidport.h"
-#include "devguid.h"
 #include "dinput.h"
 #include "dinputd.h"
 #include "hidusage.h"
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index bfa564fe746..c4eebdf0ab8 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -26,8 +26,8 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"
-#include "initguid.h"
 #include "devguid.h"
+#include "initguid.h"
 #include "devpkey.h"
 #include "setupapi.h"
 #include "cfgmgr32.h"
diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c
index aa7ad3dd678..1ba0397414e 100644
--- a/libs/uuid/uuid.c
+++ b/libs/uuid/uuid.c
@@ -91,6 +91,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 #include "shimgdata.h"
 #include "comsvcs.h"
 #include "directmanipulation.h"
+#include "devguid.h"

#define __WINE_INIT_NPI_MODULEID
 #include "netiodef.h"

[PATCH v2 1/1] uuid: Add devguid.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=125122

Your paranoid android.

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

ddraw:
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x3000.

urlmon:
protocol.c:3682: Test failed: wait timed out
protocol: Timeout

=== debian11 (32 bit zh:CN report) ===

dinput:
device8.c:2037: Test marked flaky: 0x800: GetDeviceData returned 0x8007000c

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24701.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24701.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24701.