Skip to content

Commit 5037a3a

Browse files
committed
[0.4.11] Avoid regression CORE-14955 "DDraw fullscreen crashes" part II
addendum to last commit. We now additionally need to fix redefinition of ARRAY_SIZE macro to make the revert compile. Most likely its definition was moved since 0.4.10rls. The result is capable to complete the DxDiag DDraw fullscreen test again.
1 parent cf0c1ad commit 5037a3a

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

dll/directx/wine/d3d9/d3d9_private.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747

4848
#define D3D9_TEXTURE_MIPMAP_DIRTY 0x1
4949

50-
#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
51-
5250
extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN;
5351

5452
HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN;

dll/directx/wine/ddraw/ddraw_private.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
#include "wine/list.h"
4040
#include "wine/wined3d.h"
4141

42-
#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
43-
4442
extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN;
4543
extern DWORD force_refresh_rate DECLSPEC_HIDDEN;
4644

0 commit comments

Comments
 (0)