Compare commits

...

391 Commits
v4.9 ... v5.5

Author SHA1 Message Date
Alistair Leslie-Hughes
18f7125892 Release v5.5 2020-03-29 09:10:06 +11:00
Alistair Leslie-Hughes
f993930ee6 Add winmm-Replace_OpenFile patchset 2020-03-29 09:03:56 +11:00
Alistair Leslie-Hughes
2a9e87abea Updated ntdll-RtlIpv4StringToAddress patchset 2020-03-29 08:55:38 +11:00
Zebediah Figura
af97ec8ce0 ntdll-avoid-fstatat: Protect cwd manipulation with dir_section. 2020-03-28 14:41:38 -05:00
Zebediah Figura
b14430433d ntdll-avoid-fstatat: New patch. 2020-03-28 13:22:31 -05:00
Zebediah Figura
f9d1798edb Rebase against 123c0543e0bb4c99fbee0a568e786405ff886a93. 2020-03-27 17:28:30 -05:00
Alistair Leslie-Hughes
e5da84dc36 Rebase against 9c190f8118faa2f4708e86340e3e0440f668835b 2020-03-25 08:56:23 +11:00
Alistair Leslie-Hughes
75c7644c3d Rebase against 00e55c8fc0c08e14c39880e62526f8503468b641 2020-03-24 08:55:13 +11:00
Alistair Leslie-Hughes
7c7868f4bb Rebase against 3ddf3a720f2a342141550c973f10854b573d80ed 2020-03-21 11:07:53 +11:00
Alistair Leslie-Hughes
d1a8b6bc14 Rebase against aaa625217b202dc0a22d67e63e941b027146a456 2020-03-20 09:55:13 +11:00
Zebediah Figura
53b02cd0ee Rebase against c43998cb51c53ab9c355c2ff37489d51f9009e2d. 2020-03-18 18:33:10 -05:00
Alistair Leslie-Hughes
36b8b8cc65 Remove winemenubuilder-integration patch 0002
This causes wine-protocol-* to be created, and thus any
http/https/ftp will routed via wine.
2020-03-18 11:29:10 +11:00
Alistair Leslie-Hughes
13536af59c Rebase against 7ad740cd29c6bd87238df6231689b861058bc5a8 2020-03-18 10:38:14 +11:00
Paul Gofman
a6f3bd989e Updated wined3d-SWVP-shaders, wined3d-Indexed_Vertex_Blending patchsets.
Minor cleanup.
2020-03-17 13:37:18 +03:00
Alistair Leslie-Hughes
0830db32cd Rebase against c2ee20c95bea55069d32cfa69a95ae3e4486a02b 2020-03-17 09:37:12 +11:00
Paul Gofman
cd7d77fe36 Updated ddraw-Rendering_Targets patchset.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48757
2020-03-16 09:07:19 +03:00
Alistair Leslie-Hughes
2e9977f4ac Add winemenubuilder-integration patchset 2020-03-16 09:24:08 +11:00
Zebediah Figura
a1246b5e92 xactengine-initial: Build an import library for x3daudio1_7.
Should fix test compilation.
2020-03-14 11:52:09 -05:00
Alistair Leslie-Hughes
676dd02663 Release v5.4 2020-03-14 15:07:59 +11:00
Zebediah Figura
648db00708 wineqtdecoder-fix-compilation: New patch set. 2020-03-13 21:39:01 -05:00
Zebediah Figura
6bfaa3b0a5 Rebase against 4c61c8dce09307ecfe0beea307213bd1fb6a69db. 2020-03-13 19:19:03 -05:00
Paul Gofman
cbf7f73313 Restore wined3d-WINED3D_TEXF_ANISOTROPIC patchset. 2020-03-13 11:57:21 +03:00
Alistair Leslie-Hughes
c896e5cb69 Fix ntdll-CriticalSection patch rebase 2020-03-13 10:47:49 +11:00
Alistair Leslie-Hughes
4d65ec9456 Rebase against c3165b4c96a021a96dc6dd8a0b8e1030682dd6e5 2020-03-13 10:26:53 +11:00
Paul Gofman
d14250ab03 Rebase against 4dfd5f22f4032efdc283adf861d82e43c3b08d42 2020-03-12 02:26:50 +03:00
Alistair Leslie-Hughes
789f5c7c64 Rebase against d731208602393877709d3bb0bdeb28c80f9719b0 2020-03-11 09:24:27 +11:00
Alistair Leslie-Hughes
69cb47fd36 Rebase against 26ffc40bfb42b7c05ce9513bf479e31eb85294b1 2020-03-10 10:36:28 +11:00
Alistair Leslie-Hughes
8450903b5c Fix last rebase 2020-03-08 12:13:59 +11:00
Alistair Leslie-Hughes
ffe93505d2 Rebase against eb63713f606d81dee75d7fdbc5685cc3862bc63f 2020-03-08 10:39:21 +11:00
Zebediah Figura
5213d551f8 Rebase against 4f53be1a6e7c15c3648b0770f9d92685dc9a9717. 2020-03-05 22:33:21 -06:00
Paul Gofman
e61a75f75f Updated wined3d-SWVP-shaders patchset. 2020-03-05 11:25:14 +03:00
Alistair Leslie-Hughes
7428dd8656 Rebase against 0eea1b09d3f619ea35b6b4a70b4091eae85c4834 2020-03-05 10:11:51 +11:00
Zebediah Figura
40e84b052b server-device_manager_destroy: Remove patch set.
This was fixed upstream by 0bd7da4290ea32da0dba92c0190e2fb839580c3d and 504cf18e19535759e75ce81db0909ba3136c9bfe.
2020-03-03 22:53:52 -06:00
Alistair Leslie-Hughes
92b2688a74 Rebase against 0022b7a6cfd38cf0b8c5d98145f7e7f6e254d65d 2020-03-04 11:37:01 +11:00
Alistair Leslie-Hughes
f7eec766a5 Updated ntdll-unaligned-futex patchset
Fix macos build.
2020-03-03 16:12:59 +11:00
Alistair Leslie-Hughes
b4e0277488 updated xactengine-initial patchset
Include xact_class.h with <> to ensure the local file is found
over the one in the xaudio2_7 directory.

If one builds xaudio2_7 then one of the xactengine dll, a build
occurs because it's included the wrong header.

The build appears to work by chance because the xactengine dlls are
built before xaudio.
2020-03-03 10:50:35 +11:00
Alistair Leslie-Hughes
f54b943bca Revert "Updated xactengine-initial patchset"
This reverts commit 6138369b4f.
This prevented proper registation of each dll.
2020-03-03 10:42:13 +11:00
Alistair Leslie-Hughes
6138369b4f Updated xactengine-initial patchset
Removed #if from idl. The generated header in xaudio2_7 takes preference over local file.
2020-03-03 10:16:25 +11:00
Paul Gofman
59fe96c14c Added ntdll-unaligned-futex patchset. 2020-03-02 10:46:01 +03:00
Alistair Leslie-Hughes
afdf5020ff Updated xactengine-initial patchset
Fixed build issue on Macos and suse.
2020-03-02 13:26:54 +11:00
Alistair Leslie-Hughes
2fc5c88068 Added xactengine-initial patchset 2020-03-01 15:05:53 +11:00
Alistair Leslie-Hughes
ad3de029e7 Added tasklist-basics patchset 2020-03-01 13:40:02 +11:00
Alistair Leslie-Hughes
4ff3984c49 Updated ntdll-RtlIpv4StringToAddress patchset 2020-03-01 13:31:46 +11:00
Alistair Leslie-Hughes
deeaa04aa4 Release v5.3 2020-02-29 15:23:35 +11:00
Alistair Leslie-Hughes
592b853fe4 Rebase against 1e478b804f72a9b5122fc6adafac5479b816885e 2020-02-29 14:37:19 +11:00
Zebediah Figura
26f14c2ddd Rebase against c6b852e3c37247a01547d8ab9d1630684f9c5aaa. 2020-02-27 23:36:35 -06:00
Alistair Leslie-Hughes
57204d77d9 Updated bcrypt-ECDHSecretAgreement patchset
Correct build for macos
2020-02-28 08:19:45 +11:00
Paul Gofman
37e000145f Added bcrypt-ECDHSecretAgreement patchset. 2020-02-27 19:13:21 +03:00
Alistair Leslie-Hughes
d68ab574f5 Rebase against 0e7392040c910403e3418b4670e4cc30037025ed 2020-02-26 11:22:58 +11:00
Zebediah Figura
469cbe7ed8 Rebase against b253bd65658fe7dde8e50d7f7e6930cd215282df. 2020-02-21 19:06:44 -06:00
Alistair Leslie-Hughes
1fe141dd3e Rebase against e7c735b825b504b7742fdfa991a1cbc462e9c622 2020-02-21 12:31:28 +11:00
Alistair Leslie-Hughes
a3b99d730d Rebase against a10267172046fc16aaa1cd1237701f6867b92fc0 2020-02-19 10:10:54 +11:00
Zebediah Figura
de7c2faf80 Rebase against be2b0b1cec5843f0145f376316d6c28507559910. 2020-02-17 18:43:10 -06:00
Zebediah Figura
8b2fd051c9 eventfd_synchronization: Abandon esync mutexes on thread exit.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48089
2020-02-17 17:38:05 -06:00
Alistair Leslie-Hughes
ede44e4e8f Release v5.2 2020-02-17 10:31:59 +11:00
Alistair Leslie-Hughes
aca614eb8b Rebase against 85bd94f8705115ac0c35eac6ff7e2f3e59be924e 2020-02-17 09:47:53 +11:00
Alistair Leslie-Hughes
49d52336e1 Rebase against 7332de64a5a204cc285bdc1f8768d3217103b7dd 2020-02-14 09:03:50 +11:00
Zebediah Figura
17fdb93f55 Rebase against 3d57cc2863f2f9a5ace40d29317b3ff4357fd119. 2020-02-12 17:33:55 -06:00
Paul Gofman
3f43238b01 Restore d3dx9_36-BumpLuminance patch 0002. 2020-02-12 11:49:28 +03:00
Paul Gofman
59d19c8963 Rebase against d1373e8aae1b15b96e847488e4b6617789f8fb62. 2020-02-12 02:38:19 +03:00
Paul Gofman
d3ad4e1115 Updated ntdll-User_shared_data_fields patchset. 2020-02-11 16:33:47 +03:00
Zebediah Figura
b3f1e5566f Rebase against 0df9cce29d0d32d3f1f13c4ec4eabc81675a17ed. 2020-02-10 17:40:48 -06:00
Zebediah Figura
c26be86c42 Rebase against f909d18baf1d97831c55a1d47610427ac2084ca3. 2020-02-07 16:49:59 -06:00
Zebediah Figura
14a3242b92 winebuild-Fake_Dlls: Fix the fake DLL function dispatcher offset.
Fixes: ff10ae6e74

Spotted by Ken Thomases.
2020-02-06 11:37:07 -06:00
Zebediah Figura
991bebfee7 Rebase against 9642f35922b79cebacdc774eb54619e389ccd531. 2020-02-05 17:42:46 -06:00
Zebediah Figura
0d7a4f0c73 newupdate.py: Bail immediately on a bad dependency graph. 2020-02-05 17:42:42 -06:00
Alistair Leslie-Hughes
30c1e2757a Updated ntdll-RtlIpv4StringToAddress patchset 2020-02-05 15:21:09 +11:00
Zebediah Figura
e55a3a3f43 ntdll-Signal_Handler: Remove.
As of 684c272aa794 we disable the stack protector for all (non-PE) code.
2020-02-04 15:12:34 -06:00
Alistair Leslie-Hughes
ca1047528f Rebase against 87875e12bcdca659e578849fa62585b1b5316a50 2020-02-04 08:36:15 +11:00
Zebediah Figura
d53a1b4a17 d3d9-Tests: Remove patch set.
No information is provided as to what cards or driver trigger the failures;
assume they are not relevant any longer until proven otherwise.
2020-02-02 16:05:38 -06:00
Zebediah Figura
47facf2571 d3dx9-32bpp_Alpha_Channel: Add reference to bug report. 2020-02-02 16:03:49 -06:00
Alistair Leslie-Hughes
b7c9feb3c1 Release v5.1 2020-02-03 08:11:52 +11:00
Zebediah Figura
c263c4f896 Rebase against bdf8d94e2a40f82c618ba5587cc82382c5230ac0. 2020-02-02 13:43:29 -06:00
Zebediah Figura
fa188fd6b0 wined3d-UAV_Counters: Remove patch.
The parameter checks in d3d11 are not particularly necessary; there is no known application that passes NULL here, and such an application would be easy to detect.

The additional reference to the UAV resource need not be taken, since wined3d_cs_exec_copy_uav_counter() never touches the resource (only the UAV itself).

