Commit graph

353 commits

Author SHA1 Message Date
winesync 083cd9a957 [WINESYNC]d3dx9: Use {lock|unlock}_surface() in D3DXLoadSurfaceFromMemory().
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 65956ae50a136fe8467a0332c7495f36617a16dc by Paul Gofman <gofmanp@gmail.com>
2020-02-26 18:19:18 +01:00
winesync a1f2064705 [WINESYNC]d3dx9: Use temporary surface in D3DXSaveSurfaceToFileInMemory() for unmappable textures.
Fixes a regression triggered by commit
949dbbd31f450178c90ea8267097a975b77c3219.

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 092c14b9d86ee1e96e465908cc524ec85988d0ff by Paul Gofman <gofmanp@gmail.com>
2020-02-26 18:19:18 +01:00
winesync 9e1d68edb0 [WINESYNC]d3dx9: Do not ignore surface map failure in D3DXSaveSurfaceToFileInMemory().
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id ce090114340fe6ce9314f543a1389de9bdc6df14 by Paul Gofman <gofmanp@gmail.com>
2020-02-26 18:19:18 +01:00
winesync b8714c31cd [WINESYNC]d3dx9: Use temporary surface in D3DXFillTexture() for unmappable textures.
Fixes a regression triggered by commit 949dbbd31f450178c90ea8267097a975b77c3219.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46453
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4e44d74afb12b40f673e3be0a91cd523013544cd by Paul Gofman <gofmanp@gmail.com>
2020-02-26 18:19:18 +01:00
winesync b50ef9007c [WINESYNC]d3dx9: Factor out {lock|unlock}_surface() functions.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 33be8439fc95ca8f005bd3a2b6790c101842c02e by Paul Gofman <gofmanp@gmail.com>
2020-02-26 18:19:18 +01:00
Jérôme Gardou c530f34e79 [D3DX9_36] Revert wine staged patches 2020-02-26 18:19:18 +01:00
Jérôme Gardou 3435c3b503 [D3DX9_XX] Share source files
Just like wine does
2020-02-26 18:19:18 +01:00
Amine Khaldi 51e134cd76 [DINPUT8] Sync with Wine Staging 4.18. CORE-16441 2019-11-05 22:31:12 +01:00
Serge Gautherie cef6a5b691 [D3D8][D3D9][DDRAW][WINED3D] Use modules instead of shared libraries
This reverts part of (revert) commit 81cffd7658,
so restores 23373acbb9.
2019-10-27 09:50:38 +01:00
Amine Khaldi ee5f98cc00 [D3DXOF] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:07:07 +01:00
Amine Khaldi b25254dcda [MSDMO] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:06:37 +01:00
Amine Khaldi d6c879a0e0 [DXDIAGN] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:05:45 +01:00
Amine Khaldi 4188095a3a [DPNHPAST] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:05:19 +01:00
Amine Khaldi eed824362a [DPLAYX] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:04:51 +01:00
Amine Khaldi c1cf2ac305 [DMUSIC] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:04:24 +01:00
Amine Khaldi 41c8c312e1 [DINPUT] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:03:34 +01:00
Amine Khaldi 3d017d7150 [D3DRM] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:01:38 +01:00
Amine Khaldi 7ce1a24a8b [D3DCOMPILER_43_WINETEST] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:01:05 +01:00
Amine Khaldi dffb99c172 [D3DCOMPILER_43] Sync with Wine Staging 4.18. CORE-16441 2019-10-26 13:00:33 +01:00
Joachim Henze 082f230ac7 [WINED3D] Workaround regression CORE-15408
Many 3D applications crashed with 'WineD3D fake window' msgbox
if they were used in VirtualBox with graphics driver
'VBoxDisp.sys from VM guest additions + installed 3D acceleration'

That was a regression of SVN r75847 == git
3d13ed394e

Contrary we had no such issues with the SW emulation.
The reason for the bug is that
VBoxDisp only supports OpenGL 2.1 (GLSL 120) and WineD3D
tried to use shaders for OpenGL 3.2 (GLSL 150).

This workaround disables the usage in a hard-coded way for
all graphics adapters. Should be ok for now, as ros does not
really support any modern GPU drivers yet.
Proper working runtime detection would be better ofc.

Thx to Doug Lyons & Fabian Maurer
2019-10-22 03:07:09 +02:00
Amine Khaldi c1585bb868 [DEVENUM] Sync with Wine Staging 4.18. CORE-16441 2019-10-20 18:56:05 +01:00
Joachim Henze 36d9e80add [D3DCOMPILER_43] Addendum to last commit CORE-14955 & CORE-15652
GCC Linux build had no issues with the last commit but
MSVC x86 & x64 v18.0.31101.0 choked on it with
error C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE *' to 'DWORD *'
and similar.

