From da45303bdc248a50bc68730a14a561023e8661a5 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 11 Oct 2017 08:54:10 +0200 Subject: [PATCH] Rebase against ee7ddd1ed38a3b2f41bdb676f42e3453021968c1. --- ...pilation-with-recent-versions-of-gcc.patch | 26 ----------- ...ppers-for-glDebugMessageCallback-to-.patch | 45 ++++++++++--------- patches/patchinstall.sh | 11 ++--- 3 files changed, 28 insertions(+), 54 deletions(-) delete mode 100644 patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch diff --git a/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch b/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch deleted file mode 100644 index 408d8f75..00000000 --- a/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 43628d9b1905396ff6442e4f1e07c9dd48739b19 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Fri, 14 Apr 2017 15:57:18 +0200 -Subject: ole32: Fix compilation with recent versions of gcc. - ---- - dlls/ole32/storage32.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h -index 4fcfd9c362..2b23ab8eb8 100644 ---- a/dlls/ole32/storage32.h -+++ b/dlls/ole32/storage32.h -@@ -526,6 +526,9 @@ StgStreamImpl* StgStreamImpl_Construct( - /****************************************************************************** - * Endian conversion macros - */ -+#undef htole32 -+#undef htole16 -+ - #ifdef WORDS_BIGENDIAN - - #define htole32(x) RtlUlongByteSwap(x) --- -2.12.2 - diff --git a/patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch b/patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch index 4e2c4017..8dbe6448 100644 --- a/patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch +++ b/patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch @@ -1,4 +1,4 @@ -From 8d34e3ec8ce01e63d65469ab8064c1fde6a289b3 Mon Sep 17 00:00:00 2001 +From d50a5bcd0bf3da7efba19797045769ef66bb4e0d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 12 Feb 2016 02:39:07 +0100 Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling @@ -6,17 +6,17 @@ Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling --- dlls/opengl32/make_opengl | 5 ++++ - dlls/opengl32/opengl_ext.c | 18 -------------- + dlls/opengl32/opengl_ext.c | 21 ---------------- dlls/opengl32/opengl_ext.h | 4 ++++ dlls/opengl32/tests/opengl.c | 44 ++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 110 insertions(+), 18 deletions(-) + 5 files changed, 110 insertions(+), 21 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl -index 44d58ec7bba..10fca6d724f 100755 +index dc30df5a3cf..83b10013542 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl -@@ -243,6 +243,11 @@ sub GenerateThunk($$$) +@@ -172,6 +172,11 @@ sub GenerateThunk($$$) return "" if $name eq "glDebugEntry"; return "" if $name eq "glGetIntegerv"; return "" if $name eq "glGetString"; @@ -27,36 +27,39 @@ index 44d58ec7bba..10fca6d724f 100755 + return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; - $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; + my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func_ref ); diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c -index a8d267793e0..1f99991f1f3 100644 +index 91aa33dd19b..6d058c8c1a8 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c -@@ -1990,24 +1990,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) { +@@ -2319,27 +2319,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) funcs->ext.p_glCurrentPaletteMatrixARB( index ); } --static void WINAPI glDebugMessageCallback( void * callback, const void* userParam ) { +-static void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) +-{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; -- TRACE("(%p, %p)\n", callback, userParam ); +- TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallback( callback, userParam ); -} - --static void WINAPI glDebugMessageCallbackAMD( void * callback, void* userParam ) { +-static void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) +-{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; -- TRACE("(%p, %p)\n", callback, userParam ); +- TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackAMD( callback, userParam ); -} - --static void WINAPI glDebugMessageCallbackARB( void * callback, const void* userParam ) { +-static void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) +-{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; -- TRACE("(%p, %p)\n", callback, userParam ); +- TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackARB( callback, userParam ); -} - - static void WINAPI glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled ) { + static void WINAPI glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) + { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %d, %d, %d, %p, %d)\n", source, type, severity, count, ids, enabled ); diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 4f1791a6436..8bffba05023 100644 --- a/dlls/opengl32/opengl_ext.h @@ -71,10 +74,10 @@ index 4f1791a6436..8bffba05023 100644 + #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */ diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c -index fd68a994153..f6845aabfef 100644 +index 4b918424f62..0dc8bd51259 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c -@@ -71,6 +71,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); +@@ -70,6 +70,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); static int (WINAPI *pwglGetSwapIntervalEXT)(void); @@ -86,7 +89,7 @@ index fd68a994153..f6845aabfef 100644 static const char* wgl_extensions = NULL; static void init_functions(void) -@@ -103,6 +108,11 @@ static void init_functions(void) +@@ -102,6 +107,11 @@ static void init_functions(void) GET_PROC(wglSwapIntervalEXT) GET_PROC(wglGetSwapIntervalEXT) @@ -98,7 +101,7 @@ index fd68a994153..f6845aabfef 100644 #undef GET_PROC } -@@ -327,6 +337,39 @@ static void test_choosepixelformat(void) +@@ -326,6 +336,39 @@ static void test_choosepixelformat(void) pfd.cAuxBuffers = 0; } @@ -138,7 +141,7 @@ index fd68a994153..f6845aabfef 100644 static void test_setpixelformat(HDC winhdc) { int res = 0; -@@ -1810,6 +1853,7 @@ START_TEST(opengl) +@@ -1809,6 +1852,7 @@ START_TEST(opengl) } test_choosepixelformat(); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e50dc77b..c9935124 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "63d6dce04746237c1cb39c22914ed666c55178e1" + echo "ee7ddd1ed38a3b2f41bdb676f42e3453021968c1" } # Show version information @@ -3015,13 +3015,11 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, -# | dlls/dwrite/layout.c, dlls/evr/evr.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, -# | dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/wined3d/glsl_shader.c, -# | dlls/ws2_32/tests/sock.c, dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, -# | tools/makedep.c +# | dlls/dwrite/layout.c, dlls/evr/evr.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, +# | dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, +# | dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then - patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch patch_apply Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch @@ -3040,7 +3038,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch ( - printf '%s\n' '+ { "Sebastian Lackner", "ole32: Fix compilation with recent versions of gcc.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Work around an incorrect detection in GCC 7.", 1 },'; printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },';