April 2024 - Wine-Commits - list.winehq.org

Francisco Casas : tests: Report missing signature element in openGL runner.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 3503145cedf90d368e3745ff1abd7cc21a2f60f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3503145cedf90d368e3745ff1abd7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 22 17:46:38 2024 -0300 tests: Report missing signature element in openGL runner. --- tests/shader_runner_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index e56eccab..2045950e 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -1046,6 +1046,7 @@ static bool gl_runner_draw(struct shader_runner *r, signature_element = vkd3d_shader_find_signature_element(&vs_input_signature, element->name, element->index, 0); + ok(signature_element, "Cannot find signature element %s%u.\n", element->name, element->index); attribute_idx = signature_element->register_index; format = get_format_info(element->format, false);

1 0

Jacek Caban : winegcc: Add -marm64x option for linking ARM64X images.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 00198c4084a61f65f18574d16833d945e50c0614 URL: https://gitlab.winehq.org/wine/wine/-/commit/00198c4084a61f65f18574d16833d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 23:35:25 2024 +0200 winegcc: Add -marm64x option for linking ARM64X images. --- tools/winegcc/winegcc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 694242542ad..fb759063da9 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -191,6 +191,7 @@ struct options const char* entry_point; const char* debug_file; const char* out_implib; + const char* native_arch; struct strarray prefix; struct strarray lib_dirs; struct strarray args; @@ -1232,6 +1233,13 @@ static void build(struct options* opts) build_spec_obj( opts, spec_file, output_file, opts->target_alias, files, resources, lib_dirs, entry_point, &spec_objs ); + if (opts->native_arch) + { + const char *suffix = strchr( opts->target_alias, '-' ); + if (!suffix) suffix = ""; + build_spec_obj( opts, spec_file, output_file, strmake( "%s%s", opts->native_arch, suffix ), + files, empty_strarray, lib_dirs, entry_point, &spec_objs ); + } if (opts->fake_module) return; /* nothing else to do */ @@ -1707,6 +1715,11 @@ int main(int argc, char **argv) { raw_linker_arg = 1; } + else if (!strcmp("-marm64x", opts.args.str[i] )) + { + raw_linker_arg = 1; + opts.native_arch = "aarch64"; + } else if (!strncmp("-mcpu=", opts.args.str[i], 6) || !strncmp("-mfpu=", opts.args.str[i], 6) || !strncmp("-march=", opts.args.str[i], 7))

1 0

Jacek Caban : winegcc: Pass target and resources as arguments to build_spec_obj.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 753f405536eb97b6fe06348a9d89d9a312a7c652 URL: https://gitlab.winehq.org/wine/wine/-/commit/753f405536eb97b6fe06348a9d89d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 17 01:49:18 2024 +0100 winegcc: Pass target and resources as arguments to build_spec_obj. --- tools/winegcc/winegcc.c | 76 ++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 35 deletions(-)

1 0

Sam Joan Roque-Worcel : win32u: Make SCROLL_MIN_THUMB larger.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 939b3d19318a2d8947997e80767659fd00f67e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/939b3d19318a2d8947997e80767659… Author: Sam Joan Roque-Worcel <sam(a)roque-worcel.com> Date: Fri Apr 5 21:35:51 2024 +0100 win32u: Make SCROLL_MIN_THUMB larger. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54759 --- dlls/win32u/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 19a9a1379f4..f72ef0c2929 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); #define SCROLL_MIN_RECT 4 /* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 8 +#define SCROLL_MIN_THUMB 17 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0

1 0