I could not retest with that exact version of MSVC, but the mentioned problems
vanished for me when compiling locally with MSVC 16.0.40219.1 x86.
Fingers crossed, that this makes the builders happy again!
2019-10-03 21:16:39 +02:00
Joachim Henze 81cffd7658 [D3D8][D3D9][DDRAW][D3DCOMPILER_43][WINED3D] Revert to Wine Staging 3.3
Avoid regressions CORE-14955 "Ddraw fullscreen crashes" and CORE-15652

This brings us back to before guilty commit 0.4.10-dev-55-g
7af3969e9f

and therefore downgrades
dll/directx/wine/
D3D8,D3D9,DDRAW,D3DCOMPILER_43,WINED3D
to WineStaging 3.3.
Also downgrades related header sdk/include/reactos/wine/wined3d.h
and for the first time also media/doc/README.WINE

Same versions of these dlls we had in every ros rls since 0.4.10rls.
Amine Khaldi agreed to perform this revert also for master now.

Purpose of this revert is to fix crashes when Ddraw apps switch
into fullscreen with VBEMP and inbuilt Mesa.
I tested, before:
 DxDiag crashed when switching to fullscreen (CORE-14955),
 Diablo II crashed immediately (CORE-15652),
 Monster-Truck-Madness 2 demo crashed after main menu

Afterwards all of these apps do run.
DXTN does still work after that, even with VBEMP and inbuilt Mesa.

squashed commit of 0.4.13-RC-2-g
67dd70e5ef
and 0.4.13-RC-3-g
9f1e2cd172
2019-10-03 18:38:29 +02:00
Timo Kreuzer 06e631fafe [KSUSER] Improve pointer arithmetics 2019-08-15 18:04:57 +02:00
Hermès Bélusca-Maïto b6135732d4
[DLLs] Fix .spec files regarding OLE-specific exports.
- Do not use hardcoded ordinals, add missing '-private'.
  Except for MSXML3, OLE32 and RSAENH, see commit bff824b2 for more details.

- SHSVCS: The 6 first exports are nonamed with ordinals. Replace exported
  commented stubs by actual exported stubs instead.

