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

Alexandre Julliard : include: Make wine_dbg_log() into an inline function.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: cf8193df5b4c5a09208e40d8f3183c00187c8bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf8193df5b4c5a09208e40d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:27:13 2019 +0200 include: Make wine_dbg_log() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 30 +++++++++++++++++++++++++++--- libs/wine/debug.c | 2 ++ 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 1e4a3a1..94d2de7 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -276,6 +276,38 @@ int __cdecl __wine_dbg_output( const char *str ) } /*********************************************************************** + * __wine_dbg_header (NTDLL.@) + */ +int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ) +{ + static const char * const classes[] = { "fixme", "err", "warn", "trace" }; + struct debug_info *info = get_info(); + char buffer[200], *pos = buffer; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* only print header if we are at the beginning of the line */ + if (info->out_pos > info->output) return 0; + + if (init_done) + { + if (TRACE_ON(timestamp)) + { + ULONG ticks = NtGetTickCount(); + pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); + } + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + } + if (function && cls < ARRAY_SIZE( classes )) + snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", + classes[cls], channel->name, function ); + + return append_output( info, buffer, strlen( buffer )); +} + +/*********************************************************************** * NTDLL_dbg_vprintf */ static int NTDLL_dbg_vprintf( const char *format, va_list args ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b608ab9..292b0f6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1507,6 +1507,7 @@ # Debugging @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) +@ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) diff --git a/include/wine/debug.h b/include/wine/debug.h index 416b6c8..e95fcfb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -161,6 +161,8 @@ extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_f struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); +extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ); /* * Exported definitions and macros @@ -170,9 +172,6 @@ extern int __cdecl __wine_dbg_output( const char *str ); quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, - const char *format, ... ) __WINE_PRINTF_ATTR(4,5); - #if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __wine_dbg_cdecl __cdecl # define __wine_dbg_va_list __builtin_ms_va_list @@ -209,6 +208,31 @@ static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) return __wine_dbg_output( buffer ); } +static int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, const char *func, + const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function, const char *format, ... ) +{ + char buffer[1024]; + __wine_dbg_va_list args; + int ret; + + if (*format == '\1') /* special magic to avoid standard prefix */ + { + format++; + function = NULL; + } + if ((ret = __wine_dbg_header( cls, channel, function )) == -1) return ret; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + ret += __wine_dbg_output( buffer ); + return ret; +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index b9c7e0b..b19fefe 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -33,6 +33,7 @@ #define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline #define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbg_printf wine_dbg_printf_inline +#define wine_dbg_log wine_dbg_log_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -252,6 +253,7 @@ const char *wine_dbg_sprintf( const char *format, ... ) /* varargs wrapper for funcs.dbg_vlog */ +#undef wine_dbg_log int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *func, const char *format, ... ) {

1 0

Alexandre Julliard : include: Make wine_dbg_printf() into an inline function.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: ddf1ff2f6ae39e6962441a5a88439755ff72c525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf1ff2f6ae39e6962441a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:39 2019 +0200 include: Make wine_dbg_printf() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 14 +++++++++++++- libs/wine/debug.c | 2 ++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 42db30a..9c3add4 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -74,6 +74,20 @@ static void release_temp_buffer( char *ptr, size_t size ) info->str_pos = ptr + size; } +/* add a string to the output buffer */ +static int append_output( struct debug_info *info, const char *str, size_t len ) +{ + if (len >= sizeof(info->output) - (info->out_pos - info->output)) + { + fprintf( stderr, "wine_dbg_output: debugstr buffer overflow (contents: '%s')\n", info->output ); + info->out_pos = info->output; + abort(); + } + memcpy( info->out_pos, str, len ); + info->out_pos += len; + return len; +} + /*********************************************************************** * __wine_dbg_strdup (NTDLL.@) */ @@ -89,6 +103,26 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) } /*********************************************************************** + * __wine_dbg_output (NTDLL.@) + */ +int __cdecl __wine_dbg_output( const char *str ) +{ + struct debug_info *info = get_info(); + const char *end = strrchr( str, '\n' ); + int ret = 0; + + if (end) + { + ret += append_output( info, str, end + 1 - str ); + write( 2, info->output, info->out_pos - info->output ); + info->out_pos = info->output; + str = end + 1; + } + if (*str) ret += append_output( info, str, strlen( str )); + return ret; +} + +/*********************************************************************** * NTDLL_dbg_vprintf */ static int NTDLL_dbg_vprintf( const char *format, va_list args ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7622289..98991ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1506,6 +1506,7 @@ @ cdecl __wine_make_process_system() # Debugging +@ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) # Virtual memory diff --git a/include/wine/debug.h b/include/wine/debug.h index fd8e56e..2412c2b 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -162,6 +162,7 @@ extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); +extern int __cdecl __wine_dbg_output( const char *str ); /* * Exported definitions and macros @@ -171,7 +172,6 @@ extern const char * __cdecl __wine_dbg_strdup( const char *str ); quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); @@ -199,6 +199,18 @@ static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format return __wine_dbg_strdup( buffer ); } +static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) +{ + char buffer[1024]; + __wine_dbg_va_list args; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + return __wine_dbg_output( buffer ); +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 1bf59dd..2d56b01 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -31,6 +31,7 @@ #endif #define wine_dbg_sprintf wine_dbg_sprintf_inline +#define wine_dbg_printf wine_dbg_printf_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -217,6 +218,7 @@ static void debug_init(void) } /* varargs wrapper for funcs.dbg_vprintf */ +#undef wine_dbg_printf int wine_dbg_printf( const char *format, ... ) { int ret;

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_get_channel_flags().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: b0ecbe0baed6910fae291f0ae506dd90506e5315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ecbe0baed6910fae291f0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:25:39 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_get_channel_flags(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 4ae086c..8003e03 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -27,9 +27,18 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/heap.h" static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); static int (__cdecl *p__wine_dbg_output)( const char *str ); +static unsigned char (__cdecl *p__wine_dbg_get_channel_flags)( struct __wine_debug_channel *channel ); + +static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; + +static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); +static int nb_debug_options = -1; +static int options_size; +static struct __wine_debug_channel *debug_options; static void load_func( void **func, const char *name, void *def ) { @@ -42,6 +51,103 @@ static void load_func( void **func, const char *name, void *def ) } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) + +/* add a new debug option at the end of the option list */ +static void add_option( const char *name, unsigned char set, unsigned char clear ) +{ + int min = 0, max = nb_debug_options - 1, pos, res; + + if (!name[0]) /* "all" option */ + { + default_flags = (default_flags & ~clear) | set; + return; + } + if (strlen(name) >= sizeof(debug_options[0].name)) return; + + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( name, debug_options[pos].name ); + if (!res) + { + debug_options[pos].flags = (debug_options[pos].flags & ~clear) | set; + return; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + if (nb_debug_options >= options_size) + { + options_size = max( options_size * 2, 16 ); + debug_options = heap_realloc( debug_options, options_size * sizeof(debug_options[0]) ); + } + + pos = min; + if (pos < nb_debug_options) memmove( &debug_options[pos + 1], &debug_options[pos], + (nb_debug_options - pos) * sizeof(debug_options[0]) ); + strcpy( debug_options[pos].name, name ); + debug_options[pos].flags = (default_flags & ~clear) | set; + nb_debug_options++; +} + +/* parse a set of debugging option specifications and add them to the option list */ +static void parse_options( const char *str ) +{ + char *opt, *next, *options; + unsigned int i; + + if (!(options = _strdup(str))) return; + for (opt = options; opt; opt = next) + { + const char *p; + unsigned char set = 0, clear = 0; + + if ((next = strchr( opt, ',' ))) *next++ = 0; + + p = opt + strcspn( opt, "+-" ); + if (!p[0]) p = opt; /* assume it's a debug channel name */ + + if (p > opt) + { + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) + { + int len = strlen(debug_classes[i]); + if (len != (p - opt)) continue; + if (!memcmp( opt, debug_classes[i], len )) /* found it */ + { + if (*p == '+') set |= 1 << i; + else clear |= 1 << i; + break; + } + } + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ + continue; + } + else + { + if (*p == '-') clear = ~0; + else set = ~0; + } + if (*p == '+' || *p == '-') p++; + if (!p[0]) continue; + + if (!strcmp( p, "all" )) + default_flags = (default_flags & ~clear) | set; + else + add_option( p, set, clear ); + } + free( options ); +} + +/* initialize all options at startup */ +static void init_options(void) +{ + char *wine_debug = getenv("WINEDEBUG"); + + nb_debug_options = 0; + if (wine_debug) parse_options( wine_debug ); +} + /* FIXME: this is not 100% thread-safe */ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) { @@ -60,6 +166,27 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) return fwrite( str, 1, strlen(str), stderr ); } +static unsigned char __cdecl fallback__wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + int min, max, pos, res; + + if (nb_debug_options == -1) init_options(); + + min = 0; + max = nb_debug_options - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( channel->name, debug_options[pos].name ); + if (!res) return debug_options[pos].flags; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + /* no option for this channel */ + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; +} + const char * __cdecl __wine_dbg_strdup( const char *str ) { LOAD_FUNC( __wine_dbg_strdup ); @@ -72,4 +199,10 @@ int __cdecl __wine_dbg_output( const char *str ) return p__wine_dbg_output( str ); } +unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + LOAD_FUNC( __wine_dbg_get_channel_flags ); + return p__wine_dbg_get_channel_flags( channel ); +} + #endif /* _WIN32 */

1 0

Detlef Riekenberg : ntdll/tests: Fix failures in the file tests.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 4b7d2ea0a76ba480939abe2697c48e466fc52908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7d2ea0a76ba480939abe26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 2 21:17:13 2019 +0200 ntdll/tests: Fix failures in the file tests. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d107c2e..ce1619e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4463,8 +4463,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -4492,8 +4491,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);

1 0

Zhiyi Zhang : tests: Add more tests for mapping texture on custom heaps.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: vkd3d Branch: master Commit: c726a1df0a3c13a514c3f05729710faf2ad62d51 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c726a1df0a3c13a514c3f05… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 3 16:39:10 2019 +0800 tests: Add more tests for mapping texture on custom heaps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 00005c4..6abc1df 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5969,6 +5969,11 @@ static void test_map_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + /* Texture on custom heaps can be mapped, but the address doesn't get disclosed to applications */ + hr = ID3D12Resource_Map(resource, 0, NULL, NULL); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Resource_Unmap(resource, 0, NULL); + ID3D12Resource_Release(resource); }

