[PATCH v2 1/4] xinput: change to IMPORTS from DELAYIMPORTS
Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- v2: seperate commits to lower scope --- dlls/xinput1_1/Makefile.in | 2 +- dlls/xinput1_2/Makefile.in | 2 +- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_4/Makefile.in | 2 +- dlls/xinput9_1_0/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248c..c4a0fe4b3a 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc..9e56513501 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d..fd4e48b4a8 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed0..73ef49dbf5 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c464..2efe7b31b6 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin -- 2.27.0
Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- v2: seperate commits to lower scope --- dlls/gdi32/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 32b2e6959c..5f34a56478 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,10 +1,10 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 -IMPORTS = advapi32 +IMPORTS = advapi32 setupapi EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 setupapi +DELAYIMPORTS = usp10 C_SRCS = \ bidi.c \ -- 2.27.0
Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- v2: seperate commits to lower scope --- dlls/hidclass.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index be4af74785..4cb9cd2514 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = hal ntoskrnl -DELAYIMPORTS = setupapi hid +IMPORTS = hal ntoskrnl setupapi hid EXTRADLLFLAGS = -mno-cygwin -- 2.27.0
Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- v2: seperate commits to lower scope --- dlls/ntoskrnl.exe/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index df48e44ede..10e5b7951e 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = rpcrt4 setupapi +IMPORTS = advapi32 hal msvcrt setupapi +DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin -- 2.27.0
It's better to state the reason for the changes here even it's already discussed in IRC for future references. On 7/27/20 7:22 PM, Jordan Coppard wrote:
Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead.
Signed-off-by: Jordan Coppard <jordan(a)niau.io>
--- v2: seperate commits to lower scope --- dlls/xinput1_1/Makefile.in | 2 +- dlls/xinput1_2/Makefile.in | 2 +- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_4/Makefile.in | 2 +- dlls/xinput9_1_0/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248c..c4a0fe4b3a 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc..9e56513501 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d..fd4e48b4a8 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed0..73ef49dbf5 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c464..2efe7b31b6 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi
EXTRADLLFLAGS = -mno-cygwin
participants (2)
-
Jordan Coppard -
Zhiyi Zhang