The offset parameter check is not borne out by native Windows; indeed passing an invalid offset leaves the device in a broken state.
2020-01-30 23:47:25 -06:00
Zebediah Figura
6e474e34fb More definition file updates. 2020-01-30 23:45:19 -06:00
Alistair Leslie-Hughes
f917b2fc24 Removed wusa-MSU_Package_Installer patchset
This patch was to correct an issue with window Vista and none of the
MSU which had this issue are available.
2020-01-30 10:51:05 +11:00
Alistair Leslie-Hughes
44115dbd63 Rebase against 1bb953c6766c9cc4372ca23a7c5b7de101324218 2020-01-30 10:30:07 +11:00
Paul Gofman
59f43478d6 Updated wined3d-SWVP-shaders patchset 2020-01-29 11:46:30 +03:00
Alistair Leslie-Hughes
d83b9f53fb Updated d3dx9_36-D3DXCreateKeyframedAnimationSet patchset 2020-01-29 12:02:22 +11:00
Alistair Leslie-Hughes
f57d1b8d02 Updated ntdll-RtlIpv4StringToAddress patchset 2020-01-29 11:32:19 +11:00
Zebediah Figura
f397af1c7f Rebase against 4588f10f8d3895624a8a2087f2e5c3c1b51e576f. 2020-01-28 15:57:00 -06:00
Zebediah Figura
44fb25d66d advapi32-LsaLookupSids: Remove patches working around a Cygwin bug.
See <https://www.winehq.org/pipermail/wine-patches/2015-April/138516.html>.
There is no known current application that attempts this, and in fact simple
testing shows that the assertion that "native has similar handling" is quite
simply false.
2020-01-27 19:33:07 -06:00
Zebediah Figura
4ad9169f53 Rebase against cf6546fb3b914dc1d87b23d6920526b7487cfd6d. 2020-01-27 17:05:03 -06:00
Zebediah Figura
bbc86a61db comctrl-rebar-capture: Fix name. 2020-01-27 16:55:18 -06:00
Zebediah Figura
537b6dd5e3 Lots more definition file updates. 2020-01-27 16:53:09 -06:00
Zebediah Figura
8b862038c5 oleaut32-CreateTypeLib: Fix a misplaced address operator. 2020-01-27 16:05:11 -06:00
Zebediah Figura
3b2fb113fa user32-DrawMenuItem: Remove patch.
The attached bug is fixed; and there does not seem to be any legitimate way in which the "text" field can be set to anything other than NULL or a valid pointer.
2020-01-27 15:25:53 -06:00
Zebediah Figura
964b6c1ab5 d2d1-ID2D1Factory1: Remove patch.
This contains no functional change.
2020-01-27 15:25:00 -06:00
Zebediah Figura
fc87fb74db Various documentation updates. 2020-01-27 11:56:43 -06:00
Zebediah Figura
8bbe365bfc server-Timestamp_Compat: Remove patch.
This is only useful for converting Staging trees last used before August 2015;
it is far past time it was removed.
2020-01-26 15:35:28 -06:00
Alistair Leslie-Hughes
07ef9c93b8 Rebase against 9a9a1821a34d10bb3e96ce1e42a8d046133f0958 2020-01-25 15:42:12 +11:00
Alistair Leslie-Hughes
050435f28e Rebase against c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9 2020-01-24 09:53:05 +11:00
Alistair Leslie-Hughes
00f288b12e Updated dxva2-Video_Decoder patchset
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48497
2020-01-23 12:13:03 +11:00
Alistair Leslie-Hughes
b1e9ef0294 Rebase against 84f2ce5139bb840ee2cf381d039d3787a0cdf2b6 2020-01-23 10:56:01 +11:00
Alistair Leslie-Hughes
3ac1519f34 Release v5.0 2020-01-22 08:45:01 +11:00
Alistair Leslie-Hughes
9a2a33ee2b Correct typo
Fixes macos compile error.
2020-01-21 10:42:39 +11:00
Paul Gofman
9c3a91903e Updated ntdll-ForceBottomUpAlloc patchset
Includes various performance optimizations and fixes
stuttering in Darksiders III reported by some users.
2020-01-20 18:37:08 +03:00
Alistair Leslie-Hughes
dd581d0b2f Cleanup whitespace noise 2020-01-20 20:17:31 +11:00
Alistair Leslie-Hughes
506efa392c Updated winedevice-Default_Drivers patchset 2020-01-20 10:46:31 +11:00
Alistair Leslie-Hughes
a45597f811 Updated dsdmo-new-dll patchset 2020-01-20 10:40:10 +11:00
Alistair Leslie-Hughes
7073073fcc Added gdiplus-FontFamily-RefCount patchset 2020-01-20 10:15:48 +11:00
Rémi Bernon
9dc9c57bbf patchinstall: Test for .git presence, regardless of its type.
It's possible that .git is a file, for example when using multiple
worktrees, and in this case git apply will still work fine.
2020-01-18 21:29:42 -06:00
Alistair Leslie-Hughes
915ed2cec1 Release v5.0-rc6 2020-01-19 12:39:57 +11:00
Alistair Leslie-Hughes
329005baaf Rebase against 287dabd9b6887e94cabfa2a5f9bfe822522095e5 2020-01-15 09:12:06 +11:00
Alistair Leslie-Hughes
d8496cacd1 Disabled user32-rawinput-keyboard patchset
Disabled by request

Causing regressions
https://bugs.winehq.org/show_bug.cgi?id=48419
https://bugs.winehq.org/show_bug.cgi?id=48462
2020-01-15 08:36:02 +11:00
Alistair Leslie-Hughes
695a835b0a Rebase against 287dabd9b6887e94cabfa2a5f9bfe822522095e5 2020-01-14 09:28:28 +11:00
Paul Gofman
68bfc31be4 Updated winebuild-Fake_Dlls patchset
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48410
2020-01-13 12:40:40 +03:00
Alistair Leslie-Hughes
23960d9862 Release v5.0-rc5 2020-01-12 08:48:00 +11:00
Alistair Leslie-Hughes
bca3c546d2 Added dsound-SRW patchset 2020-01-11 17:30:43 +11:00
Alistair Leslie-Hughes
1e3eb08c69 Added dinput-DIPROP_BUFFERSIZE patchset 2020-01-11 17:07:24 +11:00
Alistair Leslie-Hughes
bd8f35fad1 Rebase against 4f0212c4fd35ac4b03a082cab27e629130ac1b13 2020-01-10 10:35:41 +11:00
Alistair Leslie-Hughes
ccd0bc4ccd Updated user32-rawinput-nolegacy patchset
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48433
2020-01-10 08:45:05 +11:00
Paul Gofman
89af635b94 Updated ntdll-ForceBottomUpAlloc patchset
Fixes hang on start in Far Cry 5.
2020-01-09 15:49:08 +03:00
Alistair Leslie-Hughes
f05f084d9a Rebase against 21003538619cb22bf35d7cf68ee0ef13ff658424 2020-01-09 10:21:50 +11:00
Alistair Leslie-Hughes
93a708bf2b Rebase against 6b839a0f85236aac2cc794d5d586f1ba371866b1 2020-01-08 11:08:54 +11:00
Alistair Leslie-Hughes
b9f34bbbc3 Update Copyright year 2020-01-07 12:25:46 +11:00
Alistair Leslie-Hughes
8be2c25e19 Dropped gdiplus-DC_Handling patchset
This patchset has been disabled for 2 years and the bug it referenced is marked as fixed.
2020-01-07 10:25:10 +11:00
Alistair Leslie-Hughes
7059b2e1ec Updated activeds-ADsOpenObject patchset 2020-01-07 08:30:38 +11:00
Alistair Leslie-Hughes
7044b0dc98 Updated dxva2-Video_Decoder patchset
Thanks Gabriel Ivăncescu.
2020-01-07 08:24:24 +11:00
Alistair Leslie-Hughes
a1bf11e38a Release v5.0-rc4 2020-01-04 10:38:31 +11:00
Alistair Leslie-Hughes
703c84ce70 Added comctl32-version_6 2020-01-03 18:23:08 +11:00
Alistair Leslie-Hughes
b79e576574 Updated winepulse-PulseAudio_Support patchset 2020-01-03 18:23:08 +11:00
Zebediah Figura
db1f94bae4 libs-Unicode_Collation: Patch dlls/kernelbase/collation.c too. 2019-12-31 19:18:22 -06:00
Alistair Leslie-Hughes
0f52b315d6 Disable ntoskrnl-safedisc-2 patchset
https://bugs.winehq.org/show_bug.cgi?id=48341
https://bugs.winehq.org/show_bug.cgi?id=48379
2019-12-31 09:09:18 +11:00
Paul Gofman
ce3fc5723d Added ntdll-User_shared_data_fields patchset 2019-12-30 14:31:01 +03:00
Paul Gofman
595f2f9860 Added ntdll-Syscall_Emulation patchset 2019-12-30 13:46:05 +03:00
Alistair Leslie-Hughes
c01051f313 Updated ntdll-ThreadHideFromDebugger patchset 2019-12-30 11:18:46 +11:00
Alistair Leslie-Hughes
d163510e1e Release v5.0-rc3 2019-12-28 18:27:35 +11:00
Alistair Leslie-Hughes
c675804204 Rebase against fa97cbdf14883fb301dcc0a5264369f8ed184182 2019-12-28 09:32:05 +11:00
Zebediah Figura
d729a7b132 Update some documentation. 2019-12-23 22:29:13 -06:00
Alistair Leslie-Hughes
2782e6db1e Updated user32-rawinput-mouse-experimental patchset 2019-12-24 08:50:21 +11:00
Alistair Leslie-Hughes
a08376bca0 Correct commit id 2019-12-24 07:58:24 +11:00
Zebediah Figura
3371e62824 gdiplus-GdipCreateBitmapFromHBITMAP: Add reference to a bug report. 2019-12-23 09:52:45 -06:00
Alistair Leslie-Hughes
8218a78955 Updated rawinput patchsets
This is a completely updated rawinput patchsets from Rémi Bernon,
replacing the current user32-rawinput.
2019-12-23 21:47:16 +11:00
Alistair Leslie-Hughes
a8cb853708 Added gdiplus-GdipCreateBitmapFromHBITMAP patchset 2019-12-23 18:07:23 +11:00
Alistair Leslie-Hughes
6cbb6dc117 Updated directmanipulation-new-dll patchset 2019-12-22 20:59:58 +11:00
Alistair Leslie-Hughes
34302e77dd Release v5.0-rc2 2019-12-21 14:31:48 +11:00
Alistair Leslie-Hughes
ae0343f628 Rebase against 6dd84c53b55ecfa2e2735a914cb126fa0c4b23a5 2019-12-21 14:28:42 +11:00
Alistair Leslie-Hughes
5905340060 Updated dmime-PChannel-range patchset 2019-12-20 10:21:04 +11:00
Paul Gofman
c8e3795e69 Updated ntoskrnl-safedisc-2 patchset
Fix kernel32 pipe tests and crash in GTAV launcher.
2019-12-19 12:40:41 +03:00
Alistair Leslie-Hughes
108662b1cc Rebase against fa66c1b3011a32036b42c436320212aa3b30ae3f 2019-12-19 09:45:39 +11:00
Paul Gofman
088d7f9ddf Added include-LdrData patchset 2019-12-18 13:23:52 +03:00
Alistair Leslie-Hughes
b788fe9549 Rebase against 238c6be5b81cbfcf8cd147b1cbb25d16803efbe1 2019-12-18 09:13:09 +11:00
Alistair Leslie-Hughes
b8b836e43d Added activeds-ADsOpenObject patchset 2019-12-17 19:08:25 +11:00
Alistair Leslie-Hughes
d44f4885f2 Added user32-window-activation patchset 2019-12-17 11:31:16 +11:00
Alistair Leslie-Hughes
73caf7ace2 Added ntoskrnl-safedisc-2 patchset 2019-12-17 11:12:41 +11:00
Paul Gofman
d36d63ac84 Updated winebuild-Fake_Dlls patchset.
Fix stack alignment in x64 syscall thunks, again.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48274
2019-12-16 16:45:05 +03:00
Alistair Leslie-Hughes
8e8259db69 Release v5.0-rc1 2019-12-14 18:41:55 +11:00
Zebediah Figura
e6aac5d240 Rebase against ce7e10868a1279573acc5be5a9659d254e936b27. 2019-12-13 21:47:52 -06:00
Paul Gofman
40d020d66e Updated winebuild-Fake_Dlls patchset.
Fix stack alignment in x64 syscall thunks.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48274
2019-12-13 19:18:23 +03:00
Alistair Leslie-Hughes
0db8c6ad3c Updated dsdmo-new-dll patchset
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48255
2019-12-13 20:58:23 +11:00
Paul Gofman
45d69ec48b Rebase against 750d382f54e494771128c6b331122be2bc747484 2019-12-13 02:37:28 +03:00
Alistair Leslie-Hughes
2326756550 Updated wintab32-improvements patchset 2019-12-12 11:46:00 +11:00
Alistair Leslie-Hughes
4522654f1c Rebase against 5f0b5d350566a46f0f999e4cff7ad9e280fcfa05 2019-12-12 11:16:40 +11:00
Alistair Leslie-Hughes
dc9fa12a14 Rebase against 626162f7db979360d231698ab1288cda97940bb9 2019-12-11 09:43:03 +11:00
Alistair Leslie-Hughes
b011002d55 comctrl-rebar-capture: Update email address 2019-12-10 18:45:50 +11:00
Zebediah Figura
3e6d6e3909 Rebase against f870aa4988fa8e980919c144682da72865364ff0. 2019-12-09 21:29:30 -06:00
Alistair Leslie-Hughes
62c069eb9f Rebase against ac245040345e2039252b26f5c44841fc730f0854 2019-12-07 14:51:02 +11:00
Zebediah Figura
cb9aa710d5 Rebase against 7ca1c4900e42d608150822ef87a7ce2847a59b6f. 2019-12-05 22:31:23 -06:00
Zebediah Figura
3a14d63abf kernelbase-ReOpenFile: Use a handle we know is invalid.
Also fixes a compiler warning spotted by Marcus Meissner.
2019-12-05 10:43:54 -06:00
Alistair Leslie-Hughes
af616c5fc3 Rebase against 67d1321c2b8eb5d54aa8fbe0807d9052ae56c1ed 2019-12-05 09:32:37 +11:00
Alistair Leslie-Hughes
7167c4d6ad Rebase against 5cf64084fb6f277c3453099a65a78817d5c9f1db 2019-12-04 10:46:54 +11:00
Alistair Leslie-Hughes
d388288e2e Updated Compiler_Warnings 2019-12-03 15:57:36 +11:00
Alistair Leslie-Hughes
7b177b15fa Updated d2d1-ID2D1Factory1 patchset 2019-12-03 15:47:34 +11:00
Alistair Leslie-Hughes
70aaee4bf8 Updated wusa-MSU_Package_Installer patchset 2019-12-03 15:27:38 +11:00
Zebediah Figura
f23d30bc06 wusa-MSU_Package_Installer: Rebase and re-enable. 2019-12-02 19:28:46 -06:00
Paul Gofman
2f95fb4782 Rebase against 5536df1ee1042c6cf20a7d96c43520003a547092 2019-12-03 03:43:30 +03:00
Alistair Leslie-Hughes
9be789b289 Release v4.21 2019-11-30 15:52:08 +11:00
Paul Gofman
0da25307db Rebase against 2935bab96569dcd734a8e855ec9a20ae27c18973 2019-11-29 22:41:24 +03:00
Alistair Leslie-Hughes
9f10bba729 Rebase against ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf 2019-11-29 09:39:35 +11:00
Alistair Leslie-Hughes
14a1f8bd0c Rebase against 4ccdf3e58a816ebf9c58000e985fd21737ffd485 2019-11-28 18:31:59 +11:00
Alistair Leslie-Hughes
3ba119e67c Rebase against ce275f38a02dd5f809eea45ff3fa02f645b56a7c 2019-11-27 11:11:51 +11:00
Paul Gofman
f4987b47e3 ntdll-ForceBottomUpAlloc: Add patch. 2019-11-26 15:05:31 +03:00
Paul Gofman
ced0f96514 ntdll-RtlGetNativeSystemInformation: Add patch. 2019-11-26 14:54:35 +03:00
Alistair Leslie-Hughes
f62913bfc3 Rebase against ddec23013e39b563a3a50c0fe42c2ae8b518d538 2019-11-26 12:16:52 +11:00
Torge Matthies
3fe9b83fa4 winecfg-Staging: Fix check for GTK3 support.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48155
2019-11-22 20:08:53 -06:00
Zebediah Figura
194199011a Rebase against 190fb605c34ac1365076dff0a6560ddb42ca1ef2. 2019-11-22 20:02:37 -06:00
Alistair Leslie-Hughes
7e4e808869 Rebase against 90fc020400c06c163d4ab117d8da755b0f0e0861 2019-11-22 09:51:24 +11:00
Zebediah Figura
38efd9d1bc ntdll-x86_64_SegDs: Add patch. 2019-11-21 10:58:02 -06:00
Zebediah Figura
29cc042257 ntdll-ThreadHideFromDebugger: Add patch. 2019-11-20 18:54:23 -06:00
Zebediah Figura
1f5394ae51 Rebase against aa3d01e65019fb2f135f74cf26cfa1661ca09325. 2019-11-20 18:48:50 -06:00
Alistair Leslie-Hughes
a9639c412f Rebase against a9c4b309f6af82b624604bd0df898ad88d59ab5a 2019-11-20 10:28:28 +11:00
Zebediah Figura
d391086546 d3d9-Direct3DShaderValidatorCreate9: The last argument to "stub2" is at most 32 bits in size.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48132
2019-11-18 21:45:03 -06:00
Alistair Leslie-Hughes
41ebbee85d Rebase agaisnt 288a6625ad0177e258a0db1da166d292ff420b1e 2019-11-19 09:46:15 +11:00
Alistair Leslie-Hughes
69cf026375 Added kernelbase-ReOpenFile patchset 2019-11-18 09:51:47 +11:00
Alistair Leslie-Hughes
356f228262 Release v4.20 2019-11-16 14:10:37 +11:00
Alistair Leslie-Hughes
f94a274729 Rebase against 5725ed3b46309b62469e4f305cb0b5a9b292dd43 2019-11-14 12:08:19 +11:00
Alistair Leslie-Hughes
cec9c7c73e Restore ole32-STGPROP patch 0001 2019-11-13 16:13:53 +11:00
Zebediah Figura
411f2a9702 d3d9-Direct3DShaderValidatorCreate9: Add patch set. 2019-11-12 21:15:58 -06:00
Zebediah Figura
ef0e88407e Rebase against 292b728908563952f56b0585d072f3d7a08e93b2. 2019-11-12 19:56:51 -06:00
Zebediah Figura
8148194353 Rebase against 34ed1e37da1e1c1cfd641f1f16b0e00030cbb357. 2019-11-11 19:53:15 -06:00
Zebediah Figura
ca018c8079 ntdll-NtContinue: Fix arguments to NtContinue(). 2019-11-10 20:47:35 -06:00
Zebediah Figura
7a3f594df2 evenfd_synchronization: Fix rebase, again.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48069
2019-11-09 13:56:25 -06:00
Alistair Leslie-Hughes
01a3c15320 Rebase against 070cfc358c8ed67ba08a49ae78c20205ab4e2d00 2019-11-09 15:13:58 +11:00
Zebediah Figura
fb40c21c72 Fix some errors in the last rebase, and add more dependencies. 2019-11-07 20:28:05 -06:00
Alistair Leslie-Hughes
0a469905c2 Rebase against 88d30985ddd534e8bafed531e619846bc8d10839 2019-11-08 11:55:03 +11:00
Zebediah Figura
e1ac8f20fe ntdll-MemoryWorkingSetExInformation: Fix a typo. 2019-11-07 10:00:59 -06:00
Zebediah Figura
471dc198a8 ntdll-NtContinue: Also use NtContinue() to continue after an exception on x86_64.
Patch by David Torok.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47970
2019-11-06 21:50:56 -06:00
Zebediah Figura
6c44e84e74 ntdll-NtContinue: Get rid of the check for CONTEXT_FULL.
Returning an error (silently!) is not an improvement over printing a message
and doing nothing, especially since I suspect no caller is going to be able
to cope with NtContinue() returning.

