Commit Graph

198 Commits

Author SHA1 Message Date
Sebastian Lackner
e1ff6e2674 Rebase against b652c119690afe8b89b8ce9cddde34b4c1589a62. 2016-02-24 20:46:39 +01:00
Sebastian Lackner
9a7ca404cf Rebase against f71f7db63caeffdc92ede12bf15e8f7d184addd4.
[msvcrt-StdHandle_RefCount]
Removed patch to fix implementation of msvcrt.close when stdout == stderr
(fixed upstream).
2016-02-23 02:31:03 +01:00
Sebastian Lackner
932dd8fbbc wined3d-CSMT_Main: Reenable patchset.
For now, various conflicting changes have just been reverted.
2016-02-22 15:26:23 +01:00
Sebastian Lackner
b7ac6188f9 Rebase against 9c98d632779862aae15e9e3a25f59065fae03386.
[mmsystem.dll16-Fix_Argument_Order]
Removed patch to fix argument order in GlobalAlloc16 call (accepted upstream).

[msvideo-MCIWNDM_SETTIMEFORMATA]
Removed patch to translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA
message (accepted upstream).

[vcomp-Atomic_I8]
Removed patch to implement 64-bit atomic instructions in OpenMP (accepted
upstream).

[wined3d-CSMT_Main]
Temporarily disable patchset, needs rebasing.
2016-02-10 19:46:44 +01:00
Sebastian Lackner
4d81da5229 Rebase against 11be16ca799ac642fb636633392f4ec80e765da7. 2016-02-10 03:34:43 +01:00
Sebastian Lackner
51917ee882 Rebase against b278bb8f5670a123b25d51fd8c927cb4f896a574. 2016-02-10 02:20:14 +01:00
Sebastian Lackner
3883513261 Rebase against 195d16c8267fcd5085048b3513571e2fee0eb548.
The current version of CSMT moves user_memory and pitches into the resource, so
those upstream changes (moving them into the texture) are not really
compatible. Revert them in CSMT until we have decided how to resolve this.
2016-02-10 02:11:05 +01:00
Sebastian Lackner
6a55df61ce Rebase against 85ba92c33a8c689e375fae2f3313657aaa9877fb. 2016-02-10 02:08:16 +01:00
Sebastian Lackner
e2e98ce27a Rebase against f0053d06c4fc168360da638fa26f1927fe975262. 2016-02-09 23:57:18 +01:00
Sebastian Lackner
cf7f966347 ddraw-Revert_Surface_Init: Disable patchset.
This issue will (hopefully) be fixed with http://source.winehq.org/patches/data/118966.
Get rid of it now since this makes rebasing much easier.
2016-02-09 22:56:38 +01:00
Sebastian Lackner
98d77c786f Rebase against 02008a6f2e373ba4ff06deb8ca124ecd65b57227. 2016-02-09 18:09:58 +01:00
Sebastian Lackner
6576a7796a Rebase against e395d4e766ef60030ee05947ffc9fac0c3fbe84b. 2016-02-09 07:47:43 +01:00
Sebastian Lackner
0e424c26ad Rebase against ea85a1ca598228eeacc370b0d827ca9e11387dfe. 2016-02-08 20:35:24 +01:00
Sebastian Lackner
d35ab071b5 Rebase against 6e30b042e17b4a62f48ca29f26cf9e62c7fd077a. 2016-02-08 19:13:08 +01:00
Sebastian Lackner
20a201f51a Added patches to revert "move mip-level dimensions fixup" (causes regressions in multiple games). 2016-02-07 18:56:22 +01:00
Sebastian Lackner
5289f77aad Rebase against c266d373deb417abef4883f59daa5d517b77e76c.
[user32-MOUSEHOOKSTRUCTEX]
Removed patch to pass MOUSEHOOKSTRUCTEX struct to mouse hook callback (accepted
upstream).
2016-02-05 20:03:58 +01:00
Sebastian Lackner
661976a145 Rebase against 36b38b8a203c2cca77b101810770afe952f7164a. 2016-02-05 18:18:04 +01:00
Sebastian Lackner
31fe5d3167 Rebase against 46317e0cb1af2f0b2a07532903677dd412bde3c4. 2016-02-05 17:43:27 +01:00
Sebastian Lackner
5d71a4eff3 Rebase against 6037179f6b48a9becdc9e8328ee3b4cc45a8f8eb. 2016-02-05 16:45:33 +01:00
Sebastian Lackner
e369069feb Rebase against 9c526b41314359c52954f7f367cb9d7b4a26c3ac. 2016-02-05 15:33:31 +01:00
Sebastian Lackner
883297db76 Rebase against 44f2589e7c239243b587e2d7ff92f4cdde61c3b6. 2016-02-05 15:31:30 +01:00
Sebastian Lackner
7f4d6429ad Rebase against 36187987ed92f1e6662cfd739e0f67d7ff58a9f3. 2016-02-05 15:30:47 +01:00
Sebastian Lackner
ec3240b174 Rebase against b922b55182ca2b51bf2599369c471b3920bfb635.
[user32-WM_CAPTURECHANGE]
Removed patch to send WM_CAPTURECHANGE also when capture has not changed
(accepted upstream).
2016-02-05 15:29:13 +01:00
Sebastian Lackner
21ac67b551 Rebase against 9bdab23bf7a57e92656782907ae2ac67ed292f0b. 2016-02-05 15:26:56 +01:00
Sebastian Lackner
b8de48bb3a Rebase against 7e57924d322e6c15bbfc8c505c2a0817d9e5ad2e. 2016-02-04 01:27:13 +01:00
Sebastian Lackner
03d86bd0d4 Rebase against 83a147d98a9c944dae63de251efda9744a539f5c. 2016-02-04 01:27:13 +01:00
Sebastian Lackner
e8595a8305 Rebase against 7561f343815a34c3445238047e1742baec05fdb7.
[mshtml-Wine_Gecko_2.44]
Removed patch to update Wine-Gecko to 2.44-beta1 (released).
2016-02-04 01:25:53 +01:00
Sebastian Lackner
be6712245c Rebase against 59116f833ea29839b186617b625bb3aa01927944. 2016-02-03 23:10:27 +01:00
Sebastian Lackner
345d3789cc Rebase against f7e9604c3eb9082d3a1b0172ec7e3b21234fe7b7. 2016-02-03 18:37:53 +01:00
Sebastian Lackner
901c33023f Rebase against 257ee8cc6e63acc54576f60ad09de5b4051f8045. 2016-02-03 14:51:18 +01:00
Sebastian Lackner
ad65139e3d Rebase against 80ea5a01ef42b0e9e0b6c872f8f5bbbf393c0ae7. 2016-02-01 05:02:03 +01:00
Sebastian Lackner
89a3c598c3 Rebase against a96abff8082d3c6ac7f1acb57727656a94a6bde9. 2016-02-01 04:49:58 +01:00
Sebastian Lackner
c853702845 Rebase against a124064ce5e1c83fa453da5610712b303e65de30.
[ntdll-NtQuerySystemInformationEx]
Removed patch to change return value of GetLogicalProcessorInformationEx to
TRUE (fixed upstream).

