From 0182014bedeb2d2f8f5666a0c03915b60264db3c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 25 Sep 2015 22:33:19 +0200 Subject: [PATCH] Rebase against 3966affe064c7b98a7b4c052b6a6696fe74c8830. --- README.md | 3 +- debian/changelog | 4 +++ ...her-bits-in-selector-for-ThreadDescr.patch | 35 ------------------- .../definition | 1 - ...recation-warning-for-OpenCL-1.2-APIs.patch | 24 ------------- patches/opencl-Deprecation/definition | 1 - patches/patchinstall.sh | 34 +----------------- 7 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 patches/ntdll-ThreadDescriptorTableEntry/0001-ntdll-Ignore-higher-bits-in-selector-for-ThreadDescr.patch delete mode 100644 patches/ntdll-ThreadDescriptorTableEntry/definition delete mode 100644 patches/opencl-Deprecation/0001-opencl-Avoid-deprecation-warning-for-OpenCL-1.2-APIs.patch delete mode 100644 patches/opencl-Deprecation/definition diff --git a/README.md b/README.md index 92cac48d..490dbf90 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,10 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [4]:** +**Bug fixes and features included in the next upcoming release [3]:** * Add implementation for msidb commandline tool * Codepage conversion should fail when destination length is < 0 -* Ignore higher bits in selector for ThreadDescriptorTableEntry info query * Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory diff --git a/debian/changelog b/debian/changelog index 42b7582f..2fafad69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,10 @@ wine-staging (1.7.52) UNRELEASED; urgency=low upstream). * Removed patches with stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W (accepted upstream). + * Removed patch to ignore higher bits in selector for + ThreadDescriptorTableEntry info query (accepted upstream). + * Removed patch to avoid deprecation warning for OpenCL 1.2 APIs (accepted + upstream). -- Sebastian Lackner Mon, 07 Sep 2015 16:51:25 +0200 wine-staging (1.7.51) unstable; urgency=low diff --git a/patches/ntdll-ThreadDescriptorTableEntry/0001-ntdll-Ignore-higher-bits-in-selector-for-ThreadDescr.patch b/patches/ntdll-ThreadDescriptorTableEntry/0001-ntdll-Ignore-higher-bits-in-selector-for-ThreadDescr.patch deleted file mode 100644 index 99a8a1e8..00000000 --- a/patches/ntdll-ThreadDescriptorTableEntry/0001-ntdll-Ignore-higher-bits-in-selector-for-ThreadDescr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a8f0b6092f5f1a52ca87bf6fc2822fe0b4edcc84 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 13 Sep 2015 23:03:43 +0200 -Subject: ntdll: Ignore higher bits in selector for ThreadDescriptorTableEntry - info query. - ---- - dlls/ntdll/thread.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 0be5585..5799f27 100644 ---- a/dlls/ntdll/thread.c -+++ b/dlls/ntdll/thread.c -@@ -1062,7 +1062,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, - status = STATUS_INFO_LENGTH_MISMATCH; - else if (!(tdi->Selector & 4)) /* GDT selector */ - { -- unsigned sel = tdi->Selector & ~3; /* ignore RPL */ -+ unsigned sel = LOWORD(tdi->Selector) & ~3; /* ignore RPL */ - status = STATUS_SUCCESS; - if (!sel) /* null selector */ - memset( &tdi->Entry, 0, sizeof(tdi->Entry) ); -@@ -1093,7 +1093,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, - SERVER_START_REQ( get_selector_entry ) - { - req->handle = wine_server_obj_handle( handle ); -- req->entry = tdi->Selector >> 3; -+ req->entry = LOWORD(tdi->Selector) >> 3; - status = wine_server_call( req ); - if (!status) - { --- -2.5.1 - diff --git a/patches/ntdll-ThreadDescriptorTableEntry/definition b/patches/ntdll-ThreadDescriptorTableEntry/definition deleted file mode 100644 index 440834ac..00000000 --- a/patches/ntdll-ThreadDescriptorTableEntry/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Ignore higher bits in selector for ThreadDescriptorTableEntry info query diff --git a/patches/opencl-Deprecation/0001-opencl-Avoid-deprecation-warning-for-OpenCL-1.2-APIs.patch b/patches/opencl-Deprecation/0001-opencl-Avoid-deprecation-warning-for-OpenCL-1.2-APIs.patch deleted file mode 100644 index 4970eb3a..00000000 --- a/patches/opencl-Deprecation/0001-opencl-Avoid-deprecation-warning-for-OpenCL-1.2-APIs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cef8020c7a1f4f8224513dac2017189c2774d1c8 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Thu, 3 Sep 2015 23:30:25 +0200 -Subject: opencl: Avoid deprecation warning for OpenCL 1.2 APIs. - ---- - dlls/opencl/opencl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c -index f690733..2d145bf 100644 ---- a/dlls/opencl/opencl.c -+++ b/dlls/opencl/opencl.c -@@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); - - #if defined(HAVE_CL_CL_H) - #define CL_USE_DEPRECATED_OPENCL_1_1_APIS -+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS - #define CL_USE_DEPRECATED_OPENCL_2_0_APIS - #include - #elif defined(HAVE_OPENCL_OPENCL_H) --- -2.5.1 - diff --git a/patches/opencl-Deprecation/definition b/patches/opencl-Deprecation/definition deleted file mode 100644 index 80b17a46..00000000 --- a/patches/opencl-Deprecation/definition +++ /dev/null @@ -1 +0,0 @@ -Apply-Before: * diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 12749013..015a5e20 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "60d1d6f5952e8b5d6fb0327a28c047058851fa70" + echo "3966affe064c7b98a7b4c052b6a6696fe74c8830" } # Show version information @@ -203,7 +203,6 @@ patch_enable_all () enable_ntdll_Stack_Fault="$1" enable_ntdll_Status_Mapping="$1" enable_ntdll_SystemRoot_Symlink="$1" - enable_ntdll_ThreadDescriptorTableEntry="$1" enable_ntdll_ThreadTime="$1" enable_ntdll_Threading="$1" enable_ntdll_User_Shared_Data="$1" @@ -217,7 +216,6 @@ patch_enable_all () enable_nvcuvid_CUDA_Video_Support="$1" enable_nvencodeapi_Video_Encoder="$1" enable_openal32_EFX_Extension="$1" - enable_opencl_Deprecation="$1" enable_opengl32_Revert_Disable_Ext="$1" enable_quartz_MediaSeeking_Positions="$1" enable_rasapi32_RasEnumDevicesA="$1" @@ -704,9 +702,6 @@ patch_enable () ntdll-SystemRoot_Symlink) enable_ntdll_SystemRoot_Symlink="$2" ;; - ntdll-ThreadDescriptorTableEntry) - enable_ntdll_ThreadDescriptorTableEntry="$2" - ;; ntdll-ThreadTime) enable_ntdll_ThreadTime="$2" ;; @@ -746,9 +741,6 @@ patch_enable () openal32-EFX_Extension) enable_openal32_EFX_Extension="$2" ;; - opencl-Deprecation) - enable_opencl_Deprecation="$2" - ;; opengl32-Revert_Disable_Ext) enable_opengl32_Revert_Disable_Ext="$2" ;; @@ -2029,18 +2021,6 @@ if test "$enable_patchlist" -eq 1; then fi -# Patchset opencl-Deprecation -# | -# | Modified files: -# | * dlls/opencl/opencl.c -# | -if test "$enable_opencl_Deprecation" -eq 1; then - patch_apply opencl-Deprecation/0001-opencl-Avoid-deprecation-warning-for-OpenCL-1.2-APIs.patch - ( - echo '+ { "Sebastian Lackner", "opencl: Avoid deprecation warning for OpenCL 1.2 APIs.", 1 },'; - ) >> "$patchlist" -fi - # Patchset Compiler_Warnings # | # | Modified files: @@ -4219,18 +4199,6 @@ if test "$enable_ntdll_SystemRoot_Symlink" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-ThreadDescriptorTableEntry -# | -# | Modified files: -# | * dlls/ntdll/thread.c -# | -if test "$enable_ntdll_ThreadDescriptorTableEntry" -eq 1; then - patch_apply ntdll-ThreadDescriptorTableEntry/0001-ntdll-Ignore-higher-bits-in-selector-for-ThreadDescr.patch - ( - echo '+ { "Sebastian Lackner", "ntdll: Ignore higher bits in selector for ThreadDescriptorTableEntry info query.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-ThreadTime # | # | This patchset fixes the following Wine bugs: