Compare commits

..

107 Commits

Author SHA1 Message Date
Sebastian Lackner
1f2899cb9f Release 1.9.8. 2016-04-17 17:09:14 +02:00
Sebastian Lackner
dd46af2590 Added patch to fix handling of wildcard paths in GetShortPathName and GetLongPathName. 2016-04-17 15:29:19 +02:00
Sebastian Lackner
6197fa1681 ntdll-Dealloc_Thread_Stack: Temporarily reenable patchset.
Without this patch, 64-bit MSYS2 runs into a STATUS_CONFLICTING_ADDRESSES
issue on x86_64 during fork(). This patch is not a proper solution, so it
will be disabled again in one of the future versions.
2016-04-17 08:32:52 +02:00
Sebastian Lackner
0946354641 user32-PNG_Support: Set EXTRAINCL variable in Makefile.in. 2016-04-17 02:19:37 +02:00
Sebastian Lackner
2354855786 Added patch to fix a bug when exception handling triggers stack guard page. 2016-04-17 01:28:17 +02:00
Sebastian Lackner
578398f0ab Added patch with tests for wbemprox ASSOCIATORS queries. 2016-04-16 22:59:37 +02:00
Sebastian Lackner
d8d1cf2e35 Added patch to trigger stack overflow exception earlier on x86_64. 2016-04-16 22:45:16 +02:00
Sebastian Lackner
4b7dbb610b Added patch with stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW. 2016-04-16 21:15:16 +02:00
Sebastian Lackner
181ad80116 Added patch to fix a typo in a wined3d TRACE message. 2016-04-16 19:15:43 +02:00
Sebastian Lackner
b57004bc38 Added patch to improve compatibility of 64-bit support for OS X. 2016-04-16 16:30:58 +02:00
Sebastian Lackner
7fefd606b8 Rebase against f0429adbffce1f67b88b8c0a3e3a5badb6d6526e.
[compobj.dll16-StringFromGUID2]
Removed patch to fix implementation of compobj.dll16.StringFromGUID2 function
(accepted upstream).

[ntdll-Stack_Guard_Pages]
Removed patch to handle stack guard pages on x86_64 (accepted upstream).

[windowscodecs-PNG_Fixes]
Removed patch to allocate correct amount of memory for PNG image data (accepted
upstream).
2016-04-15 23:58:01 +02:00
Sebastian Lackner
7cbb25d95d Rebase against ee9ae29a55b12b2c657f968fd3a958d72ecd7857. 2016-04-14 19:02:36 +02:00
Sebastian Lackner
1a8a066920 Added patches for various improvements in wineps.drv. 2016-04-13 20:40:50 +02:00
Sebastian Lackner
141fc0844c Added patch to ignore invalid exit_frame when exiting thread.
This makes the ntdll-Dealloc_Thread_Stack patchset unnecessary.
2016-04-13 06:52:45 +02:00
Sebastian Lackner
95ff86b496 Added patch to use a separate stack when starting new threads. 2016-04-13 06:50:22 +02:00
Sebastian Lackner
579d7f8032 Removed disabled patchset user32-Dialog_Owner.
A rebased version of the remaining tests got upstream.
2016-04-12 23:00:20 +02:00
Sebastian Lackner
84922f9148 Rebase against 944190bad442f19fba5e0073d284469bd2329652. 2016-04-12 20:18:38 +02:00
Sebastian Lackner
402b8c4972 Added patch to improve handling of builtin frames for x86_64 when switching stacks. 2016-04-12 20:12:28 +02:00
Sebastian Lackner
b8b8585286 Added patch for feclient stub dll. 2016-04-12 07:00:54 +02:00
Sebastian Lackner
8064151dce Rebase against 1c201a96c57a68caaf6c976d7f3732738c9d9ac8. 2016-04-11 20:59:54 +02:00
Sebastian Lackner
cb89c75141 Added patch to implement support for async handling in InternetReadFile. 2016-04-09 08:30:09 +02:00
Sebastian Lackner
b4a404a22a Added patch to implement support for loading PNG icon files. 2016-04-09 07:53:48 +02:00
Sebastian Lackner
38db26b6d9 Rebase against ad7cb436571ec66ae7a5687568fca2f5318c7e76. 2016-04-08 18:34:13 +02:00
Sebastian Lackner
acd63ecddd Removed disabled patchset wined3d-MESA_GPU_Info.
The feature has already been integrated into the development branch.
2016-04-08 18:07:48 +02:00
Sebastian Lackner
1e7df1a0d8 Removed patch to rename wined3d_resource_(un)map to wined3d_resource_sub_resource_(un)map.
The patch was initially added for compatibility with the old CSMT patchset.
2016-04-08 18:07:31 +02:00
Sebastian Lackner
16975cdd43 api-ms-win-Stub_DLLs: Synchronize ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 spec file. 2016-04-08 02:46:33 +02:00
Sebastian Lackner
57dde8e88f Rebase against aaddf1365a3371263827206eedf1464a83562c00.
[msi-Fix_Stack_Alignment]
Removed patch to fix stack alignment in CUSTOMPROC_wrapper function (accepted
upstream).

[ntdll-FSCTL_PIPE_LISTEN]
Removed patch to avoid updating iosb.Status after FSCTL_PIPE_LISTEN call
(accepted upstream).

[user32-FlashWindowEx]
Removed patch to avoid dereferencing NULL pointer in a trace (accepted
upstream).

[windowscodecs-PNG_Fixes]
Removed patch to fix a copy/paste mistake (accepted upstream).

[winex11-Desktop_Resolution]
Removed patch to allow 320x240 as supported resolution in desktop mode
(accepted upstream).
2016-04-08 02:46:33 +02:00
Sebastian Lackner
e8ef34b3a1 Removed patch to fix cross-compilation of 32-bit Wine on OSX.
On Clang 3.5 passing "-m32" implicitly enabled SSE2 support. In newer versions
of Clang this issue was fixed, so the patch has no effect anymore, and a
different solution is required to fix various build failures related to SSE2
support. Ideally Wine should automatically set it when compiling such
components, but for now we pass CFLAGS="-msse2" in the build scripts to work
around this bug.