More saliently, Legends of Runeterra apparently accidentally passes the wrong
CPU flag. We don't do anything with the CPU flag, and manual testing shows
that Windows doesn't validate it in NtGetContextThread() at least, so it
probably doesn't validate it here either.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47970
2019-11-06 21:50:52 -06:00
Zebediah Figura
0c89d96edc winebuild-Fake_Dlls: Put the RET at the end of the 64-bit syscall thunk back.
I will pretend I did not see that
2019-11-06 20:15:26 -06:00
Zebediah Figura
5fbf201ea8 winebuild-Fake_Dlls: Adjust the 64-bit syscall dispatcher to return to the first "ret" instruction.
Diagnosed by David Torok: https://bugs.winehq.org/show_bug.cgi?id=47970
2019-11-06 19:06:57 -06:00
Alistair Leslie-Hughes
8c5d374d5a Rebase agaisnt 7f469b689a2dccc0863952cd73e592df391dc607 2019-11-06 10:16:40 +11:00
Alistair Leslie-Hughes
ded2e22686 Rebase against 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe 2019-11-05 12:23:05 +11:00
Alistair Leslie-Hughes
1f77584097 Release v4.19 2019-11-02 10:37:40 +11:00
Alistair Leslie-Hughes
6e793996ba Rebase against ccec532879ec14b2e79da08288152a69221ec4d1 2019-11-01 18:10:58 +11:00
Paul Gofman
6f1ebb84a2 Added ntdll-BitmaskAllocAreaSearch patchset. 2019-10-31 16:42:52 +03:00
Alistair Leslie-Hughes
d26687d90a Updated ntdll-User_Shared_Data patchset
Silence a noisy FIXME, by github user Guy1524
2019-10-31 11:48:18 +11:00
Alistair Leslie-Hughes
067a975495 Rebase against 666f7501d03983f84833a7a1952e78fd0650fde6 2019-10-30 11:26:22 +11:00
Alistair Leslie-Hughes
bc4e00ae02 Rebase against 5b62f89baa82daecd430897de0bb5cab32c5fc5e 2019-10-29 09:50:40 +11:00
Alistair Leslie-Hughes
086d99f83e Rebase against 237d5636271a1a78b02a0eb7feaab7dfb9dfed57 2019-10-28 09:12:06 +11:00
Alistair Leslie-Hughes
bc7627cdf1 Rebase against 717109ce79bbf92b5e3e93e49f96b78ece00a952 2019-10-24 08:29:06 +11:00
Alistair Leslie-Hughes
e380c1e9a7 Rebase against d82f06c07556408e9584d2a1f8b275df39c93d74 2019-10-23 10:20:30 +11:00
Alistair Leslie-Hughes
a568bd3e79 Rebase against 98c2c9a9c98d174851fa7a87db79599dd7d8af89 2019-10-22 09:01:23 +11:00
Alistair Leslie-Hughes
9807a02bb3 Release v4.18 2019-10-19 13:37:33 +11:00
Alistair Leslie-Hughes
eab8fd69f7 Rebase against 8c74027ba60a360f24cf232ee233e71262d8f1ff 2019-10-19 13:36:30 +11:00
Alistair Leslie-Hughes
b95882c061 Updated advapi32-LsaLookupSids patchset
Fix test in last rebase.
2019-10-18 10:10:00 +11:00
Alistair Leslie-Hughes
49b240d88c Rebase against 0fe003435e90dc32dd405a62af8fbcc20afc925d 2019-10-18 08:54:48 +11:00
Alistair Leslie-Hughes
c96aa29030 Added user32-InternalGetWindowIcon patchset 2019-10-14 10:40:38 +11:00
Alistair Leslie-Hughes
d432608737 Updated dinput-joy-mappings patchset 2019-10-11 14:20:41 +11:00
Alistair Leslie-Hughes
db09443c86 Updated ntdll-RtlIpv4StringToAddress reference 2019-10-11 13:34:43 +11:00
Alistair Leslie-Hughes
da73254259 Updated dinput-joy-mappings patchset
- Use heap_alloc/free
- Remove use of const buffers.
- Add "dinput: Dont allow Fixed actions to be changed."
2019-10-11 13:30:49 +11:00
Alistair Leslie-Hughes
a246130f81 Rebase against 89d9bcb1f19a03ffafa9a93a5f32049b4bfdaa00 2019-10-09 08:38:54 +11:00
Paul Gofman
042a633c8a Rebase against 15bf3eee2cf05ce98011458fc5e715f4524c4ebd 2019-10-04 02:11:27 +03:00
Zebediah Figura
cf04b8d6ac eventfd_synchronization: Cherry-pick some fixes. 2019-10-02 20:37:48 -05:00
Alistair Leslie-Hughes
6be963ebfd Rebase against 5e8eb5f4c54c3a6d3c92fd414372da2fbd5bd91a 2019-10-03 08:54:04 +10:00
Alistair Leslie-Hughes
5b066d6aed Disable user32-rawinput patchset
This is causing regressions across the board.
https://bugs.winehq.org/show_bug.cgi?id=47834