Co-Authored-By: Timo Kreuzer <timo.kreuzer@reactos.org>
2019-07-28 16:26:22 +02:00
Oleg Dubinskiy 1a84d120a6 [DSOUND_NEW] Remove unused dsound_convert.c file (#1748) 2019-07-24 19:56:33 +02:00
Oleg Dubinskiy 7f59361911
[DSOUND_NEW] Completely fix gcc compilation (addendum to 25e98eb). (#1740)
CORE-16128
2019-07-21 17:02:34 +02:00
Oleg Dubinskiy 25e98eb0da [DSOUND_NEW] Add CMakeLists.txt + mostly fix gcc compilation 2019-06-30 20:06:36 +02:00
Oleg Dubinskiy c8611aea13 [DPNHPAST] Import dpnhpast.dll from Wine (Staging) 4.5 2019-04-24 19:59:15 +02:00
Oleg Dubinskiy 7a88727570 [DIRECTX] Fix typos in readme.txt (#1498)
See also PR #687.
2019-04-13 17:07:02 +02:00
Thomas Faber 5685ad4a12
[CMAKE] Don't use the PCH for generated files.
The PCH must be used with the same compiler flags it was generated with,
so don't use it for files that use modified flags.
2019-04-13 15:58:22 +02:00
Timo Kreuzer 146096cd2e [3RDPARTY] Make some warnings non-fatal 2019-04-13 14:07:50 +02:00
jimtabor 84d518b190 [DDraw] Fix DxDiag tests.
After the DC work is done while before releasing the DC flush the GDI
batch.
See CORE-15905. Someone may need to notify wine about this change.
2019-04-10 19:24:50 -05:00
Hervé Poussineau 11d11cf6d0 [CMAKE] Temporarly disable pch in some modules to fix travis-ci
Problem appeared after 09c4d0a74b
2019-04-07 21:00:49 +02:00
Hervé Poussineau 09c4d0a74b [CMAKE] Prevent out-of-bound accesses in parser/lexer files
which try to remove path prefix from them.
2019-04-07 18:32:29 +02:00
Jérôme Gardou 23373acbb9 [CMAKE] Use modules instead of shared libraries
There is no need to compile our DLLs as shared libraries since we are
managing symbols exports and imports through spec files.

On my system, this reduces the configure-time by a factor of two.
2019-04-06 17:43:38 +02:00
Amine Khaldi 517ea70ceb [DMUSIC] Sync with Wine Staging 4.0. CORE-15682 2019-01-25 13:12:18 +01:00
Amine Khaldi 98e62237b1 [DINPUT] Sync with Wine Staging 4.0. CORE-15682 2019-01-25 13:11:07 +01:00
Amine Khaldi e7b199daff [D3DX9_*] Sync with Wine Staging 4.0. CORE-15682 2019-01-25 13:10:23 +01:00
Amine Khaldi 511039b77d [D3DRM] Sync with Wine Staging 4.0. CORE-15682 2019-01-25 13:09:01 +01:00
Amine Khaldi 6971090559 [D3DCOMPILER_43] Sync with Wine Staging 4.0. CORE-15682 2019-01-25 13:08:25 +01:00
Serge Gautherie 85cd2849c0 [D3DCOMPILER_43] Fix a MSVC-x64 warning about dxbc_init() (#1173)
"...\utils.c(561) : warning C4028: formal parameter 2 different from declaration"

Cherry-pick:
ffe9346120
CORE-7538
2018-12-21 02:53:42 +01:00
Serge Gautherie 5e8e654dfd
[DDRAW] Remove useless 'else's. 2018-12-08 17:10:36 +01:00
Serge Gautherie 166c6e2498
[DDRAW] Fix two duplicate DDSD_WIDTH uses.
Thanks to Kudratov Olimjon who reported this.
CORE-8545
2018-12-08 17:10:31 +01:00
Mark Jansen cc27de18f4
[DMUSIC] Fix the build for vs 2010 2018-10-01 20:47:01 +02:00
Pierre Schweitzer 37e0012be1
[DMUSIC] Fix build? 2018-10-01 11:04:26 +02:00
Amine Khaldi 698fd79dd2 [QEDIT] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:24:54 +01:00
Amine Khaldi 64c1a65258 [MSDMO] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:24:18 +01:00
Amine Khaldi a8126f3f1e [DPLAYX] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:23:02 +01:00
Amine Khaldi a16afc25c9 [DMUSIC] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:22:26 +01:00
Amine Khaldi ad21be5e5f [DINPUT] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:20:57 +01:00
Amine Khaldi db2b3364c6 [D3DXOF] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:20:18 +01:00
Amine Khaldi bcb816619a [D3DX9_36] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:19:39 +01:00
Amine Khaldi c003509323 [D3DCOMPILER_43] Sync with Wine Staging 3.17. CORE-15127 2018-10-01 00:19:01 +01:00
Amine Khaldi 82faa151e5 [XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127 2018-09-30 23:57:08 +01:00
Thomas Faber c97e9defc1
[WINED3D] Yield CPU to the scheduler in wined3d_pause. CORE-14637 CORE-14534
Much like the previous commit, this is a workaround for our buggy Win32k.
2018-08-19 13:46:08 +02:00
Thomas Faber adfbefde2b
[WINED3D] Avoid spinning in wined3d_cs_run. CORE-14534
Spinning here is supposed to improve performance by avoiding scheduling
overhead, but because ReactOS's Win32 subsystem does not deal with this well,
it causes the system to freeze on ROS.
As a workaround, we disable spinning and jump directly to the wait.

It should become obvious when this starts actually causing performance issues
again and it's time to undo.
2018-08-19 13:46:02 +02:00
Timo Kreuzer 0f8439aa71 [DLLS] Fix 64 bit issues 2018-08-04 19:19:34 +02:00
Mark Jansen a731be3f12
[DEVENUM] Initialize rgpins. 2018-06-29 22:28:57 +02:00
Amine Khaldi f267af2ac1 [QUARTZ] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 04:00:39 +01:00
Amine Khaldi 20e02be701 [MSDMO] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:59:47 +01:00
Amine Khaldi e467e5ff1b [DMUSIC] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:59:04 +01:00
Amine Khaldi e2ded18d65 [DINPUT] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:57:38 +01:00
Amine Khaldi 5e3341f4bb [DEVENUM] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:56:13 +01:00
Amine Khaldi 561fd57166 [D3DX9_24 => 43] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:54:15 +01:00
Amine Khaldi 61ea4c528e [D3DRM] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:53:02 +01:00
Amine Khaldi 7af3969e9f [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:52:04 +01:00
Amine Khaldi a5f73f6c86 [AMSTREAM] Sync with Wine Staging 3.9. CORE-14656 2018-05-27 03:50:07 +01:00
Timo Kreuzer 6b1ca75899
[REACTOS] Fix 64 bit build (#465)
* [HAL] Simplify HalpReboot() and make it portable
* [NTOS:MM] Cast constant to PVOID
* [BINPATCH] Fix 64 bit build
* [VFDDRV] Fix 64 bit build and buffer overruns
* [USBOHCI] Fix structure alignment issues
* [ATL_APITEST] Fix 64 bit build
* [XDK] Update unwind structures in winnt.h
* [NTDLL_APITEST] Fix 64 bit build
* [NTDLL_WINETEST] Fix 64 bit build
* [TFTPD] Fix x64 build
* [USBPORT] Fix a C_ASSERT
* [DSOUND] Fix x64 build
* [HAL] Remove obsolete GetPteAddress() macro
2018-04-03 15:13:17 -06:00
Mark Jansen 775e2aea3c
[DSOUND] Check arguments in IDirectSoundFullDuplex::Initialize.
This prevents a crash in winetest_dsound:duplex
2018-03-18 15:58:04 +01:00
Amine Khaldi 83d28845a1 [QUARTZ] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:46:24 +01:00
Amine Khaldi d3e7f8dd2d [QEDIT] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:43:36 +01:00
Amine Khaldi 7fdc682155 [MSDMO] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:42:29 +01:00
Amine Khaldi afc3201b40 [DXDIAGN] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:40:32 +01:00
Amine Khaldi a531318156 [DPLAYX] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:39:19 +01:00
Amine Khaldi 2608d38619 [DPLAY] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:38:10 +01:00
Amine Khaldi 5d870f5ba6 [DMUSIC] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:36:52 +01:00
Amine Khaldi e8c6acd13d [DINPUT8] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:35:22 +01:00
Amine Khaldi 7016dd6d65 [DINPUT] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:33:13 +01:00
Amine Khaldi dbcbc1cda1 [DEVENUM] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:30:52 +01:00
Amine Khaldi 1bb40cffc0 [D3DXOF] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:28:23 +01:00
Amine Khaldi e5c42da45c [D3DX9_*] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:26:47 +01:00
Amine Khaldi e792c304fe [D3DRM] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:17:38 +01:00
Amine Khaldi 9987f02917 [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:15:18 +01:00
Amine Khaldi 7401c74a40 [AMSTREAM] Sync with Wine Staging 3.3. CORE-14434 2018-03-08 13:10:17 +01:00
Amine Khaldi a8d718da39 [D3DCOMPILER_43] Sync with Wine Staging 3.3. CORE-14434 2018-03-05 00:15:03 +01:00
Serge Gautherie cd4db318d0 [D3D9][ARPING] Add missing va_start() and va_end() (#371) 2018-02-16 10:28:25 +01:00
Amine Khaldi b313fd906e [QUARTZ] Sync with Wine 3.0. CORE-14225 2018-01-21 22:33:20 +01:00
Amine Khaldi defffcf1f0 [QEDIT] Sync with Wine 3.0. CORE-14225 2018-01-21 22:31:34 +01:00
Amine Khaldi 92f11cd7c0 [DXDIAGN] Sync with Wine 3.0. CORE-14225 2018-01-21 22:29:51 +01:00
Amine Khaldi 0b35adc274 [DINPUT] Sync with Wine 3.0. CORE-14225 2018-01-21 22:26:41 +01:00
Amine Khaldi 56fc552f24 [DEVENUM] Sync with Wine 3.0. CORE-14225 2018-01-21 22:25:39 +01:00
Amine Khaldi 65bd988c40 [D3DX9_24=>43] Sync with Wine 3.0. CORE-14225 2018-01-21 22:24:27 +01:00
Amine Khaldi a18d16dcb5 [D3DCOMPILER_43] Sync with Wine 3.0. CORE-14225 2018-01-21 22:22:20 +01:00
Amine Khaldi d6ac0a71ad [D3D9][WINED3D] Sync with Wine 3.0. CORE-14225 2018-01-21 22:20:57 +01:00
Amine Khaldi d255223474 [DDRAW] Sync with Wine 3.0. CORE-14225 2018-01-21 22:15:58 +01:00
Amine Khaldi e6c95b14e3 [D3D8] Sync with Wine 3.0. CORE-14225 2018-01-21 22:13:33 +01:00
Amine Khaldi 928bad849b [AMSTREAM] Sync with Wine 3.0. CORE-14225 2018-01-21 22:11:24 +01:00
Timo Kreuzer bad1c03529 [KSPROXY] Fix MSVC build
The module stays disabled though.
2017-12-30 11:08:11 +01:00
Amine Khaldi e7054d7688 [AMSTREAM] We don't need to define WIDL_C_INLINE_WRAPPERS here anymore. 2017-10-08 14:32:50 +01:00
Amine Khaldi 57cda5aa7d [MSDMO] Fix build. 2017-10-08 12:28:23 +01:00
Amine Khaldi 85d9a38ac0 [D3DX9_24 => 43] Sync with Wine Staging 2.16. CORE-13762 2017-10-08 11:48:29 +01:00
Colin Finck c2c66aff7d Git conversion: Make reactos the root directory, move rosapps, rostests, wallpapers into modules, and delete rossubsys. 2017-10-03 07:45:34 +00:00