In addition, there are several bugs in the cctools-port crosscompiling
toolchain - at several places host architecture and target architecture are
mixed up, leading to build failures when the toolchain was built for a 64-bit
host system and trying to compile for a 32-bit target. For our build servers,
we now apply patches to fix those issues properly. A quick&dirty workaround
would be to keep the CFLAGS="-m32".
2016-04-08 02:34:12 +02:00
Sebastian Lackner
7ffe842cc0 shell32-File_Property_Dialog: Add reference to bug report. 2016-04-07 00:14:28 +02:00
Sebastian Lackner
640d075440 winex11-_NET_ACTIVE_WINDOW: Update patchset. 2016-04-06 18:51:03 +02:00
Sebastian Lackner
49ea937be3 Added patches to fix multiple minor issues in Wines windowscodecs implementation. 2016-04-06 18:43:29 +02:00
Sebastian Lackner
476a9c608e Rebase against be91fcd879a1de768a57b4a06be470c10313b08d.
[advapi32-RegNotifyChangeKeyValue]
Removed patch to fix return value of RegNotifyChangeKeyValue for pending events
(accepted upstream).
2016-04-05 22:35:54 +02:00
Sebastian Lackner
1f66129ef4 reg-Implement_Query: Update patchset. 2016-04-05 00:42:31 +02:00
Sebastian Lackner
1fa34cfef0 wined3d-Silence_FIXMEs: Added patch to display gl_blend_op FIXME only once when op is 0. 2016-04-05 00:33:14 +02:00
Sebastian Lackner
f427133a03 msvfw32-ICGetDisplayFormat: Added various fixes for stride handling. 2016-04-04 23:47:02 +02:00
Sebastian Lackner
fb87fbb11d Rebase against f6c10b8a75943dc3a49890c9c7a64c91752a4ee0.
[ntoskrnl-Stubs]
Removed patch to add stub for KeDelayExecutionThread (fixed upstream).
Removed patch to add stub for PsRemoveLoadImageNotifyRoutine (fixed upstream).

[wined3d-Geforce_425M]
Removed patch to add wined3d detection for GeForce GT 425M (accepted upstream).
2016-04-04 19:54:34 +02:00
Sebastian Lackner
6914bab984 patchutils.py: Use a common helper function for parsing patch hunks. 2016-04-04 04:43:05 +02:00
Sebastian Lackner
3ad772bb1f patchutils.py: Add tests for multiple patches in a single file. 2016-04-04 00:58:34 +02:00
Sebastian Lackner
a3bc186a20 patchutils.py: Move external test resources to a separate directory. 2016-04-04 00:56:14 +02:00
Sebastian Lackner
d21860deb6 patchutils.py: Get rid of 'expected' array in tests. 2016-04-04 00:24:26 +02:00
Sebastian Lackner
9e9b2716c4 patchutils.py: Avoid side-effects in asserts. 2016-04-03 23:47:43 +02:00
Sebastian Lackner
c4a321904d patchutils.py: Allow to pass io object to read_patch and _FileReader class. 2016-04-03 23:44:10 +02:00
Sebastian Lackner
9aba381edd Release 1.9.7. 2016-04-03 00:39:55 +02:00
Sebastian Lackner
f21f134546 patchutils.py: Remove is_binary() function. 2016-04-02 23:13:01 +02:00
Sebastian Lackner
a3ecf01ce2 Added patch to implement support for converting 16 bit depth to 24 bit in msvidc32. 2016-04-02 22:41:15 +02:00
Sebastian Lackner
bc7dbd89e0 patchutils.py: Remaining improvements for Python 3 compatibility. 2016-04-02 22:21:04 +02:00
Sebastian Lackner
74d16be256 patchutils.py: Explicitly open temporary files in non-binary mode for Python 3 compatibility. 2016-04-02 22:19:49 +02:00
Sebastian Lackner
8571c8b533 patchutils.py: Fix compatibility of StringIO with Python 3. 2016-04-02 22:16:59 +02:00
Sebastian Lackner
d3a4c072f7 patchutils.py: Add tests for read_patch function. 2016-04-02 21:22:01 +02:00
Sebastian Lackner
8bed2e61a6 patchutils.py: Avoid runtime error when parsing patch without author information. 2016-04-02 21:02:23 +02:00
Sebastian Lackner
6eb36a3a28 patchutils.py: Add tests for apply_patch function. 2016-04-02 20:25:37 +02:00
Sebastian Lackner
a872e2b1d0 wintrust-WinVerifyTrust: Fix a compiler warning with gcc 5.3.1 (thanks Michael MĂĽller). 2016-04-02 17:00:21 +02:00
Sebastian Lackner
8b8f5b3b8c msvfw32-ICGetDisplayFormat: Update patchset and fix initialization of biSizeImage field. 2016-04-02 16:27:28 +02:00
Sebastian Lackner
8cc2c511dd ntoskrnl-Stubs: Added patch for stub of ntoskrnl.IoGetDeviceAttachmentBaseRef. 2016-04-02 08:24:00 +02:00
Sebastian Lackner
bdb15cfc19 Added patch to implement image hash verification in WinVerifyTrust. 2016-04-02 07:43:48 +02:00
Sebastian Lackner
1f27eee3ed Added patches to fix multiple issues in shell32 context menu handling. 2016-04-02 05:58:59 +02:00
Sebastian Lackner
bd61bfe45f vulkan-Vulkan_Implementation: Also try to load libvulkan.so.1. 2016-04-02 03:49:51 +02:00
Sebastian Lackner
1b9726a88e Rebase against 442e60b7e4c010e6622d524f47a2dd0d26ba19d4. 2016-04-01 19:16:26 +02:00
Sebastian Lackner
29b8c10db6 Added patch for fsutil.exe hardlink command. 2016-04-01 01:56:01 +02:00
Sebastian Lackner
8bed2773c4 Added patch to allow 320x240 as supported resolution in desktop mode. 2016-04-01 01:27:54 +02:00
Sebastian Lackner
ca69ea6ddf Added patch for 'New' context menu handler entry for directories. 2016-04-01 01:15:45 +02:00
Sebastian Lackner
9527830afa Rebase against f820c0942854c14fcd063c83225af03e73286334.
[dinput-DIPROP_USERNAME]
Removed patch to implement dinput device property DIPROP_USERNAME (accepted
upstream).

[kernel32-CreateFileA]
Removed patch to check for invalid filename pointers in CreateFileA in Win 9x
mode (accepted upstream).

[kernel32-ERROR_DLL_NOT_FOUND]
Removed patch to set ERROR_DLL_NOT_FOUND as error code for Win 9X instead of
ERROR_MOD_NOT_FOUND in load_library (accepted upstream).

[kernel32-GetOverlappedResult]
Removed patch to fix handling of GetOverlappedResult when status remains
STATUS_PENDING (accepted upstream).