[wined3d-Invalid_Render_States]
Removed patch to ignore invalid render states in
wined3d_device_set_render_state (accepted upstream).
2016-02-01 04:48:06 +01:00
Sebastian Lackner
74a1d8d0fb Rebase against 7afeec4bf2908d92be30220871fc70c0b981211f. 2016-02-01 04:42:50 +01:00
Sebastian Lackner
8ca2de22a0 Rebase against bb29a9bf5b42a9848faae749b6d0bd79576f665a. 2016-01-28 10:17:21 +01:00
Sebastian Lackner
44aeaade64 Rebase against a25c47f59a600d7da819869b643b0b17720c07c6.
[wined3d-Multisampling]
Removed patch to allow to override number of quality levels for
D3DMULTISAMPLE_NONMASKABLE (fixed upstream).
2016-01-28 10:17:21 +01:00
Sebastian Lackner
8ebf32fb69 Rebase against d178301b723b0a05d8dc0c04b185e39f3ac8ba14. 2016-01-28 10:17:21 +01:00
Sebastian Lackner
e9bb99ec93 Rebase against ad11f38db92b425e8df84dc4f7ea58366b73e32a. 2016-01-28 10:17:21 +01:00
Sebastian Lackner
b1a1c80a0d Rebase against dafaae77308be415e024739f227fea64ae85d6d2. 2016-01-28 10:17:21 +01:00
Sebastian Lackner
8b24f43d5e Rebase against b0140f8ee22ad0f4a627f396b760e4a7833e474a. 2016-01-26 18:13:06 +01:00
Sebastian Lackner
124b8035a4 Rebase against d575e0afe304d0096f8014f7f411bf28c126cc0b.
[kernel32-Codepage_Conversion]
Removed patch to make sure codepage conversion fails when destination length
is < 0 (accepted upstream).

[server-Coverity]
Removed patches to fix multiple possible invalid memory accesses detected by
Coverity (accepted upstream).

[user32-SetCaretPos]
Removed patch to avoid corruption of caret when SetCaretPos() is called
(accepted upstream).
2016-01-25 19:24:40 +01:00
Sebastian Lackner
fe47c7cf07 Rebase against 8676f7bae099f0ca20c26a29dfa4bebd828b39b9. 2016-01-22 02:52:59 +01:00
Sebastian Lackner
7fb8937fd3 Rebase against af4a757ad2cacbd238486632d0f7bd6f0a94483f.
[d3dx9_36-Uninitialized_Memory]
Removed patch to initialize animation variable before
D3DXCreateAnimationController test (fixed upstream).
2016-01-20 19:21:13 +01:00
Sebastian Lackner
3815316d5f Rebase against 4083af404b2ef9e0b0928a6f685f2efa8567c80b.
[d3dx9_36-AnimationController]
Removed patch to add stubs for D3DXCreateAnimationController interface
(accepted upstream).
2016-01-19 05:17:06 +01:00
Sebastian Lackner
27ea029694 Rebase against f2ceadc6e6e6b7906400b6df84ac385d263cf394.
[quartz-NULL_TargetFormat]
Removed patch to handle NULL target format in FilterGraph::ConvertTimeFormat
(accepted upstream).
2016-01-12 21:28:32 +01:00
Sebastian Lackner
541375be89 Added patch to ignore invalid render states in wined3d_device_set_render_state. 2016-01-10 18:00:27 +01:00
Sebastian Lackner
11093e0bf8 Rebase against 91dd155e9bc13c1bc1be860cd67fe3e48c20feae. 2016-01-09 13:36:37 +01:00
Sebastian Lackner
98e45e14d9 Rebase against d7e4193df2f22a87031e44ce358a626a5f92b295.
FIXME: Should destroy_default_sampler() also be called from delete_opengl_contexts() in the non-CSMT case?
2016-01-07 00:07:56 +01:00
Sebastian Lackner
0a5887e483 patchupdate.py: Generate #ifdef patches in alphabetical order. 2016-01-06 21:38:47 +01:00
Sebastian Lackner
88ddac5ca3 wined3d-CSMT_Main: Renumber patches. 2016-01-06 14:28:01 +01:00