Paul Gofman : winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream().
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 6ad606483959dbacf3179b277983b5b0404423fe URL: https://gitlab.winehq.org/wine/wine/-/commit/6ad606483959dbacf3179b277983b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 3 15:02:49 2024 -0600 winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream(). --- dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 18910f87d40..c96d053ccae 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2224,18 +2224,36 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream) { + static const ULONG64 canary_size = 0xdeadbeeffeedcafe; struct wm_reader *reader = impl_from_IWMSyncReader2(iface); STATSTG stat; HRESULT hr; TRACE("reader %p, stream %p.\n", reader, stream); + stat.cbSize.QuadPart = canary_size; if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) { ERR("Failed to stat stream, hr %#lx.\n", hr); return hr; } + if (stat.cbSize.QuadPart == canary_size) + { + /* Call of Juarez: Gunslinger implements IStream_Stat as an empty function returning S_OK, leaving + * the output stat unchanged. Windows doesn't call IStream_Seek(_SEEK_END) and probably validates + * the size against WMV file headers so the bigger cbSize doesn't change anything. + * Such streams work as soon as the uninitialized cbSize is big enough which is usually the case + * (if that is not the case Windows will favour shorter cbSize). */ + static const LARGE_INTEGER zero = { 0 }; + ULARGE_INTEGER pos = { .QuadPart = canary_size }; + + if (SUCCEEDED(hr = IStream_Seek(stream, zero, STREAM_SEEK_END, &pos))) + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + stat.cbSize.QuadPart = pos.QuadPart == canary_size ? 0 : pos.QuadPart; + ERR("IStream_Stat did not fill the stream size, size from _Seek %I64u.\n", stat.cbSize.QuadPart); + } + EnterCriticalSection(&reader->cs); if (reader->wg_parser)

1 0

Mohamad Al-Jaf : windows.ui: Return success in IInputPane2::TryShow().
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b17ef15e124d0a75ceed7ab9e16f0214a9e53286 URL: https://gitlab.winehq.org/wine/wine/-/commit/b17ef15e124d0a75ceed7ab9e16f02… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 7 01:44:54 2024 -0400 windows.ui: Return success in IInputPane2::TryShow(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56536 --- dlls/windows.ui/inputpane.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.ui/inputpane.c b/dlls/windows.ui/inputpane.c index cd1ddec217a..383ca877d46 100644 --- a/dlls/windows.ui/inputpane.c +++ b/dlls/windows.ui/inputpane.c @@ -158,7 +158,8 @@ DEFINE_IINSPECTABLE( inputpane2, IInputPane2, struct inputpane, IInputPane_iface static HRESULT WINAPI inputpane2_TryShow( IInputPane2 *iface, boolean *result ) { FIXME( "iface %p, result %p stub!\n", iface, result ); - return E_NOTIMPL; + *result = FALSE; + return S_OK; } static HRESULT WINAPI inputpane2_TryHide( IInputPane2 *iface, boolean *result )

1 0

