Commit graph

86 commits

Author SHA1 Message Date
Joachim Henze 1087cd589b [0.4.13][DDRAW] Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags() CORE-18378 (#4713)
Mutes the logging:
fixme:(dll/directx/wine/ddraw/utils.c:584) Unhandled flags 0x20.
gets logged many times per second.

It does affect several applications, e.g. the game 'Anno 1602' from 1998, and the 'Diablo 2 demo' from rapps,
For both games it can be observed with both: our VBEMP driver and the VBox4.3.12 3D-accelerated-driver.

Muting may improve performance a bit in such apps.
It gets logged although no missing features can be perceived visually in the rendering.

The regression was introduced to master by 0.4.9-dev-155-g 9987f02917

Fix it by importing Wine-commit
b943c7910b
 ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags().
 Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
 Signed-off-by: Alexandre Julliard <julliard@winehq.org>

fix picked from 0.4.15-dev-5070-g 305aae75f5
2022-10-27 00:03:13 +02:00
Joachim Henze 8fbd192c4c [0.4.13][DDRAW] ddraw.c ddraw7_FlipToGDISurface() to Wine-6.8 (#3827) CORE-15128
fixes CORE-15128 "Fall 0.1.3, black controls all over the desktop after exiting the game"
which regressed by 0.4.9-dev-155-g 9987f02917
(the sync to Wine Staging 3.3)

the patch on top of 0.4.15-dev-2923-g2210d23:
KVM: https://reactos.org/testman/compare.php?ids=78290,78295 LGTM
VBox: https://reactos.org/testman/compare.php?ids=78291,78294 LGTM

fix picked from 0.4.15-dev-2929-g 34d5d1dbd4
2022-01-21 05:58:31 +01:00
Joachim Henze 1e367ccbb7 [0.4.13] Fix VSSolution's msbuild CORE-15991
It regressed by 0.4.12-dev-1064-g 09c4d0a74b
when we tried to mute compiler warnings in the GCC Release configuration
for all modules, that do contain .y files.

In master we switched to use flex+bison to process those files at build-time
in 0.4.15-dev-2277-g 28dadda8be and at the same
time reverted the guilty rev.

In the backport to the old releases we do only revert, but do not introduce
flex+bison. This will reintroduce the warnings in GCC Release configuration.
2021-06-20 00:29:30 +02:00
Joachim Henze 5e4310bcc9 [0.4.13][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

cherry picked from commit 0.4.14-dev-113-g
082f230ac7
2019-10-22 03:13:35 +02:00
Joachim Henze d27a20233d [0.4.13][D3DCOMPILER_43] Addendum to last commit CORE-14955 & CORE-15652
GCC Linux build had no issues with the last commit in D3DCOMPILER_43 but
MSVC x86 & x64 v18.0.31101.0 choked on it with
error C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE *' to 'DWORD *'
and similar.

MSVC v18.0.31101.0, target x86 and x64, flagged C4133 as error
MSVC v16.0.40219.1, target x86, flagged C4133 as warning

cherry picked from commit 0.4.14-dev-8-g
36d9e80add
2019-10-03 21:45:38 +02:00
Joachim Henze 67dd70e5ef [0.4.13] Avoid regressions CORE-14955 "Ddraw fullscreen crashes", 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
to WineStaging 3.3 for this rls.
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.

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.

This will be the interim fix, which I will keep for rls at least
until someone manages to fix CORE-14955 properly in master with current Wine.

analog to 0.4.10-RC-17-g
bb4c55d650
2019-10-02 01:27:03 +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