Star Craft 2, Borderlands, StarCitizen, Halo Online
2019-10-02 10:41:41 +10:00
Alistair Leslie-Hughes
c24cb89257 Rebase against b360cd67e8f7f8c01f09457bacb032fd4a248d0a 2019-10-02 10:11:40 +10:00
Paul Gofman
3d5bb83e05 Updated wined3d-zero-inf-shaders patchset.
Avoid infinity resulting from overflow in POW with multiply_setting set to 1.
2019-10-01 21:52:15 +03:00
Alistair Leslie-Hughes
0c7512f5f5 Updated user32-rawinput patchset 2019-09-29 18:06:18 +10:00
Alistair Leslie-Hughes
9fe5cabf21 Release v4.17 2019-09-28 13:26:48 +10:00
Paul Gofman
99c474f018 Updated d3d11-Deferred_Context patchset.
Fix device reference leak on command list release.
2019-09-27 17:30:48 +03:00
Paul Gofman
c942f42ee5 Remove wined3d-DXTn patchset.
Should be obsolete since 5a6efe632918fd18758897c39910d52791d46053
mainstream commit.
2019-09-27 17:30:48 +03:00
Paul Gofman
670a9e20c0 Updated d3d11-Deferred_Context patchset.
Add basic test for drawing with deferred context.
2019-09-27 17:30:27 +03:00
Paul Gofman
0c815a486b Updated d3d11-Deferred_Context patchset.
Fix test failures.
2019-09-27 16:42:57 +03:00
Paul Gofman
cdfddb170a Updated d3dx9_36-CloneEffect patchset.
Fix test failures.
2019-09-27 16:42:57 +03:00
Paul Gofman
c58f817de8 Updated d3dx9-32bpp_Alpha_Channel patchset.
Removed todo_wine from relevant test.
2019-09-27 16:42:57 +03:00
Paul Gofman
c7d0330ce8 Updated ddraw-Rendering_Targets patchset. 2019-09-27 04:09:44 +03:00
Paul Gofman
c6f7b46951 Updated d3dx9_36-Texture_Align patchset. 2019-09-27 04:04:51 +03:00
Paul Gofman
84a644848c Updated wined3d-SWVP-shaders patchset. 2019-09-27 03:53:25 +03:00
Paul Gofman
b24b3a88cc Rebase against f4ecef456595325f973487173cad3ac1269d87f9. 2019-09-27 01:05:22 +03:00
Alistair Leslie-Hughes
ced72a6a0a Add missing file 2019-09-25 19:35:51 +10:00
Alistair Leslie-Hughes
e09468ec17 Updated user32-rawinput patchset 2019-09-25 14:26:05 +10:00
Alistair Leslie-Hughes
81ac4ea01a Fix rebase 2019-09-25 14:05:04 +10:00
Alistair Leslie-Hughes
053de1b617 Drop mfplat-MFGetConfigurationDWORD patchset
Mixing Native/Builtin mfplat isn't supported.
2019-09-25 12:55:41 +10:00
Alistair Leslie-Hughes
47891c1826 Disable user32-rawinput
As Rémi Bernon patches will soon supersede this, disabled once again.
2019-09-25 12:55:30 +10:00
Alistair Leslie-Hughes
dd7f7cc1ba Rebase against ae8f605ede0054c8e380e809c196f2621d9cf423 2019-09-25 12:45:16 +10:00
Zebediah Figura
649c35ff92 Rebase against ae8f605ede0054c8e380e809c196f2621d9cf423. 2019-09-23 18:54:36 -05:00
Zebediah Figura
7c57b6eba4 Rebase against 27da4fa4498c3b6e0e46c72a9cdd13b620726e92. 2019-09-20 17:04:56 -05:00
Alistair Leslie-Hughes
c0389b0479 Enable user32-rawinput patchset 2019-09-20 08:59:46 +10:00
Alistair Leslie-Hughes
fd3b1a04e7 Added dsdmo-new-dll patchset 2019-09-19 11:54:33 +10:00
Alistair Leslie-Hughes
fab929969c Added dmime-PChannel-range patchset 2019-09-19 11:47:24 +10:00
Zebediah Figura
ccdf3d98ff uxtheme-GTK_Theming: Depend on uxtheme-CloseThemeClass. 2019-09-18 20:35:15 -05:00
Alistair Leslie-Hughes
1e58aad446 Correct GTK patchset change 2019-09-19 11:14:24 +10:00
Zebediah Figura
8dc124ce70 uxtheme-GTK_Theming: Various build fixes.
Don't add a new autoconf macro, just use the existing one.
2019-09-18 19:24:49 -05:00
Zebediah Figura
b6054fa105 Add some references to bug reports. 2019-09-18 18:39:54 -05:00
Zebediah Figura
fe6b2652ef ntdll-NtContinue: Fix rebase. 2019-09-18 18:23:55 -05:00
Alistair Leslie-Hughes
692d7d43e0 Rebase against e83f427a65726bfdefd2712a96f228e720c8b274 2019-09-19 08:53:36 +10:00
Alistair Leslie-Hughes
6bee4b6e76 Rebase against 12c09051b48507cf8bb37d500719661d0c6ad9f0 2019-09-18 08:15:22 +10:00
Alistair Leslie-Hughes
c323ef47c7 Release v4.16 2019-09-14 17:17:30 +10:00
Zebediah Figura
9e6693ed13 ntdll-Interrupt-0x2e: Fully handle interrupt 0x2e on the signal stack. 2019-09-13 17:12:40 -05:00
Zebediah Figura
29bdd4cd85 ntdll-Signal_Handler: Restore accidentally deleted hunk. 2019-09-13 17:03:26 -05:00
Zebediah Figura
39d7dcb2c6 Rebase against 3bf7473b880eea8b8dcaa43487afda2d7b1fbd03. 2019-09-13 17:03:00 -05:00
Alistair Leslie-Hughes
2e4d0f4727 Updated wined3d-zero-inf-shaders patchset 2019-09-13 09:28:30 +10:00
Alistair Leslie-Hughes
fd818b1914 Update mfplat-MFGetConfigurationDWORD patchset 2019-09-13 09:28:30 +10:00
Alistair Leslie-Hughes
26e542b4e5 Rebase against 85d8d1390467147fca416236fd50bb6ea2e2c8e4 2019-09-13 09:28:30 +10:00
Alistair Leslie-Hughes
6ef7be2566 Updated directmanipulation-new-dll patchset 2019-09-12 09:00:15 +10:00
Alistair Leslie-Hughes
5b012f08d5 Added mfplat-MFGetConfigurationDWORD patchset 2019-09-12 09:00:15 +10:00
Alistair Leslie-Hughes
8390ba0d95 Added wined3d-zero-inf-shaders patchset 2019-09-12 08:33:01 +10:00
Alistair Leslie-Hughes
fb18deb95f Rebase against 1413f577c592cd4aaeb3dba1a8adbe3e04d62d29 2019-09-11 09:26:34 +10:00
Alistair Leslie-Hughes
27b33a4be9 Remove setupapi-Display_Device patchset
This has been reported as fixed upstream and is no longer required.

