- Wine-Commits - list.winehq.org

Rémi Bernon : user32: Avoid freeing invalid pointers in WIN_CreateWindowEx.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 984969be5600244b443c59287457a5b78e811b77 URL: https://gitlab.winehq.org/wine/wine/-/commit/984969be5600244b443c59287457a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:25:50 2022 +0100 user32: Avoid freeing invalid pointers in WIN_CreateWindowEx. --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a6f43c188c4..d8869b2b9db 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -278,7 +278,7 @@ static BOOL is_default_coord( int x ) */ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { - UNICODE_STRING class, window_name; + UNICODE_STRING class, window_name = {0}; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; WNDCLASSEXW info; @@ -401,7 +401,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, cs->lpCreateParams, 0, NULL, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); - if (!unicode) RtlFreeUnicodeString( &window_name ); + if (!unicode && window_name.Buffer != name_buf) RtlFreeUnicodeString( &window_name ); return hwnd; }

1 0

Rémi Bernon : kernel32/tests: Avoid releasing invalid path pointer.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 54b37a37027828864882e89ab4655c27f05f72cb URL: https://gitlab.winehq.org/wine/wine/-/commit/54b37a37027828864882e89ab4655c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:32:03 2022 +0100 kernel32/tests: Avoid releasing invalid path pointer. --- dlls/kernel32/tests/path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3c57e81f4c6..2c657e26b24 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2653,7 +2653,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ok( ret == STATUS_INVALID_PARAMETER, "got %lx expected %lx\n", ret, STATUS_INVALID_PARAMETER ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - pRtlReleasePath( path ); lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer);

1 0

Rémi Bernon : advapi32/tests: Only free GetSecurityInfo pointer on success.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 0204e6e33a05f80fe4d19b71a9c6d8fba9acf3fb URL: https://gitlab.winehq.org/wine/wine/-/commit/0204e6e33a05f80fe4d19b71a9c6d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:25:29 2022 +0100 advapi32/tests: Only free GetSecurityInfo pointer on success. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51bf60d0f36..8b4a868ee11 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8083,7 +8083,7 @@ static void test_pseudo_handle_security(void) "key %p: got error %u\n", keys[i], ret); else ok(!ret, "key %p: got error %u\n", keys[i], ret); - LocalFree(sd_ptr); + if (!ret) LocalFree(sd_ptr); ret = GetSecurityInfo(keys[i], SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);

1 0

Zebediah Figura : d3d9/tests: Do not test the alpha channel in test_multisample_get_front_buffer_data().
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: ab0488d712f260111976eafd36253f88e178ace7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab0488d712f260111976eafd36253f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri May 27 17:06:32 2022 -0500 d3d9/tests: Do not test the alpha channel in test_multisample_get_front_buffer_data(). This avoids test failures on radeonsi. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f8375d238e4..d1bcaf39c14 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17788,7 +17788,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, @@ -17800,7 +17800,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); IDirect3DTexture9_Release(texture);

1 0

Zebediah Figura : wined3d: Trace the created command stream in wined3d_cs_create().
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 4c656372b65a15cb9b53548fccd1faace0f2d937 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c656372b65a15cb9b53548fccd1fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 18:09:17 2022 -0600 wined3d: Trace the created command stream in wined3d_cs_create(). --- dlls/wined3d/cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9dc1dffe575..23780b40a76 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3462,6 +3462,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, } } + TRACE("Created command stream %p.\n", cs); return cs; fail:

1 0

Zebediah Figura : wined3d: Trace the sampler desc in wined3d_sampler_init().
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: e4f470e55cd3523e8c8b9d64547615e4fcc68bea URL: https://gitlab.winehq.org/wine/wine/-/commit/e4f470e55cd3523e8c8b9d64547615… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 23 19:14:20 2022 -0500 wined3d: Trace the sampler desc in wined3d_sampler_init(). --- dlls/wined3d/sampler.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index c003770c74b..d6e19fc521c 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -59,6 +59,19 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d TRACE("sampler %p, device %p, desc %p, parent %p, parent_ops %p.\n", sampler, device, desc, parent, parent_ops); + TRACE(" Address modes: U %#x, V %#x, W %#x.\n", desc->address_u, desc->address_v, desc->address_w); + TRACE(" Border colour: {%.8e, %.8e, %.8e, %.8e}.\n", + desc->border_color[0], desc->border_color[1], desc->border_color[2], desc->border_color[3]); + TRACE(" Filters: mag %#x, min %#x, mip %#x.\n", desc->mag_filter, desc->min_filter, desc->mip_filter); + TRACE(" LOD bias: %.8e.\n", desc->lod_bias); + TRACE(" Minimum LOD: %.8e.\n", desc->min_lod); + TRACE(" Maximum LOD: %.8e.\n", desc->max_lod); + TRACE(" Base mip level: %u.\n", desc->mip_base_level); + TRACE(" Maximum anisotropy: %u.\n", desc->max_anisotropy); + TRACE(" Comparison: %d.\n", desc->compare); + TRACE(" Comparison func: %#x.\n", desc->comparison_func); + TRACE(" SRGB decode: %d.\n", desc->srgb_decode); + sampler->refcount = 1; sampler->device = device; sampler->parent = parent;

