December 2022 - Wine-Commits

Alexandre Julliard : commdlg: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 8e6317ffeeec6b15b04cfe93b1f1607a7c15109d URL: https://gitlab.winehq.org/wine/wine/-/commit/8e6317ffeeec6b15b04cfe93b1f160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:42:14 2022 +0100 commdlg: Consistently use %I printf format for ULONG_PTR values. --- dlls/commdlg.dll16/colordlg.c | 2 +- dlls/commdlg.dll16/filedlg.c | 6 +++--- dlls/commdlg.dll16/fontdlg.c | 6 +++--- dlls/commdlg.dll16/printdlg.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/commdlg.dll16/colordlg.c b/dlls/commdlg.dll16/colordlg.c index dfdea6a4b09..91837bcb9ca 100644 --- a/dlls/commdlg.dll16/colordlg.c +++ b/dlls/commdlg.dll16/colordlg.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); */ BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam ) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, message, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, message, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 5ad67a4a91f..2631febb6ae 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -218,7 +218,7 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR CONTEXT context; WORD params[5]; - TRACE( "%p: %p %08x %x %lx: stub\n", hook, hwnd, msg, wp, lp ); + TRACE( "%p: %p %08x %x %Ix: stub\n", hook, hwnd, msg, wp, lp ); memset( &context, 0, sizeof(context) ); context.SegDs = context.SegEs = CURRENT_SS; @@ -547,7 +547,7 @@ static UINT_PTR CALLBACK dummy_hook( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) */ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hWnd16, wMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hWnd16, wMsg, wParam, lParam ); return FALSE; } @@ -556,7 +556,7 @@ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L */ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hWnd16, wMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hWnd16, wMsg, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/fontdlg.c b/dlls/commdlg.dll16/fontdlg.c index 79efb3a292f..0bf94976d9d 100644 --- a/dlls/commdlg.dll16/fontdlg.c +++ b/dlls/commdlg.dll16/fontdlg.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %Ix\n", logfont, metrics, nFontType, lParam ); return 0; } @@ -53,7 +53,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %Ix\n", logfont, metrics, nFontType, lParam ); return 0; } @@ -138,6 +138,6 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, message, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, message, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index ac4741ee4e9..c44d21c0e23 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -153,7 +153,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) */ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, uMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, uMsg, wParam, lParam ); return FALSE; } @@ -167,7 +167,7 @@ BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, switch (wMsg) { case WM_INITDIALOG: - TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); + TRACE("WM_INITDIALOG lParam=%08IX\n", lParam); ShowWindow(hWnd, SW_SHOWNORMAL); return (TRUE); case WM_COMMAND:

1 0

Alexandre Julliard : configure: Simplify checks for functions that require an external library.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 4091758b78eb72c5ab292dfefd13c22d5d41c61e URL: https://gitlab.winehq.org/wine/wine/-/commit/4091758b78eb72c5ab292dfefd13c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:09:43 2022 +0100 configure: Simplify checks for functions that require an external library. --- configure | 324 +++++++++++++++++++++++++++++------------------------------ configure.ac | 31 +++--- 2 files changed, 174 insertions(+), 181 deletions(-)

1 0

Eric Pouech : d3dx9_36/tests: Enable compilation with long types.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 4eaadda479533132d6b76c43a7f27fc90605ee3c URL: https://gitlab.winehq.org/wine/wine/-/commit/4eaadda479533132d6b76c43a7f27f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 8 12:30:36 2022 +0100 d3dx9_36/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/Makefile.in | 1 - dlls/d3dx9_36/tests/asm.c | 48 +- dlls/d3dx9_36/tests/core.c | 374 ++++----- dlls/d3dx9_36/tests/effect.c | 1614 +++++++++++++++++++-------------------- dlls/d3dx9_36/tests/line.c | 34 +- dlls/d3dx9_36/tests/math.c | 88 +-- dlls/d3dx9_36/tests/mesh.c | 760 +++++++++--------- dlls/d3dx9_36/tests/shader.c | 336 ++++---- dlls/d3dx9_36/tests/surface.c | 460 +++++------ dlls/d3dx9_36/tests/texture.c | 544 ++++++------- dlls/d3dx9_36/tests/volume.c | 56 +- dlls/d3dx9_36/tests/xfile.c | 110 +-- 12 files changed, 2212 insertions(+), 2213 deletions(-)

1 0

