December 2022 - Wine-commits

Eric Pouech : msvcr90: Fix warning on object access tests.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 565ce829e1955ffe4b7ebc81a9f3ba7a153bd017 URL: https://gitlab.winehq.org/wine/wine/-/commit/565ce829e1955ffe4b7ebc81a9f3ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 14:28:04 2022 +0100 msvcr90: Fix warning on object access tests. GCC 12 complains about accessing a too small object. In function 'test__AdjustPointer', inlined from 'func_msvcr90' at wine/dlls/msvcr90/tests/msvcr90.c:2515:5: wine/dlls/msvcr90/tests/msvcr90.c:1556:30: warning: array subscript 30 is outside array bounds of 'void[8]' [-Warray-bounds] 1556 | {&obj1, (char*)&obj1 + obj.off, {0, 0, 0}}, | ~~~~~~~~~~~~~^~~~~~~~~ Since we're only checking the addresses and not the underlying objects, use uintptr_t instead of pointers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcr90/tests/msvcr90.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0d28df217ab..cdc9de0d6d2 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1542,28 +1542,28 @@ static void test__AdjustPointer(void) void *obj1 = &obj.off; void *obj2 = &obj; struct test_data { - void *ptr; - void *ret; + uintptr_t ptr; + uintptr_t ret; struct { int this_offset; int vbase_descr; int vbase_offset; } this_ptr_offsets; } data[] = { - {NULL, NULL, {0, -1, 0}}, - {(void*)0xbeef, (void*)0xbef0, {1, -1, 1}}, - {(void*)0xbeef, (void*)0xbeee, {-1, -1, 0}}, - {&obj1, (char*)&obj1 + obj.off, {0, 0, 0}}, - {(char*)&obj1 - 5, (char*)&obj1 + obj.off, {0, 5, 0}}, - {(char*)&obj1 - 3, (char*)&obj1 + obj.off + 24, {24, 3, 0}}, - {(char*)&obj2 - 17, (char*)&obj2 + obj.off + 4, {4, 17, sizeof(int)}} + {0, 0, {0, -1, 0}}, + {0xbeef, 0xbef0, {1, -1, 1}}, + {0xbeef, 0xbeee, {-1, -1, 0}}, + {(uintptr_t)&obj1, (uintptr_t)&obj1 + obj.off, {0, 0, 0}}, + {(uintptr_t)&obj1 - 5, (uintptr_t)&obj1 + obj.off, {0, 5, 0}}, + {(uintptr_t)&obj1 - 3, (uintptr_t)&obj1 + obj.off + 24, {24, 3, 0}}, + {(uintptr_t)&obj2 - 17, (uintptr_t)&obj2 + obj.off + 4, {4, 17, sizeof(int)}} }; void *ret; int i; for(i=0; i<ARRAY_SIZE(data); i++) { - ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); - ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); + ret = p__AdjustPointer((void*)data[i].ptr, &data[i].this_ptr_offsets); + ok(ret == (void*)data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, (void*)data[i].ret); } }

1 0

