mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch with stub for atl80.AtlIPersistPropertyBag_Save.
This commit is contained in:
Sebastian Lackner
parent
41f0cda558
commit
e44c30c64e
@ -39,8 +39,9 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [1]:**
|
||||
**Bug fixes and features included in the next upcoming release [2]:**
|
||||
|
||||
* Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
|
||||
* Improve ReadDataAvailable handling in FilePipeLocalInformation class
|
||||
|
||||
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -3,6 +3,7 @@ wine-staging (1.7.43) UNRELEASED; urgency=low
|
||||
* Updated patch to calculate msvcrt exponential math operations with higher precision (fixes Wine Staging Bug #268).
|
||||
* Added patch to improve ReadDataAvailable handling in FilePipeLocalInformation class.
|
||||
* Added patch with tests for shlwapi.AssocGetPerceivedType.
|
||||
* Added patch with stub for atl80.AtlIPersistPropertyBag_Save.
|
||||
* Removed patch to use lockfree implementation for FD cache (accepted upstream).
|
||||
* Removed patch to properly handle closing sockets during a select call (accepted upstream).
|
||||
* Removed patches to fix behaviour of VirtualProtect / NtProtectVirtualMemory (accepted upstream).
|
||||
|
||||
@ -0,0 +1,100 @@
|
||||
From d36d6e9c52001d6b2fd7ff5be98cfc1aca650694 Mon Sep 17 00:00:00 2001
|
||||
From: Qian Hong <qhong@codeweavers.com>
|
||||
Date: Wed, 16 Apr 2014 14:45:53 +0800
|
||||
Subject: atl: Added stub AtlIPersistPropertyBag_Save.
|
||||
|
||||
---
|
||||
dlls/atl/atl.c | 7 +++++++
|
||||
dlls/atl/atl.spec | 2 +-
|
||||
dlls/atl100/atl100.spec | 2 +-
|
||||
dlls/atl110/atl110.spec | 2 +-
|
||||
dlls/atl80/atl80.spec | 2 +-
|
||||
dlls/atl90/atl90.spec | 2 +-
|
||||
6 files changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c
|
||||
index 795ca9b..84c81f9 100644
|
||||
--- a/dlls/atl/atl.c
|
||||
+++ b/dlls/atl/atl.c
|
||||
@@ -285,6 +285,13 @@ HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pE
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
+HRESULT WINAPI AtlIPersistPropertyBag_Save(LPPROPERTYBAG pPropBag, int unknown1, int unknown2,
|
||||
+ ATL_PROPMAP_ENTRY *pMap, void *pThis, IUnknown *pUnk)
|
||||
+{
|
||||
+ FIXME("(%p, %x, %x, %p, %p, %p)\n", pPropBag, unknown1, unknown2, pMap, pThis, pUnk);
|
||||
+
|
||||
+ return S_OK;
|
||||
+}
|
||||
/***********************************************************************
|
||||
* AtlModuleAddTermFunc [atl100.@]
|
||||
*/
|
||||
diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec
|
||||
index aa0f44b..466f07a 100644
|
||||
--- a/dlls/atl/atl.spec
|
||||
+++ b/dlls/atl/atl.spec
|
||||
@@ -44,7 +44,7 @@
|
||||
50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
|
||||
51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
|
||||
52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
|
||||
-53 stub AtlIPersistPropertyBag_Save
|
||||
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr)
|
||||
54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
|
||||
55 stub AtlModuleUnRegisterTypeLib
|
||||
56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr)
|
||||
diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec
|
||||
index 25fad3d..80b4b16 100644
|
||||
--- a/dlls/atl100/atl100.spec
|
||||
+++ b/dlls/atl100/atl100.spec
|
||||
@@ -36,7 +36,7 @@
|
||||
50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
|
||||
51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
|
||||
52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
|
||||
-53 stub AtlIPersistPropertyBag_Save
|
||||
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
|
||||
54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
|
||||
56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
|
||||
58 stdcall AtlModuleAddTermFunc(ptr ptr long)
|
||||
diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec
|
||||
index 25fad3d..80b4b16 100644
|
||||
--- a/dlls/atl110/atl110.spec
|
||||
+++ b/dlls/atl110/atl110.spec
|
||||
@@ -36,7 +36,7 @@
|
||||
50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
|
||||
51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
|
||||
52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
|
||||
-53 stub AtlIPersistPropertyBag_Save
|
||||
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
|
||||
54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
|
||||
56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
|
||||
58 stdcall AtlModuleAddTermFunc(ptr ptr long)
|
||||
diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec
|
||||
index f313944..e82fba0 100644
|
||||
--- a/dlls/atl80/atl80.spec
|
||||
+++ b/dlls/atl80/atl80.spec
|
||||
@@ -38,7 +38,7 @@
|
||||
50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
|
||||
51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
|
||||
52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
|
||||
-53 stub AtlIPersistPropertyBag_Save
|
||||
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
|
||||
54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
|
||||
55 stub AtlUnRegisterTypeLib
|
||||
56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
|
||||
diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec
|
||||
index 25fad3d..80b4b16 100644
|
||||
--- a/dlls/atl90/atl90.spec
|
||||
+++ b/dlls/atl90/atl90.spec
|
||||
@@ -36,7 +36,7 @@
|
||||
50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
|
||||
51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
|
||||
52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
|
||||
-53 stub AtlIPersistPropertyBag_Save
|
||||
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
|
||||
54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
|
||||
56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
|
||||
58 stdcall AtlModuleAddTermFunc(ptr ptr long)
|
||||
--
|
||||
2.3.7
|
||||
|
||||
@ -81,6 +81,7 @@ patch_enable_all ()
|
||||
enable_Staging="$1"
|
||||
enable_advapi32_ImpersonateAnonymousToken="$1"
|
||||
enable_advapi32_LsaLookupSids="$1"
|
||||
enable_atl_AtlIPersistPropertyBag_Save="$1"
|
||||
enable_browseui_Progress_Dialog="$1"
|
||||
enable_category_stable="$1"
|
||||
enable_combase_String="$1"
|
||||
@ -295,6 +296,9 @@ patch_enable ()
|
||||
advapi32-LsaLookupSids)
|
||||
enable_advapi32_LsaLookupSids="$2"
|
||||
;;
|
||||
atl-AtlIPersistPropertyBag_Save)
|
||||
enable_atl_AtlIPersistPropertyBag_Save="$2"
|
||||
;;
|
||||
browseui-Progress_Dialog)
|
||||
enable_browseui_Progress_Dialog="$2"
|
||||
;;
|
||||
@ -1746,23 +1750,6 @@ if test "$enable_advapi32_ImpersonateAnonymousToken" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Misc_ACL
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
|
||||
# |
|
||||
if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
|
||||
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -1782,6 +1769,23 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Misc_ACL
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
|
||||
# |
|
||||
if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
|
||||
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupSids
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -1806,6 +1810,22 @@ if test "$enable_advapi32_LsaLookupSids" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset atl-AtlIPersistPropertyBag_Save
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33888] Add stub for atl80.AtlIPersistPropertyBag_Save
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/atl/atl.c, dlls/atl/atl.spec, dlls/atl100/atl100.spec, dlls/atl110/atl110.spec, dlls/atl80/atl80.spec,
|
||||
# | dlls/atl90/atl90.spec
|
||||
# |
|
||||
if test "$enable_atl_AtlIPersistPropertyBag_Save" -eq 1; then
|
||||
patch_apply atl-AtlIPersistPropertyBag_Save/0001-atl-Added-stub-AtlIPersistPropertyBag_Save.patch
|
||||
(
|
||||
echo '+ { "Qian Hong", "atl: Added stub AtlIPersistPropertyBag_Save.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset browseui-Progress_Dialog
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user