February 2018 - Wine-devel - list.winehq.org

[PATCH v4 4/7] winebus.sys: Process SDL device reports
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 120 ++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/bus_udev.c | 19 +------ dlls/winebus.sys/controller.c | 17 ++++++ dlls/winebus.sys/controller.h | 1 + 4 files changed, 139 insertions(+), 18 deletions(-)

1 0

[PATCH v4 3/7] winebus.sys: Build SDL device report
by Aric Stewart 21 Feb '18

21 Feb '18

v2: Correct ifdef value v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 1 + dlls/winebus.sys/bus_sdl.c | 197 +++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/bus_udev.c | 95 +------------------- dlls/winebus.sys/controller.c | 48 ++++++++++ dlls/winebus.sys/controller.h | 96 ++++++++++++++++++++ 5 files changed, 342 insertions(+), 95 deletions(-) create mode 100644 dlls/winebus.sys/controller.c create mode 100644 dlls/winebus.sys/controller.h

1 0

[PATCH v4 2/7] winebus.sys: Support adding and removing SDL devices
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 292 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 291 insertions(+), 1 deletion(-)

1 0

[PATCH v4 1/7] winebus.sys: Add SDL gamepad and joystick driver
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic SDL library loading v4: Dynamically use Joystick Vendor and Product ID if avaliable Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- configure | 160 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 15 ++++ dlls/winebus.sys/Makefile.in | 3 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_sdl.c | 58 ++++++++++++++++ dlls/winebus.sys/main.c | 15 +++- include/config.h.in | 9 +++ 7 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 dlls/winebus.sys/bus_sdl.c

1 0

[PATCH] wined3d: Increase string buffer size in wined3d_debug_resource_access().
by Paul Gofman 21 Feb '18

21 Feb '18

