mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 6144addcf0fc26f187aa05e6bac6c4a0c3542199.
This commit is contained in:
Sebastian Lackner
parent
d7385d6c01
commit
ce01adb3ed
@ -1,4 +1,4 @@
|
||||
From 001d09614779630b5fe3885975b8badc79b0a58b Mon Sep 17 00:00:00 2001
|
||||
From 89a4ee827b74d8e4d63ca3e1354d89d75cc0fc19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 20 Aug 2014 19:21:18 +0200
|
||||
Subject: ntdll: Move NtProtectVirtualMemory and NtCreateSection to separate
|
||||
@ -9,10 +9,10 @@ Subject: ntdll: Move NtProtectVirtualMemory and NtCreateSection to separate
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index caf26ade02d..fb91b03ccb6 100644
|
||||
index ce2469829b0..eb2dbe8a2cd 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -152,6 +152,14 @@ static void *preload_reserve_end;
|
||||
@@ -168,6 +168,14 @@ static void *preload_reserve_end;
|
||||
static BOOL use_locks;
|
||||
static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */
|
||||
|
||||
@ -24,9 +24,9 @@ index caf26ade02d..fb91b03ccb6 100644
|
||||
+ ULONG sec_flags, HANDLE file ) DECLSPEC_ALIGN(4096);
|
||||
+#endif
|
||||
+
|
||||
|
||||
/***********************************************************************
|
||||
* get_page_vprot
|
||||
static inline int is_view_valloc( const struct file_view *view )
|
||||
{
|
||||
return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT));
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "19d57982ecb4520453a1b77ace386c625312e265"
|
||||
echo "6144addcf0fc26f187aa05e6bac6c4a0c3542199"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -349,7 +349,6 @@ patch_enable_all ()
|
||||
enable_server_device_manager_destroy="$1"
|
||||
enable_server_free_async_queue="$1"
|
||||
enable_server_send_hardware_message="$1"
|
||||
enable_setupapi_DelReg="$1"
|
||||
enable_setupapi_DiskSpaceList="$1"
|
||||
enable_setupapi_Display_Device="$1"
|
||||
enable_setupapi_HSPFILEQ_Check_Type="$1"
|
||||
@ -362,7 +361,6 @@ patch_enable_all ()
|
||||
enable_shell32_ACE_Viewer="$1"
|
||||
enable_shell32_Context_Menu="$1"
|
||||
enable_shell32_File_Property_Dialog="$1"
|
||||
enable_shell32_FolderItemsImpl_get_Count="$1"
|
||||
enable_shell32_Icons="$1"
|
||||
enable_shell32_Microsoft_Windows_Themes="$1"
|
||||
enable_shell32_NewMenu_Interface="$1"
|
||||
@ -1325,9 +1323,6 @@ patch_enable ()
|
||||
server-send_hardware_message)
|
||||
enable_server_send_hardware_message="$2"
|
||||
;;
|
||||
setupapi-DelReg)
|
||||
enable_setupapi_DelReg="$2"
|
||||
;;
|
||||
setupapi-DiskSpaceList)
|
||||
enable_setupapi_DiskSpaceList="$2"
|
||||
;;
|
||||
@ -1364,9 +1359,6 @@ patch_enable ()
|
||||
shell32-File_Property_Dialog)
|
||||
enable_shell32_File_Property_Dialog="$2"
|
||||
;;
|
||||
shell32-FolderItemsImpl_get_Count)
|
||||
enable_shell32_FolderItemsImpl_get_Count="$2"
|
||||
;;
|
||||
shell32-Icons)
|
||||
enable_shell32_Icons="$2"
|
||||
;;
|
||||
@ -7850,21 +7842,6 @@ if test "$enable_server_send_hardware_message" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset setupapi-DelReg
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#13548] setupapi DelReg should recursively delete registry keys
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/setupapi/install.c, dlls/setupapi/tests/install.c
|
||||
# |
|
||||
if test "$enable_setupapi_DelReg" -eq 1; then
|
||||
patch_apply setupapi-DelReg/0001-setupapi-DelReg-should-recursively-delete-registry-k.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "setupapi: DelReg should recursively delete registry keys.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset setupapi-DiskSpaceList
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -8116,18 +8093,6 @@ if test "$enable_shell32_Context_Menu" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset shell32-FolderItemsImpl_get_Count
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/shell32/shelldispatch.c, dlls/shell32/tests/shelldispatch.c
|
||||
# |
|
||||
if test "$enable_shell32_FolderItemsImpl_get_Count" -eq 1; then
|
||||
patch_apply shell32-FolderItemsImpl_get_Count/0001-shell32-Improve-FolderItemsImpl_get_Count-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "shell32: Improve FolderItemsImpl_get_Count stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset shell32-Icons
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -9313,13 +9278,11 @@ fi
|
||||
# | * dlls/windowscodecs/converter.c, dlls/windowscodecs/jpegformat.c
|
||||
# |
|
||||
if test "$enable_windowscodecs_JPEG_Decoder" -eq 1; then
|
||||
patch_apply windowscodecs-JPEG_Decoder/0001-windowscodecs-Fix-IWICBitmapEncoder-SetPalette-for-a.patch
|
||||
patch_apply windowscodecs-JPEG_Decoder/0002-windowscodecs-Fix-stride-calculation-in-JPEG-decoder.patch
|
||||
patch_apply windowscodecs-JPEG_Decoder/0003-windowscodecs-Move-additional-processing-out-of-the-.patch
|
||||
patch_apply windowscodecs-JPEG_Decoder/0004-windowscodecs-Move-JPEG-frame-image-data-initializat.patch
|
||||
patch_apply windowscodecs-JPEG_Decoder/0005-windowscodecs-Add-support-for-CMYK-to-BGR-conversion.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in JPEG encoder.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix stride calculation in JPEG decoder.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Move additional processing out of the JPEG decoding loop.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Move JPEG frame image data initialization from Frame::CopyPixels to Decoder::Initialize.", 2 },';
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 60593e8bfdaa748bd006f364a1f134e79066f6a5 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 28 Feb 2016 03:36:07 +0100
|
||||
Subject: setupapi: DelReg should recursively delete registry keys.
|
||||
|
||||
---
|
||||
dlls/setupapi/install.c | 7 ++++++-
|
||||
dlls/setupapi/tests/install.c | 1 -
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
|
||||
index a8d38aa..2aefc16 100644
|
||||
--- a/dlls/setupapi/install.c
|
||||
+++ b/dlls/setupapi/install.c
|
||||
@@ -302,6 +302,7 @@ static void delete_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s
|
||||
*/
|
||||
static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context, INT flags )
|
||||
{
|
||||
+ static const WCHAR emptyW[] = {0};
|
||||
DWORD type, size;
|
||||
|
||||
if (flags & (FLG_ADDREG_DELREG_BIT | FLG_ADDREG_DELVAL)) /* deletion */
|
||||
@@ -320,7 +321,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
|
||||
}
|
||||
else RegDeleteValueW( hkey, value );
|
||||
}
|
||||
- else NtDeleteKey( hkey );
|
||||
+ else
|
||||
+ {
|
||||
+ RegDeleteTreeW( hkey, NULL );
|
||||
+ RegDeleteKeyW( hkey, emptyW );
|
||||
+ }
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
|
||||
index d12d683..e09ac8e 100644
|
||||
--- a/dlls/setupapi/tests/install.c
|
||||
+++ b/dlls/setupapi/tests/install.c
|
||||
@@ -174,7 +174,6 @@ static void test_registry(void)
|
||||
|
||||
/* Check if the registry key is recursively deleted */
|
||||
res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key);
|
||||
- todo_wine
|
||||
ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n");
|
||||
/* Just in case */
|
||||
if (res == ERROR_SUCCESS)
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [13548] setupapi DelReg should recursively delete registry keys
|
||||
@ -1,41 +0,0 @@
|
||||
From b055c9d4609c16afc5da9bd1a19e0e71ed3e32eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 4 Mar 2017 00:27:22 +0100
|
||||
Subject: shell32: Improve FolderItemsImpl_get_Count stub.
|
||||
|
||||
---
|
||||
dlls/shell32/shelldispatch.c | 3 ++-
|
||||
dlls/shell32/tests/shelldispatch.c | 2 --
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
|
||||
index ac79302c933..f1a301d01b5 100644
|
||||
--- a/dlls/shell32/shelldispatch.c
|
||||
+++ b/dlls/shell32/shelldispatch.c
|
||||
@@ -1053,7 +1053,8 @@ static HRESULT WINAPI FolderItemsImpl_get_Count(FolderItems3 *iface, LONG *count
|
||||
{
|
||||
FIXME("(%p,%p)\n", iface, count);
|
||||
|
||||
- return E_NOTIMPL;
|
||||
+ if (count) *count = 0;
|
||||
+ return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDispatch **ppid)
|
||||
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
|
||||
index 0c711259c55..73c29d1ef89 100644
|
||||
--- a/dlls/shell32/tests/shelldispatch.c
|
||||
+++ b/dlls/shell32/tests/shelldispatch.c
|
||||
@@ -421,9 +421,7 @@ static void test_items(void)
|
||||
r = FolderItems_get_Count(items, NULL);
|
||||
|
||||
r = FolderItems_get_Count(items, &lcount);
|
||||
-todo_wine
|
||||
ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r);
|
||||
-todo_wine
|
||||
ok(!lcount, "expected 0 files, got %d\n", lcount);
|
||||
|
||||
V_VT(&var) = VT_I4;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Improve FolderItemsImpl_get_Count stub in shell32
|
||||
@ -1,37 +0,0 @@
|
||||
From 3a150ddeeb8cfc19bd93eb6484aad9e1d8f21658 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 18 Aug 2017 11:53:17 +0800
|
||||
Subject: windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not
|
||||
initialized case in JPEG encoder.
|
||||
|
||||
---
|
||||
dlls/windowscodecs/jpegformat.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c
|
||||
index ae54b0f8009..abab36ab40a 100644
|
||||
--- a/dlls/windowscodecs/jpegformat.c
|
||||
+++ b/dlls/windowscodecs/jpegformat.c
|
||||
@@ -1424,8 +1424,18 @@ static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface,
|
||||
|
||||
static HRESULT WINAPI JpegEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette)
|
||||
{
|
||||
+ JpegEncoder *This = impl_from_IWICBitmapEncoder(iface);
|
||||
+ HRESULT hr;
|
||||
+
|
||||
TRACE("(%p,%p)\n", iface, pIPalette);
|
||||
- return WINCODEC_ERR_UNSUPPORTEDOPERATION;
|
||||
+
|
||||
+ EnterCriticalSection(&This->lock);
|
||||
+
|
||||
+ hr = This->initialized ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED;
|
||||
+
|
||||
+ LeaveCriticalSection(&This->lock);
|
||||
+
|
||||
+ return hr;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI JpegEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)
|
||||
--
|
||||
2.14.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user