1 0

Zhiyi Zhang : tests: Add tests for subresource read write.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: vkd3d Branch: master Commit: 0ac694e7cc786f5ce5b5a53abf80f8474a5acca7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ac694e7cc786f5ce5b5a53… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 3 11:49:11 2019 +0200 tests: Add tests for subresource read write. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6abc1df..1f88e68 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6090,7 +6090,7 @@ static void test_map_placed_resources(void) root_parameters[1].Descriptor.ShaderRegister = 0; root_parameters[1].Descriptor.RegisterSpace = 0; root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.pParameters = root_parameters; root_signature_desc.NumStaticSamplers = 0; root_signature_desc.pStaticSamplers = NULL; @@ -27319,6 +27319,220 @@ static void test_vertex_shader_stream_output(void) destroy_test_context(&context); } +static void test_read_write_subresource(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_SUBRESOURCE_DATA texture_data; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *src_texture; + ID3D12Resource *dst_texture; + unsigned int got, expected; + ID3D12CommandQueue *queue; + ID3D12Resource *rb_buffer; + unsigned int *dst_buffer; + unsigned int buffer_size; + unsigned int slice_pitch; + unsigned int row_pitch; + unsigned int x, y, z; + ID3D12Device *device; + unsigned int *ptr; + D3D12_BOX box; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + row_pitch = 128 * sizeof(unsigned int); + slice_pitch = row_pitch * 100; + buffer_size = slice_pitch * 64; + + /* Buffers are not supported */ + rb_buffer = create_readback_buffer(device, buffer_size); + dst_buffer = malloc(buffer_size); + ok(dst_buffer, "Failed to allocate memory.\n"); + + set_box(&box, 0, 0, 0, 1, 1, 1); + hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource_Release(rb_buffer); + + /* Only texture on custom heaps is legal for ReadFromSubresource/WriteToSubresource */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.Alignment = 0; + resource_desc.Width = 128; + resource_desc.Height = 100; + resource_desc.DepthOrArraySize = 64; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM; + heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&src_texture); + if (FAILED(hr)) + { + skip("Failed to create texture on custom heap.\n"); + goto done; + } + + /* NULL box */ + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Empty box */ + set_box(&box, 0, 0, 0, 0, 0, 0); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + ptr = &dst_buffer[z * 128 * 100 + y * 128 + x]; + if (x < 2 && y< 2 && z < 2) /* Region 1 */ + *ptr = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + *ptr = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else + *ptr = 0xdeadbeef; + } + } + } + + /* Write region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Write region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], + row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(dst_buffer, 0, buffer_size); + + /* Read region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Read region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, + slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + if (x < 2 && y < 2 && z < 2) /* Region 1 */ + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else /* Untouched */ + expected = 0; + + got = dst_buffer[z * 128 * 100 + y * 128 + x]; + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + + /* Test layout is the same */ + dst_texture = create_default_texture3d(device, 128, 100, 64, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, + D3D12_RESOURCE_STATE_COPY_DEST); + memset(dst_buffer, 0, buffer_size); + texture_data.pData = dst_buffer; + texture_data.RowPitch = row_pitch; + texture_data.SlicePitch = slice_pitch; + upload_texture_data(dst_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + dst_location.pResource = dst_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + set_box(&box, 0, 0, 0, 128, 100, 64); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, &box); + + transition_resource_state(command_list, dst_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list); + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + if (x < 2 && y < 2 && z < 2) /* Region 1 */ + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else /* Untouched */ + expected = 0; + + got = get_readback_uint(&rb, x, y, z); + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + release_resource_readback(&rb); + + ID3D12Resource_Release(src_texture); + ID3D12Resource_Release(dst_texture); + reset_command_list(command_list, context.allocator); + +done: + free(dst_buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -27461,4 +27675,5 @@ START_TEST(d3d12) run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); + run_test(test_read_write_subresource); }

