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 edce79a6..6e7307d4 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 ea32c5954fa372ee12c8566724897e5aba6ca886 Mon Sep 17 00:00:00 2001 +From 10830fe26e7b3828860e1ac24831f153ec1257cc 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 @@ -13,7 +13,7 @@ Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling 5 files changed, 110 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl -index 45e3f72..c799347 100755 +index 45e3f720ea6..c79934727bc 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -239,6 +239,11 @@ sub GenerateThunk($$$$) @@ -29,7 +29,7 @@ index 45e3f72..c799347 100755 # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c -index 2a3b435..e216ec4 100644 +index 2a3b4355173..e216ec42e30 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -1954,24 +1954,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) { @@ -58,7 +58,7 @@ index 2a3b435..e216ec4 100644 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 4f1791a..8bffba0 100644 +index 4f1791a6436..8bffba05023 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -38,4 +38,8 @@ extern BOOL WINAPI wglQueryRendererIntegerWINE( HDC dc, GLint renderer, @@ -71,7 +71,7 @@ index 4f1791a..8bffba0 100644 + #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */ diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c -index 3f203ab..59b92ea 100644 +index 5d3a2455051..6b67850c5ee 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -71,6 +71,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); @@ -98,8 +98,8 @@ index 3f203ab..59b92ea 100644 #undef GET_PROC } -@@ -232,6 +242,39 @@ static void test_pbuffers(HDC hdc) - else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); +@@ -327,6 +337,39 @@ static void test_choosepixelformat(void) + pfd.cAuxBuffers = 0; } +static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, @@ -138,19 +138,19 @@ index 3f203ab..59b92ea 100644 static void test_setpixelformat(HDC winhdc) { int res = 0; -@@ -1684,6 +1727,7 @@ START_TEST(opengl) - return; +@@ -1785,6 +1828,7 @@ START_TEST(opengl) } + test_choosepixelformat(); + test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c -index 932b217..64ebda2 100644 +index dafafb66507..48d7a28f245 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c -@@ -62,6 +62,9 @@ struct opengl_context +@@ -63,6 +63,9 @@ struct opengl_context DWORD tid; /* thread that the context is current in */ HDC draw_dc; /* current drawing DC */ HDC read_dc; /* current reading DC */ @@ -160,7 +160,7 @@ index 932b217..64ebda2 100644 GLubyte *extensions; /* extension string */ GLuint *disabled_exts; /* indices of disabled extensions */ struct wgl_context *drv_ctx; /* driver context */ -@@ -1975,6 +1978,60 @@ const GLubyte * WINAPI glGetString( GLenum name ) +@@ -1938,6 +1941,60 @@ const GLubyte * WINAPI glGetString( GLenum name ) return ret; } @@ -222,5 +222,5 @@ index 932b217..64ebda2 100644 * OpenGL initialisation routine */ -- -2.7.1 +2.13.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 592c0bb8..4e579eea 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f2bb2064bfdf0e7b369f22c34d680dec6c12493c" + echo "4005e6e659107c29f93e7a35a3bb933b22416598" } # Show version information diff --git a/patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch b/patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch index a4c38bf4..4987511a 100644 --- a/patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch +++ b/patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch @@ -1,4 +1,4 @@ -From 4e90e07da9b0880527ac5aed3d2d27b2ba094d83 Mon Sep 17 00:00:00 2001 +From 8eecf2d7d5632e0ce4907981f195309a883f6ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 21 Aug 2016 02:36:47 +0200 Subject: winemp3.acm: Check input format in MPEG3_StreamOpen. @@ -9,11 +9,11 @@ Subject: winemp3.acm: Check input format in MPEG3_StreamOpen. 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c -index a485f9a197..13532a4980 100644 +index 337e20c4b03..a4aa599fd6f 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c -@@ -1249,6 +1249,76 @@ static void test_acmFormatTagDetails(void) - ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +@@ -1274,6 +1274,76 @@ static void test_acmFormatChoose(void) + afc.pwfx = pwfx; } +static void test_mp3(void) @@ -89,16 +89,16 @@ index a485f9a197..13532a4980 100644 static struct { struct -@@ -1418,6 +1488,7 @@ START_TEST(msacm) - test_convert(); +@@ -1444,6 +1514,7 @@ START_TEST(msacm) test_acmFormatSuggest(); test_acmFormatTagDetails(); + test_acmFormatChoose(); + test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c -index 13a6109a77..b5ba4c6d83 100644 +index 0e419bd66dc..b28519f835a 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -215,6 +215,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) @@ -128,7 +128,7 @@ index 13a6109a77..b5ba4c6d83 100644 /* resampling or mono <=> stereo not available * MPEG3 algo only define 16 bit per sample output */ -@@ -270,7 +283,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) +@@ -273,7 +286,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) theEnd: HeapFree(GetProcessHeap(), 0, aad); adsi->dwDriver = 0L;