Otherwise it was crashing on long resource access debug string. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 10cfa25a4c..e2c02f0785 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4150,7 +4150,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *wined3d_debug_resource_access(DWORD access) { - char buf[91]; + char buf[126]; buf[0] = '\0'; #define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } -- 2.14.3

3 3

[PATCH] d3dx9: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/surface.c | 10 +++++----- dlls/d3dx9_36/texture.c | 4 ++-- dlls/d3dx9_36/util.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294ce624f..fc23745b0b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2340,7 +2340,7 @@ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_id if (element->Stream != stream_idx) continue; - if (element->Type >= sizeof(d3dx_decltype_size) / sizeof(*d3dx_decltype_size)) + if (element->Type >= ARRAY_SIZE(d3dx_decltype_size)) { FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); continue; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fc747799d6..0a6e20e8f1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -53,7 +53,7 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) { unsigned int i; - for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(wic_pixel_formats); i++) { if (IsEqualGUID(wic_pixel_formats[i].wic_guid, guid)) return wic_pixel_formats[i].d3dformat; @@ -66,7 +66,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) { unsigned int i; - for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(wic_pixel_formats); i++) { if (wic_pixel_formats[i].d3dformat == format) return wic_pixel_formats[i].wic_guid; @@ -164,7 +164,7 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) D3DFMT_A32B32G32R32F, }; - for (i = 0; i < sizeof(known_fourcc) / sizeof(known_fourcc[0]); i++) + for (i = 0; i < ARRAY_SIZE(known_fourcc); i++) { if (known_fourcc[i] == fourcc) return fourcc; @@ -203,7 +203,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { unsigned int i; - for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(rgb_pixel_formats); i++) { if (rgb_pixel_formats[i].bpp == pixel_format->bpp && rgb_pixel_formats[i].rmask == pixel_format->rmask @@ -297,7 +297,7 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form pixel_format->size = sizeof(*pixel_format); - for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(rgb_pixel_formats); i++) { if (rgb_pixel_formats[i].format == d3dformat) { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index b326bc1362..b81f3a1e9e 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -200,7 +200,7 @@ static D3DFORMAT get_luminance_replacement_format(D3DFORMAT format) }; unsigned int i; - for (i = 0; i < sizeof(luminance_replacements) / sizeof(luminance_replacements[0]); ++i) + for (i = 0; i < ARRAY_SIZE(luminance_replacements); ++i) if (format == luminance_replacements[i].luminance_format) return luminance_replacements[i].replacement_format; return format; @@ -557,7 +557,7 @@ static D3DFORMAT get_alpha_replacement_format(D3DFORMAT format) }; unsigned int i; - for (i = 0; i < sizeof(replacement_formats) / sizeof(replacement_formats[0]); ++i) + for (i = 0; i < ARRAY_SIZE(replacement_formats); ++i) if (replacement_formats[i].orig_format == format) return replacement_formats[i].replacement_format; return format; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 9e4bbbf0bc..af71250b78 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -220,7 +220,7 @@ const struct pixel_format_desc *get_format_info(D3DFORMAT format) const struct pixel_format_desc *get_format_info_idx(int idx) { - if(idx >= sizeof(formats) / sizeof(formats[0])) + if(idx >= ARRAY_SIZE(formats)) return NULL; if(formats[idx].format == D3DFMT_UNKNOWN) return NULL; -- 2.14.3

2 1

wineserver sometimes crashes in fd.c:1548: set_fd_events: Assertion `poll_users[user] == fd' failed
by Mihai Todor 21 Feb '18

21 Feb '18

Hello Everyone, I am using Wine 3.0 stable and, as part of my setup, I am running wineserver in persistent mode forever (wineserver -p) for performance reasons and, sometimes, it dies with this error: "wineserver: fd.c:1548: set_fd_events: Assertion `poll_users[user] == fd' failed." For the time being, this is a sufficiently rare occurrence to not concern me (it happens once / day or so), but I am curious to learn what might cause it, since it looks like a bug. For a bit more detail about my setup, while wineserver is running, I am starting a single instance of an x86 application with an embedded gRPC TCP server, I am instructing this application to process some local files and, after it finishes, I am stopping it. This cycle repeats once every 10 - 20 seconds on average and there is just one instance of this application running at the same time. Sometimes, this application hangs and I terminate it forcefully by killing the process (bad input file / bad code / etc), which is what I am thinking might be the cause of the wineserver crash. However, so far, I was unable to reproduce this issue consistently. I am considering to spend some time adding more logging in the wineserver code to narrow it down, but I'd be grateful if anyone has any insight into what might be the cause and how to diagnose it. Thanks, Mihai

1 1

[PATCH] ddraw: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 10 +++++----- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/utils.c | 25 ++++++++++++------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a02bc676..97a11ef1ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1738,7 +1738,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes outsize = NumCodes && Codes ? *NumCodes : 0; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) @@ -2395,7 +2395,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, wined3d_mutex_lock(); pixelformat.dwSize = sizeof(pixelformat); - for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) + for(fmt = 0; fmt < ARRAY_SIZE(checkFormatList); fmt++) { modenum = 0; while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], @@ -3111,7 +3111,7 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags) return FALSE; - for (i=0; i < sizeof(compare)/sizeof(compare[0]); i++) + for (i=0; i < ARRAY_SIZE(compare); i++) { if (requested->dwFlags & compare[i].flag && memcmp((const char *)provided + compare[i].offset, @@ -3643,7 +3643,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA return hr; } - for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) + for (i = 0; i < ARRAY_SIZE(device_list7); i++) { HRESULT ret; @@ -4357,7 +4357,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device return hr; } - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c2d87ddfe6..75e000aa09 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,7 +1086,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) @@ -1108,7 +1108,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, } } - for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) + for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_LEGACYBUMPMAP, @@ -1214,7 +1214,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b6e5b11879..0faa98234d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -740,13 +740,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i=0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 0170fcd7fb..65f24dc13f 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -768,8 +768,8 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) FE(DDSCAPS2_STEREOSURFACELEFT) }; - DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); - DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); + DDRAW_dump_flags_nolf(in->dwCaps, flags, ARRAY_SIZE(flags)); + DDRAW_dump_flags(in->dwCaps2, flags2, ARRAY_SIZE(flags2)); } static void @@ -806,7 +806,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) FE(DDPF_ZPIXELS) }; - DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags_nolf(flagmask, flags, ARRAY_SIZE(flags)); } static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) @@ -906,8 +906,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members_caps, 1); } - DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, - sizeof(members)/sizeof(members[0])); + DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, ARRAY_SIZE(members)); } } @@ -984,7 +983,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) if (TRACE_ON(ddraw)) { TRACE(" - "); - DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags(cooplevel, flags, ARRAY_SIZE(flags)); } } @@ -1143,13 +1142,13 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) }; TRACE(" - dwSize : %d\n", lpcaps->dwSize); - TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); - TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); - TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); - TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0])); - TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0])); - TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); - TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); + TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1)); + TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2)); + TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3)); + TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, ARRAY_SIZE(flags4)); + TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, ARRAY_SIZE(flags5)); + TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6)); + TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7)); TRACE("...\n"); TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes); TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays); -- 2.14.3

2 1

[PATCH] ddraw/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 02b10b5ccb..550d73a1bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14265,7 +14265,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 43c52aa8b9..3f433a6765 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13640,7 +13640,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); -- 2.14.3

2 1

[PATCH] d3d9: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/vertexdeclaration.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5f8827852a..5e0f55838f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2401,7 +2401,7 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; @@ -2421,7 +2421,7 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index f7e0eb9e53..5075309638 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -344,7 +344,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem for (i = 0; i < count; ++i) { - if (d3d9_elements[i].Type >= (sizeof(d3d_dtype_lookup) / sizeof(*d3d_dtype_lookup))) + if (d3d9_elements[i].Type >= ARRAY_SIZE(d3d_dtype_lookup)) { WARN("Invalid element type %#x.\n", d3d9_elements[i].Type); heap_free(*wined3d_elements); -- 2.14.3

2 1