[setupapi-SetupDiSetDeviceInstallParamsW]
Removed patch to add stub for setupapi.SetupDiSetDeviceInstallParamsW
(accepted upstream).

[user32-EnumDisplayMonitors]
Removed patch to set %ecx to address of rect in EnumDisplayMonitors callback
(accepted upstream).
2016-04-01 00:36:37 +02:00
Sebastian Lackner
9d68d56c29 msvfw32-ICGetDisplayFormat: Update patchset and add some more tests. 2016-03-31 17:20:11 +02:00
Sebastian Lackner
962403c7ca Added patch to enable the correct dialog owner in DIALOG_DoDialogBox. 2016-03-31 06:46:04 +02:00
Sebastian Lackner
336873284e Added patch to avoid dereferencing NULL pointer in a user32 trace. 2016-03-31 06:24:52 +02:00
Sebastian Lackner
29a8c30ce8 oleaut32-OleLoadPictureFile: Remove reference to bug report. 2016-03-31 04:30:51 +02:00
Sebastian Lackner
086b729ec2 Added patch to fix implementation of ICGetDisplayFormat. 2016-03-31 02:56:10 +02:00
Sebastian Lackner
98284e0a1e Rebase against f34fd257c6c83804075914ee2b82cc42eadc683f. 2016-03-30 19:03:37 +02:00
Sebastian Lackner
a1621d692a Rebase against 5b3681f62ddd2977924424d6f326ce729de9102a. 2016-03-29 16:45:43 +02:00
Sebastian Lackner
c43b0d8ac0 Rebase against d04a54857cc84f881393e4bc794185650a302084.
[makefiles-Revert_libwine_Import]
Disabled patch, the problem should be fixed in the development branch.
2016-03-29 02:45:32 +02:00
Sebastian Lackner
0a391faaba reg-Implement_Query: Updated patchset. 2016-03-27 18:53:12 +02:00
Sebastian Lackner
e83d9c4233 Added patch to fix IStream::Read() return value for partial reads. 2016-03-27 18:29:41 +02:00
Sebastian Lackner
7edc147a61 oleaut32-OleLoadPictureFile: Updated patchset. 2016-03-27 18:22:11 +02:00
Sebastian Lackner
96fddf8187 Added patch to handle stack guard pages on x86_64. 2016-03-26 22:28:03 +01:00
Sebastian Lackner
0e9f07b2b7 Added patch to return stub interface from mf.MFCreateMediaSession. 2016-03-26 20:03:33 +01:00
Sebastian Lackner
86f1e40597 patchutils.py: Add tests for generate_ifdef_patch function. 2016-03-26 03:13:06 +01:00
Sebastian Lackner
5e5229ecce patchutils.py: Improve handling of patches without linebreak at end of file in generate_ifdef_patch. 2016-03-26 02:54:21 +01:00
Sebastian Lackner
4b1c2ec4d6 patchutils.py: Add tests for _parse_author and _parse_subject function. 2016-03-26 02:16:39 +01:00
Sebastian Lackner
19d04e3ea1 patchutils.py: Add tests for _preprocess_source function. 2016-03-26 01:10:48 +01:00
Sebastian Lackner
f8073b5148 makefiles-Revert_libwine_Import: Add reference to upstream bug. 2016-03-25 23:57:18 +01:00
Sebastian Lackner
450495f319 Added patch to use CONTAINING_RECORD in user.exe16 instead of reimplementing it. 2016-03-25 23:19:15 +01:00
Sebastian Lackner
980743ad37 winex11-MONITORENUMPROC: Rebase and move code to user32. 2016-03-25 22:50:15 +01:00
Sebastian Lackner
5cc96d631e setupapi-DiskSpaceList: Fix compile warning on x86_64. 2016-03-25 04:06:46 +01:00
Sebastian Lackner
04bb547a4b nvencodeapi-Video_Encoder: Fix compile warning on x86_64. 2016-03-25 04:02:28 +01:00
Sebastian Lackner
1b03b0201e ntdll-RtlIpStringToAddress_Tests: Fix compile warning on x86_64. 2016-03-25 03:59:18 +01:00
Sebastian Lackner
6b60ac392a ntdll-Junction_Points: Fix compile warning on x86_64. 2016-03-25 03:55:51 +01:00
Sebastian Lackner
20c3485cf8 Compiler_Warnings: Fix a whitespace error. 2016-03-25 03:02:09 +01:00
Sebastian Lackner
b550faff6a Rebase against 47cf3fe36d4f5a2f83c0d48ee763c256cd6010c5.
[winscard-SCardListReaders]
Removed patch to add stub for winscard.SCardListReadersA/W.
2016-03-24 17:40:50 +01:00
Sebastian Lackner
a748bea862 Added patch to implement oleaut32.OleLoadPictureFile. 2016-03-24 07:27:42 +01:00
Sebastian Lackner
e06dec2c39 windowscodecs-IMILBitmapSource: Fix number of arguments to IMILUnknown2Impl_unknown2. 2016-03-24 05:57:23 +01:00
Sebastian Lackner
a98c140c42 Added patch to fix return value of RegNotifyChangeKeyValue for pending events. 2016-03-24 02:47:21 +01:00
Sebastian Lackner
a7440de8ce Staging: Add some missing libraries to the wine_libs list. 2016-03-24 01:39:39 +01:00
Sebastian Lackner
711cfa9cf4 Rebase against 510c8e39838e4ceef1a66b42e7e58484bf4ac143. 2016-03-23 19:39:15 +01:00
Sebastian Lackner
70b46ff603 windowscodecs-IMILBitmapSource: Merge additional compatibility improvements. 2016-03-23 19:39:15 +01:00
Sebastian Lackner
edcd32bdea vulkan-Vulkan_Implementation: Use binary search to lookup function in is_null_func. 2016-03-23 19:36:53 +01:00
Sebastian Lackner
941d4e4383 vulkan-Vulkan_Implementation: Move WINE_DECLARE_DEBUG_CHANNEL inside #ifdef. 2016-03-23 17:54:06 +01:00
Sebastian Lackner
a3f00d208e Added multiple patches to avoid implicit cast of interface pointers. 2016-03-23 17:54:05 +01:00
Sebastian Lackner
7a99b50694 mmsystem.dll16-MIDIHDR_Refcount: Fix warnings caused by implicit casts from int to pointer. 2016-03-23 17:54:05 +01:00
Sebastian Lackner
22ca9a3c6a Added patch to improve compatibility of IMILBitmapSource interface. 2016-03-22 21:37:58 +01:00
Sebastian Lackner
f98cec7cf6 Rebase against 329dfee70c35184329d0820a5e9edbbed8b49b37. 2016-03-22 19:56:57 +01:00
Sebastian Lackner
f21c3bc221 patchutils.py: Simplify access of optional dict values. 2016-03-22 08:22:19 +01:00
Sebastian Lackner
b0cbb8bda2 patchutils.py: Reset the Signed-off-by header after parsing each patch. 2016-03-22 08:17:01 +01:00
Sebastian Lackner
d6f0fd33c7 patchutils.py: Avoid nested function definitions. 2016-03-22 08:00:18 +01:00
Sebastian Lackner
c2b79fac1f api-ms-win-Stub_DLLs: Sort kernelbase spec file alphabetically. 2016-03-22 04:21:47 +01:00
Sebastian Lackner
ac8c49d331 Synchronize multiple spec files. 2016-03-22 04:21:47 +01:00
Sebastian Lackner
90842489d6 Rebase against bc357819296594aca300fdf30bb0cda46e9f0be0. 2016-03-22 04:20:18 +01:00
Michael MĂĽller
ffad0e5c7b vulkan-Vulkan_Implementation: Fix compilation when XCB extension is not present. 2016-03-21 20:48:20 +01:00
182 changed files with 9811 additions and 3511 deletions

