[PATCH 0/2] MR3056: user32: Remove no longer used setupapi import.

[Jacek Caban (＠jacek)]

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

[PATCH 1/2] user32: Remove no longer used setupapi import.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 dlls/user32/Makefile.in |  2 +-
 dlls/user32/sysparams.c | 30 +-----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 112afa4c9a0..2783d289407 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -3,7 +3,7 @@ MODULE    = user32.dll
 IMPORTLIB = user32
 IMPORTS   = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u
 EXTRAINCL = $(PNG_PE_CFLAGS)
-DELAYIMPORTS = setupapi imm32
+DELAYIMPORTS = imm32
 
 C_SRCS = \
 	button.c \
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index fc80fdd271a..5ededfee62a 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -18,42 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "wine/wingdi16.h"
-#include "winerror.h"
-
-#include "initguid.h"
-#include "devguid.h"
-#include "setupapi.h"
-#include "controls.h"
 #include "user_private.h"
+#include "controls.h"
 #include "wine/asm.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(system);
 
 
-DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1);
-DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2);
-
-/* Wine specific monitor properties */
-DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2);
-DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5);
-
-
 static HDC display_dc;
 static CRITICAL_SECTION display_dc_section;
 static CRITICAL_SECTION_DEBUG critsect_debug =
-- 
GitLab


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

[PATCH 2/2] win32u: Remove duplicated d3dkmdt.h include.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 dlls/win32u/sysparams.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index a8d9a4f9a10..4f69cac7040 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -31,7 +31,6 @@
 #define WIN32_NO_STATUS
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
-#include "d3dkmdt.h"
 #include "devpropdef.h"
 #include "cfgmgr32.h"
 #include "d3dkmdt.h"
-- 
GitLab

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