Alexandre Julliard : makedep: Fix parsing of man page section.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: bd0ca5103a068a1d1b4a9da8ec72380edbb78bed URL: https://gitlab.winehq.org/wine/wine/-/commit/bd0ca5103a068a1d1b4a9da8ec7238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 10:47:49 2022 +0100 makedep: Fix parsing of man page section. --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 04403c5b332..cab573c0488 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1132,9 +1132,9 @@ static void parse_in_file( struct file *source, FILE *file ) { if (strncmp( buffer, ".TH", 3 )) continue; p = skip_spaces( buffer + 3 ); - while (*p && *p != ' ' && *p != '\t') p++; /* program name */ - p = skip_spaces( p ); - if (*p) source->args = xstrdup( p ); /* man section */ + if (!(p = strtok( p, " \t" ))) continue; /* program name */ + if (!(p = strtok( NULL, " \t" ))) continue; /* man section */ + source->args = xstrdup( p ); return; } }

1 0

Eric Pouech : wined3d: Change stencil parameter type in blitter_clear() method.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 983bcd96397ffb8dc10f6b229f19d78df165672a URL: https://gitlab.winehq.org/wine/wine/-/commit/983bcd96397ffb8dc10f6b229f19d7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:46:48 2022 +0100 wined3d: Change stencil parameter type in blitter_clear() method. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a3005a3cfe0..113279e0bb6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7940,7 +7940,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 188080967e5..594fdf73f46 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13272,7 +13272,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli static void glsl_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *color, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *color, float depth, unsigned int stencil) { struct wined3d_blitter *next; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8bee9b6d83b..fd8db9ce60d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1243,7 +1243,7 @@ static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; struct wined3d_box box, box_clip, box_view; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7fa3022635f..d770a82caab 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6068,7 +6068,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_rendertarget_view *view, *previous = NULL; bool have_identical_size = TRUE; @@ -6345,7 +6345,7 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next; @@ -6458,7 +6458,7 @@ static void raw_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next; @@ -6826,7 +6826,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_device_vk *device_vk = wined3d_device_vk(device); struct wined3d_rendertarget_view *view, *previous = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38dc994010d..e4104d2c61a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2909,7 +2909,7 @@ struct wined3d_blitter_ops void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil); + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil); DWORD (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx,

1 0

Eric Pouech : wined3d: Enable long types in nvidia_texture_shader.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 7cab61754c307f16b5ccb1d6b743481cd366fc93 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cab61754c307f16b5ccb1d6b74348… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:00 2022 +0100 wined3d: Enable long types in nvidia_texture_shader.c. --- dlls/wined3d/nvidia_texture_shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 3718af135a0..d25a314e2cb 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -19,7 +19,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>

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in nvidia_texture_shader.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 866cf3ce729dbc3be486f9ccc68488ee5ee7a836 URL: https://gitlab.winehq.org/wine/wine/-/commit/866cf3ce729dbc3be486f9ccc68488… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:43:59 2022 +0100 wined3d: Reduce usage of long integral types in nvidia_texture_shader.c. --- dlls/wined3d/nvidia_texture_shader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index efa9f703d2f..3718af135a0 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -89,7 +89,7 @@ struct tex_op_args GLenum component_usage[3]; }; -static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) { +static GLenum d3dta_to_combiner_input(unsigned int d3dta, DWORD stage, INT texture_idx) { switch (d3dta) { case WINED3DTA_DIFFUSE: return GL_PRIMARY_COLOR_NV; @@ -145,7 +145,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum* } void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, - int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) + int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, INT texture_idx, DWORD dst) { struct tex_op_args tex_op_args = {{0}, {0}, {0}}; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; @@ -481,7 +481,7 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); BOOL tex_used = context->fixed_function_usage_map & (1u << stage); const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -584,7 +584,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s static void nvrc_resultarg(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); TRACE("Setting result arg for stage %u.\n", stage); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8df6816b1f5..81a02d9b6d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5788,7 +5788,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - BOOL is_alpha, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3, + BOOL is_alpha, int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void texture_activate_dimensions(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in texture.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: f46f24e7c0a3cf0fa5dd01a45e9159ed1c68c321 URL: https://gitlab.winehq.org/wine/wine/-/commit/f46f24e7c0a3cf0fa5dd01a45e9159… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:46:50 2022 +0100 wined3d: Reduce usage of long integral types in texture.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d770a82caab..6dd6ab8cbd9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -138,7 +138,7 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) return GL_BACK; } -static DWORD wined3d_resource_access_from_location(uint32_t location) +static uint32_t wined3d_resource_access_from_location(uint32_t location) { switch (location) { @@ -796,7 +796,7 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, if (WARN_ON(d3d)) { - DWORD required_access = wined3d_resource_access_from_location(location); + uint32_t required_access = wined3d_resource_access_from_location(location); if ((texture->resource.access & required_access) != required_access) WARN("Operation requires %#x access, but texture only has %#x.\n", required_access, texture->resource.access);