1 0

Isira Seneviratne : progman: Add missing apostrophe to IDS_SAVE_GROUP_AS_s string.
by Alexandre Julliard April 2, 2019

April 2, 2019

1 0

Nikolay Sivov : mfplat: Use attributes helpers for presentation descriptor.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: b4c28a70852da9b41c848197a71079a8980cc220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c28a70852da9b41c848197… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:14 2019 +0300 mfplat: Use attributes helpers for presentation descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 154 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 122 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4c28a70852da9b41c84…

1 0

Nikolay Sivov : mfplat: Trace known format ids in MFCalculateImageSize().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: fee85530dc224d59c08cbe09697dadbe76689c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee85530dc224d59c08cbe09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:16 2019 +0300 mfplat: Trace known format ids in MFCalculateImageSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/mfplat_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index be3a78d..a3e784c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -687,7 +687,7 @@ const char *debugstr_attr(const GUID *guid) return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); } -static const char *debugstr_mf_guid(const GUID *guid) +const char *debugstr_mf_guid(const GUID *guid) { static const struct guid_def guid_defs[] = { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 49143c5..f4a2577 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1759,7 +1759,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height }; struct uncompressed_video_format *format; - TRACE("%s, %u, %u, %p.\n", debugstr_guid(subtype), width, height, size); + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 5b183d4..d7a7547f 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -43,6 +43,7 @@ struct attributes extern HRESULT init_attributes_object(struct attributes *object, UINT32 size) DECLSPEC_HIDDEN; extern void clear_attributes_object(struct attributes *object) DECLSPEC_HIDDEN; extern const char *debugstr_attr(const GUID *guid) DECLSPEC_HIDDEN; +extern const char *debugstr_mf_guid(const GUID *guid) DECLSPEC_HIDDEN; extern HRESULT attributes_GetItem(struct attributes *object, REFGUID key, PROPVARIANT *value) DECLSPEC_HIDDEN; extern HRESULT attributes_GetItemType(struct attributes *object, REFGUID key, MF_ATTRIBUTE_TYPE *type) DECLSPEC_HIDDEN;

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 9a6feb8500fec7d07bf83d7d1870e2548bb60e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6feb8500fec7d07bf83d7d… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Mar 31 05:14:38 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 416 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 244 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6feb8500fec7d07bf8…

1 0