Piotr Caban : msvcrt: Construct a real C++ object to test against.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 0c3653bbcd3af9d845b0582f9db852a3454cd074 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c3653bbcd3af9d845b0582f9db852… Author: Piotr Caban <eric.pouech(a)codeweavers.com> Date: Wed Dec 7 14:28:06 2022 +0100 msvcrt: Construct a real C++ object to test against. This fixes GCC12 warnings about accessing a too small object. wine/dlls/msvcrt/tests/cpp.c: In function 'test_rtti': wine/dlls/msvcrt/tests/cpp.c:1036:45: warning: array subscript 2 is outside array bounds of 'void[4]' [-Warray-bounds] 1036 | ok (casted == (char*)&child_class_sig0+8, "failed cast to simple_class (%p %p)\n", casted, &child_class_sig0); | ~~~~~~~~~~~~~~~~~~~~~~~~^~ Signed-off-by: Piotr Caban <piotr.caban(a)codeweavers.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index b2b6a1909b7..e5fa652ede2 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -943,11 +943,17 @@ static void test_rtti(void) void *simple_class_vtbl[2] = {&simple_class_rtti.object_locator}; void *simple_class = &simple_class_vtbl[1]; void *child_class_vtbl[2] = {&child_class_rtti.object_locator}; - void *child_class = &child_class_vtbl[1]; + struct { + void *vtbl; + char data[4]; + } child_class = { &child_class_vtbl[1] }; void *simple_class_sig0_vtbl[2] = {&simple_class_sig0_rtti.object_locator}; void *simple_class_sig0 = &simple_class_sig0_vtbl[1]; void *child_class_sig0_vtbl[2] = {&child_class_sig0_rtti.object_locator}; - void *child_class_sig0 = &child_class_sig0_vtbl[1]; + struct { + void *vtbl; + char data[4]; + } child_class_sig0 = { &child_class_sig0_vtbl[1] }; void *virtual_base_class_vtbl[2] = {&virtual_base_class_rtti.object_locator}; int virtual_base_class_vbtbl[2] = {0, 0x100}; struct {

1 0

Sven Baars : taskschd/tests: Fix a test failure on w1064v1507.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 7acd3aa429f2d45d96f4699906dc81e47ebd9c13 URL: https://gitlab.winehq.org/wine/wine/-/commit/7acd3aa429f2d45d96f4699906dc81… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 7 17:19:48 2022 +0100 taskschd/tests: Fix a test failure on w1064v1507. --- dlls/taskschd/tests/scheduler.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e6efd3aa1af..4e156e7ef33 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -775,12 +775,23 @@ static void test_GetTask(void) hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#lx\n", hr); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); + + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); + todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#lx\n", hr); + + /* Delete the folder and recreate it to prevent a crash on w1064v1507 */ + hr = ITaskFolder_DeleteFolder(root, Wine, 0); + ok(hr == S_OK, "DeleteTask error %#lx\n", hr); + + hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); + ok(hr == S_OK, "CreateFolder error %#lx\n", hr); + hr = ITaskFolder_GetTask(root, Wine, &task1); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_PATH_NOT_FOUND, got %#lx\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); - for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); @@ -799,10 +810,6 @@ static void test_GetTask(void) hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_VALIDATE_ONLY, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#lx\n", hr); - hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#lx\n", hr); - hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#lx\n", hr);

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in adapter_gl.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: f96630f04f68207db7c4ed2b95431d6bc36d94c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f96630f04f68207db7c4ed2b95431d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:47:13 2022 +0100 wined3d: Reduce usage of long integral types in adapter_gl.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8353a10a87a..fa9b24948d3 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -719,7 +719,7 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - DWORD data[4]; + unsigned int data[4]; GLuint tex, fbo; GLenum status; float color[4] = {0.0f, 1.0f, 0.0f, 0.0f};

1 0

Eric Pouech : wined3d: Enable long types in adapter_gl.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: b36eab110b9e1a34a328685f63c5f7bb8fdf4e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/b36eab110b9e1a34a328685f63c5f7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:47:14 2022 +0100 wined3d: Enable long types in adapter_gl.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index fa9b24948d3..f3810bad440 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -20,7 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -291,15 +290,15 @@ static BOOL wined3d_caps_gl_ctx_create_attribs(struct wined3d_caps_gl_ctx *caps_ if (!wglMakeCurrent(caps_gl_ctx->dc, new_ctx)) { - ERR("Failed to make new context current, last error %#x.\n", GetLastError()); + ERR("Failed to make new context current, last error %#lx.\n", GetLastError()); if (!wglDeleteContext(new_ctx)) - ERR("Failed to delete new context, last error %#x.\n", GetLastError()); + ERR("Failed to delete new context, last error %#lx.\n", GetLastError()); gl_info->p_wglCreateContextAttribsARB = NULL; return TRUE; } if (!wglDeleteContext(caps_gl_ctx->gl_ctx)) - ERR("Failed to delete old context, last error %#x.\n", GetLastError()); + ERR("Failed to delete old context, last error %#lx.\n", GetLastError()); caps_gl_ctx->gl_ctx = new_ctx; return TRUE; @@ -4265,7 +4264,7 @@ static HRESULT adapter_gl_create_device(struct wined3d *wined3d, const struct wi if (FAILED(hr = wined3d_device_init(&device_gl->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, adapter->gl_info.supported, device_parent))) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); heap_free(device_gl); return hr; } @@ -4700,7 +4699,7 @@ static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, state_parent, parent, parent_ops))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(swapchain_gl); return hr; } @@ -4734,7 +4733,7 @@ static HRESULT adapter_gl_create_buffer(struct wined3d_device *device, if (FAILED(hr = wined3d_buffer_gl_init(buffer_gl, device, desc, data, parent, parent_ops))) { - WARN("Failed to initialise buffer, hr %#x.\n", hr); + WARN("Failed to initialise buffer, hr %#lx.\n", hr); heap_free(buffer_gl); return hr; } @@ -4781,7 +4780,7 @@ static HRESULT adapter_gl_create_texture(struct wined3d_device *device, if (FAILED(hr = wined3d_texture_gl_init(texture_gl, device, desc, layer_count, level_count, flags, parent, parent_ops))) { - WARN("Failed to initialise texture, hr %#x.\n", hr); + WARN("Failed to initialise texture, hr %#lx.\n", hr); heap_free(texture_gl); return hr; } @@ -4832,7 +4831,7 @@ static HRESULT adapter_gl_create_rendertarget_view(const struct wined3d_view_des if (FAILED(hr = wined3d_rendertarget_view_gl_init(view_gl, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_gl); return hr; } @@ -4936,7 +4935,7 @@ static HRESULT adapter_gl_create_shader_resource_view(const struct wined3d_view_ if (FAILED(hr = wined3d_shader_resource_view_gl_init(view_gl, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_gl); return hr; } @@ -4981,7 +4980,7 @@ static HRESULT adapter_gl_create_unordered_access_view(const struct wined3d_view if (FAILED(hr = wined3d_unordered_access_view_gl_init(view_gl, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_gl); return hr; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in glsl_shader.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 9b1ce2d824d7e60128ac09d735b6a25cccaefa04 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b1ce2d824d7e60128ac09d735b6a2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:48:46 2022 +0100 wined3d: Reduce usage of long integral types in glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 27 insertions(+), 26 deletions(-)

1 0

Eric Pouech : wined3d: Enable long types in glsl_shader.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 36717714c9388f0de8b99e4a791fa7a6d5d394c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/36717714c9388f0de8b99e4a791fa7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:48:47 2022 +0100 wined3d: Enable long types in glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9db92fdb9b2..188080967e5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -20,7 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ /* * D3D shader asm has swizzles on source parameters, and write masks for @@ -13158,7 +13157,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); return dst_location; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in include/wined3d.h.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 68811881e67d4b8b9a63d70501f476b2a4ecdaeb URL: https://gitlab.winehq.org/wine/wine/-/commit/68811881e67d4b8b9a63d70501f476… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:38:34 2022 +0100 wined3d: Reduce usage of long integral types in include/wined3d.h. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/device.c | 6 +++--- include/wine/wined3d.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fead3e6e09..5c2659850f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3754,7 +3754,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - const struct wined3d_vertex_declaration *declaration, uint32_t flags, DWORD dst_fvf) + const struct wined3d_vertex_declaration *declaration, uint32_t flags, uint32_t dst_fvf) { struct wined3d_state *state = device->cs->c.state; struct wined3d_stream_info stream_info; @@ -4342,8 +4342,8 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, - const RECT *rects, uint32_t flags, const struct wined3d_color *color, float depth, DWORD stencil) +HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, unsigned int rect_count, + const RECT *rects, uint32_t flags, const struct wined3d_color *color, float depth, unsigned int stencil) { struct wined3d_fb_state *fb = &device->cs->c.state->fb; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1660b424441..e08650fb69f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2169,7 +2169,7 @@ struct wined3d_stateblock_state struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; - DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int rs[WINEHIGHEST_RENDER_STATE + 1]; BOOL alpha_to_coverage; struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; @@ -2358,8 +2358,8 @@ ULONG __cdecl wined3d_depth_stencil_state_incref(struct wined3d_depth_stencil_st HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, - uint32_t flags, const struct wined3d_color *color, float z, DWORD stencil); +HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, unsigned int rect_count, const RECT *rects, + uint32_t flags, const struct wined3d_color *color, float z, unsigned int stencil); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, @@ -2391,7 +2391,7 @@ struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - const struct wined3d_vertex_declaration *declaration, uint32_t flags, DWORD dst_fvf); + const struct wined3d_vertex_declaration *declaration, uint32_t flags, uint32_t dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode,

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in device.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 47ea1cb8105d9f931bfc6edd3576fbd2459cb63c URL: https://gitlab.winehq.org/wine/wine/-/commit/47ea1cb8105d9f931bfc6edd3576fb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:38:36 2022 +0100 wined3d: Reduce usage of long integral types in device.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5c2659850f5..bb1979a3d3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2889,7 +2889,7 @@ unsigned int CDECL wined3d_device_get_max_frame_latency(const struct wined3d_dev return device->max_frame_latency; } -static unsigned int wined3d_get_flexible_vertex_size(DWORD fvf) +static unsigned int wined3d_get_flexible_vertex_size(uint32_t fvf) { unsigned int texcoord_count = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; unsigned int i, size = 0; @@ -3433,7 +3433,7 @@ static void update_fog_factor(float *fog_factor, struct lights_settings *ls) /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, uint32_t flags, DWORD dst_fvf) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, uint32_t flags, uint32_t dst_fvf) { enum wined3d_material_color_source diffuse_source, specular_source, ambient_source, emissive_source; const struct wined3d_color *material_specular_state_colour; @@ -4580,7 +4580,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device { const struct wined3d_state *state = device->cs->c.state; struct wined3d_texture *texture; - DWORD i; + unsigned i; TRACE("device %p, num_passes %p.\n", device, num_passes);

1 0

Eric Pouech : wined3d: Enable long types in device.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 894e46365faeb21fa221dd72b11dd4b3cadc9a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/894e46365faeb21fa221dd72b11dd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:38:37 2022 +0100 wined3d: Enable long types in device.c. --- dlls/wined3d/device.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb1979a3d3c..c0646148c4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -23,7 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -324,7 +323,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { - ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); + ERR("Wine logo requested, but failed to create texture, hr %#lx.\n", hr); goto out; } @@ -553,7 +552,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc */ if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->default_sampler))) { - ERR("Failed to create default sampler, hr %#x.\n", hr); + ERR("Failed to create default sampler, hr %#lx.\n", hr); device->default_sampler = NULL; } @@ -566,7 +565,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc desc.mip_filter = WINED3D_TEXF_LINEAR; if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->null_sampler))) { - ERR("Failed to create null sampler, hr %#x.\n", hr); + ERR("Failed to create null sampler, hr %#lx.\n", hr); device->null_sampler = NULL; } } @@ -1264,7 +1263,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); + ERR("Failed to allocate shader private data, hr %#lx.\n", hr); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); @@ -1341,7 +1340,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; goto err_out; @@ -1868,7 +1867,7 @@ static void wined3d_device_set_render_state(struct wined3d_device *device, static void wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { - TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", + TRACE("device %p, sampler_idx %u, state %s, value %#lx.\n", device, sampler_idx, debug_d3dsamplerstate(state), value); if (value == device->cs->c.state->sampler_states[sampler_idx][state]) @@ -3485,7 +3484,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO box.right = box.left + dwCount * vertex_size; if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, WINED3D_MAP_WRITE))) { - WARN("Failed to map buffer, hr %#x.\n", hr); + WARN("Failed to map buffer, hr %#lx.\n", hr); return hr; } dest_ptr = map_desc.data; @@ -3835,7 +3834,7 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - TRACE("device %p, stage %u, state %s, value %#x.\n", + TRACE("device %p, stage %u, state %s, value %lx.\n", device, stage, debug_d3dtexturestate(state), value); if (stage >= d3d_info->limits.ffp_blend_stages) @@ -5703,7 +5702,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, focus_window = swapchain->state.device_window; if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) { - ERR("Failed to acquire focus window, hr %#x.\n", hr); + ERR("Failed to acquire focus window, hr %#lx.\n", hr); return hr; } } @@ -5728,7 +5727,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, * up their mess. Guild Wars also loses the device during that. */ if (FAILED(hr = wined3d_output_get_desc(swapchain_desc->output, &output_desc))) { - ERR("Failed to get output description, hr %#x.\n", hr); + ERR("Failed to get output description, hr %#lx.\n", hr); return hr; } @@ -5784,7 +5783,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &texture))) { - ERR("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); + ERR("Failed to create the auto depth/stencil surface, hr %#lx.\n", hr); return WINED3DERR_INVALIDCALL; } @@ -5799,7 +5798,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(texture); if (FAILED(hr)) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); return hr; } } @@ -5822,7 +5821,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); return hr; } } @@ -6141,7 +6140,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined &adapter->d3d_info, supported_extensions, vertex_pipeline, fragment_pipeline, adapter->misc_state_template))) { - ERR("Failed to compile state table, hr %#x.\n", hr); + ERR("Failed to compile state table, hr %#lx.\n", hr); wine_rb_destroy(&device->samplers, NULL, NULL); wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL);

1 0