Joachim Henze
a7a9867f87
[0.4.10][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:05:21 +02:00
Joachim Henze
b5f5dcf336
[0.4.10][D3DCOMPILER_43] Fix 11 MSVC2010SP1 x86 dbg warnings C4133 CORE-18104
...
can be observed with MSVC 2010SP1 (16.0.40219.1) x86 target in dbg configuation:
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1107) : warning C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1110) : warning C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE_TOPOLOGY *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1126) : warning C4133: 'function' : incompatible types - from 'D3D_TESSELLATOR_OUTPUT_PRIMITIVE *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1129) : warning C4133: 'function' : incompatible types - from 'D3D_TESSELLATOR_PARTITIONING *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1132) : warning C4133: 'function' : incompatible types - from 'D3D_TESSELLATOR_DOMAIN *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1438) : warning C4133: 'function' : incompatible types - from 'D3D_SHADER_INPUT_TYPE *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1441) : warning C4133: 'function' : incompatible types - from 'D3D_RESOURCE_RETURN_TYPE *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1444) : warning C4133: 'function' : incompatible types - from 'D3D_SRV_DIMENSION *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1507) : warning C4133: 'function' : incompatible types - from 'D3D_CBUFFER_TYPE *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1603) : warning C4133: 'function' : incompatible types - from 'D3D_NAME *' to 'DWORD *'
C:\047rls\reactos\dll\directx\wine\d3dcompiler_43\reflection.c(1604) : warning C4133: 'function' : incompatible types - from 'D3D_REGISTER_COMPONENT_TYPE *' to 'DWORD *'
picked from 0.4.14-dev-8-g 36d9e80add
( for the record: 0.4.13 got this years ago already via 0.4.13-RC-4-g d27a20233d
)
2022-03-29 01:53:28 +02:00
Joachim Henze
8b9811a62b
[0.4.10][XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules.
...
part of CORE-15127
picked from:
0.4.11-dev-258-g 82faa151e5
2022-03-13 21:41:21 +01:00
Joachim Henze
fc62a2ef50
[0.4.10][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 06:00:19 +01:00
Joachim Henze
f38baae9e7
[0.4.10][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 0.4.7-dev-319-g
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
Fix cherry picked from 0.4.14-dev-113-g
082f230ac7
2020-10-04 17:11:07 +02:00
Joachim Henze
bb4c55d650
[0.4.10] Avoid regression CORE-14955 "Ddraw fullscreen crashes"
...
This reverts commit 0.4.10-dev-55-g
7af3969e9f
and therefore downgrades D3D8,D3D9,DDRAW,WINED3D from 3.9 to 3.3 for this rls.
This is still newer than last release where we had to go back to 3.0 even.
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,
Diablo II crashed immediately,
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 Wine 3.9.
2018-08-28 15:16:10 +02: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