View File

@@ -0,0 +1,26 @@
From de9dbd542143b13741886c3e4b9f96ffcbfaa432 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 16 Mar 2016 05:46:33 +0100
Subject: dsound: Avoid implicit cast of interface pointer.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/dsound/primary.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 3f8a478..6f280f8 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -626,7 +626,7 @@ out:
static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer(IDirectSoundBuffer *iface)
{
/* IDirectSoundBuffer and IDirectSoundBuffer8 use the same iface. */
- return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
+ return CONTAINING_RECORD((IDirectSoundBuffer8 *)iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
}
/* This sets this format for the primary buffer only */
--
2.7.1

View File

@@ -0,0 +1,25 @@
From 83d96cdd81553544c79527c2aed329e96938af64 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:54:01 +0100
Subject: amstream: Avoid implicit cast of interface pointer.
---
dlls/amstream/mediastreamfilter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index d0c6714..3f0397a 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -70,7 +70,7 @@ typedef struct {
static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface)
{
- return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter);
+ return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface);
}
static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt)
--
2.7.1

View File

@@ -0,0 +1,75 @@
From 929eaf5dcdca040cd82141ad5ddfdcbc6c5f4a03 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:54:26 +0100
Subject: d2d1: Avoid implicit cast of interface pointer.
---
dlls/d2d1/brush.c | 6 +++---
dlls/d2d1/geometry.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index aa92318..19b0993 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -181,7 +181,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
@@ -318,7 +318,7 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
@@ -476,7 +476,7 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *facto
static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush *iface,
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 9fa1783..125c610 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -2022,7 +2022,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
+ return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
@@ -2283,7 +2283,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
+ return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
@@ -2531,7 +2531,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory
static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
+ return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
--
2.7.1

View File

@@ -0,0 +1,23 @@
From 71e593294e868bafa0b0b45c2694d7c0dceb0d64 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:54:48 +0100
Subject: d3d11: Avoid implicit cast of interface pointer.
---
dlls/d3d11/view.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 1d9b766..78fc1ad 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1559,5 +1559,5 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1
if (!iface)
return NULL;
assert(iface->lpVtbl == (ID3D10ShaderResourceViewVtbl *)&d3d10_shader_resource_view_vtbl);
- return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
+ return CONTAINING_RECORD((ID3D10ShaderResourceView1 *)iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
}
--
2.7.1

View File

@@ -0,0 +1,37 @@
From 0913c58ca5a15868fa72c883d46db1f0038a2e22 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:55:00 +0100
Subject: d3d8: Avoid implicit cast of interface pointer.
---
dlls/d3d8/texture.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index 7ed79a5..62463ba 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -23,17 +23,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_texture *impl_from_IDirect3DTexture8(IDirect3DTexture8 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
}
static inline struct d3d8_texture *impl_from_IDirect3DCubeTexture8(IDirect3DCubeTexture8 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
}
static inline struct d3d8_texture *impl_from_IDirect3DVolumeTexture8(IDirect3DVolumeTexture8 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
}
static HRESULT WINAPI d3d8_texture_2d_QueryInterface(IDirect3DTexture8 *iface, REFIID riid, void **out)
--
2.7.1

View File

@@ -0,0 +1,37 @@
From cd3c63b259a711abf4e6e06f975e47f82b5b3e1b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:55:12 +0100
Subject: d3d9: Avoid implicit cast of interface pointer.
---
dlls/d3d9/texture.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 07bd83e..4e50093 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -25,17 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
}
static inline struct d3d9_texture *impl_from_IDirect3DCubeTexture9(IDirect3DCubeTexture9 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
}
static inline struct d3d9_texture *impl_from_IDirect3DVolumeTexture9(IDirect3DVolumeTexture9 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
}
static HRESULT WINAPI d3d9_texture_2d_QueryInterface(IDirect3DTexture9 *iface, REFIID riid, void **out)
--
2.7.1

View File

@@ -0,0 +1,34 @@
From ff2e84fd4c6c12b5e9e6c9d793b71159295b1e01 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:58:30 +0100
Subject: ddraw: Avoid implicit cast of interface pointer.
---
dlls/ddraw/viewport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 5ebc41e..4f61d10 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -1121,7 +1121,7 @@ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *ifa
/* IDirect3DViewport and IDirect3DViewport3 use the same iface. */
if (!iface) return NULL;
assert(iface->lpVtbl == (IDirect3DViewport2Vtbl *)&d3d_viewport_vtbl);
- return CONTAINING_RECORD(iface, struct d3d_viewport, IDirect3DViewport3_iface);
+ return CONTAINING_RECORD((IDirect3DViewport3 *)iface, struct d3d_viewport, IDirect3DViewport3_iface);
}
struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface)
@@ -1129,7 +1129,7 @@ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface
/* IDirect3DViewport and IDirect3DViewport3 use the same iface. */
if (!iface) return NULL;
assert(iface->lpVtbl == (IDirect3DViewportVtbl *)&d3d_viewport_vtbl);
- return CONTAINING_RECORD(iface, struct d3d_viewport, IDirect3DViewport3_iface);
+ return CONTAINING_RECORD((IDirect3DViewport3 *)iface, struct d3d_viewport, IDirect3DViewport3_iface);
}
void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw)
--
2.7.1