Thanks Zhiyi Zhang.
2019-09-10 18:16:20 +10:00
Zebediah Figura
a15bdaa0ba Rebase against 01b19b63a454aa455928c10c694895fdba901aba. 2019-09-09 18:52:44 -05:00
Zebediah Figura
734918298c Rebase against 765815729fc4af2472e60551364e3b29dccfbcff. 2019-09-06 17:38:54 -05:00
Alistair Leslie-Hughes
bc1aa54891 Rebase against 92c00c51b21594987d342b5ce00c174ab4e84595 2019-09-05 08:52:02 +10:00
Alistair Leslie-Hughes
2da0d341f6 Rebase against 363b8809f37b3ea5915ea4240b3d397fd2355e2e 2019-09-04 08:23:20 +10:00
Alistair Leslie-Hughes
155cb0b051 Rebase against 0c2f5f8b15a4f7bb7008c3efb12b4cd3c774a3a1 2019-09-04 08:02:11 +10:00
Alistair Leslie-Hughes
498c9eae60 Added macos-compile patchset 2019-09-04 07:58:11 +10:00
Alistair Leslie-Hughes
a46b9ff3dc Release v4.15 2019-08-31 17:01:02 +10:00
Alistair Leslie-Hughes
6589142220 Updated ntdll-RtlIpv4StringToAddress patchset 2019-08-31 17:01:02 +10:00
Alistair Leslie-Hughes
fd3bb06a4c Disabled user32-rawinput patchset
This is currently causing a regression in Overwatch.
Disabled until an updated patch corrects the regression found.
2019-08-31 17:01:02 +10:00
Zebediah Figura
49aafeb17b Rebase against a4aaf3f3d184c2cdad8c4bf06dc10980744a9d15. 2019-08-30 17:36:34 -05:00
Alistair Leslie-Hughes
841e2a8cda Rebase against e54f1cf9fba1ae8748e8e5c577530138baaf9e3d 2019-08-30 08:51:18 +10:00
Alistair Leslie-Hughes
4aa460b8cd Rebase against 124f48d3114fe86f5feda2ce200d87b97c4009de 2019-08-29 10:21:37 +10:00
Alistair Leslie-Hughes
512d0b1d30 Added wined3d-inverted-objects patchset 2019-08-28 10:25:51 +10:00
Alistair Leslie-Hughes
ff10ae6e74 Rebase against 480bae108c96dfe370feba2680dbefc42ef97571 2019-08-27 09:19:43 +10:00
Alistair Leslie-Hughes
fcfeaf092c Drop mailing-list-patches patchset 2019-08-26 16:14:56 +10:00
Zebediah Figura
2da5f18812 Rebase against f238e846e701d2039eceb51f2f6e9d936f8c791c. 2019-08-23 16:10:19 -05:00
Zebediah Figura
004a5a5717 ntoskrnl.exe-IoInvalidateDeviceRelations: Create separate patch set. 2019-08-23 15:33:28 -05:00
Alistair Leslie-Hughes
7447216104 Rebase against fb5b0c64639c056d55e14011a3b4e6f2d83e7cda 2019-08-23 08:14:11 +10:00
Alistair Leslie-Hughes
938dddf7df Added user32-rawinput patchset
This include patch from winex11-mouse-movements.
2019-08-22 14:33:14 +10:00
Alistair Leslie-Hughes
618e349c72 Rebase against a64b9c93b1eeef151221b5a100547fdae85435f4 2019-08-21 08:19:29 +10:00
Alistair Leslie-Hughes
2007f010ac Rebase against 5ea3a044b83c4cd55a3c647f5e80511a85b9f536 2019-08-20 08:39:18 +10:00
Alistair Leslie-Hughes
fb4fcb4da6 Updated ntdll-NtQuerySection patchset 2019-08-19 11:56:35 +10:00
Alistair Leslie-Hughes
74068f2cab Updated uxtheme-GTK_Theming patchset
Correct warnings this time.
2019-08-19 10:36:41 +10:00
Alistair Leslie-Hughes
31157f5ed4 Updated kernel32-SetProcessDEPPolicy patchset 2019-08-19 10:35:46 +10:00
Alistair Leslie-Hughes
3813f414ed Updated directmanipulation-new-dll patchset 2019-08-19 10:07:18 +10:00
Alistair Leslie-Hughes
c6f239ef2e Updated ddraw-Texture_Wrong_Caps patchset 2019-08-19 10:06:24 +10:00
Alistair Leslie-Hughes
3b3cb09acc Added kernel32-EnumSystemFirmwareTables patchset 2019-08-19 09:45:23 +10:00
Alistair Leslie-Hughes
5734c2c2df Added cryptext-CryptExtOpenCER patchset 2019-08-19 09:45:23 +10:00
Alistair Leslie-Hughes
8ceae1a2a3 Updated uxtheme-GTK_Theming patchset 2019-08-19 09:45:23 +10:00
Alistair Leslie-Hughes
31c73c6b53 Release v4.14 2019-08-17 16:37:01 +10:00
Alistair Leslie-Hughes
c205df71c7 Updated advapi32-Token_Integrity_Level patchset 2019-08-16 21:47:24 +10:00
Alistair Leslie-Hughes
010c308abd Updated fsutil-Stub_Program patchset 2019-08-16 20:10:02 +10:00
Alistair Leslie-Hughes
924665da6f Updated wusa-MSU_Package_Installer patchset 2019-08-16 20:10:02 +10:00
Alistair Leslie-Hughes
523d4ac996 Rebase against dc23cca322a93915465a1ea3ca6f360106cd2018 2019-08-16 08:54:07 +10:00
Alistair Leslie-Hughes
67035d62f7 Rebase against 4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e 2019-08-15 14:07:34 +10:00
Alistair Leslie-Hughes
35a5f7db93 Rebase against 4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e 2019-08-14 10:02:43 +10:00
Alistair Leslie-Hughes
ca09e8918c Rebase against cf5ccf29a9ae341cebe03634b3c4220c0c59ea53 2019-08-13 10:40:13 +10:00
Zebediah Figura
49b441e0df Rebase against 5e8ded1646579a597c029531f2612930b17c7627. 2019-08-09 20:12:17 -05:00
Zebediah Figura
f901156486 Rebase against 6e3d68b14120563fd584fe9c5a27885f51e7ae66. 2019-08-08 20:33:13 -05:00
Zebediah Figura
c7780d90cb Rebase against 9855fbe252ff3664d879e8cd9f5d1ea879af47dd. 2019-08-08 20:14:29 -05:00
Alistair Leslie-Hughes
73f58bac41 Rebase against 15dd8e2b981ca32cae94409153627b3300bbeab8 2019-08-06 09:06:07 +10:00
Alistair Leslie-Hughes
ad822b6405 Added user32-recursive-activation patchset 2019-08-05 10:27:34 +10:00
Alistair Leslie-Hughes
9917fb4559 Updated wintab32-improvements patchset
Dropped scalling patch as it's causing regressions.
2019-08-05 08:56:26 +10:00
Alistair Leslie-Hughes
3f06c18b19 Release v4.13 2019-08-03 13:35:02 +10:00
Alistair Leslie-Hughes
2474aff2c1 Rebase against 559842ffc15f85b54a8731b6c6603468f9dd740b 2019-08-03 09:37:53 +10:00
Alistair Leslie-Hughes
c9b8050f9d Rebase against 559842ffc15f85b54a8731b6c6603468f9dd740b 2019-08-02 08:48:28 +10:00
Alistair Leslie-Hughes
2394b08005 Rebase against fdf8d7176f59043999b34ff4facdcbee14a7d6aa 2019-08-01 08:46:58 +10:00
Alistair Leslie-Hughes
276ed085b7 Updated wuauserv-Dummy_Service patchset 2019-07-30 14:18:24 +10:00
Alistair Leslie-Hughes
b5010c55e8 Updated winedevice-Default_Drivers patchset 2019-07-30 14:15:05 +10:00
Alistair Leslie-Hughes
391055dbe1 Updated directmanipulation-new-dll patchset 2019-07-29 09:49:00 +10:00
Alistair Leslie-Hughes
7ebc640edb Updated user32-Implement-CascadeWindows patchset 2019-07-26 10:38:35 +10:00
Alistair Leslie-Hughes
4413770af1 Updated mailing-list-patches patchset 2019-07-26 10:38:35 +10:00
Alistair Leslie-Hughes
aad0b50e62 Updated directmanipulation-new-dll patchset 2019-07-26 10:38:35 +10:00
Alistair Leslie-Hughes
9fd7972c2b Updated mailing-list-patches 2019-07-23 08:56:49 +10:00
Alistair Leslie-Hughes
a67dca35a1 Updated directmanipulation-new-dll 2019-07-23 08:56:49 +10:00
Alistair Leslie-Hughes
5d7a86d054 Updated mailing-list-patches patchset 2019-07-19 11:01:02 +10:00
Alistair Leslie-Hughes
a12c030bd9 Updated directmanipulation-new-dll patchset 2019-07-19 09:18:06 +10:00
Alistair Leslie-Hughes
a0735f083d Added directmanipulation-new-dll patchset 2019-07-18 11:44:22 +10:00
Alistair Leslie-Hughes
460094e600 Updated mailing-list-patches patchset 2019-07-18 08:38:41 +10:00
Alistair Leslie-Hughes
c95aae1049 Updated mailing-list-patches patchset
Thanks Tk-Glitch for the update.
2019-07-16 15:04:24 +10:00
Alistair Leslie-Hughes
394c51bd20 Added cmd-launch-association patchset 2019-07-16 14:18:17 +10:00
Alistair Leslie-Hughes
0bdc57245a Updated mailing-list-patches patchset 2019-07-16 11:36:29 +10:00
Alistair Leslie-Hughes
9092f3922a Updated mailing-list-patches and loader-KeyboardLayouts patchset
Just some cleanups, no actual code changes.
2019-07-16 11:25:13 +10:00
Alistair Leslie-Hughes
e298cdfaf9 Added d3dx9_36-D3DXCreateKeyframedAnimationSet patchset 2019-07-16 10:37:07 +10:00
Alistair Leslie-Hughes
b95b9109b8 Use FAudio library now 2019-07-15 09:35:57 +10:00
Alistair Leslie-Hughes
8d19b3fc4b Added wined3d-swapchain-buffers patchset 2019-07-15 09:02:55 +10:00
Alistair Leslie-Hughes
aa2ec8b32c Added dbgeng-IDebugClient7 patchset 2019-07-15 08:36:48 +10:00
Alistair Leslie-Hughes
944b464511 Added msctf-ITfActiveLanguageProfileNotifySink patchset 2019-07-15 08:35:24 +10:00
Alistair Leslie-Hughes
1b15ab1bdc Updated mailing-list-patches patchset 2019-07-13 09:09:27 +10:00
Alistair Leslie-Hughes
6e530333e6 Updated mailing-list-patches patchset 2019-07-12 09:03:03 +10:00
Alistair Leslie-Hughes
5ed9211eab Added mailing list patchset 2019-07-11 09:40:22 +10:00
Alistair Leslie-Hughes
e0bf5ac738 Added ntdll-RtlIpv4StringToAddress patchset 2019-07-10 09:49:35 +10:00
Alistair Leslie-Hughes
accf189516 Updated loader-KeyboardLayouts patchset 2019-07-10 08:37:16 +10:00
Alistair Leslie-Hughes
f07181375b Release v4.12.1 2019-07-07 21:17:23 +10:00
Alistair Leslie-Hughes
35f28c4538 Rebase against 40a83b2ff3bca9ef58d03400a3c8e4aac94a0dc7 2019-07-07 13:18:09 +10:00
Alistair Leslie-Hughes
4babcaf231 Release v4.12 2019-07-06 17:50:06 +10:00
Alistair Leslie-Hughes
eba1e9b28a Rebase against 8c34add3bd747d8ff267974de67880b7eb50bc8d 2019-07-06 15:21:16 +10:00
Alistair Leslie-Hughes
52076762ec Rebase against 201d13a3c31131f204f89d61be37bf75d58dc6dd 2019-07-05 08:25:41 +10:00
Alistair Leslie-Hughes
e1bfd97e2b Reenabled d3dx9_36-DXTn patchset 2019-07-04 10:38:41 +10:00
Alistair Leslie-Hughes
ca8ae3e929 Rebase against 436fb03a87ae6dcbbbe149e401942b7eb8369f51 2019-07-03 09:33:31 +10:00
Alistair Leslie-Hughes
c08046e1cc Rebase against 95be042be3f116db38eb4a255c2667a6b46fcc1e 2019-07-02 08:32:28 +10:00
Alistair Leslie-Hughes
53dad92c83 Added loader-KeyboardLayouts patchset 2019-07-01 10:41:41 +10:00
Alistair Leslie-Hughes
82c59d7eca Added user32-LoadKeyboardLayoutEx patchset 2019-07-01 09:19:46 +10:00
Alistair Leslie-Hughes
507cb29933 Added kernel32-SetProcessDEPPolicy patchset 2019-07-01 08:26:17 +10:00
Alistair Leslie-Hughes
dff74f4169 Added wined3d-unset-flip-gdi patchset 2019-07-01 08:25:21 +10:00
Alistair Leslie-Hughes
292e3c87d9 Added shlwapi-UrlCanonicalize patchset 2019-07-01 08:25:04 +10:00
Alistair Leslie-Hughes
fbb8eac819 Rebase against 90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1 2019-06-28 19:46:18 +10:00
Alistair Leslie-Hughes
41d6d5f39a Updated wined3d-SWVP-shaders patchset 2019-06-28 19:32:50 +10:00
Alistair Leslie-Hughes
ca67426420 Rebase against 6d417f7890ee94dd17acc18eb2ef81f152dd0ed0 2019-06-28 08:38:47 +10:00
Alistair Leslie-Hughes
3ad0475779 Rebase against 6e9746158030c4a8f876bf411e598e2b42ff1032 2019-06-27 09:06:23 +10:00
Alistair Leslie-Hughes
fad0c725ae Rebase against 887a57fadd00b39b266b421fe1a04ab09e0d917d 2019-06-26 12:57:43 +10:00
Alistair Leslie-Hughes
be41345d31 Rebase against d83b71ebfdfe83704c313d7c11e8c87c9a8b0419 2019-06-25 08:22:06 +10:00
Alistair Leslie-Hughes
e6f1cafdd8 Release v4.11 2019-06-22 11:32:30 +10:00
Alistair Leslie-Hughes
79ed5e86aa Rebase against 07afb240a87d097c83ca5263c61145a170894a22 2019-06-22 11:06:58 +10:00
Alistair Leslie-Hughes
3bba693408 Added mshtml-TranslateAccelerator patchset 2019-06-21 11:01:13 +10:00
Alistair Leslie-Hughes
be5814e428 Rebase against cce8074aa9fb2191faba25ce7fd24e2678d3bd17 2019-06-21 09:51:08 +10:00
Alistair Leslie-Hughes
ed630b8146 Updated kernel32-PE_Loader_Fixes patchset
Thanks Paul.
2019-06-20 09:10:31 +10:00
Alistair Leslie-Hughes
11194ea339 Rebase against 48f93bc3290596b8da4455496fa88cd13ea6f3c9 2019-06-20 08:28:26 +10:00
Alistair Leslie-Hughes
694f513d71 Rebase against 1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625 2019-06-19 21:05:55 +10:00
Alistair Leslie-Hughes
b5055c0b1b Rebase against 4aa7fbe0561e6a27f098a05a63c5a7d12397e678 2019-06-18 09:07:13 +10:00
Alistair Leslie-Hughes
e07b0fa042 Disabled setupapi-Display_Device patchset
This patchset need to be revisited since it causing a stack
overflow after the improved EnumDisplayDevicesW patches
were accepted.
2019-06-14 19:22:45 +10:00
Alistair Leslie-Hughes
e7110e5153 Rebase against c13351c05af43aa542938e0c0935b154a8166905 2019-06-14 09:36:53 +10:00
Alistair Leslie-Hughes
e2fa6bd9c0 Rebase against 83ca9a95de80083d906a2aeb5d1e5ca2ed611199 2019-06-12 08:31:14 +10:00
Alistair Leslie-Hughes
ed9681d9df Release v4.10 2019-06-11 09:23:11 +10:00
Alistair Leslie-Hughes
1196bcb86b Updated wined3d-SWVP-shaders patchset 2019-06-11 09:19:17 +10:00
Alistair Leslie-Hughes
9afb244a8e Rebase against 78f74446b9806f63a27c2d643b8e29156b5bdcbe 2019-06-11 09:17:17 +10:00
Alistair Leslie-Hughes
5681cd5466 Added dinput-SetActionMap-genre patchset 2019-06-07 11:33:47 +10:00
Alistair Leslie-Hughes
1d3c799e6f Added ntdll-ext4-case-folder patchset 2019-06-07 10:53:43 +10:00
Alistair Leslie-Hughes
a49aa40ac8 Rebase against 48a74277f5f9e0c87d8c01457236a89d94cb71d3 2019-06-07 08:52:10 +10:00
Alistair Leslie-Hughes
1998c0570d Rebase against 4d5c874f42e27ac992f361c71490985d7553571a 2019-06-06 08:56:13 +10:00
Alistair Leslie-Hughes
245fc7913d Updated wined3d-Dual_Source_Blending patchset
Fixes a regression introduced in 3287f0fc9b
2019-06-05 10:23:45 +10:00
Alistair Leslie-Hughes
a1afc6f151 Rebase against 7d77d330a5b60be918dbf17d9d9ca357d93bff29 2019-06-05 09:35:37 +10:00
Alistair Leslie-Hughes
3287f0fc9b Rebase against c92fddae8661233e7699e1914987f0cc4caa8217 2019-06-04 09:10:22 +10:00
Alistair Leslie-Hughes
671295089e Updated user32-msgbox-Support-WM_COPY-mesg patchset
Thanks Gabriel Ivăncescu
2019-06-01 14:50:56 +10:00
Zebediah Figura
197e08b441 Rebase against 1d9a3f6d12322891a2af4aadd66a92ea66479233. 2019-05-30 22:27:25 -05:00
Alistair Leslie-Hughes
cd1862609a Updated tdll-Junction_Points patchset 2019-05-30 11:43:08 +10:00
Alistair Leslie-Hughes
8725e273cc Rebase against 6d05fae6f7ebab83a2f1c6621d9619bbe91833fd 2019-05-29 09:41:06 +10:00
Alistair Leslie-Hughes
b9204d93c9 Rebase against 3139727a97a91b91e74d57ec97a8c19b0093b68e 2019-05-28 08:31:07 +10:00
Alistair Leslie-Hughes
e1259ef094 Drop ddraw-Fix_Typos patchset
This is never going to accepted upstream and doesn't add
any benifit to staging.
2019-05-27 10:52:34 +10:00
Alistair Leslie-Hughes
bccec28691 Drop wined3d-Restore-DirectX10-Support patchset
The nVidia Legacy driver hasn't been updated in nearly a year
and is unlikely to see another update.

Use the nouveau driver.
2019-05-27 10:42:34 +10:00
Alistair Leslie-Hughes
f25c0ce411 Updated libs-Debug_Channel patchset
Thanks Derek Lesho.
2019-05-27 09:32:00 +10:00
595 changed files with 29792 additions and 30041 deletions

View File

