diff --git a/README.md b/README.md index f070c86a..fc8e790c 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Included bug fixes and improvements * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770)) * Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575)) * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436)) -* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](https://bugs.winehq.org/show_bug.cgi?id=37272)) +* ~~Don't fill KdHelp structure for usermode applications~~ ([Wine Bug #37272](https://bugs.winehq.org/show_bug.cgi?id=37272)) * Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849)) * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162)) * Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854)) diff --git a/debian/changelog b/debian/changelog index e2263eb7..a4ad6c7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ wine-staging (1.7.36) UNRELEASED; urgency=low * Added patchset to implement Vista+ threadpool functions for work / timers. * Added patch to fix crash in Jedi Knight: Dark Forces II when winmm is set to native. * Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats. + * Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream). + * Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream). -- Sebastian Lackner Sun, 25 Jan 2015 05:58:36 +0100 wine-staging (1.7.35) unstable; urgency=low diff --git a/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch b/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch deleted file mode 100644 index 2db7a99e..00000000 --- a/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 78ab3400ea9c3c9ae9d85f3ee2952c20c7d68f73 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 15 Sep 2014 22:55:49 +0200 -Subject: dbghelp: Don't fill KdHelp structure for usermode applications. - ---- - dlls/dbghelp/stack.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c -index 3e1ff72..21412f6 100644 ---- a/dlls/dbghelp/stack.c -+++ b/dlls/dbghelp/stack.c -@@ -240,15 +240,6 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, - if (!cpu->stack_walk(&csw, frame, ctx)) return FALSE; - - /* we don't handle KdHelp */ -- frame->KdHelp.Thread = 0xC000FADE; -- frame->KdHelp.ThCallbackStack = 0x10; -- frame->KdHelp.ThCallbackBStore = 0; -- frame->KdHelp.NextCallback = 0; -- frame->KdHelp.FramePointer = 0; -- frame->KdHelp.KiCallUserMode = 0xD000DAFE; -- frame->KdHelp.KeUserCallbackDispatcher = 0xE000F000; -- frame->KdHelp.SystemRangeStart = 0xC0000000; -- frame->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; - - return TRUE; - } --- -2.1.0 - diff --git a/patches/dbghelp-KdHelp/definition b/patches/dbghelp-KdHelp/definition deleted file mode 100644 index 4bfb1928..00000000 --- a/patches/dbghelp-KdHelp/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [37272] Don't fill KdHelp structure for usermode applications diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d0640f3b..4e8dfdae 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -82,7 +82,6 @@ patch_enable_all () enable_d3dx9_36_Texture_Align="$1" enable_d3dx9_36_UpdateSkinnedMesh="$1" enable_dbghelp_Debug_Symbols="$1" - enable_dbghelp_KdHelp="$1" enable_ddraw_d3d_execute_buffer="$1" enable_dinput_Events="$1" enable_dpvoice_GetCompressionTypes="$1" @@ -270,9 +269,6 @@ patch_enable () dbghelp-Debug_Symbols) enable_dbghelp_Debug_Symbols="$2" ;; - dbghelp-KdHelp) - enable_dbghelp_KdHelp="$2" - ;; ddraw-d3d_execute_buffer) enable_ddraw_d3d_execute_buffer="$2" ;; @@ -1372,21 +1368,6 @@ if test "$enable_dbghelp_Debug_Symbols" -eq 1; then ) >> "$patchlist" fi -# Patchset dbghelp-KdHelp -# | -# | This patchset fixes the following Wine bugs: -# | * [#37272] Don't fill KdHelp structure for usermode applications -# | -# | Modified files: -# | * dlls/dbghelp/stack.c -# | -if test "$enable_dbghelp_KdHelp" -eq 1; then - patch_apply dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch - ( - echo '+ { "Sebastian Lackner", "dbghelp: Don'\''t fill KdHelp structure for usermode applications.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ddraw-d3d_execute_buffer # | # | Modified files: @@ -2827,16 +2808,14 @@ fi # | * [#36709] Support for SLGetWindowsInformationDWORD # | # | Modified files: -# | * configure.ac, dlls/ntdll/ntdll.spec, dlls/ntdll/reg.c, dlls/ntdll/tests/reg.c, dlls/slc/slc.c, -# | dlls/slc/tests/Makefile.in, dlls/slc/tests/slc.c, include/slerror.h, include/winternl.h, loader/wine.inf.in +# | * dlls/ntdll/ntdll.spec, dlls/ntdll/reg.c, dlls/ntdll/tests/reg.c, dlls/slc/slc.c, dlls/slc/tests/slc.c, +# | include/winternl.h, loader/wine.inf.in # | if test "$enable_slc_SLGetWindowsInformation" -eq 1; then - patch_apply slc-SLGetWindowsInformation/0001-slc-tests-Add-tests-for-SLGetWindowsInformationDWORD.patch - patch_apply slc-SLGetWindowsInformation/0002-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch - patch_apply slc-SLGetWindowsInformation/0003-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch - patch_apply slc-SLGetWindowsInformation/0004-slc-Implement-SLGetWindowsInformationDWORD.patch + patch_apply slc-SLGetWindowsInformation/0001-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch + patch_apply slc-SLGetWindowsInformation/0002-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch + patch_apply slc-SLGetWindowsInformation/0003-slc-Implement-SLGetWindowsInformationDWORD.patch ( - echo '+ { "Sebastian Lackner", "slc/tests: Add tests for SLGetWindowsInformationDWORD.", 1 },'; echo '+ { "Sebastian Lackner", "ntdll/tests: Add tests for NtQueryLicenseKey.", 1 },'; echo '+ { "Sebastian Lackner", "ntdll: Implement [Nt|Zw]QueryLicenseValue.", 1 },'; echo '+ { "Sebastian Lackner", "slc: Implement SLGetWindowsInformationDWORD.", 1 },'; diff --git a/patches/slc-SLGetWindowsInformation/0002-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch b/patches/slc-SLGetWindowsInformation/0001-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch similarity index 100% rename from patches/slc-SLGetWindowsInformation/0002-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch rename to patches/slc-SLGetWindowsInformation/0001-ntdll-tests-Add-tests-for-NtQueryLicenseKey.patch diff --git a/patches/slc-SLGetWindowsInformation/0001-slc-tests-Add-tests-for-SLGetWindowsInformationDWORD.patch b/patches/slc-SLGetWindowsInformation/0001-slc-tests-Add-tests-for-SLGetWindowsInformationDWORD.patch deleted file mode 100644 index 2c08a7dd..00000000 --- a/patches/slc-SLGetWindowsInformation/0001-slc-tests-Add-tests-for-SLGetWindowsInformationDWORD.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 509bb7172754c95f340aacfeae365e6da7007305 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 22 Dec 2014 07:26:37 +0100 -Subject: slc/tests: Add tests for SLGetWindowsInformationDWORD. - ---- - configure.ac | 1 + - dlls/slc/tests/Makefile.in | 5 +++ - dlls/slc/tests/slc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ - include/slerror.h | 1 + - 4 files changed, 87 insertions(+) - create mode 100644 dlls/slc/tests/Makefile.in - create mode 100644 dlls/slc/tests/slc.c - -diff --git a/configure.ac b/configure.ac -index 2fa4dcc..0eaa26e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3228,6 +3228,7 @@ WINE_CONFIG_DLL(shlwapi,,[implib,po]) - WINE_CONFIG_TEST(dlls/shlwapi/tests) - WINE_CONFIG_DLL(slbcsp) - WINE_CONFIG_DLL(slc,,[implib]) -+WINE_CONFIG_TEST(dlls/slc/tests) - WINE_CONFIG_DLL(snmpapi,,[implib]) - WINE_CONFIG_TEST(dlls/snmpapi/tests) - WINE_CONFIG_DLL(softpub) -diff --git a/dlls/slc/tests/Makefile.in b/dlls/slc/tests/Makefile.in -new file mode 100644 -index 0000000..51b648c ---- /dev/null -+++ b/dlls/slc/tests/Makefile.in -@@ -0,0 +1,5 @@ -+TESTDLL = slc.dll -+IMPORTS = slc -+ -+C_SRCS = \ -+ slc.c -diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c -new file mode 100644 -index 0000000..723cd4c ---- /dev/null -+++ b/dlls/slc/tests/slc.c -@@ -0,0 +1,80 @@ -+/* -+ * Copyright 2014 Sebastian Lackner -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#include -+ -+#include "windef.h" -+#include "winbase.h" -+#include "winerror.h" -+ -+#include "slpublic.h" -+#include "slerror.h" -+ -+#include -+ -+static void test_SLGetWindowsInformationDWORD(void) -+{ -+ static const WCHAR NonexistentLicenseValueW[] = {'N','o','n','e','x','i','s','t','e','n','t','-', -+ 'L','i','c','e','n','s','e','-','V','a','l','u','e',0}; -+ static const WCHAR KernelMUILanguageAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', -+ 'L','a','n','g','u','a','g','e','-','A','l','l','o','w','e','d',0}; -+ static const WCHAR KernelMUINumberAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', -+ 'N','u','m','b','e','r','-','A','l','l','o','w','e','d',0}; -+ static const WCHAR emptyW[] = {0}; -+ DWORD value; -+ HRESULT res; -+ -+ res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); -+ todo_wine -+ ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); -+ -+ res = SLGetWindowsInformationDWORD(NULL, &value); -+ todo_wine -+ ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); -+ -+ value = 0xdeadbeef; -+ res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); -+ todo_wine -+ ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); -+ ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); -+ -+ value = 0xdeadbeef; -+ res = SLGetWindowsInformationDWORD(emptyW, &value); -+ ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */, -+ "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res); -+ ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); -+ -+ value = 0xdeadbeef; -+ res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); -+ todo_wine -+ ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); -+ ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); -+ -+ value = 0xdeadbeef; -+ res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); -+ todo_wine -+ ok(res == S_OK, "expected S_OK, got %u\n", res); -+ todo_wine -+ ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); -+} -+ -+ -+START_TEST(slc) -+{ -+ test_SLGetWindowsInformationDWORD(); -+} -diff --git a/include/slerror.h b/include/slerror.h -index 9c800f6..8b45d99 100644 ---- a/include/slerror.h -+++ b/include/slerror.h -@@ -19,6 +19,7 @@ - #ifndef __WINE_SLERROR_H - #define __WINE_SLERROR_H - -+#define SL_E_VALUE_NOT_FOUND 0xC004F012 - #define SL_E_RIGHT_NOT_GRANTED 0xC004F013 - #define SL_E_DATATYPE_MISMATCHED 0xC004F01E - --- -2.2.1 - diff --git a/patches/slc-SLGetWindowsInformation/0003-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch b/patches/slc-SLGetWindowsInformation/0002-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch similarity index 100% rename from patches/slc-SLGetWindowsInformation/0003-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch rename to patches/slc-SLGetWindowsInformation/0002-ntdll-Implement-Nt-Zw-QueryLicenseValue.patch diff --git a/patches/slc-SLGetWindowsInformation/0004-slc-Implement-SLGetWindowsInformationDWORD.patch b/patches/slc-SLGetWindowsInformation/0003-slc-Implement-SLGetWindowsInformationDWORD.patch similarity index 100% rename from patches/slc-SLGetWindowsInformation/0004-slc-Implement-SLGetWindowsInformationDWORD.patch rename to patches/slc-SLGetWindowsInformation/0003-slc-Implement-SLGetWindowsInformationDWORD.patch