View File

@@ -0,0 +1,25 @@
From 869fbc7190eb77e027be4bcd98d938198189c3dd Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:58:40 +0100
Subject: dwrite: Avoid implicit cast of interface pointer.
---
dlls/dwrite/layout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 38b5e32..24f4abc 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -5115,7 +5115,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
{
return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
- CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
+ CONTAINING_RECORD((IDWriteTextFormat2 *)iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
}
HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
--
2.7.1

View File

@@ -0,0 +1,25 @@
From 665373effeadbf44f75dd15b6ea27ebec0fd7190 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 22:28:09 +0100
Subject: msxml3: Avoid implicit cast of interface pointer.
---
dlls/msxml3/schema.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index f92130a..03d24b2 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -809,7 +809,7 @@ static inline schema_cache* impl_from_IXMLDOMSchemaCollection2(IXMLDOMSchemaColl
static inline schema_cache* impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection* iface)
{
- return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface);
+ return CONTAINING_RECORD((IXMLDOMSchemaCollection2 *)iface, schema_cache, IXMLDOMSchemaCollection2_iface);
}
static inline schema_cache* unsafe_impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection *iface)
--
2.7.1

View File

@@ -0,0 +1,25 @@
From 60ab37cc3ba6cb771fccc187ea87b669ac83dc80 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 22:28:23 +0100
Subject: oleaut32: Avoid implicit cast of interface pointer.
---
dlls/oleaut32/oleaut.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 742e63f..8dae150 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -117,7 +117,7 @@ static inline size_t bstr_alloc_size(size_t size)
static inline bstr_t *bstr_from_str(BSTR str)
{
- return CONTAINING_RECORD(str, bstr_t, u.str);
+ return CONTAINING_RECORD((void *)str, bstr_t, u.str);
}
static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx)
--
2.7.1

View File

@@ -0,0 +1,25 @@
From e35d665256d08ebccee30361867ba57f790d519f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 23:01:32 +0100
Subject: rpcrt4: Avoid implicit cast of interface pointer.
---
dlls/rpcrt4/cstub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
index 838ed03..992c235 100644
--- a/dlls/rpcrt4/cstub.c
+++ b/dlls/rpcrt4/cstub.c
@@ -59,7 +59,7 @@ typedef struct
static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface )
{
- return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer);
+ return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer);
}
HRESULT CStdStubBuffer_Construct(REFIID riid,
--
2.7.1

View File

@@ -0,0 +1,25 @@
From 1806798cf9b186d2c788f5a94074d0d6fa426f9e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 23:01:48 +0100
Subject: vbscript: Avoid implicit cast of interface pointer.
---
dlls/vbscript/vbdisp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index 9c0c4c1..daed7ec 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -555,7 +555,7 @@ static IDispatchExVtbl DispatchExVtbl = {
static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface)
{
return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl
- ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface)
+ ? CONTAINING_RECORD((IDispatchEx *)iface, vbdisp_t, IDispatchEx_iface)
: NULL;
}
--
2.7.1

View File

@@ -0,0 +1,76 @@
From 59f0bb786dc3ec4e77cb43ea4410743ecd317bbf Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 23:08:30 +0100
Subject: include: Check element type in CONTAINING_RECORD and similar macros.
---
include/wine/list.h | 10 ++++++++--
include/wine/rbtree.h | 10 ++++++++--
include/winnt.h | 10 ++++++++--
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/include/wine/list.h b/include/wine/list.h
index b4d681f..287ad39 100644
--- a/include/wine/list.h
+++ b/include/wine/list.h
@@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
/* get pointer to object containing list element */
#undef LIST_ENTRY
-#define LIST_ENTRY(elem, type, field) \
- ((type *)((char *)(elem) - offsetof(type, field)))
+#ifdef __GNUC__
+# define LIST_ENTRY(elem, type, field) ({ \
+ const typeof(((type *)0)->field) *__ptr = (elem); \
+ (type *)((char *)__ptr - offsetof(type, field)); })
+#else
+# define LIST_ENTRY(elem, type, field) \
+ ((type *)((char *)(elem) - offsetof(type, field)))
+#endif
#endif /* __WINE_SERVER_LIST_H */
diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
index 13452d9..554d239 100644
--- a/include/wine/rbtree.h
+++ b/include/wine/rbtree.h
@@ -22,8 +22,14 @@
#ifndef __WINE_WINE_RBTREE_H
#define __WINE_WINE_RBTREE_H
-#define WINE_RB_ENTRY_VALUE(element, type, field) \
- ((type *)((char *)(element) - offsetof(type, field)))
+#ifdef __GNUC__
+# define WINE_RB_ENTRY_VALUE(element, type, field) ({ \
+ const typeof(((type *)0)->field) *__ptr = (element); \
+ (type *)((char *)__ptr - offsetof(type, field)); })
+#else
+# define WINE_RB_ENTRY_VALUE(element, type, field) \
+ ((type *)((char *)(element) - offsetof(type, field)))
+#endif
struct wine_rb_entry
{
diff --git a/include/winnt.h b/include/winnt.h
index 559a719..4a711f4 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -753,8 +753,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
-#define CONTAINING_RECORD(address, type, field) \
- ((type *)((PCHAR)(address) - offsetof(type, field)))
+#ifdef __GNUC__
+# define CONTAINING_RECORD(address, type, field) ({ \
+ const typeof(((type *)0)->field) *__ptr = (address); \
+ (type *)((PCHAR)__ptr - offsetof(type, field)); })
+#else
+# define CONTAINING_RECORD(address, type, field) \
+ ((type *)((PCHAR)(address) - offsetof(type, field)))
+#endif
/* Types */
--
2.7.1

View File

