mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 09bf88092d0748ceac355098a942b01b267e8773
This commit is contained in:
Alistair Leslie-Hughes
parent
7348f0b12b
commit
7966caf282
@ -1,82 +0,0 @@
|
||||
From d6446888cdfc8546f311e6c37e3b6e011acf4a75 Mon Sep 17 00:00:00 2001
|
||||
From: Nikolay Sivov <nsivov@codeweavers.com>
|
||||
Date: Sat, 28 Apr 2018 22:34:22 +0300
|
||||
Subject: [PATCH] dxgi: Add IDXGIDevice2 stub.
|
||||
|
||||
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
|
||||
---
|
||||
dlls/dxgi/device.c | 30 ++++++++++++++++++++++++++++++
|
||||
include/wine/winedxgi.idl | 2 +-
|
||||
2 files changed, 31 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c
|
||||
index 441bf14dd41..60690cfce8b 100644
|
||||
--- a/dlls/dxgi/device.c
|
||||
+++ b/dlls/dxgi/device.c
|
||||
@@ -41,6 +41,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa
|
||||
|| IsEqualGUID(riid, &IID_IDXGIObject)
|
||||
|| IsEqualGUID(riid, &IID_IDXGIDevice)
|
||||
|| IsEqualGUID(riid, &IID_IDXGIDevice1)
|
||||
+ || IsEqualGUID(riid, &IID_IDXGIDevice2)
|
||||
|| IsEqualGUID(riid, &IID_IWineDXGIDevice))
|
||||
{
|
||||
IUnknown_AddRef(iface);
|
||||
@@ -275,6 +276,31 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
+static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count,
|
||||
+ IDXGIResource * const *resources, DXGI_OFFER_RESOURCE_PRIORITY priority)
|
||||
+{
|
||||
+ FIXME("iface %p, resource_count %u, resources %p, priority %u stub!\n", iface, resource_count,
|
||||
+ resources, priority);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT STDMETHODCALLTYPE dxgi_device_ReclaimResources(IWineDXGIDevice *iface, UINT resource_count,
|
||||
+ IDXGIResource * const *resources, BOOL *discarded)
|
||||
+{
|
||||
+ FIXME("iface %p, resource_count %u, resources %p, discarded %p stub!\n", iface, resource_count,
|
||||
+ resources, discarded);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *iface, HANDLE event)
|
||||
+{
|
||||
+ FIXME("iface %p, even %p stub!\n", iface, event);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
/* IWineDXGIDevice methods */
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface,
|
||||
@@ -355,6 +381,10 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl =
|
||||
/* IDXGIDevice1 methods */
|
||||
dxgi_device_SetMaximumFrameLatency,
|
||||
dxgi_device_GetMaximumFrameLatency,
|
||||
+ /* IDXGIDevice2 methods */
|
||||
+ dxgi_device_OfferResources,
|
||||
+ dxgi_device_ReclaimResources,
|
||||
+ dxgi_device_EnqueueSetEvent,
|
||||
/* IWineDXGIDevice methods */
|
||||
dxgi_device_create_surface,
|
||||
dxgi_device_create_swapchain,
|
||||
diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl
|
||||
index 2c5734280c6..3a1d6fa064f 100644
|
||||
--- a/include/wine/winedxgi.idl
|
||||
+++ b/include/wine/winedxgi.idl
|
||||
@@ -25,7 +25,7 @@ import "dxgi1_5.idl";
|
||||
local,
|
||||
uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71)
|
||||
]
|
||||
-interface IWineDXGIDevice : IDXGIDevice1
|
||||
+interface IWineDXGIDevice : IDXGIDevice2
|
||||
{
|
||||
HRESULT create_surface(
|
||||
[in] struct wined3d_texture *wined3d_texture,
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [45080] - Add support for IDXGIDevice2 interface
|
||||
@ -1,69 +0,0 @@
|
||||
From 3d107f1c34d56ee2a7fbd2ed25e6198e4f8aebe4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 21 Jan 2016 00:34:27 +0100
|
||||
Subject: ntdll: Add stub for RtlIpv6StringToAddressExW.
|
||||
|
||||
---
|
||||
dlls/ntdll/ntdll.spec | 2 +-
|
||||
dlls/ntdll/rtl.c | 11 +++++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
3 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 5e27f0af952..7c12f06aa5a 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -733,7 +733,7 @@
|
||||
# @ stub RtlIpv6AddressToStringW
|
||||
# @ stub RtlIpv6StringToAddressA
|
||||
# @ stub RtlIpv6StringToAddressExA
|
||||
-# @ stub RtlIpv6StringToAddressExW
|
||||
+@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr)
|
||||
# @ stub RtlIpv6StringToAddressW
|
||||
@ stdcall RtlIsActivationContextActive(ptr)
|
||||
@ stdcall RtlIsCriticalSectionLocked(ptr)
|
||||
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
|
||||
index 8630ddecdf2..b9b99b24b1c 100644
|
||||
--- a/dlls/ntdll/rtl.c
|
||||
+++ b/dlls/ntdll/rtl.c
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "wine/unicode.h"
|
||||
#include "ntdll_misc.h"
|
||||
#include "inaddr.h"
|
||||
+#include "in6addr.h"
|
||||
#include "ddk/ntddk.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
||||
@@ -902,6 +903,16 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * RtlIpv6StringToAddressExW [NTDLL.@]
|
||||
+ */
|
||||
+NTSTATUS NTAPI RtlIpv6StringToAddressExW(LPCWSTR str, IN6_ADDR *address, PULONG scope, PUSHORT port)
|
||||
+{
|
||||
+ FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port);
|
||||
+
|
||||
+ return STATUS_INVALID_PARAMETER;
|
||||
+}
|
||||
+
|
||||
/***********************************************************************
|
||||
* RtlIpv4AddressToStringExW [NTDLL.@]
|
||||
*
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 69f605922e4..c50073b7aa5 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -1088,7 +1088,7 @@
|
||||
@ stub RtlIpv6AddressToStringW
|
||||
@ stub RtlIpv6StringToAddressA
|
||||
@ stub RtlIpv6StringToAddressExA
|
||||
-@ stub RtlIpv6StringToAddressExW
|
||||
+@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) ntdll.RtlIpv6StringToAddressExW
|
||||
@ stub RtlIpv6StringToAddressW
|
||||
@ stub RtlIsGenericTableEmpty
|
||||
@ stub RtlIsGenericTableEmptyAvl
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
Fixes: Fix prototype of RtlIpv4StringToAddressExW
|
||||
Fixes: Add stub for RtlIpv6StringToAddressExW
|
||||
@ -52,13 +52,13 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "7280f7fb744e951281e7f051c347fb8fef5ab36b"
|
||||
echo "09bf88092d0748ceac355098a942b01b267e8773"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
version()
|
||||
{
|
||||
echo "Wine Staging 3.8"
|
||||
echo "Wine Staging 3.9 (Unreleased)"
|
||||
echo "Copyright (C) 2014-2018 the Wine Staging project authors."
|
||||
echo "Copyright (C) 2018 Alistair Leslie-Hughes"
|
||||
echo ""
|
||||
@ -149,7 +149,6 @@ patch_enable_all ()
|
||||
enable_dxdiagn_Enumerate_DirectSound="$1"
|
||||
enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1"
|
||||
enable_dxgi_GammaRamp="$1"
|
||||
enable_dxgi_IDXGIDevice2="$1"
|
||||
enable_dxgi_MakeWindowAssociation="$1"
|
||||
enable_dxgi_SetMaximumFrameLatency="$1"
|
||||
enable_dxva2_Video_Decoder="$1"
|
||||
@ -242,7 +241,6 @@ patch_enable_all ()
|
||||
enable_ntdll_Purist_Mode="$1"
|
||||
enable_ntdll_RtlCaptureStackBackTrace="$1"
|
||||
enable_ntdll_RtlGetUnloadEventTraceEx="$1"
|
||||
enable_ntdll_RtlIpStringToAddress_Stubs="$1"
|
||||
enable_ntdll_RtlIpStringToAddress_Tests="$1"
|
||||
enable_ntdll_RtlQueryPackageIdentity="$1"
|
||||
enable_ntdll_Serial_Port_Detection="$1"
|
||||
@ -320,7 +318,6 @@ patch_enable_all ()
|
||||
enable_shell32_SFGAO_HASSUBFOLDER="$1"
|
||||
enable_shell32_SHELL_execute="$1"
|
||||
enable_shell32_SHFileOperation_Move="$1"
|
||||
enable_shell32_SHFileOperation_Win9x="$1"
|
||||
enable_shell32_Toolbar_Bitmaps="$1"
|
||||
enable_shell32_UnixFS="$1"
|
||||
enable_shlwapi_AssocGetPerceivedType="$1"
|
||||
@ -635,9 +632,6 @@ patch_enable ()
|
||||
dxgi-GammaRamp)
|
||||
enable_dxgi_GammaRamp="$2"
|
||||
;;
|
||||
dxgi-IDXGIDevice2)
|
||||
enable_dxgi_IDXGIDevice2="$2"
|
||||
;;
|
||||
dxgi-MakeWindowAssociation)
|
||||
enable_dxgi_MakeWindowAssociation="$2"
|
||||
;;
|
||||
@ -914,9 +908,6 @@ patch_enable ()
|
||||
ntdll-RtlGetUnloadEventTraceEx)
|
||||
enable_ntdll_RtlGetUnloadEventTraceEx="$2"
|
||||
;;
|
||||
ntdll-RtlIpStringToAddress_Stubs)
|
||||
enable_ntdll_RtlIpStringToAddress_Stubs="$2"
|
||||
;;
|
||||
ntdll-RtlIpStringToAddress_Tests)
|
||||
enable_ntdll_RtlIpStringToAddress_Tests="$2"
|
||||
;;
|
||||
@ -1148,9 +1139,6 @@ patch_enable ()
|
||||
shell32-SHFileOperation_Move)
|
||||
enable_shell32_SHFileOperation_Move="$2"
|
||||
;;
|
||||
shell32-SHFileOperation_Win9x)
|
||||
enable_shell32_SHFileOperation_Win9x="$2"
|
||||
;;
|
||||
shell32-Toolbar_Bitmaps)
|
||||
enable_shell32_Toolbar_Bitmaps="$2"
|
||||
;;
|
||||
@ -1995,13 +1983,6 @@ if test "$enable_stdole32_tlb_SLTG_Typelib" -eq 1; then
|
||||
enable_widl_SLTG_Typelib_Support=1
|
||||
fi
|
||||
|
||||
if test "$enable_shell32_SHFileOperation_Win9x" -eq 1; then
|
||||
if test "$enable_shell32_Progress_Dialog" -gt 1; then
|
||||
abort "Patchset shell32-Progress_Dialog disabled, but shell32-SHFileOperation_Win9x depends on that."
|
||||
fi
|
||||
enable_shell32_Progress_Dialog=1
|
||||
fi
|
||||
|
||||
if test "$enable_shell32_ACE_Viewer" -eq 1; then
|
||||
if test "$enable_shell32_Progress_Dialog" -gt 1; then
|
||||
abort "Patchset shell32-Progress_Dialog disabled, but shell32-ACE_Viewer depends on that."
|
||||
@ -2514,6 +2495,20 @@ if test "$enable_advapi32_CreateRestrictedToken" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupPrivilegeName
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/lsa.c, dlls/advapi32/tests/lsa.c
|
||||
# |
|
||||
if test "$enable_advapi32_LsaLookupPrivilegeName" -eq 1; then
|
||||
patch_apply advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch
|
||||
patch_apply advapi32-LsaLookupPrivilegeName/0002-advapi32-Use-TRACE-for-LsaOpenPolicy-LsaClose.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "advapi32: Fix error code when calling LsaOpenPolicy for non existing remote machine.", 1 },';
|
||||
printf '%s\n' '+ { "Michael Müller", "advapi32: Use TRACE for LsaOpenPolicy/LsaClose.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2550,20 +2545,6 @@ if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupPrivilegeName
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/lsa.c, dlls/advapi32/tests/lsa.c
|
||||
# |
|
||||
if test "$enable_advapi32_LsaLookupPrivilegeName" -eq 1; then
|
||||
patch_apply advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch
|
||||
patch_apply advapi32-LsaLookupPrivilegeName/0002-advapi32-Use-TRACE-for-LsaOpenPolicy-LsaClose.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "advapi32: Fix error code when calling LsaOpenPolicy for non existing remote machine.", 1 },';
|
||||
printf '%s\n' '+ { "Michael Müller", "advapi32: Use TRACE for LsaOpenPolicy/LsaClose.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupSids
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
@ -3854,21 +3835,6 @@ if test "$enable_dxgi_GammaRamp" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dxgi-IDXGIDevice2
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#45080] - Add support for IDXGIDevice2 interface
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/dxgi/device.c, include/wine/winedxgi.idl
|
||||
# |
|
||||
if test "$enable_dxgi_IDXGIDevice2" -eq 1; then
|
||||
patch_apply dxgi-IDXGIDevice2/0001-dxgi-Add-IDXGIDevice2-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Nikolay Sivov", "dxgi: Add IDXGIDevice2 stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dxgi-MakeWindowAssociation
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -5497,18 +5463,6 @@ if test "$enable_ntdll_RtlGetUnloadEventTraceEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-RtlIpStringToAddress_Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
# |
|
||||
if test "$enable_ntdll_RtlIpStringToAddress_Stubs" -eq 1; then
|
||||
patch_apply ntdll-RtlIpStringToAddress_Stubs/0002-ntdll-Add-stub-for-RtlIpv6StringToAddressExW.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "ntdll: Add stub for RtlIpv6StringToAddressExW.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-RtlIpStringToAddress_Tests
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
@ -6722,25 +6676,6 @@ if test "$enable_shell32_SHELL_execute" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset shell32-SHFileOperation_Win9x
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, shell32-SHFileOperation_Move,
|
||||
# | shell32-Progress_Dialog
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37916] Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/shell32/shlfileop.c
|
||||
# |
|
||||
if test "$enable_shell32_SHFileOperation_Win9x" -eq 1; then
|
||||
patch_apply shell32-SHFileOperation_Win9x/0001-shell32-Choose-return-value-for-SHFileOperationW-dep.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "shell32: Choose return value for SHFileOperationW depending on windows version.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset shell32-Toolbar_Bitmaps
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From d606011cab7ce44de90b6945796deee86bacba44 Mon Sep 17 00:00:00 2001
|
||||
From 23e9d4f9e18d24215fbed8e595757163370fa073 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 24 Feb 2015 04:25:29 +0100
|
||||
Subject: [PATCH] shell32: Correct indentation in shfileop.c.
|
||||
|
||||
---
|
||||
dlls/shell32/shlfileop.c | 787 +++++++++++++++++++++++------------------------
|
||||
1 file changed, 393 insertions(+), 394 deletions(-)
|
||||
dlls/shell32/shlfileop.c | 794 +++++++++++++++++++++++------------------------
|
||||
1 file changed, 396 insertions(+), 398 deletions(-)
|
||||
|
||||
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
|
||||
index 117d668..975106a 100644
|
||||
index 9358980..260b4c2 100644
|
||||
--- a/dlls/shell32/shlfileop.c
|
||||
+++ b/dlls/shell32/shlfileop.c
|
||||
@@ -207,108 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H
|
||||
@ -824,7 +824,7 @@ index 117d668..975106a 100644
|
||||
}
|
||||
/*************************************************************************
|
||||
* SHFileOperationA [SHELL32.@]
|
||||
@@ -862,42 +861,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
|
||||
@@ -862,46 +861,45 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
|
||||
*/
|
||||
int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
|
||||
{
|
||||
@ -848,6 +848,10 @@ index 117d668..975106a 100644
|
||||
- if (ForFree)
|
||||
- {
|
||||
- retCode = SHFileOperationW(&nFileOp);
|
||||
- /* Windows 95/98 returns S_OK for this case. */
|
||||
- if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000))
|
||||
- retCode = S_OK;
|
||||
-
|
||||
- heap_free(ForFree); /* we cannot use wString, it was changed */
|
||||
- break;
|
||||
- }
|
||||
@ -884,6 +888,9 @@ index 117d668..975106a 100644
|
||||
+ if (ForFree)
|
||||
+ {
|
||||
+ retCode = SHFileOperationW(&nFileOp);
|
||||
+ /* Windows 95/98 returns S_OK for this case. */
|
||||
+ if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000))
|
||||
+ retCode = S_OK;
|
||||
+ heap_free(ForFree); /* we cannot use wString, it was changed */
|
||||
+ break;
|
||||
+ }
|
||||
@ -903,7 +910,7 @@ index 117d668..975106a 100644
|
||||
}
|
||||
|
||||
#define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026
|
||||
@@ -927,7 +926,7 @@ typedef struct
|
||||
@@ -931,7 +929,7 @@ typedef struct
|
||||
static inline void grow_list(FILE_LIST *list)
|
||||
{
|
||||
FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles,
|
||||
@ -912,7 +919,7 @@ index 117d668..975106a 100644
|
||||
list->feFiles = new;
|
||||
list->num_alloc *= 2;
|
||||
}
|
||||
@@ -1019,7 +1018,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
|
||||
@@ -1024,7 +1022,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
|
||||
/* empty list */
|
||||
if (!szFiles[0])
|
||||
return ERROR_ACCESS_DENIED;
|
||||
@ -921,7 +928,7 @@ index 117d668..975106a 100644
|
||||
flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY));
|
||||
|
||||
while (*ptr)
|
||||
@@ -1122,7 +1121,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
|
||||
@@ -1129,7 +1127,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
|
||||
/* Don't ask the user about overwriting files when he accepted to overwrite the
|
||||
folder. FIXME: this is not exactly what Windows does - e.g. there would be
|
||||
an additional confirmation for a nested folder */
|
||||
@ -930,7 +937,7 @@ index 117d668..975106a 100644
|
||||
|
||||
SHFileOperationW(&fileOp);
|
||||
}
|
||||
@@ -1335,7 +1334,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
|
||||
@@ -1342,7 +1340,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
|
||||
|
||||
/* Windows also checks only the first item */
|
||||
bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO)
|
||||
@ -939,7 +946,7 @@ index 117d668..975106a 100644
|
||||
|
||||
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING))
|
||||
if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))
|
||||
@@ -1370,11 +1369,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
|
||||
@@ -1377,11 +1375,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -953,7 +960,7 @@ index 117d668..975106a 100644
|
||||
else
|
||||
ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE);
|
||||
|
||||
@@ -1499,8 +1498,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con
|
||||
@@ -1506,8 +1504,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con
|
||||
static void check_flags(FILEOP_FLAGS fFlags)
|
||||
{
|
||||
WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS |
|
||||
@ -964,7 +971,7 @@ index 117d668..975106a 100644
|
||||
|
||||
if (fFlags & wUnsupportedFlags)
|
||||
FIXME("Unsupported flags: %04x\n", fFlags);
|
||||
@@ -1583,19 +1582,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
|
||||
@@ -1590,19 +1588,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
|
||||
*/
|
||||
void WINAPI SHFreeNameMappings(HANDLE hNameMapping)
|
||||
{
|
||||
@ -994,7 +1001,7 @@ index 117d668..975106a 100644
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -1701,14 +1700,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path)
|
||||
@@ -1708,14 +1706,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path)
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 2100778b424bd396931a5315f8eb2360675e7e68 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 31 Jul 2014 04:52:01 +0200
|
||||
Subject: [PATCH] shell32: Choose return value for SHFileOperationW
|
||||
depending on windows version
|
||||
|
||||
---
|
||||
dlls/shell32/shlfileop.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
|
||||
index d64d1d1..8076a99 100644
|
||||
--- a/dlls/shell32/shlfileop.c
|
||||
+++ b/dlls/shell32/shlfileop.c
|
||||
@@ -1055,7 +1055,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
|
||||
|
||||
/* empty list */
|
||||
if (!szFiles[0])
|
||||
- return ERROR_ACCESS_DENIED;
|
||||
+ return ERROR_ACCESS_DENIED; /* S_OK for Windows 95/98 */
|
||||
|
||||
flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY));
|
||||
|
||||
@@ -1571,7 +1571,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
|
||||
ZeroMemory(&flTo, sizeof(FILE_LIST));
|
||||
|
||||
if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom)))
|
||||
+ {
|
||||
+ if (ret != ERROR_ACCESS_DENIED)
|
||||
+ return ret;
|
||||
+
|
||||
+ /* Win 9X */
|
||||
+ if (GetVersion() & 0x80000000)
|
||||
+ return S_OK;
|
||||
+
|
||||
+ FIXME("The return value of this function call depends on the windows version.\n");
|
||||
+ FIXME("For old software it might be necessary to set the windows version to 95/98 using winecfg.\n");
|
||||
+
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
if (lpFileOp->wFunc != FO_DELETE)
|
||||
parse_file_list(&flTo, lpFileOp->pTo);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
Fixes: [37916] Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
|
||||
Depends: shell32-Progress_Dialog
|
||||
@ -1 +1 @@
|
||||
Wine Staging 3.8
|
||||
Wine Staging 3.9 (Unreleased)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user