From 484054b204a683fcaf5a5a0de9d27366ae60d7a5 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 25 Jan 2023 10:19:48 +1100 Subject: [PATCH] Rebase against be57ebe01581f709b0e52a29304668eaaf6f0634. --- ...d-implicit-cast-of-interface-pointer.patch | 25 --------- patches/patchinstall.sh | 26 ++------- ...-warn-about-used-contexts-in-wglShar.patch | 53 ------------------- staging/upstream-commit | 2 +- 4 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 patches/Compiler_Warnings/0029-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch delete mode 100644 patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch diff --git a/patches/Compiler_Warnings/0029-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0029-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch deleted file mode 100644 index e302ba64..00000000 --- a/patches/Compiler_Warnings/0029-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e35d665256d08ebccee30361867ba57f790d519f Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Tue, 22 Mar 2016 23:01:32 +0100 -Subject: rpcrt4: Avoid implicit cast of interface pointer. - ---- - dlls/rpcrt4/cstub.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c -index 838ed03..992c235 100644 ---- a/dlls/rpcrt4/cstub.c -+++ b/dlls/rpcrt4/cstub.c -@@ -59,7 +59,7 @@ typedef struct - - static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) - { -- return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); -+ return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer); - } - - HRESULT CStdStubBuffer_Construct(REFIID riid, --- -2.7.1 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a2f34b2e..5b98414f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "6677c044abb711f423fadfb61f2c9a37da6ff686" + echo "be57ebe01581f709b0e52a29304668eaaf6f0634" } # Show version information @@ -242,7 +242,6 @@ patch_enable_all () enable_winex11_XEMBED="$1" enable_winex11__NET_ACTIVE_WINDOW="$1" enable_winex11_ime_check_thread_data="$1" - enable_winex11_wglShareLists="$1" enable_winex11_drv_Query_server_position="$1" enable_wininet_Cleanup="$1" enable_winmm_mciSendCommandA="$1" @@ -738,9 +737,6 @@ patch_enable () winex11-ime-check-thread-data) enable_winex11_ime_check_thread_data="$2" ;; - winex11-wglShareLists) - enable_winex11_wglShareLists="$2" - ;; winex11.drv-Query_server_position) enable_winex11_drv_Query_server_position="$2" ;; @@ -1257,9 +1253,9 @@ fi # | * dlls/bcrypt/gnutls.c, dlls/d2d1/bitmap.c, dlls/d2d1/brush.c, dlls/d2d1/dc_render_target.c, dlls/d2d1/geometry.c, # | dlls/d2d1/hwnd_render_target.c, dlls/d2d1/state_block.c, dlls/d3d10/effect.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dwrite/font.c, dlls/dxgi/output.c, dlls/msctf/range.c, -# | dlls/msxml3/schema.c, dlls/ntdll/unix/virtual.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, -# | dlls/rpcrt4/ndr_marshall.c, dlls/rpcrt4/ndr_typelib.c, dlls/vbscript/vbdisp.c, dlls/wbemdisp/locator.c, -# | dlls/windowscodecs/info.c, dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h +# | dlls/msxml3/schema.c, dlls/ntdll/unix/virtual.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/ndr_marshall.c, +# | dlls/rpcrt4/ndr_typelib.c, dlls/vbscript/vbdisp.c, dlls/wbemdisp/locator.c, dlls/windowscodecs/info.c, +# | dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-windowscodecs-Avoid-implicit-cast-of-interface-point.patch @@ -1271,7 +1267,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0027-msxml3-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0028-oleaut32-Avoid-implicit-cast-of-interface-pointer.patch - patch_apply Compiler_Warnings/0029-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0030-vbscript-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch @@ -3478,19 +3473,6 @@ if test "$enable_winex11_ime_check_thread_data" -eq 1; then patch_apply winex11-ime-check-thread-data/0001-winex11.drv-handle-missing-thread-data-in-X11DRV_get_ic.patch fi -# Patchset winex11-wglShareLists -# | -# | This patchset fixes the following Wine bugs: -# | * [#11436] Do not fail when a used context is passed to wglShareLists -# | * [#25419] Fix broken textures in XIII Century: Death or Glory -# | -# | Modified files: -# | * dlls/opengl32/tests/opengl.c, dlls/winex11.drv/opengl.c -# | -if test "$enable_winex11_wglShareLists" -eq 1; then - patch_apply winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch -fi - # Patchset winex11.drv-Query_server_position # | # | This patchset fixes the following Wine bugs: diff --git a/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch b/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch deleted file mode 100644 index f03d96ea..00000000 --- a/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4d2c03539d7316d75b56fd8a2c852a9013234f0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 28 Sep 2014 21:20:52 +0200 -Subject: winex11.drv: Only warn about used contexts in wglShareLists. - ---- - dlls/opengl32/tests/opengl.c | 2 +- - dlls/winex11.drv/opengl.c | 10 ++++------ - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c -index e5e1507..5454d3a 100644 ---- a/dlls/opengl32/tests/opengl.c -+++ b/dlls/opengl32/tests/opengl.c -@@ -365,7 +365,7 @@ static void test_sharelists(HDC winhdc) - res = wglMakeCurrent(winhdc, hglrc2); - ok(res, "Make current failed\n"); - res = wglShareLists(hglrc1, hglrc2); -- todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); -+ ok(res, "Sharing display lists with a destination context which has been made current failed\n"); - wglMakeCurrent(0, 0); - wglDeleteContext(hglrc2); - } -diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c -index 0f7534e..39929f2 100644 ---- a/dlls/winex11.drv/opengl.c -+++ b/dlls/winex11.drv/opengl.c -@@ -1959,18 +1959,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de - * current or when it hasn't shared display lists before. - */ - -- if((org->has_been_current && dest->has_been_current) || dest->has_been_current) -- { -- ERR("Could not share display lists, one of the contexts has been current already !\n"); -- return FALSE; -- } -- else if(dest->sharing) -+ if(dest->sharing) - { - ERR("Could not share display lists because hglrc2 has already shared lists before\n"); - return FALSE; - } - else - { -+ if(dest->has_been_current) -+ ERR("Recreating OpenGL context to share display lists, although the context has been current!\n"); -+ - /* Re-create the GLX context and share display lists */ - pglXDestroyContext(gdi_display, dest->ctx); - dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); --- -2.8.0 - diff --git a/staging/upstream-commit b/staging/upstream-commit index e5dc5212..9401f1ab 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6677c044abb711f423fadfb61f2c9a37da6ff686 +be57ebe01581f709b0e52a29304668eaaf6f0634