@@ -1,16 +1,16 @@
From e71a6c24c41e3d390a81aac1986938a1db71f9e6 Mon Sep 17 00:00:00 2001
From 41863fd8fdf3a885efa93359a538e4e74258fb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 28 May 2014 19:50:51 +0200
Subject: loader: Add commandline option --check-libs.
---
include/wine/library.h | 2 +
libs/wine/config.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 ++++++++++++++++
libs/wine/config.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 ++++++++++++++
libs/wine/wine.def | 2 +
libs/wine/wine.map | 2 +
loader/main.c | 50 +++++++++++++++++++++-
6 files changed, 203 insertions(+), 1 deletion(-)
loader/main.c | 50 +++++++++++++++++++-
6 files changed, 215 insertions(+), 1 deletion(-)
diff --git a/include/wine/library.h b/include/wine/library.h
index fae73fe..7395a11 100644
@@ -33,14 +33,17 @@ index fae73fe..7395a11 100644
extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
extern int wine_dlclose( void *handle, char *error, size_t errorsize );
diff --git a/libs/wine/config.c b/libs/wine/config.c
index 5262c76..7acf51b 100644
index 12f4a67..be9f401 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -444,6 +444,118 @@ const char *wine_get_build_dir(void)
@@ -443,6 +443,130 @@ const char *wine_get_build_dir(void)
return build_dir;
}
+const char *wine_libs[] = {
+#ifdef SONAME_LIBCAIRO
+ SONAME_LIBCAIRO,
+#endif
+#ifdef SONAME_LIBCAPI20
+ SONAME_LIBCAPI20,
+#endif
@@ -65,9 +68,15 @@ index 5262c76..7acf51b 100644
+#ifdef SONAME_LIBGNUTLS
+ SONAME_LIBGNUTLS,
+#endif
+#ifdef SONAME_LIBGOBJECT_2_0
+ SONAME_LIBGOBJECT_2_0,
+#endif
+#ifdef SONAME_LIBGSM
+ SONAME_LIBGSM,
+#endif
+#ifdef SONAME_LIBGTK_3
+ SONAME_LIBGTK_3,
+#endif
+#ifdef SONAME_LIBHAL
+ SONAME_LIBHAL,
+#endif
@@ -116,6 +125,9 @@ index 5262c76..7acf51b 100644
+#ifdef SONAME_LIBX11
+ SONAME_LIBX11,
+#endif
+#ifdef SONAME_LIBX11_XCB
+ SONAME_LIBX11_XCB,
+#endif
+#ifdef SONAME_LIBXCOMPOSITE
+ SONAME_LIBXCOMPOSITE,
+#endif
@@ -156,10 +168,10 @@ index 5262c76..7acf51b 100644
const char *wine_get_server_dir(void)
{
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 3591ede..2718857 100644
index b5b32cc..1453a82 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -1043,6 +1043,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
@@ -1041,6 +1041,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
}
/***********************************************************************
@@ -243,7 +255,7 @@ index 7cb2918..72ffed8 100644
wine_get_sortkey;
wine_get_ss;
diff --git a/loader/main.c b/loader/main.c
index fa0efa2..e96363d 100644
index 343ea26..44804e1 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -36,6 +36,12 @@
@@ -318,5 +330,5 @@ index fa0efa2..e96363d 100644
--
2.3.1
2.7.1

View File

@@ -1,4 +1,4 @@
From 1ab24ab7e6d2ef9915e7881bc36853edfc52d1ee Mon Sep 17 00:00:00 2001
From 06fc57e35f3424d17d8e3cb61692d594691674f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:10:37 +0100
Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
@@ -33,12 +33,12 @@ index 0000000..18a0b1f
+MODULE = ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll
diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
new file mode 100644
index 0000000..9d2af72
index 0000000..ffb8f5b
--- /dev/null
+++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
@@ -0,0 +1,20 @@
+@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW
+@ stub DisplayConfigGetDeviceInfo
+@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo
+@ stub DisplayConfigSetDeviceInfo
+@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW
+@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors
@@ -48,20 +48,20 @@ index 0000000..9d2af72
+@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW
+@ stdcall GetSysColor(long) user32.GetSysColor
+@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics
+@ stub IsProcessDPIAware
+@ stdcall IsProcessDPIAware() user32.IsProcessDPIAware
+@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint
+@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect
+@ stdcall MonitorFromWindow(long long) user32.MonitorFromWindow
+@ stub QueryDisplayConfig
+@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig
+@ stdcall SetProcessDPIAware() user32.SetProcessDPIAware
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
+@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA
+@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index f482264..b364446 100755
index 43b8dc2..af88f8b 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -278,6 +278,7 @@ my @dll_groups =
@@ -281,6 +281,7 @@ my @dll_groups =
"api-ms-win-rtcore-ntuser-window-l1-1-0",
"ext-ms-win-ntuser-mouse-l1-1-0",
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
@@ -70,5 +70,5 @@ index f482264..b364446 100755
[
"version",
--
2.6.4
2.7.1

View File

@@ -1,4 +1,4 @@
From d1cb153363aec82f8b7c5dbb0f382880e01fc2d4 Mon Sep 17 00:00:00 2001
From d0688788458f243ccef2c337d7ab8f59ead75a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 4 Feb 2016 06:19:57 +0100
Subject: kernelbase: Add stub for QuirkIsEnabled3.
@@ -23,16 +23,16 @@ index 54ce373..1485512 100644
@ stub QuirkIsEnabledForPackage2
@ stub QuirkIsEnabledForProcess
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 83fff3e..dbba3cc 100644
index 8fdb80d..c0b2594 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1188,7 +1188,7 @@
@@ -1189,7 +1189,7 @@
@ stub QuirkGetData2
@ stub QuirkGetData
@ stdcall QuirkIsEnabled(ptr)
@ stub QuirkIsEnabled2
-@ stub QuirkIsEnabled3
+@ stdcall QuirkIsEnabled3(ptr ptr)
@ stdcall QuirkIsEnabled(ptr)
@ stub QuirkIsEnabledForPackage
@ stub QuirkIsEnabledForPackage2
@ stub QuirkIsEnabledForPackage3
diff --git a/dlls/kernelbase/misc.c b/dlls/kernelbase/misc.c
@@ -54,5 +54,5 @@ index be1591a..e703e6d 100644
+ return FALSE;
+}
--
2.7.0
2.7.1

View File

@@ -0,0 +1,133 @@
From 4a8b29b5a4c923cec3a78bd9f43e0fc736721cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Apr 2016 01:00:02 +0200
Subject: feclient: Add stub dll.
---
configure.ac | 1 +
dlls/feclient/Makefile.in | 4 ++++
dlls/feclient/feclient.spec | 36 ++++++++++++++++++++++++++++++++++++
dlls/feclient/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 86 insertions(+)
create mode 100644 dlls/feclient/Makefile.in
create mode 100644 dlls/feclient/feclient.spec
create mode 100644 dlls/feclient/main.c
diff --git a/configure.ac b/configure.ac
index 98bb7d7..39097d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2957,6 +2957,7 @@ WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
WINE_CONFIG_DLL(faultrep,,[implib])
WINE_CONFIG_TEST(dlls/faultrep/tests)
+WINE_CONFIG_DLL(feclient)
WINE_CONFIG_DLL(fltlib)
WINE_CONFIG_DLL(fltmgr.sys)
WINE_CONFIG_DLL(fntcache)
diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in
new file mode 100644
index 0000000..d3eeefb
--- /dev/null
+++ b/dlls/feclient/Makefile.in
@@ -0,0 +1,4 @@
+MODULE = feclient.dll
+
+C_SRCS = \
+ main.c
diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec
new file mode 100644
index 0000000..3620b85
--- /dev/null
+++ b/dlls/feclient/feclient.spec
@@ -0,0 +1,36 @@
+@ stub EdpContainerizeFile
+@ stub EdpCredentialCreate
+@ stub EdpCredentialDelete
+@ stub EdpCredentialExists
+@ stub EdpCredentialQuery
+@ stub EdpDecontainerizeFile
+@ stub EdpDplPolicyEnabledForUser
+@ stub EdpDplUpgradePinInfo
+@ stub EdpDplUpgradeVerifyUser
+@ stub EdpDplUserCredentialsSet
+@ stub EdpDplUserUnlockComplete
+@ stub EdpDplUserUnlockStart
+@ stub EdpFree
+@ stub EdpGetContainerIdentity
+@ stub EdpGetCredServiceState
+@ stub EdpQueryCredServiceInfo
+@ stub EdpQueryDplEnforcedPolicyOwnerIds
+@ stub EdpQueryRevokedPolicyOwnerIds
+@ stub EdpRmsClearKeys
+@ stub EdpSetCredServiceInfo
+@ stub EfsClientCloseFileRaw
+@ stub EfsClientDecryptFile
+@ stub EfsClientDuplicateEncryptionInfo
+@ stub EfsClientEncryptFileEx
+@ stub EfsClientFileEncryptionStatus
+@ stub EfsClientFreeProtectorList
+@ stub EfsClientGetEncryptedFileVersion
+@ stub EfsClientOpenFileRaw
+@ stub EfsClientQueryProtectors
+@ stub EfsClientReadFileRaw
+@ stub EfsClientWriteFileRaw
+@ stub EfsClientWriteFileWithHeaderRaw
+@ stub EfsUtilGetCurrentKey
+@ stub FeClientInitialize
+@ stub GetLockSessionUnwrappedKey
+@ stub GetLockSessionWrappedKey
diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c
new file mode 100644
index 0000000..91aed70
--- /dev/null
+++ b/dlls/feclient/main.c
@@ -0,0 +1,45 @@
+/*
+ * feclient API
+ *
+ * Copyright 2016 Michael MĂĽller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(feclient);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
+{
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ break;
+ }
+
+ return TRUE;
+}
--
2.7.1

View File

@@ -0,0 +1,311 @@
From a1b20acdf908d93184138869d1fc105c133498ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Apr 2016 01:02:34 +0200
Subject: uiautomationcore: Add dll and stub some functions.
---
configure.ac | 1 +
dlls/uiautomationcore/Makefile.in | 5 ++
dlls/uiautomationcore/main.c | 117 ++++++++++++++++++++++++++++
dlls/uiautomationcore/uiautomationcore.spec | 99 +++++++++++++++++++++++
include/uiautomationcoreapi.h | 16 ++++
5 files changed, 238 insertions(+)
create mode 100644 dlls/uiautomationcore/Makefile.in
create mode 100644 dlls/uiautomationcore/main.c
create mode 100644 dlls/uiautomationcore/uiautomationcore.spec
diff --git a/configure.ac b/configure.ac
index 39097d1..896d413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3304,6 +3304,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests)
WINE_CONFIG_DLL(typelib.dll16,enable_win16)
WINE_CONFIG_DLL(ucrtbase)
WINE_CONFIG_TEST(dlls/ucrtbase/tests)
+WINE_CONFIG_DLL(uiautomationcore)
WINE_CONFIG_DLL(unicows,,[implib])
WINE_CONFIG_DLL(updspapi)
WINE_CONFIG_DLL(url,,[implib])
diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
new file mode 100644
index 0000000..bd6f9d6
--- /dev/null
+++ b/dlls/uiautomationcore/Makefile.in
@@ -0,0 +1,5 @@
+MODULE = uiautomationcore.dll
+IMPORTS = uuid
+
+C_SRCS = \
+ main.c
diff --git a/dlls/uiautomationcore/main.c b/dlls/uiautomationcore/main.c
new file mode 100644
index 0000000..71fe84c
--- /dev/null
+++ b/dlls/uiautomationcore/main.c
@@ -0,0 +1,117 @@
+/*
+ * uiautomationcore API
+ *
+ * Copyright 2016 Michael MĂĽller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+#define COBJMACROS
+#include "uiautomationcoreapi.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
+
+static HRESULT WINAPI dummy_QueryInterface(IUnknown *iface, REFIID iid, void **ppv)
+{
+ TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppv);
+
+ if (!ppv) return E_INVALIDARG;
+
+ if (!IsEqualIID(&IID_IUnknown, iid))
+ {
+ FIXME("Unknown interface: %s\n", debugstr_guid(iid));
+ *ppv = NULL;
+ return E_NOINTERFACE;
+ }
+
+ *ppv = iface;
+ IUnknown_AddRef((IUnknown *)*ppv);
+ return S_OK;
+}
+
+static ULONG WINAPI dummy_AddRef(IUnknown *iface)
+{
+ FIXME("(%p): stub\n", iface);
+ return 1;
+}
+
+static ULONG WINAPI dummy_Release(IUnknown *iface)
+{
+ FIXME("(%p): stub\n", iface);
+ return 1;
+}
+
+static const IUnknownVtbl dummy_Vtbl =
+{
+ dummy_QueryInterface,
+ dummy_AddRef,
+ dummy_Release,
+};
+
+static IUnknown dummy = { &dummy_Vtbl };
+
+int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid)
+{
+ FIXME("(%d, %s)\n", type, debugstr_guid(guid));
+ return 1;
+}
+
+HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
+{
+ FIXME("(%p): stub\n", value);
+
+ *value = &dummy;
+ return S_OK;
+}
+
+HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
+{
+ FIXME("(%p): stub\n", value);
+
+ *value = &dummy;
+ return S_OK;
+}
+
+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam,
+ IRawElementProviderSimple *provider)
+{
+ FIXME("(%p, %lx, %lx, %p): stub\n", hwnd, wparam, lparam, provider);
+ return 0;
+}
+
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
+{
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ break;
+ }
+
+ return TRUE;
+}
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
new file mode 100644
index 0000000..321cd06
--- /dev/null
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -0,0 +1,99 @@
+@ stub DllCanUnloadNow
+@ stub DllGetClassObject
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
+@ stub DockPattern_SetDockPosition
+@ stub ExpandCollapsePattern_Collapse
+@ stub ExpandCollapsePattern_Expand
+@ stub GridPattern_GetItem
+@ stub InvokePattern_Invoke
+@ stub ItemContainerPattern_FindItemByProperty
+@ stub LegacyIAccessiblePattern_DoDefaultAction
+@ stub LegacyIAccessiblePattern_GetIAccessible
+@ stub LegacyIAccessiblePattern_Select
+@ stub LegacyIAccessiblePattern_SetValue
+@ stub MultipleViewPattern_GetViewName
+@ stub MultipleViewPattern_SetCurrentView
+@ stub RangeValuePattern_SetValue
+@ stub ScrollItemPattern_ScrollIntoView
+@ stub ScrollPattern_Scroll
+@ stub ScrollPattern_SetScrollPercent
+@ stub SelectionItemPattern_AddToSelection
+@ stub SelectionItemPattern_RemoveFromSelection
+@ stub SelectionItemPattern_Select
+@ stub SynchronizedInputPattern_Cancel
+@ stub SynchronizedInputPattern_StartListening
+@ stub TextPattern_GetSelection
+@ stub TextPattern_GetVisibleRanges
+@ stub TextPattern_RangeFromChild
+@ stub TextPattern_RangeFromPoint
+@ stub TextPattern_get_DocumentRange
+@ stub TextPattern_get_SupportedTextSelection
+@ stub TextRange_AddToSelection
+@ stub TextRange_Clone
+@ stub TextRange_Compare
+@ stub TextRange_CompareEndpoints
+@ stub TextRange_ExpandToEnclosingUnit
+@ stub TextRange_FindAttribute
+@ stub TextRange_FindText
+@ stub TextRange_GetAttributeValue
+@ stub TextRange_GetBoundingRectangles
+@ stub TextRange_GetChildren
+@ stub TextRange_GetEnclosingElement
+@ stub TextRange_GetText
+@ stub TextRange_Move
+@ stub TextRange_MoveEndpointByRange
+@ stub TextRange_MoveEndpointByUnit
+@ stub TextRange_RemoveFromSelection
+@ stub TextRange_ScrollIntoView
+@ stub TextRange_Select
+@ stub TogglePattern_Toggle
+@ stub TransformPattern_Move
+@ stub TransformPattern_Resize
+@ stub TransformPattern_Rotate
+@ stub UiaAddEvent
+@ stub UiaClientsAreListening
+@ stub UiaDisconnectAllProviders
+@ stub UiaDisconnectProvider
+@ stub UiaEventAddWindow
+@ stub UiaEventRemoveWindow
+@ stub UiaFind
+@ stub UiaGetErrorDescription
+@ stub UiaGetPatternProvider
+@ stub UiaGetPropertyValue
+@ stdcall UiaGetReservedMixedAttributeValue(ptr)
+@ stdcall UiaGetReservedNotSupportedValue(ptr)
+@ stub UiaGetRootNode
+@ stub UiaGetRuntimeId
+@ stub UiaGetUpdatedCache
+@ stub UiaHPatternObjectFromVariant
+@ stub UiaHTextRangeFromVariant
+@ stub UiaHUiaNodeFromVariant
+@ stub UiaHasServerSideProvider
+@ stub UiaHostProviderFromHwnd
+@ stub UiaIAccessibleFromProvider
+@ stdcall UiaLookupId(long ptr)
+@ stub UiaNavigate
+@ stub UiaNodeFromFocus
+@ stub UiaNodeFromHandle
+@ stub UiaNodeFromPoint
+@ stub UiaNodeFromProvider
+@ stub UiaNodeRelease
+@ stub UiaPatternRelease
+@ stub UiaProviderForNonClient
+@ stub UiaProviderFromIAccessible
+@ stub UiaRaiseAsyncContentLoadedEvent
+@ stub UiaRaiseAutomationEvent
+@ stub UiaRaiseAutomationPropertyChangedEvent
+@ stub UiaRaiseStructureChangedEvent
+@ stub UiaRaiseTextEditTextChangedEvent
+@ stub UiaRegisterProviderCallback
+@ stub UiaRemoveEvent
+@ stdcall UiaReturnRawElementProvider(long long long ptr)
+@ stub UiaSetFocus
+@ stub UiaTextRangeRelease
+@ stub ValuePattern_SetValue
+@ stub VirtualizedItemPattern_Realize
+@ stub WindowPattern_Close
+@ stub WindowPattern_SetWindowVisualState
+@ stub WindowPattern_WaitForInputIdle
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 340f500..b9107ce 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -19,6 +19,8 @@
#ifndef _INC_UIAUTOMATIONCOREAPI
#define _INC_UIAUTOMATIONCOREAPI
+#include "uiautomationcore.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -34,6 +36,16 @@ extern "C" {
#define UiaAppendRuntimeId 3
#define UiaRootObjectId -25
+typedef enum AutomationIdentifierType
+{
+ AutomationIdentifierType_Property,
+ AutomationIdentifierType_Pattern,
+ AutomationIdentifierType_Event,
+ AutomationIdentifierType_ControlType,
+ AutomationIdentifierType_TextAttribute,
+ AutomationIdentifierType_LandmarkType,
+} AutomationIdentifierType;
+
DECLARE_HANDLE(HUIANODE);
DECLARE_HANDLE(HUIAPATTERNOBJECT);
DECLARE_HANDLE(HUIATEXTRANGE);
@@ -41,6 +53,10 @@ DECLARE_HANDLE(HUIAEVENT);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
+int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid);
+HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);
+HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam, IRawElementProviderSimple *provider);
#ifdef __cplusplus
}
--
2.7.1

View File

@@ -19,7 +19,7 @@ Fixes: Add ext-ms-win-kernel32-package-current-l1-1-0 dll
Fixes: Add kernelbase dll
Fixes: Add iertutil dll
Fixes: Add shcore dll
Depends: kernel32-GetFinalPathNameByHandle
Fixes: [40451] Add feclient dll
Depends: kernel32-FreeUserPhysicalPages
Depends: kernel32-GetCurrentPackageFamilyName
Depends: combase-RoApi

Some files were not shown because too many files have changed in this diff Show More