Jacek Caban : winebuild: Add -marm64x option for generating hybrid ARM64X import libraries.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 4243befce51b420db46111100b2a566774651d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/4243befce51b420db46111100b2a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 23:28:16 2024 +0200 winebuild: Add -marm64x option for generating hybrid ARM64X import libraries. --- tools/winebuild/build.h | 4 +++- tools/winebuild/import.c | 16 ++++++++++++++-- tools/winebuild/main.c | 4 +++- tools/winebuild/parser.c | 12 ++++++------ tools/winebuild/spec32.c | 5 ++--- tools/winebuild/utils.c | 2 ++ 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a469a0e9042..b857e05aa14 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -162,6 +162,7 @@ typedef struct int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* spec entry points */ struct exports exports; /* dll exports */ + struct exports native_exports; /* dll native exports */ struct resource *resources; /* array of dll resources (format differs between Win16/Win32) */ struct apiset apiset; /* list of defined api sets */ } DLLSPEC; @@ -327,7 +328,7 @@ extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); extern void output_data_module( DLLSPEC *spec ); -extern void output_def_file( DLLSPEC *spec, int import_only ); +extern void output_def_file( DLLSPEC *spec, struct exports *exports, int import_only ); extern void output_apiset_lib( DLLSPEC *spec, const struct apiset *apiset ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); @@ -372,6 +373,7 @@ extern int force_pointer_size; extern int unwind_tables; extern int use_dlltool; extern int use_msvcrt; +extern int native_arch; extern int safe_seh; extern int prefer_native; extern int data_only; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 9cefb2afdfe..1ca2048284b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1377,19 +1377,31 @@ void output_static_lib( const char *output_name, struct strarray files, int crea /* create a Windows-style import library using dlltool */ static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { + const char *def_file, *native_def_file = NULL; struct strarray args; - char *def_file; def_file = open_temp_output_file( ".def" ); - output_def_file( spec, 1 ); + output_def_file( spec, &spec->exports, 1 ); fclose( output_file ); + if (native_arch != -1) + { + native_def_file = open_temp_output_file( ".def" ); + output_def_file( spec, &spec->native_exports, 1 ); + fclose( output_file ); + } + args = find_tool( "dlltool", NULL ); strarray_add( &args, "-k" ); strarray_add( &args, strendswith( lib_name, ".delay.a" ) ? "-y" : "-l" ); strarray_add( &args, lib_name ); strarray_add( &args, "-d" ); strarray_add( &args, def_file ); + if (native_def_file) + { + strarray_add( &args, "-N" ); + strarray_add( &args, native_def_file ); + } switch (target.cpu) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 71e61522578..dc2992b5c51 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -36,6 +36,7 @@ int UsePIC = 0; int nb_errors = 0; int display_warnings = 0; +int native_arch = -1; int kill_at = 0; int verbose = 0; int link_ext_symbols = 0; @@ -386,6 +387,7 @@ static void option_callback( int optc, char *optarg ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; + else if (!strcmp( optarg, "arm64x" )) native_arch = CPU_ARM64; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); @@ -648,7 +650,7 @@ int main(int argc, char **argv) if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; open_output_file(); - output_def_file( spec, 0 ); + output_def_file( spec, &spec->exports, 0 ); close_output_file(); break; case MODE_IMPLIB: diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 5bd05e97ca9..ec42c240a0a 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -943,16 +943,15 @@ static void assign_ordinals( struct exports *exports ) } -static void assign_exports( DLLSPEC *spec ) +static void assign_exports( DLLSPEC *spec, unsigned int cpu, struct exports *exports ) { - struct exports *exports = &spec->exports; unsigned int i; exports->entry_points = xmalloc( spec->nb_entry_points * sizeof(*exports->entry_points) ); for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *entry = &spec->entry_points[i]; - if ((entry->flags & FLAG_CPU_MASK) && !(entry->flags & FLAG_CPU(target.cpu))) + if ((entry->flags & FLAG_CPU_MASK) && !(entry->flags & FLAG_CPU(cpu))) continue; exports->entry_points[exports->nb_entry_points++] = entry; } @@ -1018,7 +1017,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) odp->u.func.nb_args * sizeof(odp->u.func.args[0]) ); } - assign_exports( spec32 ); + assign_exports( spec32, target.cpu, &spec32->exports ); } @@ -1061,7 +1060,8 @@ int parse_spec_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_exports( spec ); + assign_exports( spec, target.cpu, &spec->exports ); + if (native_arch != -1) assign_exports( spec, native_arch, &spec->native_exports ); return !nb_errors; } @@ -1303,6 +1303,6 @@ int parse_def_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_exports( spec ); + assign_exports( spec, target.cpu, &spec->exports ); return !nb_errors; } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 857985cb292..718ce4666ef 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1343,9 +1343,8 @@ void output_data_module( DLLSPEC *spec ) * * Build a Win32 def file from a spec file. */ -void output_def_file( DLLSPEC *spec, int import_only ) +void output_def_file( DLLSPEC *spec, struct exports *exports, int import_only ) { - struct exports *exports; DLLSPEC *spec32 = NULL; const char *name; int i, total; @@ -1355,8 +1354,8 @@ void output_def_file( DLLSPEC *spec, int import_only ) spec32 = alloc_dll_spec(); add_16bit_exports( spec32, spec ); spec = spec32; + exports = &spec->exports; } - exports = &spec->exports; if (spec_file_name) output( "; File generated automatically from %s; do not edit!\n\n", diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 62f05e535b6..05595f86d37 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -615,6 +615,7 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem_minor = 0; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; spec->exports.base = MAX_ORDINALS; + spec->native_exports.base = MAX_ORDINALS; return spec; } @@ -644,6 +645,7 @@ void free_dll_spec( DLLSPEC *spec ) free( odp->link_name ); } free_exports( &spec->exports ); + free_exports( &spec->native_exports ); free( spec->file_name ); free( spec->dll_name ); free( spec->c_name );

