[PATCH 0/1] MR1335: wined3d: Use delay-load for opengl32.
Avoids loading opengl32 when Vulkan backend is used. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335
From: Jacek Caban <jacek(a)codeweavers.com> Avoids loading opengl32 when Vulkan backend is used. --- dlls/wined3d/Makefile.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 23051f2a58b..aeda4d0ca94 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,8 +1,9 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -MODULE = wined3d.dll -IMPORTLIB = wined3d -IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 -EXTRAINCL = $(VKD3D_PE_CFLAGS) +EXTRADEFS = -DWINE_NO_LONG_TYPES +MODULE = wined3d.dll +IMPORTLIB = wined3d +IMPORTS = $(VKD3D_PE_LIBS) dxguid user32 gdi32 advapi32 +DELAYIMPORTS = opengl32 +EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ adapter_gl.c \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1335
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 full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126073 Your paranoid android. === debian11 (32 bit report) === amstream: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d2d1: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d10core: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d10_1: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d10: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d11: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d12: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d8: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3d9: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dcompiler_43: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dcompiler_46: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dcompiler_47: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3drm: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_34: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_35: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_36: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_37: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_38: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_39: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_40: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_41: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_42: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx10_43: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). d3dx9_36: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). ddrawex: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). ddraw: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). dxdiagn: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). dxgi: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). dxva2: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). evr: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). mfmediaengine: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). mfplat: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). mfreadwrite: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). mf: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). quartz: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). wbemprox: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). winmm: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000).
This merge request was closed by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335
Not sure why this was closed? It seems to make sense; it should just be a matter of using LoadLibrary() instead of GetModuleHandle(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335#note_15861
On Wed Nov 16 00:23:03 2022 +0000, Zebediah Figura wrote:
Not sure why this was closed? It seems to make sense; it should just be a matter of using LoadLibrary() instead of GetModuleHandle(). Actually, I think it could use more clean up, the code seems to have some leftovers from pre-PE times. It should probably avoid using wgl_driver.h. Also, right now, it loads most functions with GetProcAddresss() but links directly to opengl32.dll for others. This could be unified and we could settle on one way or another. Depending on which one is preferred, we'd then get rid of GetModuleHandle() or opengl32 from IMPORTS/DELAYIMPORTS.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335#note_15946
Actually, I think it could use more clean up, the code seems to have some leftovers from pre-PE times. It should probably avoid using wgl_driver.h.
Maybe, but it's not really clear that we want to get rid of wgl_driver.h. I think there's still an argument for creating a wined3d unixlib.
Also, right now, it loads most functions with GetProcAddresss() but links directly to opengl32.dll for others. This could be unified and we could settle on one way or another. Depending on which one is preferred, we'd then get rid of GetModuleHandle() or opengl32 from IMPORTS/DELAYIMPORTS.
This (including the inconsistency) dates back to 449deda62fe. I don't know why this commit was written; @julliard, do you perhaps remember? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335#note_15947
This (including the inconsistency) dates back to 449deda62fe. I don't know why this commit was written; @julliard, do you perhaps remember?
That was part of some more general opengl32 cleanups. I don't think there was a deeper reason beyond removing some unnecessary complexity. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1335#note_15994
participants (5)
-
Alexandre Julliard (＠julliard) -
Jacek Caban
-
Jacek Caban (＠jacek)
-
Marvin -
Zebediah Figura (＠zfigura)