@@ -1,30 +0,0 @@
Contributing to Wine Staging
----------------------------
First of all, thank you for taking the time to contribute to this project.
### Reporting bugs
Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
can report problems directly at [bugs.winehq.org](https://bugs.winehq.org/).
Most of the time bugs found in Wine Staging also turn out to be present in the
development branch, so its recommended to open your bug in the "Wine" product,
unless you are sure its really "Wine Staging" specific. For bugs related to our
binary packages, please open a bug report in the "Packaging" product.
### Submitting patches
**IMPORTANT:** Please use [dev.wine-staging.com](https://dev.wine-staging.com/patches)
for patch submissions, we currently do not accept Pull requests on GitHub.
Wine Staging mainly concentrates on experimental features and patches which are
difficult to get into the development branch. If you have a very simple bug fix
including tests, there is usually no need to send it to Wine Staging. You can
directly contribute it to the
[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
already tried that without success, or are working on such a complex area that
you do not really think its ready for inclusion, you might want to submit it to
our Staging tree. Please open a patch submission request on
[dev.wine-staging.com](https://dev.wine-staging.com/patches) including the patch.
More information is also available in our
[Wiki](https://wiki.winehq.org/Wine-Staging_Patches).

View File

@@ -8,7 +8,8 @@ are part of **Wine Staging** and are licensed under the terms of the
```
Copyright (C) 2014-2017 the Wine Staging project authors.
Copyright (C) 2018 Alistair Leslie-Hughes
Copyright (C) 2018 Alistair Leslie-Hughes, Zebediah Figura
Copyright (C) 2019-2020 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
Wine Staging is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public

View File

@@ -6,15 +6,14 @@ features, which have not been integrated into the development branch yet. The
idea of Wine Staging is to provide experimental features faster to end users and
to give developers the possibility to discuss and improve their patches before
they are integrated into the main branch. More information about Wine Staging
can also be found on our website [wine-staging.com](http://wine-staging.com).
can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging).
Installation
------------
Ready-to-use packages for Wine Staging are available for a variety of Linux
distributions and for Mac OS X. Just follow the
[installation instructions](https://wine-staging.com/installation.html)
for your operating system.
distributions and for Mac OS X. Just follow the [installation
instructions](https://wiki.winehq.org/Download) for your operating system.
On most distributions the `wine-staging` package is installed to
`/opt/wine-staging`, such that multiple Wine versions can be installed in
@@ -78,5 +77,6 @@ in our [Wiki](https://wiki.winehq.org/Wine-Staging).
Contributing
------------
Please see CONTRIBUTING.md for more information about contributing to Wine
Staging.
For information on contributing to Wine-Staging, please see
<https://wiki.winehq.org/Wine-Staging_Contributing>. Note that GitHub pull
requests are strongly dispreferred, especially for patches.

View File

@@ -1,4 +1,4 @@
From 2aeb3a9e57142c3f4ff86cb81b206bdbc146552d Mon Sep 17 00:00:00 2001
From a0211ba2069af11a64588a49222dcdcce1d805be Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:54:26 +0100
Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -7,17 +7,16 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
dlls/d2d1/bitmap.c | 2 +-
dlls/d2d1/brush.c | 8 ++++----
dlls/d2d1/dc_render_target.c | 2 +-
dlls/d2d1/device.c | 2 +-
dlls/d2d1/geometry.c | 6 +++---
dlls/d2d1/geometry.c | 8 ++++----
dlls/d2d1/hwnd_render_target.c | 2 +-
dlls/d2d1/state_block.c | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index c0aef3c..8a4b517 100644
index bc958e50a1..76ecc7f02a 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -626,5 +626,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
if (!iface)
return NULL;
assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
@@ -25,10 +24,10 @@ index c0aef3c..8a4b517 100644
+ return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
}
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 9c73ae1..a748669 100644
index 80fc0f5331..a612e683b6 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -256,7 +256,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
@@ -253,7 +253,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
{
@@ -37,7 +36,7 @@ index 9c73ae1..a748669 100644
}
static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
@@ -399,7 +399,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
{
@@ -46,7 +45,7 @@ index 9c73ae1..a748669 100644
}
static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
@@ -586,7 +586,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
{
@@ -55,7 +54,7 @@ index 9c73ae1..a748669 100644
}
static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
@@ -818,7 +818,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface)
{
@@ -65,10 +64,10 @@ index 9c73ae1..a748669 100644
static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
index b095008..6030826 100644
index 47aa99697d..0efa3ebeaf 100644
--- a/dlls/d2d1/dc_render_target.c
+++ b/dlls/d2d1/dc_render_target.c
@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface)
{
@@ -77,24 +76,11 @@ index b095008..6030826 100644
}
static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 45b2258..bf32c23 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -207,7 +207,7 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic
static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface);
+ return CONTAINING_RECORD((ID2D1DeviceContext*)iface, struct d2d_device_context, ID2D1DeviceContext_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out)
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 421ba2b..f8db51c 100644
index 79850f1c20..b9b6a32f76 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -2987,7 +2987,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
{
@@ -103,7 +89,7 @@ index 421ba2b..f8db51c 100644
}
static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
@@ -3503,7 +3503,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor
static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
{
@@ -112,7 +98,7 @@ index 421ba2b..f8db51c 100644
}
static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
@@ -3838,7 +3838,7 @@ fail:
@@ -3841,7 +3841,7 @@ fail:
static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
{
@@ -121,11 +107,20 @@ index 421ba2b..f8db51c 100644
}
static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2
static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
+ return CONTAINING_RECORD( (ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface,
diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
index d0b9695..429561e 100644
index 625f101eaa..f3626c42ce 100644
--- a/dlls/d2d1/hwnd_render_target.c
+++ b/dlls/d2d1/hwnd_render_target.c
@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface)
{
@@ -135,10 +130,10 @@ index d0b9695..429561e 100644
static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
index b15384e..4e7e34b 100644
index e3175146a6..b66752983e 100644
--- a/dlls/d2d1/state_block.c
+++ b/dlls/d2d1/state_block.c
@@ -190,5 +190,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
if (!iface)
return NULL;
assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
@@ -146,5 +141,5 @@ index b15384e..4e7e34b 100644
+ return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
}
--
1.9.1
2.17.1

View File

@@ -1,4 +1,4 @@
From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
From 7529755fcc41fda650aac6b27f34438354435d34 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:58:40 +0100
Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
@@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index f50133d..1bc7b59 100644
index 9280b5d32..2f0974a4c 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
@@ -1887,7 +1887,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
if (!iface)
return NULL;
assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,28 +21,28 @@ index f50133d..1bc7b59 100644
}
struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
if (!iface)
return NULL;
assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
- return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
+ return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
- return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface);
+ return CONTAINING_RECORD((IDWriteFontFace5 *)iface, struct dwrite_fontface, IDWriteFontFace5_iface);
}
void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index f27fe9f..ee1eb5a 100644
index b9321157a..76ea23ba6 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
@@ -5895,7 +5895,7 @@ static const IDWriteTextFormat3Vtbl 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;
- CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
+ CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
}
HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
--
1.9.1
2.24.0

View File

@@ -1,25 +0,0 @@
From b4586e37df817f205c8bebe319b4765dea5c62d5 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 24 Sep 2017 19:21:06 +0200
Subject: evr: Avoid implicit cast of interface pointer.
---
dlls/evr/evr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index c2d2933211e..5533f38a649 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -136,7 +136,7 @@ static const IUnknownVtbl evr_inner_vtbl =
static inline evr_filter *impl_from_IBaseFilter(IBaseFilter *iface)
{
- return CONTAINING_RECORD(iface, evr_filter, filter);
+ return CONTAINING_RECORD(iface, evr_filter, filter.IBaseFilter_iface);
}
static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv)
--
2.14.1

View File

@@ -0,0 +1 @@
Fixes: Fixes compile warnings.

View File

@@ -1,7 +1,7 @@
From 08d8e1c398ed6f3e237ad9fd3d29e10d09dcff3d Mon Sep 17 00:00:00 2001
From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 2 May 2014 20:46:19 +0200
Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
---
dlls/user32/message.c | 2 +-
@@ -9,10 +9,10 @@ Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index d122980..aec0938 100644
index 1336865112a..cbe9920384f 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -4443,7 +4443,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER
if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
@@ -22,25 +22,25 @@ index d122980..aec0938 100644
SERVER_START_REQ( set_win_timer )
{
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index d92fbc7..dbaddb7 100644
index c0ba5834cf9..a6bc158e8a7 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -8521,6 +8521,7 @@ static void test_timers(void)
@@ -10282,6 +10282,7 @@ static void test_timers(void)
start = GetTickCount();
while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
DispatchMessageA(&msg);
+todo_wine
ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
|| broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */
|| broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
@@ -8589,6 +8590,7 @@ static void test_timers_no_wnd(void)
|| broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
|| broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void)
start = GetTickCount();
while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
DispatchMessageA(&msg);
+todo_wine
ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
|| broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */,
"did not get expected count for minimum timeout (%d != ~%d).\n",
|| broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
|| broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
--
2.5.1
2.17.1

View File

@@ -1,4 +1,4 @@
From ee1533db82fa2a955765b6a00f5300900350d2fe Mon Sep 17 00:00:00 2001
From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 2 Oct 2014 19:44:31 +0200
Subject: [PATCH] kernel32: Add winediag message to show warning, that this
@@ -9,7 +9,7 @@ Subject: [PATCH] kernel32: Add winediag message to show warning, that this
1 file changed, 10 insertions(+)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 0a3fd70..206224f 100644
index 36ed82bff8c..b8a677c5485 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -65,6 +65,7 @@
@@ -18,9 +18,9 @@ index 0a3fd70..206224f 100644
WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
#ifdef __APPLE__
extern char **__wine_get_main_environment(void);
@@ -1090,6 +1091,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
typedef struct
{
@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
__TRY
{
@@ -37,5 +37,5 @@ index 0a3fd70..206224f 100644
being_debugged = FALSE;
--
1.9.1
2.23.0

View File

@@ -1,4 +1,4 @@
From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001
From d216f85a593a09e7983d9178fb3e1f20bfcf08cc Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 29 May 2014 23:43:45 +0200
Subject: [PATCH] loader: Add commandline option --patches to show the patch
@@ -14,13 +14,14 @@ Subject: [PATCH] loader: Add commandline option --patches to show the patch
6 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index bb75d9c..21e2db6 100644
index c29a1c26c..8906e1942 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -61,6 +61,14 @@ const char * CDECL NTDLL_wine_get_version(void)
@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
return wine_get_version();
}
/*********************************************************************
+/*********************************************************************
+ * wine_get_patches (NTDLL.@)
+ */
+const void * CDECL NTDLL_wine_get_patches(void)
@@ -28,15 +29,14 @@ index bb75d9c..21e2db6 100644
+ return wine_get_patches();
+}
+
+/*********************************************************************
/*********************************************************************
* wine_get_build_id (NTDLL.@)
*/
const char * CDECL NTDLL_wine_get_build_id(void)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 292b0f6..fb45a94 100644
index 7aa953ca6..cf7d5b6f9 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1516,6 +1516,7 @@
@@ -1566,6 +1566,7 @@
# Version
@ cdecl wine_get_version() NTDLL_wine_get_version
@@ -45,10 +45,10 @@ index 292b0f6..fb45a94 100644
@ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
diff --git a/include/wine/library.h b/include/wine/library.h
index 242bb69..fae73fe 100644
index a6fe28059..511bf4722 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
@@ -47,6 +47,7 @@ extern const char *wine_get_data_dir(void);
extern const char *wine_get_server_dir(void);
extern const char *wine_get_user_name(void);
extern const char *wine_get_version(void);
@@ -57,10 +57,10 @@ index 242bb69..fae73fe 100644
extern void wine_init_argv0_path( const char *argv0 );
extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
diff --git a/libs/wine/config.c b/libs/wine/config.c
index 3c9110b..5da6263 100644
index 2a3314cbf..5b66c063d 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -522,6 +522,12 @@ const char *wine_get_version(void)
@@ -504,6 +504,12 @@ const char *wine_get_version(void)
return PACKAGE_VERSION;
}
@@ -74,19 +74,19 @@ index 3c9110b..5da6263 100644
const char *wine_get_build_id(void)
{
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 2159fac..7cb2918 100644
index 3f2c430fa..ca46979f5 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -90,6 +90,7 @@ WINE_1.0
@@ -28,6 +28,7 @@ WINE_1.0
wine_get_ss;
wine_get_user_name;
wine_get_version;
+ wine_get_patches;
wine_init;
wine_init_argv0_path;
wine_is_dbcs_leadbyte;
wine_ldt_alloc_entries;
diff --git a/loader/main.c b/loader/main.c
index f197cf8..f662912 100644
index f197cf802..f6629128d 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
@@ -146,5 +146,5 @@ index f197cf8..f662912 100644
--
1.9.1
2.25.0

View File

@@ -1,21 +1,21 @@
From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
From df12fdb8d4cdf11d9f72a068923a5b0097e36bdb 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: [PATCH] loader: Add commandline option --check-libs.
---
include/wine/library.h | 2 +
libs/wine/config.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 ++++++++++++++
libs/wine/config.c | 124 +++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 ++++++++++++
libs/wine/wine.map | 2 +
loader/main.c | 50 +++++++++++++++++++-
loader/main.c | 50 ++++++++++++++++-
5 files changed, 213 insertions(+), 1 deletion(-)
diff --git a/include/wine/library.h b/include/wine/library.h
index fae73fe..7395a11 100644
index 511bf4722a0..557cec20cf8 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -40,6 +40,7 @@ extern "C" {
@@ -44,6 +44,7 @@ extern "C" {
extern const char *wine_get_build_dir(void);
extern const char *wine_get_config_dir(void);
extern const char *wine_get_data_dir(void);
@@ -23,7 +23,7 @@ index fae73fe..7395a11 100644
extern const char *wine_get_server_dir(void);
extern const char *wine_get_user_name(void);
extern const char *wine_get_version(void);
@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
@@ -56,6 +57,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
typedef void (*load_dll_callback_t)( void *, const char * );
@@ -32,10 +32,10 @@ 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 5da6263..6cedfb7 100644
index 5b66c063db6..e0988513e14 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
@@ -470,6 +470,130 @@ const char *wine_get_build_dir(void)
return build_dir;
}
@@ -167,13 +167,14 @@ index 5da6263..6cedfb7 100644
const char *wine_get_server_dir(void)
{
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 649aa22..367dde3 100644
index 2a569f5b739..5f10c3f9d3e 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -1064,6 +1064,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
@@ -1072,6 +1072,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
return ret;
}
/***********************************************************************
+/***********************************************************************
+ * wine_dladdr
+ */
+int wine_dladdr( void *addr, void *info, char *error, size_t errorsize )
@@ -209,32 +210,31 @@ index 649aa22..367dde3 100644
+#endif
+}
+
+/***********************************************************************
/***********************************************************************
* wine_dlsym
*/
void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 7cb2918..72ffed8 100644
index ca46979f5b9..22a4e73b05b 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -65,6 +65,7 @@ WINE_1.0
wine_dbg_sprintf;
wine_dbgstr_an;
wine_dbgstr_wn;
@@ -9,6 +9,7 @@ WINE_1.0
wine_anon_mmap;
wine_casemap_lower;
wine_casemap_upper;
+ wine_dladdr;
wine_dlclose;
wine_dll_enum_load_path;
wine_dll_get_owner;
@@ -85,6 +86,7 @@ WINE_1.0
wine_dll_set_callback;
@@ -24,6 +25,7 @@ WINE_1.0
wine_get_es;
wine_get_fs;
wine_get_gs;
+ wine_get_libs;
wine_get_server_dir;
wine_get_sortkey;
wine_get_ss;
wine_get_user_name;
diff --git a/loader/main.c b/loader/main.c
index f662912..a2dc40c 100644
index d97d6b28bf8..49dc996e354 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -36,6 +36,12 @@
@@ -247,10 +247,10 @@ index f662912..a2dc40c 100644
+#ifdef HAVE_LINK_H
+# include <link.h>
+#endif
#include <pthread.h>
#include "wine/library.h"
@@ -55,7 +61,8 @@ static void check_command_line( int argc, char *argv[] )
#include "main.h"
@@ -54,7 +60,8 @@ static void check_command_line( int argc, char *argv[] )
"Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n"
" wine --help Display this help and exit\n"
" wine --version Output version information and exit\n"
@@ -260,7 +260,7 @@ index f662912..a2dc40c 100644
if (argc <= 1)
{
@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
@@ -110,6 +117,47 @@ static void check_command_line( int argc, char *argv[] )
exit(0);
}
@@ -309,5 +309,5 @@ index f662912..a2dc40c 100644
--
1.9.1
2.25.1

View File

@@ -1,19 +1,18 @@
From 2a1064c5f90beac2bd709ab5d1c454c90a16189b Mon Sep 17 00:00:00 2001
From 3c1f5962482e7acf531f57f49d923d9c4e5278b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Aug 2017 02:51:57 +0200
Subject: advapi32: Implement CreateRestrictedToken.
Subject: [PATCH] advapi32: Implement CreateRestrictedToken.
---
dlls/advapi32/security.c | 88 +++++++++++++++++++++++++++++++++++-------
dlls/advapi32/tests/security.c | 88 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 157 insertions(+), 19 deletions(-)
dlls/kernelbase/security.c | 103 ++++++++++++++++++++++++++++++-------
1 file changed, 84 insertions(+), 19 deletions(-)
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 82bb6689d43..c531e45c9a0 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -840,6 +840,60 @@ BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token)
ThreadImpersonationToken, &token, sizeof token ));
diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c
index 2e75e81ed77..97f6ee6a2fd 100644
--- a/dlls/kernelbase/security.c
+++ b/dlls/kernelbase/security.c
@@ -592,31 +592,96 @@ exit:
return ret;
}
+static BOOL allocate_groups(TOKEN_GROUPS **groups_ret, SID_AND_ATTRIBUTES *sids, DWORD count)
@@ -71,11 +70,16 @@ index 82bb6689d43..c531e45c9a0 100644
+}
+
/*************************************************************************
* CreateRestrictedToken [ADVAPI32.@]
*
@@ -871,25 +925,33 @@ BOOL WINAPI CreateRestrictedToken(
PSID_AND_ATTRIBUTES restrictSids,
PHANDLE newToken)
* CreateRestrictedToken (kernelbase.@)
*/
-BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags,
- DWORD disable_count, PSID_AND_ATTRIBUTES disable_sids,
- DWORD delete_count, PLUID_AND_ATTRIBUTES delete_privs,
- DWORD restrict_count, PSID_AND_ATTRIBUTES restrict_sids, PHANDLE ret )
+BOOL WINAPI CreateRestrictedToken( HANDLE baseToken, DWORD flags,
+ DWORD nDisableSids, PSID_AND_ATTRIBUTES disableSids,
+ DWORD nDeletePrivs, PLUID_AND_ATTRIBUTES deletePrivs,
+ DWORD nRestrictSids, PSID_AND_ATTRIBUTES restrictSids, PHANDLE newToken )
{
- TOKEN_TYPE type;
- SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous;
@@ -86,21 +90,14 @@ index 82bb6689d43..c531e45c9a0 100644
+ BOOL ret = FALSE;
- FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",
- token, flags, disable_count, disable_sids, delete_count, delete_privs,
- restrict_count, restrict_sids, ret );
+ TRACE("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p)\n",
baseToken, flags, nDisableSids, disableSids,
nDeletePrivs, deletePrivs,
nRestrictSids, restrictSids,
newToken);
- size = sizeof(type);
- if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE;
- if (type == TokenImpersonation)
- {
- size = sizeof(level);
- if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size ))
- return FALSE;
- }
- return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken );
+ baseToken, flags, nDisableSids, disableSids,
+ nDeletePrivs, deletePrivs,
+ nRestrictSids, restrictSids,
+ newToken);
+
+ if (!allocate_groups(&disable_groups, disableSids, nDisableSids))
+ goto done;
+
@@ -117,155 +114,19 @@ index 82bb6689d43..c531e45c9a0 100644
+ heap_free(delete_privs);
+ heap_free(restrict_sids);
+ return ret;
- size = sizeof(type);
- if (!GetTokenInformation( token, TokenType, &type, size, &size )) return FALSE;
- if (type == TokenImpersonation)
- {
- size = sizeof(level);
- if (!GetTokenInformation( token, TokenImpersonationLevel, &level, size, &size ))
- return FALSE;
- }
- return DuplicateTokenEx( token, MAXIMUM_ALLOWED, NULL, level, type, ret );
}
/* ##############################
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index a1ecc409b73..0fd41fe82fa 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -5292,10 +5292,13 @@ static void test_GetUserNameW(void)
static void test_CreateRestrictedToken(void)
{
+ TOKEN_PRIMARY_GROUP *primary_group, *primary_group2;
HANDLE process_token, token, r_token;
PTOKEN_GROUPS token_groups, groups2;
SID_AND_ATTRIBUTES sattr;
SECURITY_IMPERSONATION_LEVEL level;
+ TOKEN_PRIVILEGES *privs;
+ PRIVILEGE_SET privset;
TOKEN_TYPE type;
BOOL is_member;
DWORD size;
@@ -5311,7 +5314,7 @@ static void test_CreateRestrictedToken(void)
ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &process_token);
ok(ret, "got error %d\n", GetLastError());
- ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_QUERY,
+ ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY,
NULL, SecurityImpersonation, TokenImpersonation, &token);
ok(ret, "got error %d\n", GetLastError());
@@ -5342,11 +5345,21 @@ static void test_CreateRestrictedToken(void)
ok(ret, "got error %d\n", GetLastError());
ok(is_member, "not a member\n");
- /* disable a SID in new token */
+ privset.PrivilegeCount = 1;
+ privset.Control = PRIVILEGE_SET_ALL_NECESSARY;
+ ret = LookupPrivilegeValueA(NULL, "SeChangeNotifyPrivilege", &privset.Privilege[0].Luid);
+ ok(ret, "got error %d\n", GetLastError());
+
+ is_member = FALSE;
+ ret = PrivilegeCheck(token, &privset, &is_member);
+ ok(ret, "got error %d\n", GetLastError());
+ ok(is_member, "Expected SeChangeNotifyPrivilege to be enabled\n");
+
+ /* disable a SID and a privilege in new token */
sattr.Sid = token_groups->Groups[i].Sid;
sattr.Attributes = 0;
r_token = NULL;
- ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token);
+ ret = pCreateRestrictedToken(token, 0, 1, &sattr, 1, &privset.Privilege[0], 0, NULL, &r_token);
ok(ret, "got error %d\n", GetLastError());
if (ret)
@@ -5355,7 +5368,7 @@ static void test_CreateRestrictedToken(void)
is_member = TRUE;
ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member);
ok(ret, "got error %d\n", GetLastError());
- todo_wine ok(!is_member, "not a member\n");
+ ok(!is_member, "not a member\n");
ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
@@ -5370,9 +5383,9 @@ static void test_CreateRestrictedToken(void)
break;
}
- todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY,
+ ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY,
"got wrong attributes\n");
- todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0,
+ ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0,
"got wrong attributes\n");
HeapFree(GetProcessHeap(), 0, groups2);
@@ -5386,10 +5399,73 @@ static void test_CreateRestrictedToken(void)
ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size);
ok(ret, "got error %d\n", GetLastError());
ok(level == SecurityImpersonation, "got level %u\n", type);
+
+ is_member = TRUE;
+ ret = PrivilegeCheck(r_token, &privset, &is_member);
+ ok(ret, "got error %d\n", GetLastError());
+ ok(!is_member, "Expected SeChangeNotifyPrivilege not to be enabled\n");
+
+ ret = GetTokenInformation(r_token, TokenPrivileges, NULL, 0, &size);
+ ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
+ ret, GetLastError());
+ privs = HeapAlloc(GetProcessHeap(), 0, size);
+ ret = GetTokenInformation(r_token, TokenPrivileges, privs, size, &size);
+ ok(ret, "got error %d\n", GetLastError());
+
+ is_member = FALSE;
+ for (j = 0; j < privs->PrivilegeCount; j++)
+ {
+ if (RtlEqualLuid(&privs->Privileges[j].Luid, &privset.Privilege[0].Luid))
+ {
+ is_member = TRUE;
+ break;
+ }
+ }
+
+ ok(!is_member, "Expected not to find privilege\n");
+ HeapFree(GetProcessHeap(), 0, privs);
}
HeapFree(GetProcessHeap(), 0, token_groups);
CloseHandle(r_token);
+
+ ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &size);
+ ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
+ ret, GetLastError());
+ primary_group = HeapAlloc(GetProcessHeap(), 0, size);
+ ret = GetTokenInformation(token, TokenPrimaryGroup, primary_group, size, &size);
+ ok(ret, "got error %d\n", GetLastError());
+
+ /* disable primary group */
+ sattr.Sid = primary_group->PrimaryGroup;
+ sattr.Attributes = 0;
+ r_token = NULL;
+ ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token);
+ ok(ret, "got error %d\n", GetLastError());
+
+ if (ret)
+ {
+ is_member = TRUE;
+ ret = pCheckTokenMembership(r_token, primary_group->PrimaryGroup, &is_member);
+ ok(ret, "got error %d\n", GetLastError());
+ ok(!is_member, "not a member\n");
+
+ ret = GetTokenInformation(r_token, TokenPrimaryGroup, NULL, 0, &size);
+ ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
+ ret, GetLastError());
+ primary_group2 = HeapAlloc(GetProcessHeap(), 0, size);
+ ret = GetTokenInformation(r_token, TokenPrimaryGroup, primary_group2, size, &size);
+ ok(ret, "got error %d\n", GetLastError());
+
+ ok(EqualSid(primary_group2->PrimaryGroup, primary_group->PrimaryGroup),
+ "Expected same primary group\n");
+
+ HeapFree(GetProcessHeap(), 0, primary_group2);
+ }
+
+ HeapFree(GetProcessHeap(), 0, primary_group);
+ CloseHandle(r_token);
+
CloseHandle(token);
CloseHandle(process_token);
}
/******************************************************************************
--
2.13.1
2.20.1

View File

@@ -1,31 +0,0 @@
From be28c746d013c16fa6c2e50f5f9debc45d39d81b Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Tue, 7 Apr 2015 13:18:31 +0800
Subject: advapi32: Initialize buffer length to zero in LsaLookupSids to
prevent crash. (try 2)
Superseded 110588-110594
Try 2:
- Use RtlInitUnicodeStringEx to simplify code when possible. Same for
other patches in this series. (Thanks Nikolay)
---
dlls/advapi32/lsa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 2a8b791..69c29c5 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -502,7 +502,7 @@ NTSTATUS WINAPI LsaLookupSids(
{
(*Names)[i].Use = SidTypeUnknown;
(*Names)[i].DomainIndex = -1;
- (*Names)[i].Name.Buffer = NULL;
+ RtlInitUnicodeStringEx(&(*Names)[i].Name, NULL);
memset(&(*ReferencedDomains)->Domains[i], 0, sizeof(LSA_TRUST_INFORMATION));
--
2.3.5

View File

@@ -1,47 +0,0 @@
From 246cb6b72666dcb77fb2f553d318d7dabbe8811d Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Tue, 7 Apr 2015 13:18:47 +0800
Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupSids to
avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
---
dlls/advapi32/lsa.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 69c29c5..dfe25b3 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -488,14 +488,17 @@ NTSTATUS WINAPI LsaLookupSids(
if (!(*Names = heap_alloc(name_fullsize))) return STATUS_NO_MEMORY;
/* maximum count of stored domain infos is Count, allocate it like that cause really needed
count could only be computed after sid data is retrieved */
- domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*Count;
+ domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (Count + 1);
if (!(*ReferencedDomains = heap_alloc(domain_fullsize)))
{
heap_free(*Names);
return STATUS_NO_MEMORY;
}
(*ReferencedDomains)->Entries = 0;
- (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
+ (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
+ sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
+ (*ReferencedDomains)->Domains[-1].Sid = NULL;
+ RtlInitUnicodeStringEx(&(*ReferencedDomains)->Domains[-1].Name, NULL);
/* Get full names data length and full length needed to store domain name and SID */
for (i = 0; i < Count; i++)
@@ -555,7 +558,8 @@ NTSTATUS WINAPI LsaLookupSids(
*ReferencedDomains = heap_realloc(*ReferencedDomains, domain_fullsize);
/* fix pointer after reallocation */
- (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
+ (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
+ sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
domain_data = (char*)(*ReferencedDomains)->Domains + sizeof(LSA_TRUST_INFORMATION)*Count;
mapped = 0;
--
2.3.5

View File

@@ -1,39 +0,0 @@
From ce254ac3659e0c040136341d035629f99ec6d1ea Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Tue, 7 Apr 2015 13:19:06 +0800
Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupNames2
to avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
---
dlls/advapi32/lsa.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index dfe25b3..258b8ca 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -404,14 +404,18 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count,
sid = (SID *)(*sids + count);
/* use maximum domain count */
- if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count +
- sid_size_total + domainname_size_total*sizeof(WCHAR))))
+ if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (count + 1) +
+ sid_size_total + domainname_size_total * sizeof(WCHAR))))
{
heap_free(*sids);
return STATUS_NO_MEMORY;
}
(*domains)->Entries = 0;
- (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
+ (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains +
+ sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
+ (*domains)->Domains[-1].Sid = NULL;
+ RtlInitUnicodeStringEx(&(*domains)->Domains[-1].Name, NULL);
+
domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count;
domain.Buffer = heap_alloc(domain_size_max*sizeof(WCHAR));
--
2.3.5

View File

@@ -1,68 +0,0 @@
From 77d43d721793edda9b419f7426442a35f0cb5918 Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Tue, 7 Apr 2015 11:23:34 +0800
Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
---
dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 1b270a80829..b8dedbd6d58 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -29,6 +29,7 @@
#include "winbase.h"
#include "winreg.h"
#include "winternl.h"
+#include "sddl.h"
#include "advapi32_misc.h"
#include "wine/debug.h"
@@ -562,6 +563,21 @@ NTSTATUS WINAPI LsaLookupSids(
domain.MaximumLength = sizeof(WCHAR);
}
}
+ else
+ {
+ WCHAR *strsid = NULL;
+
+ if (ConvertSidToStringSidW(Sids[i], &strsid))
+ {
+ name_size = strlenW(strsid) + 1;
+
+ (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR);
+ (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR);
+ name_fullsize += (*Names)[i].Name.MaximumLength;
+
+ LocalFree(strsid);
+ }
+ }
}
/* now we have full length needed for both */
@@ -605,6 +621,21 @@ NTSTATUS WINAPI LsaLookupSids(
(*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data);
heap_free(domain.Buffer);
}
+ else
+ {
+ WCHAR *strsid = NULL;
+
+ if (ConvertSidToStringSidW(Sids[i], &strsid))
+ {
+ name_size = strlenW(strsid) + 1;
+ mapped++;
+
+ (*Names)[i].Name.Buffer = name_buffer;
+ memcpy((*Names)[i].Name.Buffer, strsid, name_size * sizeof(WCHAR));
+
+ LocalFree(strsid);
+ }
+ }
name_buffer += name_size;
}
--
2.11.0

View File

@@ -1,53 +0,0 @@
From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Tue, 28 Apr 2015 23:00:08 +0800
Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
---
dlls/advapi32/security.c | 7 +++++--
dlls/advapi32/tests/security.c | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index d27b2e7..2362dd5 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
-static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
+static const WCHAR None[] = { 'N','o','n','e',0 };
static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
@@ -2206,7 +2206,10 @@ LookupAccountSidW(
ac = Domain_Admins;
break;
case DOMAIN_GROUP_RID_USERS:
- ac = Domain_Users;
+ /* MSDN says the name of DOMAIN_GROUP_RID_USERS is Domain Users,
+ * tests show that MSDN seems to be wrong. */
+ ac = None;
+ use = 2;
break;
case DOMAIN_GROUP_RID_GUESTS:
ac = Domain_Guests;
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 573119f..490ce26 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2578,8 +2578,8 @@ static void test_process_security(void)
dom_size = sizeof(domain);
ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
ok(ret, "LookupAccountSid failed with %d\n", ret);
- todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
- todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+ ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
+ ok(!strcmp(account, "None"), "expect None, got %s\n", account);
res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
ok(!res, "Expected failure, got %d\n", res);
--
2.3.5

View File

@@ -1,15 +1,16 @@
From ba50fc98ee4690e62899d48efc856c2bc910536c Mon Sep 17 00:00:00 2001
From 8044f571b7e674ce9e562488864d48646a9c7b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 7 Aug 2017 01:25:02 +0200
Subject: advapi32/tests: Extend security label / token integrity tests.
Subject: [PATCH] advapi32/tests: Extend security label / token integrity
tests.
---
dlls/advapi32/tests/Makefile.in | 2 +-
dlls/advapi32/tests/security.c | 389 +++++++++++++++++++++++++++++++++++++++-
dlls/advapi32/tests/security.c | 389 +++++++++++++++++++++++++++++++-
2 files changed, 387 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
index 36ce031ef62..4437e6e5de7 100644
index 12583e59f57..caee5fae308 100644
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@@ -1,5 +1,5 @@
@@ -20,10 +21,10 @@ index 36ce031ef62..4437e6e5de7 100644
C_SRCS = \
cred.c \
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 0fd41fe82fa..4a03db27e69 100644
index a736dbffd22..4529469d932 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -7191,13 +7191,19 @@ static void test_token_security_descriptor(void)
@@ -7034,13 +7034,19 @@ static void test_token_security_descriptor(void)
{
static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY},
{SECURITY_MANDATORY_LOW_RID}};
@@ -46,7 +47,7 @@ index 0fd41fe82fa..4a03db27e69 100644
PROCESS_INFORMATION info;
DWORD size, index, retd;
ACCESS_ALLOWED_ACE *ace;
@@ -7347,6 +7353,185 @@ static void test_token_security_descriptor(void)
@@ -7190,6 +7196,185 @@ static void test_token_security_descriptor(void)
/* The security label is also not inherited */
if (pAddMandatoryAce)
{
@@ -103,7 +104,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+
+ if (sacl)
+ {
+ ret = pGetAce(sacl, 0, (void **)&ace);
+ ret = GetAce(sacl, 0, (void **)&ace);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -165,7 +166,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+
+ if (sacl)
+ {
+ ret = pGetAce(sacl, 0, (void **)&ace);
+ ret = GetAce(sacl, 0, (void **)&ace);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -215,7 +216,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+
+ if (sacl)
+ {
+ ret = pGetAce(sacl, 0, (void **)&ace);
+ ret = GetAce(sacl, 0, (void **)&ace);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -232,7 +233,7 @@ index 0fd41fe82fa..4a03db27e69 100644
ret = InitializeAcl(acl, 256, ACL_REVISION);
ok(ret, "InitializeAcl failed with error %u\n", GetLastError());
@@ -7362,6 +7547,90 @@ static void test_token_security_descriptor(void)
@@ -7205,6 +7390,90 @@ static void test_token_security_descriptor(void)
ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd);
ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError());
@@ -272,7 +273,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+
+ if (sacl)
+ {
+ ret = pGetAce(sacl, 0, (void **)&ace);
+ ret = GetAce(sacl, 0, (void **)&ace);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -310,7 +311,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+
+ if (sacl)
+ {
+ ret = pGetAce(sacl, 0, (void **)&ace);
+ ret = GetAce(sacl, 0, (void **)&ace);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -323,7 +324,7 @@ index 0fd41fe82fa..4a03db27e69 100644
}
else
win_skip("SYSTEM_MANDATORY_LABEL not supported\n");
@@ -7467,6 +7736,116 @@ static void test_child_token_sd(void)
@@ -7312,6 +7581,116 @@ static void test_child_token_sd(void)
HeapFree(GetProcessHeap(), 0, sd);
}
@@ -366,7 +367,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+ ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
+ ok(!defaulted, "SACL defaulted\n");
+ ok(acl->AceCount == 1, "Expected exactly one ACE\n");
+ ret = pGetAce(acl, 0, (void **)&ace_label);
+ ret = GetAce(acl, 0, (void **)&ace_label);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -421,7 +422,7 @@ index 0fd41fe82fa..4a03db27e69 100644
+ ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
+ ok(!defaulted, "SACL defaulted\n");
+ ok(acl->AceCount == 1, "Expected exactly one ACE\n");
+ ret = pGetAce(acl, 0, (void **)&ace_label);
+ ret = GetAce(acl, 0, (void **)&ace_label);
+ ok(ret, "GetAce failed with error %u\n", GetLastError());
+ ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
+ "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -440,7 +441,7 @@ index 0fd41fe82fa..4a03db27e69 100644
static void test_GetExplicitEntriesFromAclW(void)
{
static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
@@ -7653,6 +8032,10 @@ START_TEST(security)
@@ -7571,6 +7950,10 @@ START_TEST(security)
{
if (!strcmp(myARGV[2], "test_token_sd"))
test_child_token_sd();
@@ -452,5 +453,5 @@ index 0fd41fe82fa..4a03db27e69 100644
test_process_security_child();
return;
--
2.13.1
2.17.1

View File

@@ -1,4 +1,4 @@
From f94296129eb249a04ccb012a10f50b79fb0a631a Mon Sep 17 00:00:00 2001
From 8959c13f2be7e2a31f27c8483ee2202692f00710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 5 Aug 2017 01:45:29 +0200
Subject: [PATCH] ntdll: Add function to create new tokens for elevation
@@ -7,17 +7,17 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation
---
dlls/ntdll/ntdll.spec | 3 ++
dlls/ntdll/ntdll_misc.h | 3 ++
dlls/ntdll/process.c | 18 +++++++++++
server/protocol.def | 8 +++++
dlls/ntdll/process.c | 18 +++++++++
server/protocol.def | 8 ++++
server/security.h | 1 +
server/token.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
server/token.c | 84 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 117 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 969cee7..008abb7 100644
index d626e0bf2..5057e2b07 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1508,6 +1508,9 @@
@@ -1556,6 +1556,9 @@
# Virtual memory
@ cdecl __wine_locked_recvmsg(long ptr long)
@@ -28,12 +28,12 @@ index 969cee7..008abb7 100644
@ cdecl wine_get_version() NTDLL_wine_get_version
@ cdecl wine_get_patches() NTDLL_wine_get_patches
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 5a93ede..cb02bd1 100644
index ac1469412..6c2345c6c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -83,6 +83,9 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN;
@@ -89,6 +89,9 @@ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN;
extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN;
+/* token */
+extern HANDLE CDECL __wine_create_default_token(BOOL admin);
@@ -42,10 +42,10 @@ index 5a93ede..cb02bd1 100644
extern timeout_t server_start_time DECLSPEC_HIDDEN;
extern unsigned int server_cpus DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index 2ff8610..bb4a171 100644
index 52d7ea429..e24691b8a 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -118,6 +118,24 @@ HANDLE CDECL __wine_make_process_system(void)
@@ -125,6 +125,24 @@ HANDLE CDECL __wine_make_process_system(void)
return ret;
}
@@ -71,10 +71,10 @@ index 2ff8610..bb4a171 100644
#define UNIMPLEMENTED_INFO_CLASS(c) \
diff --git a/server/protocol.def b/server/protocol.def
index 493100b..071f740 100644
index e908f2131..0177cb579 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3666,6 +3666,14 @@ struct handle_info
@@ -3734,6 +3734,14 @@ struct handle_info
@END
@@ -90,7 +90,7 @@ index 493100b..071f740 100644
@REQ(create_completion)
unsigned int access; /* desired access to a port */
diff --git a/server/security.h b/server/security.h
index 6c33714..21e90cc 100644
index 6c337143c..21e90ccf2 100644
--- a/server/security.h
+++ b/server/security.h
@@ -49,6 +49,7 @@ extern const PSID security_builtin_users_sid;
@@ -102,7 +102,7 @@ index 6c33714..21e90cc 100644
/* token functions */
diff --git a/server/token.c b/server/token.c
index 4c37c67..e449e61 100644
index 381ae6871..fcab79955 100644
--- a/server/token.c
+++ b/server/token.c
@@ -79,6 +79,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
@@ -121,7 +121,7 @@ index 4c37c67..e449e61 100644
static luid_t prev_luid_value = { 1000, 0 };
@@ -908,6 +910,64 @@ struct token *token_create_admin( void )
@@ -917,6 +919,64 @@ struct token *token_create_admin( void )
return token;
}
@@ -186,7 +186,7 @@ index 4c37c67..e449e61 100644
static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
{
struct privilege *privilege;
@@ -1713,3 +1773,27 @@ DECL_HANDLER(set_token_default_dacl)
@@ -1722,3 +1782,27 @@ DECL_HANDLER(set_token_default_dacl)
release_object( token );
}
}
@@ -215,5 +215,5 @@ index 4c37c67..e449e61 100644
+ }
+}
--
1.9.1
2.23.0

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