1 0

Nikolay Sivov : d2d1/effect: Make it possible to set render info for draw-transform nodes.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 0a9f2494df5a90acb0b1d483a2d915a1c4dbc413 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a9f2494df5a90acb0b1d483a2d915… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 10:18:39 2024 +0200 d2d1/effect: Make it possible to set render info for draw-transform nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 15 ++++ dlls/d2d1/effect.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 237 insertions(+) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6b6d51d4b3c..f5f484e0778 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -728,10 +728,25 @@ struct d2d_transform UINT32 input_count; }; +enum d2d_render_info_mask +{ + D2D_RENDER_INFO_PIXEL_SHADER = 0x1, +}; + +struct d2d_render_info +{ + ID2D1DrawInfo ID2D1DrawInfo_iface; + LONG refcount; + + unsigned int mask; + GUID pixel_shader; +}; + struct d2d_transform_node { struct list entry; ID2D1TransformNode *object; + struct d2d_render_info *render_info; }; struct d2d_transform_node_connection diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 6738bc43a1d..a6738823e6f 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -561,6 +561,9 @@ static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, if (graph->output == node) graph->output = NULL; + if (node->render_info) + ID2D1DrawInfo_Release(&node->render_info->ID2D1DrawInfo_iface); + free(node); } @@ -2265,6 +2268,218 @@ static void d2d_effect_init_properties_vtbls(struct d2d_effect *effect) } } +static struct d2d_render_info *impl_from_ID2D1DrawInfo(ID2D1DrawInfo *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_render_info, ID2D1DrawInfo_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_QueryInterface(ID2D1DrawInfo *iface, REFIID iid, + void **obj) +{ + TRACE("iface %p, iid %s, obj %p.\n", iface, debugstr_guid(iid), obj); + + if (IsEqualGUID(iid, &IID_ID2D1DrawInfo) + || IsEqualGUID(iid, &IID_ID2D1RenderInfo) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *obj = iface; + ID2D1DrawInfo_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_draw_info_AddRef(ID2D1DrawInfo *iface) +{ + struct d2d_render_info *render_info = impl_from_ID2D1DrawInfo(iface); + ULONG refcount = InterlockedIncrement(&render_info->refcount); + + TRACE("iface %p refcount %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_draw_info_Release(ID2D1DrawInfo *iface) +{ + struct d2d_render_info *render_info = impl_from_ID2D1DrawInfo(iface); + ULONG refcount = InterlockedDecrement(&render_info->refcount); + + TRACE("iface %p refcount %lu.\n", iface, refcount); + + if (!refcount) + free(render_info); + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetInputDescription(ID2D1DrawInfo *iface, + UINT32 index, D2D1_INPUT_DESCRIPTION description) +{ + FIXME("iface %p, index %u stub.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetOutputBuffer(ID2D1DrawInfo *iface, + D2D1_BUFFER_PRECISION precision, D2D1_CHANNEL_DEPTH depth) +{ + FIXME("iface %p, precision %u, depth %u stub.\n", iface, precision, depth); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_draw_info_SetCached(ID2D1DrawInfo *iface, BOOL is_cached) +{ + FIXME("iface %p, is_cached %d stub.\n", iface, is_cached); +} + +static void STDMETHODCALLTYPE d2d_draw_info_SetInstructionCountHint(ID2D1DrawInfo *iface, + UINT32 count) +{ + FIXME("iface %p, count %u stub.\n", iface, count); +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetPixelShaderConstantBuffer(ID2D1DrawInfo *iface, + const BYTE *buffer, UINT32 size) +{ + FIXME("iface %p, buffer %p, size %u stub.\n", iface, buffer, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetResourceTexture(ID2D1DrawInfo *iface, + UINT32 index, ID2D1ResourceTexture *texture) +{ + FIXME("iface %p, index %u, texture %p stub.\n", iface, index, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetVertexShaderConstantBuffer(ID2D1DrawInfo *iface, + const BYTE *buffer, UINT32 size) +{ + FIXME("iface %p, buffer %p, size %u stub.\n", iface, buffer, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetPixelShader(ID2D1DrawInfo *iface, + REFGUID id, D2D1_PIXEL_OPTIONS options) +{ + struct d2d_render_info *render_info = impl_from_ID2D1DrawInfo(iface); + + TRACE("iface %p, id %s, options %u.\n", iface, debugstr_guid(id), options); + + render_info->mask |= D2D_RENDER_INFO_PIXEL_SHADER; + render_info->pixel_shader = *id; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE d2d_draw_info_SetVertexProcessing(ID2D1DrawInfo *iface, + ID2D1VertexBuffer *buffer, D2D1_VERTEX_OPTIONS options, + const D2D1_BLEND_DESCRIPTION *description, const D2D1_VERTEX_RANGE *range, + const GUID *shader) +{ + FIXME("iface %p, buffer %p, options %#x, description %p, range %p, shader %s stub.\n", + iface, buffer, options, description, range, debugstr_guid(shader)); + + return E_NOTIMPL; +} + +static const ID2D1DrawInfoVtbl d2d_draw_info_vtbl = +{ + d2d_draw_info_QueryInterface, + d2d_draw_info_AddRef, + d2d_draw_info_Release, + d2d_draw_info_SetInputDescription, + d2d_draw_info_SetOutputBuffer, + d2d_draw_info_SetCached, + d2d_draw_info_SetInstructionCountHint, + d2d_draw_info_SetPixelShaderConstantBuffer, + d2d_draw_info_SetResourceTexture, + d2d_draw_info_SetVertexShaderConstantBuffer, + d2d_draw_info_SetPixelShader, + d2d_draw_info_SetVertexProcessing, +}; + +static HRESULT d2d_effect_render_info_create(struct d2d_render_info **obj) +{ + struct d2d_render_info *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1DrawInfo_iface.lpVtbl = &d2d_draw_info_vtbl; + object->refcount = 1; + + *obj = object; + + return S_OK; +} + +static bool d2d_transform_node_needs_render_info(const struct d2d_transform_node *node) +{ + static const GUID *iids[] = + { + &IID_ID2D1SourceTransform, + &IID_ID2D1ComputeTransform, + &IID_ID2D1DrawTransform, + }; + unsigned int i; + IUnknown *obj; + + for (i = 0; i < ARRAY_SIZE(iids); ++i) + { + if (SUCCEEDED(ID2D1TransformNode_QueryInterface(node->object, iids[i], (void **)&obj))) + { + IUnknown_Release(obj); + return true; + } + } + + return false; +} + +static HRESULT d2d_effect_transform_graph_initialize_nodes(struct d2d_transform_graph *graph) +{ + ID2D1DrawTransform *draw_transform; + struct d2d_transform_node *node; + HRESULT hr; + + LIST_FOR_EACH_ENTRY(node, &graph->nodes, struct d2d_transform_node, entry) + { + if (d2d_transform_node_needs_render_info(node)) + { + if (FAILED(hr = d2d_effect_render_info_create(&node->render_info))) + return hr; + } + + if (SUCCEEDED(ID2D1TransformNode_QueryInterface(node->object, &IID_ID2D1DrawTransform, + (void **)&draw_transform))) + { + hr = ID2D1DrawTransform_SetDrawInfo(draw_transform, &node->render_info->ID2D1DrawInfo_iface); + ID2D1DrawTransform_Release(draw_transform); + if (FAILED(hr)) + { + WARN("Failed to set draw info, hr %#lx.\n", hr); + return hr; + } + } + else + { + FIXME("Unsupported node %p.\n", node); + return E_NOTIMPL; + } + } + + return S_OK; +} + HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, ID2D1Effect **effect) { @@ -2330,6 +2545,13 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec return hr; } + if (FAILED(hr = d2d_effect_transform_graph_initialize_nodes(object->graph))) + { + WARN("Failed to initialize graph nodes, hr %#lx.\n", hr); + ID2D1Effect_Release(&object->ID2D1Effect_iface); + return hr; + } + *effect = &object->ID2D1Effect_iface; TRACE("Created effect %p.\n", *effect);

1 0

Nikolay Sivov : d2d1/tests: Use distinct types for vector and matrix values.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: d0b404052189492ed52748f26592db983210fe93 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0b404052189492ed52748f26592db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 7 19:23:31 2024 +0200 d2d1/tests: Use distinct types for vector and matrix values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 15a9eeb00ab..7eaeddda341 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11726,20 +11726,26 @@ static void test_effect_properties(BOOL d3d11) UINT32 i, min_inputs, max_inputs, integer, index, size; ID2D1EffectContext *effect_context; D2D1_BUFFER_PRECISION precision; - float vec2[2], vec3[3], vec4[4]; ID2D1Properties *subproperties; D2D1_PROPERTY_TYPE prop_type; struct d2d1_test_context ctx; + D2D_MATRIX_3X2_F mat3x2; + D2D_MATRIX_4X3_F mat4x3; + D2D_MATRIX_4X4_F mat4x4; + D2D_MATRIX_5X4_F mat5x4; ID2D1Factory1 *factory; ID2D1Effect *effect; UINT32 count, data; + D2D_VECTOR_2F vec2; + D2D_VECTOR_3F vec3; + D2D_VECTOR_4F vec4; WCHAR buffer[128]; BYTE value[128]; - float mat[20]; - INT32 val; CLSID clsid; BOOL cached; HRESULT hr; + float *ptr; + INT32 val; static const WCHAR *effect_author = L"The Wine Project"; static const WCHAR *effect_category = L"Test"; @@ -11890,9 +11896,10 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Vec2Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR2, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR2, (BYTE *)vec2, sizeof(vec2)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR2, (BYTE *)&vec2, sizeof(vec2)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(vec2[0] == 3.0f && vec2[1] == 4.0f, "Unexpected vector (%.8e,%.8e).\n", vec2[0], vec2[1]); + ok(vec2.x == 3.0f, "Unexpected value %.8e.\n", vec2.x); + ok(vec2.y == 4.0f, "Unexpected value %.8e.\n", vec2.y); /* Vector3 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec3Prop"); @@ -11901,10 +11908,11 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Vec3Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR3, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR3, (BYTE *)vec3, sizeof(vec3)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR3, (BYTE *)&vec3, sizeof(vec3)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(vec3[0] == 5.0f && vec3[1] == 6.0f && vec3[2] == 7.0f, "Unexpected vector (%.8e,%.8e,%.8e).\n", - vec3[0], vec3[1], vec3[2]); + ok(vec3.x == 5.0f, "Unexpected value %.8e.\n", vec3.x); + ok(vec3.y == 6.0f, "Unexpected value %.8e.\n", vec3.y); + ok(vec3.z == 7.0f, "Unexpected value %.8e.\n", vec3.z); /* Vector4 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec4Prop"); @@ -11913,10 +11921,12 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Vec4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR4, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)vec4, sizeof(vec4)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&vec4, sizeof(vec4)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(vec4[0] == 8.0f && vec4[1] == 9.0f && vec4[2] == 10.0f && vec4[3] == 11.0f, - "Unexpected vector (%.8e,%.8e,%.8e,%.8e).\n", vec4[0], vec4[1], vec4[2], vec4[3]); + ok(vec4.x == 8.0f, "Unexpected value %.8e.\n", vec4.x); + ok(vec4.y == 9.0f, "Unexpected value %.8e.\n", vec4.y); + ok(vec4.z == 10.0f, "Unexpected value %.8e.\n", vec4.z); + ok(vec4.w == 11.0f, "Unexpected value %.8e.\n", vec4.w); /* Matrix3x2 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Mat3x2Prop"); @@ -11925,11 +11935,10 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Mat3x2Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_3X2, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_3X2, (BYTE *)mat, 6 * sizeof(float)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_3X2, (BYTE *)&mat3x2, sizeof(mat3x2)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(mat[0] == 1.0f && mat[1] == 2.0f && mat[2] == 3.0f && mat[3] == 4.0f && mat[4] == 5.0f && mat[5] == 6.0f, - "Unexpected matrix (%.8e,%.8e,%.8e,%.8e,%.8e,%.8e).\n", - mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + for (i = 0, ptr = (float *)&mat3x2; i < sizeof(mat3x2) / sizeof(*ptr); ++i, ++ptr) + ok(*ptr == 1.0f + i, "Unexpected value %.8e.\n", *ptr); /* Matrix4x3 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Mat4x3Prop"); @@ -11938,10 +11947,10 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Mat4x3Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_4X3, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X3, (BYTE *)mat, 12 * sizeof(float)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X3, (BYTE *)&mat4x3, sizeof(mat4x3)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - for (i = 0; i < 12; ++i) - ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + for (i = 0, ptr = (float *)&mat4x3; i < sizeof(mat4x3) / sizeof(*ptr); ++i, ++ptr) + ok(*ptr == 1.0f + i, "Unexpected value %.8e.\n", *ptr); /* Matrix4x4 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Mat4x4Prop"); @@ -11950,10 +11959,10 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Mat4x4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_4X4, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X4, (BYTE *)mat, 16 * sizeof(float)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X4, (BYTE *)&mat4x4, sizeof(mat4x4)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - for (i = 0; i < 16; ++i) - ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + for (i = 0, ptr = (float *)&mat4x4; i < sizeof(mat4x4) / sizeof(*ptr); ++i, ++ptr) + ok(*ptr == 1.0f + i, "Unexpected value %.8e.\n", *ptr); /* Matrix5x4 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Mat5x4Prop"); @@ -11962,10 +11971,10 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Mat5x4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_5X4, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_5X4, (BYTE *)mat, 20 * sizeof(float)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_5X4, (BYTE *)&mat5x4, sizeof(mat5x4)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - for (i = 0; i < 20; ++i) - ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + for (i = 0, ptr = (float *)&mat5x4; i < sizeof(mat5x4) / sizeof(*ptr); ++i, ++ptr) + ok(*ptr == 1.0f + i, "Unexpected value %.8e.\n", *ptr); ID2D1Effect_Release(effect);

1 0

Nikolay Sivov : d2d1/effect: Zero value buffer on size or type mismatch.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 88af1e5b9e95e93b43a608266d635258019eac54 URL: https://gitlab.winehq.org/wine/wine/-/commit/88af1e5b9e95e93b43a608266d6352… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 7 17:52:46 2024 +0200 d2d1/effect: Zero value buffer on size or type mismatch. Found this after seeing test crashes caused by writing to adjacent stack memory, corrupting it. Happened with "size + 1" tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 2 ++ dlls/d2d1/tests/d2d1.c | 86 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 42d2c589edc..6738bc43a1d 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1252,6 +1252,8 @@ static HRESULT d2d_effect_property_get_value(const struct d2d_effect_properties struct d2d_effect *effect = properties->effect; UINT32 actual_size; + memset(value, 0, size); + if (type != D2D1_PROPERTY_TYPE_UNKNOWN && prop->type != type) return E_INVALIDARG; if (prop->type != D2D1_PROPERTY_TYPE_STRING && prop->size != size) return E_INVALIDARG; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ad7d5163f1f..15a9eeb00ab 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -20,6 +20,7 @@ #include <limits.h> #include <math.h> #include <float.h> +#include <stdint.h> #include "d3dcompiler.h" #include "d2d1_3.h" #include "d2d1effectauthor.h" @@ -11707,6 +11708,19 @@ static void test_effect_context(BOOL d3d11) release_test_context(&ctx); } +#define check_zero_buffer(a, b) check_zero_buffer_(a, b, __LINE__) +static void check_zero_buffer_(const void *buffer, size_t size, unsigned int line) +{ + const uint32_t *ptr = buffer; + const uint8_t *ptr2 = buffer; + size_t i; + + for (i = 0; i < size / sizeof(*ptr); ++i) + ok_(__FILE__, line)(!ptr[i], "Expected zero value %#x.\n", ptr[i]); + for (i = 0; i < size % sizeof(*ptr); ++i) + ok_(__FILE__, line)(!ptr2[size - i - 1], "Expected zero value %#x.\n", ptr2[i]); +} + static void test_effect_properties(BOOL d3d11) { UINT32 i, min_inputs, max_inputs, integer, index, size; @@ -11720,6 +11734,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; + BYTE value[128]; float mat[20]; INT32 val; CLSID clsid; @@ -12077,55 +12092,84 @@ static void test_effect_properties(BOOL d3d11) index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); ok(index == 1, "Got unexpected index %u.\n", index); - effect_context = (ID2D1EffectContext *)0xdeadbeef; - hr = ID2D1Effect_GetValueByName(effect, - L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + /* On type mismatch output buffer is zeroed. */ + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_UINT32, value, sizeof(void *)); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Effect_GetValueByName(effect, - L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + check_zero_buffer(value, sizeof(void *)); + + /* On size mismatch output buffer is zeroed. */ + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, value, sizeof(void *) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + check_zero_buffer(value, sizeof(void *) - 1); + + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, value, sizeof(void *) + 1); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + check_zero_buffer(value, sizeof(void *) + 1); + + effect_context = NULL; hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, - "Got unexpected effect context %p.\n", effect_context); + ok(!!effect_context, "Got unexpected effect context %p.\n", effect_context); - effect_context = (ID2D1EffectContext *)0xdeadbeef; - hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, value, sizeof(void *) - 1); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + check_zero_buffer(value, sizeof(void *) - 1); + + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, value, sizeof(void *) + 1); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + check_zero_buffer(value, sizeof(void *) + 1); + + effect_context = NULL; hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, - "Got unexpected effect context %p.\n", effect_context); + ok(!!effect_context, "Got unexpected effect context %p.\n", effect_context); hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - integer = 0xdeadbeef; - hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, value, 3); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + check_zero_buffer(value, 3); + + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, value, 5); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + check_zero_buffer(value, 5); + + integer = 0; hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); - integer = 0xdeadbeef; - hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, value, 3); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + check_zero_buffer(value, 3); + + memset(value, 0xcc, sizeof(value)); + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, value, 5); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + check_zero_buffer(value, 5); + + integer = 0; hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); - integer = 20; - hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + memset(value, 0, sizeof(value)); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, value, 3); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, value, 5); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + integer = 20; hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef;

1 0