1 0

Eric Pouech : wined3d: Enable long types in texture.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 60226a013bd014a1ef65345d557e89a6e2a49958 URL: https://gitlab.winehq.org/wine/wine/-/commit/60226a013bd014a1ef65345d557e89… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:46:51 2022 +0100 wined3d: Enable long types in texture.c. --- dlls/wined3d/texture.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6dd6ab8cbd9..bb19ac6183d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -19,7 +19,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" @@ -429,7 +428,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont &src_staging_texture); if (FAILED(hr)) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); goto done; } @@ -468,7 +467,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont &dst_texture); if (FAILED(hr)) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); goto done; } @@ -1177,7 +1176,7 @@ static void wined3d_texture_create_dc(void *object) DeleteDC(desc.hDeviceDc); if (status) { - WARN("Failed to create DC, status %#x.\n", status); + WARN("Failed to create DC, status %#lx.\n", status); return; } @@ -1219,7 +1218,7 @@ static void wined3d_texture_destroy_dc(void *object) destroy_desc.hDc = dc_info->dc; destroy_desc.hBitmap = dc_info->bitmap; if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) - ERR("Failed to destroy dc, status %#x.\n", status); + ERR("Failed to destroy dc, status %#lx.\n", status); dc_info->dc = NULL; dc_info->bitmap = NULL; @@ -3988,7 +3987,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize resource, returning %#lx\n", hr); return hr; } wined3d_resource_update_draw_binding(&texture->resource); @@ -4087,7 +4086,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { - WARN("Failed to create sub-resource parent, hr %#x.\n", hr); + WARN("Failed to create sub-resource parent, hr %#lx.\n", hr); sub_resource->parent = NULL; wined3d_texture_cleanup_sync(texture); return hr; @@ -4199,7 +4198,7 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture *x = overlay->dst_rect.left; *y = overlay->dst_rect.top; - TRACE("Returning position %d, %d.\n", *x, *y); + TRACE("Returning position %ld, %ld.\n", *x, *y); return WINED3D_OK; } @@ -4210,7 +4209,7 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu struct wined3d_overlay_info *overlay; LONG w, h; - TRACE("texture %p, sub_resource_idx %u, x %d, y %d.\n", texture, sub_resource_idx, x, y); + TRACE("texture %p, sub_resource_idx %u, x %ld, y %ld.\n", texture, sub_resource_idx, x, y); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || !wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) @@ -6224,7 +6223,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit 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: Get/set texture's level_count and lod as unsigned int.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 901c9b599715dcb0e9eec218f252f18ab2d16a8f URL: https://gitlab.winehq.org/wine/wine/-/commit/901c9b599715dcb0e9eec218f252f1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:46:47 2022 +0100 wined3d: Get/set texture's level_count and lod as unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 641bf0355eb..7fa3022635f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1734,10 +1734,10 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, width, height, row_pitch, slice_pitch); } -DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) +unsigned int CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod) { struct wined3d_resource *resource; - DWORD old = texture->lod; + unsigned int old = texture->lod; TRACE("texture %p, lod %u.\n", texture, lod); @@ -1771,14 +1771,14 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) return old; } -DWORD CDECL wined3d_texture_get_lod(const struct wined3d_texture *texture) +unsigned int CDECL wined3d_texture_get_lod(const struct wined3d_texture *texture) { TRACE("texture %p, returning %u.\n", texture, texture->lod); return texture->lod; } -DWORD CDECL wined3d_texture_get_level_count(const struct wined3d_texture *texture) +UINT CDECL wined3d_texture_get_level_count(const struct wined3d_texture *texture) { TRACE("texture %p, returning %u.\n", texture, texture->level_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 81a02d9b6d1..38dc994010d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4557,11 +4557,11 @@ struct wined3d_texture unsigned int pow2_width; unsigned int pow2_height; UINT layer_count; - UINT level_count; + unsigned int level_count; unsigned int download_count; unsigned int sysmem_count; float pow2_matrix[16]; - UINT lod; + unsigned int lod; DWORD sampler; uint32_t flags; DWORD update_map_binding; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6f59cf38869..2e709543127 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2841,13 +2841,13 @@ HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_ HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, uint32_t flags, const struct wined3d_sub_resource_data *data, + UINT layer_count, unsigned int level_count, uint32_t flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource); ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); -DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); -DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); +unsigned int __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); +unsigned int __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG *x, LONG *y); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture); @@ -2861,7 +2861,7 @@ ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, uint32_t flags, const struct wined3d_color_key *color_key); -DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); +unsigned int __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture,

1 0