mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 530d269e0187f2d0b406f8d5e3c4de974bf553ae.
This commit is contained in:
Sebastian Lackner
parent
2a1d1a0086
commit
92379575c7
@ -64,8 +64,8 @@ for more details.*
|
||||
* Add implementation for shlwapi.AssocGetPerceivedType
|
||||
* Add nvapi stubs required for GPU PhysX support
|
||||
* Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
|
||||
* Add semi-stub for GetFileVersionInfoExA/W ([Wine Bug #38098](https://bugs.winehq.org/show_bug.cgi?id=38098))
|
||||
* Add semi-stub for GetFileVersionInfoSizeExA/W ([Wine Bug #38090](https://bugs.winehq.org/show_bug.cgi?id=38090))
|
||||
* ~~Add semi-stub for GetFileVersionInfoExA/W~~ ([Wine Bug #38098](https://bugs.winehq.org/show_bug.cgi?id=38098))
|
||||
* ~~Add semi-stub for GetFileVersionInfoSizeExA/W~~ ([Wine Bug #38090](https://bugs.winehq.org/show_bug.cgi?id=38090))
|
||||
* Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
|
||||
* Add stub for D3DXComputeNormalMap
|
||||
* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
|
||||
@ -73,7 +73,7 @@ for more details.*
|
||||
* Add stub for D3DXIntersect
|
||||
* Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
|
||||
* ~~Add stub for advapi32.ImpersonateAnonymousToken~~
|
||||
* Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
|
||||
* ~~Add stub for atl80.AtlIPersistPropertyBag_Save~~ ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
|
||||
* Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
|
||||
* Add stub for fltlib.FilterLoad ([Wine Bug #38435](https://bugs.winehq.org/show_bug.cgi?id=38435))
|
||||
* Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
|
||||
|
||||
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -26,8 +26,11 @@ wine-staging (1.7.44) UNRELEASED; urgency=low
|
||||
* Removed patches for Win32_SystemEnclosure support (accepted upstream).
|
||||
* Removed patch with tests for CoWaitForMultipleHandles and WM_QUIT (accepted
|
||||
upstream).
|
||||
* Removed patches for AtlIPersistPropertyBag_Save stub (accepted upstream).
|
||||
* Removed patches for \Device\Null driver (fixed upstream with alternative
|
||||
solution).
|
||||
* Removed patches for semi-stub of GetFileVersionInfo[Size]ExA/W (fixed
|
||||
upstream).
|
||||
* Partially removed patches for ITextFont/ITextPara implementation (fixed
|
||||
upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Wed, 20 May 2015 05:55:09 +0200
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
Fixes: [33888] Add stub for atl80.AtlIPersistPropertyBag_Save
|
||||
Category: stable
|
||||
@ -55,7 +55,7 @@ version()
|
||||
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
echo " commit 98b991fdcf3f2cdbdae7d61203367ce9728a5e6d"
|
||||
echo " commit 530d269e0187f2d0b406f8d5e3c4de974bf553ae"
|
||||
echo ""
|
||||
}
|
||||
|
||||
@ -81,7 +81,6 @@ patch_enable_all ()
|
||||
enable_Staging="$1"
|
||||
enable_advapi32_LsaLookupSids="$1"
|
||||
enable_advapi32_OpenSCManagerW="$1"
|
||||
enable_atl_AtlIPersistPropertyBag_Save="$1"
|
||||
enable_browseui_ACLShell_IEnumString="$1"
|
||||
enable_browseui_Progress_Dialog="$1"
|
||||
enable_category_stable="$1"
|
||||
@ -236,7 +235,6 @@ patch_enable_all ()
|
||||
enable_user32_WndProc="$1"
|
||||
enable_vcomp_Stub_Functions="$1"
|
||||
enable_version_VerQueryValue="$1"
|
||||
enable_version_VersionInfoEx="$1"
|
||||
enable_wbemdisp_ISWbemSecurity="$1"
|
||||
enable_wbemprox_Whitespace="$1"
|
||||
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
|
||||
@ -304,9 +302,6 @@ patch_enable ()
|
||||
advapi32-OpenSCManagerW)
|
||||
enable_advapi32_OpenSCManagerW="$2"
|
||||
;;
|
||||
atl-AtlIPersistPropertyBag_Save)
|
||||
enable_atl_AtlIPersistPropertyBag_Save="$2"
|
||||
;;
|
||||
browseui-ACLShell_IEnumString)
|
||||
enable_browseui_ACLShell_IEnumString="$2"
|
||||
;;
|
||||
@ -769,9 +764,6 @@ patch_enable ()
|
||||
version-VerQueryValue)
|
||||
enable_version_VerQueryValue="$2"
|
||||
;;
|
||||
version-VersionInfoEx)
|
||||
enable_version_VersionInfoEx="$2"
|
||||
;;
|
||||
wbemdisp-ISWbemSecurity)
|
||||
enable_wbemdisp_ISWbemSecurity="$2"
|
||||
;;
|
||||
@ -1260,9 +1252,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
if test "$enable_advapi32_OpenSCManagerW" -gt 1; then
|
||||
abort "Patchset advapi32-OpenSCManagerW disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_atl_AtlIPersistPropertyBag_Save" -gt 1; then
|
||||
abort "Patchset atl-AtlIPersistPropertyBag_Save disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_combase_String" -gt 1; then
|
||||
abort "Patchset combase-String disabled, but category-stable depends on that."
|
||||
fi
|
||||
@ -1452,9 +1441,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
if test "$enable_user32_WndProc" -gt 1; then
|
||||
abort "Patchset user32-WndProc disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_version_VersionInfoEx" -gt 1; then
|
||||
abort "Patchset version-VersionInfoEx disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_windowscodecs_GIF_Decoder" -gt 1; then
|
||||
abort "Patchset windowscodecs-GIF_Decoder disabled, but category-stable depends on that."
|
||||
fi
|
||||
@ -1524,7 +1510,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
enable_Compiler_Warnings=1
|
||||
enable_Staging=1
|
||||
enable_advapi32_OpenSCManagerW=1
|
||||
enable_atl_AtlIPersistPropertyBag_Save=1
|
||||
enable_combase_String=1
|
||||
enable_configure_Absolute_RPATH=1
|
||||
enable_d3d11_D3D11CreateDeviceAndSwapChain=1
|
||||
@ -1588,7 +1573,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
enable_user32_DrawTextExW=1
|
||||
enable_user32_GetRawInputDeviceList=1
|
||||
enable_user32_WndProc=1
|
||||
enable_version_VersionInfoEx=1
|
||||
enable_windowscodecs_GIF_Decoder=1
|
||||
enable_wine_inf_Performance=1
|
||||
enable_wine_inf_ProfileList_UserSID=1
|
||||
@ -1764,13 +1748,6 @@ if test "$enable_kernel32_CopyFileEx" -eq 1; then
|
||||
enable_ntdll_FileDispositionInformation=1
|
||||
fi
|
||||
|
||||
if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
if test "$enable_server_File_Permissions" -gt 1; then
|
||||
abort "Patchset server-File_Permissions disabled, but ntdll-FileDispositionInformation depends on that."
|
||||
fi
|
||||
enable_server_File_Permissions=1
|
||||
fi
|
||||
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
if test "$enable_kernel32_SetFileCompletionNotificationMode" -gt 1; then
|
||||
abort "Patchset kernel32-SetFileCompletionNotificationMode disabled, but kernel32-SetFileInformationByHandle depends on that."
|
||||
@ -1778,6 +1755,13 @@ if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
enable_kernel32_SetFileCompletionNotificationMode=1
|
||||
fi
|
||||
|
||||
if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
if test "$enable_server_File_Permissions" -gt 1; then
|
||||
abort "Patchset server-File_Permissions disabled, but ntdll-FileDispositionInformation depends on that."
|
||||
fi
|
||||
enable_server_File_Permissions=1
|
||||
fi
|
||||
|
||||
if test "$enable_dxva2_Video_Decoder" -eq 1; then
|
||||
if test "$enable_winecfg_Staging" -gt 1; then
|
||||
abort "Patchset winecfg-Staging disabled, but dxva2-Video_Decoder depends on that."
|
||||
@ -2069,22 +2053,6 @@ if test "$enable_advapi32_OpenSCManagerW" -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-ACLShell_IEnumString
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2650,6 +2618,18 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset makedep-PARENTSPEC
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * tools/makedep.c
|
||||
# |
|
||||
if test "$enable_makedep_PARENTSPEC" -eq 1; then
|
||||
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DllRedirects
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2670,18 +2650,6 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset makedep-PARENTSPEC
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * tools/makedep.c
|
||||
# |
|
||||
if test "$enable_makedep_PARENTSPEC" -eq 1; then
|
||||
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Helper
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -3389,36 +3357,6 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileCompletionNotificationMode
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38493] Add stub for kernel32.SetFileCompletionNotificationModes (for Steam in Win7 mode)
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/file.c,
|
||||
# | dlls/kernel32/kernel32.spec, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileCompletionNotificationMode" -eq 1; then
|
||||
patch_apply kernel32-SetFileCompletionNotificationMode/0001-kernel32-Implement-SetFileCompletionNotificationMode.patch
|
||||
(
|
||||
echo '+ { "Olivier F. R. Dierick", "kernel32: Implement SetFileCompletionNotificationModes as a stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -3460,6 +3398,36 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileCompletionNotificationMode
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38493] Add stub for kernel32.SetFileCompletionNotificationModes (for Steam in Win7 mode)
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/file.c,
|
||||
# | dlls/kernel32/kernel32.spec, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileCompletionNotificationMode" -eq 1; then
|
||||
patch_apply kernel32-SetFileCompletionNotificationMode/0001-kernel32-Implement-SetFileCompletionNotificationMode.patch
|
||||
(
|
||||
echo '+ { "Olivier F. R. Dierick", "kernel32: Implement SetFileCompletionNotificationModes as a stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-CopyFileEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5154,24 +5122,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset version-VersionInfoEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38098] Add semi-stub for GetFileVersionInfoExA/W
|
||||
# | * [#38090] Add semi-stub for GetFileVersionInfoSizeExA/W
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/version/version.c
|
||||
# |
|
||||
if test "$enable_version_VersionInfoEx" -eq 1; then
|
||||
patch_apply version-VersionInfoEx/0001-version-Partially-implement-GetFileVersionInfoSizeEx.patch
|
||||
patch_apply version-VersionInfoEx/0002-version-Partially-implement-GetFileVersionInfoExA-W.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "version: Partially implement GetFileVersionInfoSizeExA/W.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "version: Partially implement GetFileVersionInfoExA/W.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wbemdisp-ISWbemSecurity
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From e230400e6ef35d424d13cbe9cc29e6cd1ffe6fad Mon Sep 17 00:00:00 2001
|
||||
From a8dab628933aafdbdd63758763de47955fd1171c Mon Sep 17 00:00:00 2001
|
||||
From: Jactry Zeng <wine@jactry.com>
|
||||
Date: Mon, 11 Aug 2014 13:51:55 +0800
|
||||
Subject: riched20: Stub for ITextFont interface and implement
|
||||
ITextRange::GetFont and ITextSelection::GetFont.
|
||||
|
||||
---
|
||||
dlls/riched20/richole.c | 172 ++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/riched20/tests/richole.c | 93 +++++++++++++++++++++++
|
||||
2 files changed, 265 insertions(+)
|
||||
dlls/riched20/richole.c | 60 ++++++++++++++++++++++++++++
|
||||
dlls/riched20/tests/richole.c | 93 +++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 153 insertions(+)
|
||||
|
||||
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
|
||||
index e09e771..de70bc3 100644
|
||||
index b6f047c..8713e28 100644
|
||||
--- a/dlls/riched20/richole.c
|
||||
+++ b/dlls/riched20/richole.c
|
||||
@@ -1960,6 +1960,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
|
||||
@@ -2124,6 +2124,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, pFont);
|
||||
@ -24,7 +24,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -1967,6 +1971,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
|
||||
@@ -2131,6 +2135,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, ret);
|
||||
@ -35,7 +35,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -1974,6 +1982,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
|
||||
@@ -2138,6 +2146,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p %p): stub\n", This, font, ret);
|
||||
@ -46,7 +46,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2001,6 +2013,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
|
||||
@@ -2305,6 +2317,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
@ -57,7 +57,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2008,6 +2024,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
|
||||
@@ -2312,6 +2328,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -68,18 +68,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2015,6 +2035,10 @@ static HRESULT WINAPI TextFont_GetAllCaps(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2022,6 +2046,10 @@ static HRESULT WINAPI TextFont_SetAllCaps(ITextFont *iface, LONG value)
|
||||
@@ -2340,6 +2360,10 @@ static HRESULT WINAPI TextFont_SetAnimation(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -90,18 +79,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2029,6 +2057,10 @@ static HRESULT WINAPI TextFont_GetAnimation(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2036,6 +2068,10 @@ static HRESULT WINAPI TextFont_SetAnimation(ITextFont *iface, LONG value)
|
||||
@@ -2354,6 +2378,10 @@ static HRESULT WINAPI TextFont_SetBackColor(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -112,18 +90,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2043,6 +2079,10 @@ static HRESULT WINAPI TextFont_GetBackColor(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2050,6 +2090,10 @@ static HRESULT WINAPI TextFont_SetBackColor(ITextFont *iface, LONG value)
|
||||
@@ -2396,6 +2424,10 @@ static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -134,117 +101,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2064,6 +2108,10 @@ static HRESULT WINAPI TextFont_SetBold(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2071,6 +2119,10 @@ static HRESULT WINAPI TextFont_GetEmboss(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2078,6 +2130,10 @@ static HRESULT WINAPI TextFont_SetEmboss(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2092,6 +2148,10 @@ static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2099,6 +2159,10 @@ static HRESULT WINAPI TextFont_GetHidden(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2106,6 +2170,10 @@ static HRESULT WINAPI TextFont_SetHidden(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2113,6 +2181,10 @@ static HRESULT WINAPI TextFont_GetEngrave(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2120,6 +2192,10 @@ static HRESULT WINAPI TextFont_SetEngrave(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2134,6 +2210,10 @@ static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2141,6 +2221,10 @@ static HRESULT WINAPI TextFont_GetKerning(ITextFont *iface, FLOAT *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2148,6 +2232,10 @@ static HRESULT WINAPI TextFont_SetKerning(ITextFont *iface, FLOAT value)
|
||||
@@ -2452,6 +2484,10 @@ static HRESULT WINAPI TextFont_SetKerning(ITextFont *iface, FLOAT value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%.2f): stub\n", This, value);
|
||||
@ -255,7 +112,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2162,6 +2250,10 @@ static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value)
|
||||
@@ -2466,6 +2502,10 @@ static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -266,7 +123,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2198,6 +2290,10 @@ static HRESULT WINAPI TextFont_SetName(ITextFont *iface, BSTR value)
|
||||
@@ -2495,6 +2535,10 @@ static HRESULT WINAPI TextFont_SetName(ITextFont *iface, BSTR value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%s): stub\n", This, debugstr_w(value));
|
||||
@ -277,40 +134,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2205,6 +2301,10 @@ static HRESULT WINAPI TextFont_GetOutline(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2212,6 +2312,10 @@ static HRESULT WINAPI TextFont_SetOutline(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2219,6 +2323,10 @@ static HRESULT WINAPI TextFont_GetPosition(ITextFont *iface, FLOAT *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2226,6 +2334,10 @@ static HRESULT WINAPI TextFont_SetPosition(ITextFont *iface, FLOAT value)
|
||||
@@ -2523,6 +2567,10 @@ static HRESULT WINAPI TextFont_SetPosition(ITextFont *iface, FLOAT value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%.2f): stub\n", This, value);
|
||||
@ -321,51 +145,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2233,6 +2345,10 @@ static HRESULT WINAPI TextFont_GetProtected(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2240,6 +2356,10 @@ static HRESULT WINAPI TextFont_SetProtected(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2247,6 +2367,10 @@ static HRESULT WINAPI TextFont_GetShadow(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2254,6 +2378,10 @@ static HRESULT WINAPI TextFont_SetShadow(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2268,6 +2396,10 @@ static HRESULT WINAPI TextFont_SetSize(ITextFont *iface, FLOAT value)
|
||||
@@ -2565,6 +2613,10 @@ static HRESULT WINAPI TextFont_SetSize(ITextFont *iface, FLOAT value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%.2f): stub\n", This, value);
|
||||
@ -376,40 +156,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2275,6 +2407,10 @@ static HRESULT WINAPI TextFont_GetSmallCaps(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2282,6 +2418,10 @@ static HRESULT WINAPI TextFont_SetSmallCaps(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2289,6 +2429,10 @@ static HRESULT WINAPI TextFont_GetSpacing(ITextFont *iface, FLOAT *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2296,6 +2440,10 @@ static HRESULT WINAPI TextFont_SetSpacing(ITextFont *iface, FLOAT value)
|
||||
@@ -2593,6 +2645,10 @@ static HRESULT WINAPI TextFont_SetSpacing(ITextFont *iface, FLOAT value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%.2f): stub\n", This, value);
|
||||
@ -420,62 +167,7 @@ index e09e771..de70bc3 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2310,6 +2458,10 @@ static HRESULT WINAPI TextFont_SetStrikeThrough(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2324,6 +2476,10 @@ static HRESULT WINAPI TextFont_SetSubscript(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2338,6 +2494,10 @@ static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2352,6 +2512,10 @@ static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2359,6 +2523,10 @@ static HRESULT WINAPI TextFont_GetWeight(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+
|
||||
+ if (This->range && !get_range_reole(This->range))
|
||||
+ return CO_E_RELEASED;
|
||||
+
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2366,6 +2534,10 @@ static HRESULT WINAPI TextFont_SetWeight(ITextFont *iface, LONG value)
|
||||
@@ -2663,6 +2719,10 @@ static HRESULT WINAPI TextFont_SetWeight(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -487,10 +179,10 @@ index e09e771..de70bc3 100644
|
||||
}
|
||||
|
||||
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
|
||||
index dbd8dd2..8b72a1d 100644
|
||||
index cd31241..7822c82 100644
|
||||
--- a/dlls/riched20/tests/richole.c
|
||||
+++ b/dlls/riched20/tests/richole.c
|
||||
@@ -2165,6 +2165,97 @@ static void test_ITextSelection_SetEnd(void)
|
||||
@@ -2532,6 +2532,97 @@ static void test_ITextSelection_SetEnd(void)
|
||||
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
|
||||
}
|
||||
|
||||
@ -588,7 +280,7 @@ index dbd8dd2..8b72a1d 100644
|
||||
START_TEST(richole)
|
||||
{
|
||||
/* Must explicitly LoadLibrary(). The test has no references to functions in
|
||||
@@ -2180,6 +2271,7 @@ START_TEST(richole)
|
||||
@@ -2547,6 +2638,7 @@ START_TEST(richole)
|
||||
test_ITextSelection_SetStart();
|
||||
test_ITextSelection_SetEnd();
|
||||
test_ITextSelection_Collapse();
|
||||
@ -596,7 +288,7 @@ index dbd8dd2..8b72a1d 100644
|
||||
test_ITextDocument_Range();
|
||||
test_ITextRange_GetChar();
|
||||
test_ITextRange_GetStart_GetEnd();
|
||||
@@ -2187,6 +2279,7 @@ START_TEST(richole)
|
||||
@@ -2554,6 +2646,7 @@ START_TEST(richole)
|
||||
test_ITextRange_Collapse();
|
||||
test_ITextRange_SetStart();
|
||||
test_ITextRange_SetEnd();
|
||||
@ -605,5 +297,5 @@ index dbd8dd2..8b72a1d 100644
|
||||
test_IOleWindow_GetWindow();
|
||||
test_IOleInPlaceSite_GetWindow();
|
||||
--
|
||||
2.4.0
|
||||
2.4.1
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
From ec06a4056cf8d7559020027563ce34e0158cda8a Mon Sep 17 00:00:00 2001
|
||||
From 558b5a06aba3d383eaf749b1a66fda1e30eb1bf1 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 1 Nov 2014 22:51:34 +0100
|
||||
Subject: riched20: Silence repeated FIXMEs triggered by Adobe Reader.
|
||||
|
||||
Adobe Reader calls these functions very often while scrolling through a document.
|
||||
---
|
||||
dlls/riched20/richole.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
dlls/riched20/richole.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
|
||||
index 438de75..e722ef7 100644
|
||||
index e7aedaf..a189a49 100644
|
||||
--- a/dlls/riched20/richole.c
|
||||
+++ b/dlls/riched20/richole.c
|
||||
@@ -495,6 +495,14 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R
|
||||
@@ -658,6 +658,14 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R
|
||||
IUnknown_AddRef((IUnknown *)*ppvObj);
|
||||
return S_OK;
|
||||
}
|
||||
@ -27,18 +27,7 @@ index 438de75..e722ef7 100644
|
||||
FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid));
|
||||
|
||||
return E_NOINTERFACE;
|
||||
@@ -2587,7 +2595,9 @@ static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value)
|
||||
static HRESULT WINAPI TextFont_GetWeight(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
- FIXME("(%p)->(%p): stub\n", This, value);
|
||||
+ static int once;
|
||||
+
|
||||
+ if (!once++) FIXME("(%p)->(%p): stub\n", This, value);
|
||||
|
||||
if (This->range && !get_range_reole(This->range))
|
||||
return CO_E_RELEASED;
|
||||
@@ -2885,7 +2895,9 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
|
||||
@@ -3086,7 +3094,9 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
|
||||
static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
|
||||
{
|
||||
ITextParaImpl *This = impl_from_ITextPara(iface);
|
||||
@ -50,5 +39,5 @@ index 438de75..e722ef7 100644
|
||||
if (!para_get_reole(This))
|
||||
return CO_E_RELEASED;
|
||||
--
|
||||
2.4.0
|
||||
2.4.1
|
||||
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 4f229be6791dc87236ef8fc9941a5c0ecbe16f1f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 21 Feb 2015 10:56:43 +0100
|
||||
Subject: version: Partially implement GetFileVersionInfoSizeExA/W.
|
||||
|
||||
Based on a patch by Austin English.
|
||||
---
|
||||
dlls/version/version.c | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/version/version.c b/dlls/version/version.c
|
||||
index 680fa31..18bf74c 100644
|
||||
--- a/dlls/version/version.c
|
||||
+++ b/dlls/version/version.c
|
||||
@@ -1619,9 +1619,9 @@ DWORD WINAPI VerInstallFileW(
|
||||
*/
|
||||
DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle)
|
||||
{
|
||||
- FIXME("stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle);
|
||||
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
- return 0;
|
||||
+ FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle);
|
||||
+ return GetFileVersionInfoSizeA(filename, handle);
|
||||
+
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
@@ -1629,9 +1629,8 @@ DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD han
|
||||
*/
|
||||
DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle)
|
||||
{
|
||||
- FIXME("stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle);
|
||||
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
- return 0;
|
||||
+ FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle);
|
||||
+ return GetFileVersionInfoSizeW(filename, handle);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 219afe0784e5177b592da4e4ab9b42efc155f1e4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 21 Feb 2015 11:07:14 +0100
|
||||
Subject: version: Partially implement GetFileVersionInfoExA/W.
|
||||
|
||||
Based on a patch by Austin English.
|
||||
---
|
||||
dlls/version/version.c | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/version/version.c b/dlls/version/version.c
|
||||
index 18bf74c..2189445 100644
|
||||
--- a/dlls/version/version.c
|
||||
+++ b/dlls/version/version.c
|
||||
@@ -1638,9 +1638,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD ha
|
||||
*/
|
||||
BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data)
|
||||
{
|
||||
- FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data);
|
||||
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
- return 0;
|
||||
+ FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data);
|
||||
+ return GetFileVersionInfoA(filename, handle, len, data);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
@@ -1648,7 +1647,6 @@ BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DW
|
||||
*/
|
||||
BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data)
|
||||
{
|
||||
- FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data);
|
||||
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
- return 0;
|
||||
+ FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data);
|
||||
+ return GetFileVersionInfoW(filename, handle, len, data);
|
||||
}
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
Fixes: [38098] Add semi-stub for GetFileVersionInfoExA/W
|
||||
Fixes: [38090] Add semi-stub for GetFileVersionInfoSizeExA/W
|
||||
Category: stable
|
||||
Loading…
Reference in New Issue
Block a user