1 0

Zebediah Figura : wined3d: Make a couple of variables const.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: f3ff858435026228e7f8490c1c5e74557e131fb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ff858435026228e7f8490c1c5e74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 18:09:59 2022 -0600 wined3d: Make a couple of variables const. --- dlls/wined3d/shader_spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 7a7cb44c15d..60ef2c022aa 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -613,7 +613,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin struct wined3d_shader_resource_bindings *wined3d_bindings, const struct wined3d_state *state, uint32_t shader_mask) { - struct vkd3d_shader_scan_descriptor_info *descriptor_info; + const struct vkd3d_shader_scan_descriptor_info *descriptor_info; enum wined3d_shader_descriptor_type wined3d_type; enum vkd3d_shader_visibility shader_visibility; enum wined3d_shader_type shader_type; @@ -652,7 +652,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin for (i = 0; i < descriptor_info->descriptor_count; ++i) { - struct vkd3d_shader_descriptor_info *d = &descriptor_info->descriptors[i]; + const struct vkd3d_shader_descriptor_info *d = &descriptor_info->descriptors[i]; uint32_t flags; if (d->register_space)

1 0

Zebediah Figura : winspool: Define copy_file() only if CUPS is available.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: d69cdbf103ebdeb6a5377d2becffbebe568fc24f URL: https://gitlab.winehq.org/wine/wine/-/commit/d69cdbf103ebdeb6a5377d2becffbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 1 23:29:29 2022 -0600 winspool: Define copy_file() only if CUPS is available. Avoid unused function warnings. --- dlls/winspool.drv/cups.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 6d2d9fa1c8e..ccb64325e7b 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -161,29 +161,6 @@ static NTSTATUS process_attach( void *args ) #endif /* SONAME_LIBCUPS */ } -static BOOL copy_file( const char *src, const char *dst ) -{ - int fds[2] = { -1, -1 }, num; - char buf[1024]; - BOOL ret = FALSE; - - fds[0] = open( src, O_RDONLY ); - fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); - if (fds[0] == -1 || fds[1] == -1) goto fail; - - while ((num = read( fds[0], buf, sizeof(buf) )) != 0) - { - if (num == -1) goto fail; - if (write( fds[1], buf, num ) != num) goto fail; - } - ret = TRUE; - -fail: - if (fds[1] != -1) close( fds[1] ); - if (fds[0] != -1) close( fds[0] ); - return ret; -} - static char *get_unix_file_name( LPCWSTR path ) { UNICODE_STRING nt_name; @@ -246,6 +223,29 @@ static BOOL cups_is_scanner( cups_dest_t *dest ) return cups_get_printer_type( dest ) & 0x2000000 /* CUPS_PRINTER_SCANNER */; } +static BOOL copy_file( const char *src, const char *dst ) +{ + int fds[2] = { -1, -1 }, num; + char buf[1024]; + BOOL ret = FALSE; + + fds[0] = open( src, O_RDONLY ); + fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); + if (fds[0] == -1 || fds[1] == -1) goto fail; + + while ((num = read( fds[0], buf, sizeof(buf) )) != 0) + { + if (num == -1) goto fail; + if (write( fds[1], buf, num ) != num) goto fail; + } + ret = TRUE; + +fail: + if (fds[1] != -1) close( fds[1] ); + if (fds[0] != -1) close( fds[0] ); + return ret; +} + static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, size_t bufsize ) {

1 0

Eric Pouech : wined3d: Let control_values' type be unsigned int.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: aac8ae7300576312d43c5f5541f9209284ad3f36 URL: https://gitlab.winehq.org/wine/wine/-/commit/aac8ae7300576312d43c5f5541f920… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 1 00:18:55 2022 +0100 wined3d: Let control_values' type be unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db70a9853d4..4176eda91af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3397,7 +3397,7 @@ static void arbfp_add_sRGB_correction(struct wined3d_string_buffer *buffer, cons /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } -static const DWORD *find_loop_control_values(const struct wined3d_shader *shader, DWORD idx) +static const unsigned int *find_loop_control_values(const struct wined3d_shader *shader, DWORD idx) { const struct wined3d_shader_lconst *constant; @@ -3719,7 +3719,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, compiled->int_consts[i] = WINED3D_CONST_NUM_UNUSED; if (reg_maps->integer_constants & (1u << i) && priv_ctx.target_version >= NV2) { - const DWORD *control_values = find_loop_control_values(shader, i); + const unsigned int *control_values = find_loop_control_values(shader, i); if(control_values) { @@ -4167,7 +4167,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, compiled->int_consts[i] = WINED3D_CONST_NUM_UNUSED; if (reg_maps->integer_constants & (1u << i) && priv_ctx.target_version >= NV2) { - const DWORD *control_values = find_loop_control_values(shader, i); + const unsigned int *control_values = find_loop_control_values(shader, i); if(control_values) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4435b9e5b34..1dbeb9351d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4847,7 +4847,7 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct wined3d_string_buffer *reg_name; - const DWORD *control_values = NULL; + const unsigned int *control_values = NULL; if (ins->ctx->reg_maps->shader_version.major < 4) { @@ -4945,7 +4945,7 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct glsl_src_param src0_param; - const DWORD *control_values = NULL; + const unsigned int *control_values = NULL; /* Try to hardcode local values to help the GLSL compiler to unroll and optimize the loop */ if (ins->src[0].reg.type == WINED3DSPR_CONSTINT) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebbf0e8cba0..a76dc7407cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5834,7 +5834,7 @@ struct wined3d_shader_lconst { struct list entry; unsigned int idx; - DWORD value[4]; + unsigned int value[4]; }; struct wined3d_shader_limits

1 0

Eric Pouech : wined3d: Change wined3d_resource.usage field to uint32_t.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 40179643c1782e07cf78d2bc026f64867ce73409 URL: https://gitlab.winehq.org/wine/wine/-/commit/40179643c1782e07cf78d2bc026f64… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 1 00:18:51 2022 +0100 wined3d: Change wined3d_resource.usage field to uint32_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/resource.c | 6 +++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a6e9e57269a..ed828615101 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1933,7 +1933,7 @@ static BOOL wined3d_check_surface_format(const struct wined3d_format *format) * restrict it to some should applications need that. */ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, - enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_format_id adapter_format_id, uint32_t usage, unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) { const struct wined3d_format *adapter_format, *format; @@ -1941,7 +1941,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, unsigned int format_caps = 0, format_attrs = 0; BOOL mipmap_gen_supported = TRUE; unsigned int allowed_bind_flags; - DWORD allowed_usage; + uint32_t allowed_usage; TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, " "bind_flags %s, resource_type %s, check_format %s.\n", diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 39a74b71c3f..a00e235a29b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -26,9 +26,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -static void resource_check_usage(DWORD usage, unsigned int access) +static void resource_check_usage(uint32_t usage, unsigned int access) { - static const DWORD handled = WINED3DUSAGE_DYNAMIC + static const uint32_t handled = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH @@ -51,7 +51,7 @@ static void resource_check_usage(DWORD usage, unsigned int access) HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, uint32_t usage, unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 33646485f72..56f383dc763 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4929,7 +4929,7 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const str d->u.texture.layer_idx, d->u.texture.layer_count); } -const char *debug_d3dusage(DWORD usage) +const char *debug_d3dusage(uint32_t usage) { struct debug_buffer buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a6cbd29313..ff09a014dac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4415,7 +4415,7 @@ struct wined3d_resource unsigned int format_caps; enum wined3d_multisample_type multisample_type; UINT multisample_quality; - DWORD usage; + uint32_t usage; unsigned int bind_flags; unsigned int access; WORD draw_binding; @@ -5763,7 +5763,7 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; -const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; +const char *debug_d3dusage(uint32_t usage) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; const char *debug_d3dinput_classification(enum wined3d_input_classification classification) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d20157b1223..a8008fe87e2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2294,7 +2294,7 @@ HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter * enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, - enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_format_id adapter_format_id, uint32_t usage, unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id,

1 0