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

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

April 2, 2019

Module: wine Branch: master Commit: bf8d536c2218cdc857278f4ecd85f2693c1cbb6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8d536c2218cdc857278f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:17 2019 +0300 mfplat: Use attributes helpers for events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 220 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 155 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf8d536c2218cdc85727…

1 0

Vincent Povirk : uninstaller: Re-exec as 64-bit in wow64.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 88580a3ad6e6afea25716b8717a33d20184154e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88580a3ad6e6afea25716b87… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 30 15:55:43 2019 -0500 uninstaller: Re-exec as 64-bit in wow64. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 142d3d1..fa9a23c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -165,6 +165,31 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; int i = 1; + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } while( i<argc ) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: e6ec186f8acff11a4d515264dd71a01be305b7d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ec186f8acff11a4d515264… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Apr 2 10:26:27 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/po/lt.po b/po/lt.po index f7356ed..f986efe 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-27 10:40+0300\n" +"PO-Revision-Date: 2019-04-02 10:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7040,16 +7040,12 @@ msgid "No events available.\n" msgstr "Nėra pasiekiamų įvykių.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition\n" -msgstr "Nepalaikomas būsenos perėjimas.\n" +msgstr "Neteisingas medijos šaltinio būsenos perėjimas\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached\n" -msgstr "Registras atkurtas.\n" +msgstr "Pasiekta medijos srauto pabaiga\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" @@ -7057,57 +7053,43 @@ msgstr "Shutdown() buvo iškviesta.\n" #: mferror.mc:466 msgid "Media stream has no duration set\n" -msgstr "" +msgstr "Medijos srautui nenustatyta trukmė\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid\n" -msgstr "" +msgstr "Medijos formatas atpažintas, bet neteisingas\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found\n" -msgstr "Savybių aibė nerasta.\n" +msgstr "Savybė nerasta\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only\n" -msgstr "Savybė tuščia.\n" +msgstr "Savybė tik skaitymui\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed\n" -msgstr "Savybės tipas neleidžiamas.\n" +msgstr "Savybė neleidžiama\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started\n" -msgstr "Išteklius naudojamas.\n" +msgstr "Medijos šaltinis nepradėtas\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format\n" -msgstr "Nepalaikomas laiko formatas.\n" +msgstr "Nepalaikomas medijos formatas\n" #: mferror.mc:515 msgid "Media source is in wrong state\n" -msgstr "" +msgstr "Medijos šaltinis neteisingoje būsenoje\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected\n" -msgstr "Neaptikta duomenų.\n" +msgstr "Nepasirinktas nė vienas medijos srautas\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics\n" -msgstr "Nepalaikomas laiko formatas.\n" +msgstr "Nepalaikomos medijos šaltinio charakteristikos\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Sebastian Lackner : shlwapi: SHMapHandle should not set error when NULL is passed as hShared.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 7f6e1090817d0897b3ce4c63f6cdae347e9c4f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6e1090817d0897b3ce4c63… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 1 13:29:13 2019 +0200 shlwapi: SHMapHandle should not set error when NULL is passed as hShared. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 6 ++++++ dlls/shlwapi/tests/ordinal.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 4118d4b..657c33f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -97,6 +97,12 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); + if (!hShared) + { + TRACE("Returning handle NULL\n"); + return NULL; + } + /* Get dest process handle */ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 97e4606..6781b09 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -556,7 +556,6 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) SetLastError(0xdeadbeef); hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); ok(hmem2 == NULL, "expected NULL, got new handle\n"); -todo_wine ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0);

1 0

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

April 2, 2019

Module: wine Branch: master Commit: 49491a1a3c8129ec1aad574ed23ba1ffa0068020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49491a1a3c8129ec1aad574e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:15 2019 +0300 mfplat: Use attributes helpers for samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 156 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 124 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49491a1a3c8129ec1aad…

1 0

Piotr Caban : mscoree: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: cef4d3465b0826b05f944ca62570b2b5274fd1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef4d3465b0826b05f944ca6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:53 2019 +0200 mscoree: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index c02bfe1..fc1d178 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winternl.h" #include "ole2.h" #include "corerror.h" @@ -1242,7 +1243,7 @@ static void parse_override_entry(override_entry *entry, const char *string, int value = equals + 1; switch (key_len) { case 3: - if (!strncasecmp(string, "gac", 3)) { + if (!_strnicmp(string, "gac", 3)) { if (IS_OPTION_TRUE(*value)) entry->flags |= ASSEMBLY_SEARCH_GAC; else if (IS_OPTION_FALSE(*value))

1 0

Piotr Caban : krnl386.exe16: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: ea4d756cbdefd545da69785ef75b7561653e1cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4d756cbdefd545da69785e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:52:01 2019 +0200 krnl386.exe16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/atom.c | 6 +++--- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/resource.c | 8 ++++---- dlls/krnl386.exe16/snoop.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/atom.c b/dlls/krnl386.exe16/atom.c index a059561..23ef717 100644 --- a/dlls/krnl386.exe16/atom.c +++ b/dlls/krnl386.exe16/atom.c @@ -108,7 +108,7 @@ static WORD ATOM_Hash( TRACE("%x, %s, %x\n", entries, str, len); - for (i = 0; i < len; i++) hash ^= toupper(str[i]) + i; + for (i = 0; i < len; i++) hash ^= RtlUpperChar(str[i]) + i; return hash % entries; } @@ -223,7 +223,7 @@ ATOM WINAPI AddAtom16( LPCSTR str ) { entryPtr = ATOM_MakePtr( entry ); if ((entryPtr->length == len) && - (!strncasecmp( entryPtr->str, buffer, len ))) + (!_strnicmp( entryPtr->str, buffer, len ))) { entryPtr->refCount++; TRACE("-- existing 0x%x\n", entry); @@ -310,7 +310,7 @@ ATOM WINAPI FindAtom16( LPCSTR str ) { ATOMENTRY * entryPtr = ATOM_MakePtr( entry ); if ((entryPtr->length == len) && - (!strncasecmp( entryPtr->str, str, len ))) + (!_strnicmp( entryPtr->str, str, len ))) { TRACE("-- found %x\n", entry); return HANDLETOATOM( entry ); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index d494585..0d343aa 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1455,7 +1455,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) if (pModule->ne_flags & NE_FFLAGS_WIN32) continue; name_table = (BYTE *)pModule + pModule->ne_restab; - /* FIXME: the strncasecmp is WRONG. It should not be case insensitive, + /* FIXME: the _strnicmp is WRONG. It should not be case insensitive, * but case sensitive! (Unfortunately Winword 6 and subdlls have * lowercased module names, but try to load uppercase DLLs, so this * 'i' compare is just a quickfix until the loader handles that diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index 2f606fa..42a6d14 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -213,7 +213,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[1] & 0x8000) { if (!HIWORD(typeId)) continue; - if (strcasecmp( typeId, (char *)(p + 3) )) continue; + if (_strnicmp( typeId, (char *)(p + 3), -1 )) continue; } else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1])) continue; @@ -223,7 +223,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[2] & 0x8000) { if (!HIWORD(resId)) continue; - if (strcasecmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1 )) continue; + if (_strnicmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1, -1 )) continue; } else if (HIWORD(resId) || ((LOWORD(resId) & ~0x8000) != p[2])) @@ -261,7 +261,7 @@ static NE_TYPEINFO *NE_FindTypeSection( LPBYTE pResTab, NE_TYPEINFO *pTypeInfo, if (!(pTypeInfo->type_id & 0x8000)) { BYTE *p = pResTab + pTypeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, str, len )) + if ((*p == len) && !_strnicmp( (char*)p+1, str, len )) { TRACE(" Found type '%s'\n", str ); return pTypeInfo; @@ -308,7 +308,7 @@ static NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab, NE_TYPEINFO *pTypeI { if (pNameInfo->id & 0x8000) continue; p = pResTab + pNameInfo->id; - if ((*p == len) && !strncasecmp( (char*)p+1, str, len )) + if ((*p == len) && !_strnicmp( (char*)p+1, str, len )) return pNameInfo; } } diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 4496080..af06e35 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -224,7 +224,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { if (strchr(fun->name,'_')) { char *s=strchr(fun->name,'_'); - if (!strncasecmp(s,"_thunkdata",10)) { + if (!_strnicmp(s,"_thunkdata",10)) { HeapFree(GetProcessHeap(),0,fun->name); fun->name = NULL; return origfun;

1 0

Henri Verbeet : d3d10core/tests: Introduce and use check_readback_data_u16.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 1f9b99298fa29d27dff99e10cf6a9fde13312a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9b99298fa29d27dff99e10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:44 2019 +0430 d3d10core/tests: Introduce and use check_readback_data_u16. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 94 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b9b83f4..7d76cc2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -728,11 +728,16 @@ static void *get_readback_data(struct resource_readback *rb, unsigned int x, uns return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(BYTE *)get_readback_data(rb, x, y, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); @@ -785,12 +790,12 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -804,27 +809,57 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u), sub-resource %u.\n", value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -840,14 +875,12 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n", color, expected_color, x, y, rb->sub_resource_idx); @@ -15590,14 +15623,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -15662,17 +15688,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -17864,7 +17880,7 @@ static void test_render_a8(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black);

1 0

Henri Verbeet : d3d10core/tests: Introduce and use check_readback_data_u24.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 86aaebc48aa16f2b5fc7d335914aee8243e5ae10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86aaebc48aa16f2b5fc7d335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:45 2019 +0430 d3d10core/tests: Introduce and use check_readback_data_u24. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 55 +++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d76cc2..00bd16b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -738,11 +738,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); } -static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } +static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return get_readback_u32(rb, x, y); +} + static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(float *)get_readback_data(rb, x, y, sizeof(float)); @@ -854,6 +859,38 @@ done: value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e) +static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb, + const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + DWORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u32(rb, x, y) >> shift; + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%06x, expected 0x%06x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -15524,10 +15561,10 @@ static void test_depth_bias(void) struct resource_readback rb; ID3D10DepthStencilView *dsv; unsigned int expected_value; - unsigned int x, y, i, j, k; ID3D10RasterizerState *rs; ID3D10Texture2D *texture; unsigned int format_idx; + unsigned int y, i, j, k; unsigned int shift = 0; ID3D10Device *device; float *depth_values; @@ -15667,19 +15704,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u32 = get_readback_data(&rb, x, y, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - } - } + check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1); release_resource_readback(&rb); break; case DXGI_FORMAT_D16_UNORM:

1 0

Henri Verbeet : d3d11/tests: Introduce and use check_readback_data_u16.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 310849de20c9fa5c8a6a13725480512f66d524a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=310849de20c9fa5c8a6a1372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:46 2019 +0430 d3d11/tests: Introduce and use check_readback_data_u16. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a02b3f..6f43848 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -936,11 +936,16 @@ static void *get_readback_data(struct resource_readback *rb, return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(BYTE *)get_readback_data(rb, x, y, z, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD)); @@ -980,12 +985,12 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -1001,30 +1006,61 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y, z); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u, %u), sub-resource %u.\n", value, expected_value, x, y, z, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0, z = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (z = 0; z < rb->depth; ++z) + { + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u, %u), sub-resource %u.\n", + value, expected_value, x, y, z, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -1042,17 +1078,13 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y, z); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u), sub-resource %u.\n", color, expected_color, x, y, z, rb->sub_resource_idx); @@ -25514,14 +25546,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -25586,17 +25611,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -29007,7 +29022,7 @@ static void test_render_a8(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, black);

1 0

Henri Verbeet : d3d11/tests: Introduce and use check_readback_data_u24.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 7bca617c6a91be96dc4e58b615393f0845eadfd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bca617c6a91be96dc4e58b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:47 2019 +0430 d3d11/tests: Introduce and use check_readback_data_u24. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 58 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6f43848..90bcbae 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -946,11 +946,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD)); } -static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD)); } +static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return get_readback_u32(rb, x, y, z); +} + static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(float *)get_readback_data(rb, x, y, 0, sizeof(float)); @@ -1055,6 +1060,41 @@ done: value, expected_value, x, y, z, rb->sub_resource_idx); } +#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e) +static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb, + const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0, z = 0; + BOOL all_match = FALSE; + RECT default_rect; + DWORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (z = 0; z < rb->depth; ++z) + { + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u32(rb, x, y, z) >> shift; + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%06x, expected 0x%06x at (%u, %u, %u), sub-resource %u.\n", + value, expected_value, x, y, z, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -25446,10 +25486,10 @@ static void test_depth_bias(void) struct resource_readback rb; ID3D11DepthStencilView *dsv; unsigned int expected_value; - unsigned int x, y, i, j, k; ID3D11RasterizerState *rs; ID3D11Texture2D *texture; unsigned int format_idx; + unsigned int y, i, j, k; unsigned int shift = 0; ID3D11Device *device; float *depth_values; @@ -25590,19 +25630,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u32 = get_readback_data(&rb, x, y, 0, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - } - } + check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1); release_resource_readback(&rb); break; case DXGI_FORMAT_D16_UNORM:

1 0

Michael Müller : taskmgr: Use system font instead of special bitmap font.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 5cd7f63f727516468913ef5a1337d5d771943a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cd7f63f727516468913ef5a… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 1 13:38:28 2019 +0200 taskmgr: Use system font instead of special bitmap font. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/font.bmp | Bin 646 -> 0 bytes programs/taskmgr/graph.c | 14 ++++++++++++-- programs/taskmgr/resource.h | 1 - programs/taskmgr/taskmgr.c | 29 ----------------------------- programs/taskmgr/taskmgr.rc | 3 --- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp deleted file mode 100644 index c1f8410..0000000 Binary files a/programs/taskmgr/font.bmp and /dev/null differ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index e6819cf..7e978e1 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph @@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cd43f15..4153f66 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -35,7 +35,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b99d238..d3337d2 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); } -void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT)); - hOldBitmap = SelectObject(hFontDC, hFontBitmap); - - for (i = 0; lpwszText[i]; i++) { - if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpwszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpwszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - static BOOL OnCreate(HWND hWnd) { HMENU hMenu; diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index e6742a7..ffd0699 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -609,6 +609,3 @@ IDB_TRAYMASK BITMAP traymask.bmp /* @makedep: trayicon.bmp */ IDB_TRAYICON BITMAP trayicon.bmp - -/* @makedep: font.bmp */ -IDB_FONT BITMAP font.bmp

1 0

Piotr Caban : krnl386.exe16: Get rid of NE_str(n)casecmp helper.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 6b2c2eb76d3f2d7ca12a9b0a09b1eb6e5b43cf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2c2eb76d3f2d7ca12a9b0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:52:10 2019 +0200 krnl386.exe16: Get rid of NE_str(n)casecmp helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 0d343aa..16d2f28 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -113,34 +113,6 @@ static inline BOOL contains_path( LPCSTR name ) /*********************************************************************** - * NE_strcasecmp - * - * locale-independent case conversion for module lookups - */ -static int NE_strcasecmp( const char *str1, const char *str2 ) -{ - int ret = 0; - for ( ; ; str1++, str2++) - if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break; - return ret; -} - - -/*********************************************************************** - * NE_strncasecmp - * - * locale-independent case conversion for module lookups - */ -static int NE_strncasecmp( const char *str1, const char *str2, int len ) -{ - int ret = 0; - for ( ; len > 0; len--, str1++, str2++) - if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break; - return ret; -} - - -/*********************************************************************** * NE_GetPtr */ NE_MODULE *NE_GetPtr( HMODULE16 hModule ) @@ -1461,7 +1433,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) * 'i' compare is just a quickfix until the loader handles that * correctly. -MM 990705 */ - if ((*name_table == len) && !NE_strncasecmp(tmpstr, (const char*)name_table+1, len)) + if ((*name_table == len) && !_strnicmp(tmpstr, (const char*)name_table+1, len)) return hModule; } @@ -1500,7 +1472,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!NE_strcasecmp(loadedfn, s)) + if (!_strnicmp(loadedfn, s, -1)) return hModule; } return 0; @@ -1820,7 +1792,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!NE_strcasecmp(loadedfn, s)) + if (!_strnicmp(loadedfn, s, -1)) return hModule; } /* If basename (without ext) matches the module name of a module: @@ -1837,7 +1809,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) if (pModule->ne_flags & NE_FFLAGS_WIN32) continue; name_table = (BYTE *)pModule + pModule->ne_restab; - if ((*name_table == len) && !NE_strncasecmp(s, (const char*)name_table+1, len)) + if ((*name_table == len) && !_strnicmp(s, (const char*)name_table+1, len)) return hModule; }

1 0

Piotr Caban : shell.dll16: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: fab4b11bc22e6f3109ba6fd52f78e33954c80f9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab4b11bc22e6f3109ba6fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:32 2019 +0200 shell.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell.dll16/shell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index be8ffeb..748db67 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -40,6 +40,7 @@ #include "wingdi.h" #include "shlobj.h" #include "shlwapi.h" +#include "winternl.h" #include "wine/winbase16.h" #include "wine/winuser16.h" @@ -358,7 +359,7 @@ static LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry) l = strlen(entry); for( ; *lpEnv ; lpEnv+=strlen(lpEnv)+1 ) - { if( strncasecmp(lpEnv, entry, l) ) + { if( _strnicmp(lpEnv, entry, l) ) continue; if( !*(lpEnv+l) ) return (lpEnv + l); /* empty entry */

1 0

Gijs Vermeulen : msvcrt/tests: Add missing return value check.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: e49a937ae30c1552adb0ffeceb68f92c4efb7618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49a937ae30c1552adb0ffec… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 1 18:00:16 2019 +0200 msvcrt/tests: Add missing return value check. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ff3a87d..09492e3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3250,6 +3250,7 @@ static void test__wcsset_s(void) str[1] = 0; str[2] = 'b'; r = p__wcsset_s(str, 3, 'c'); + ok(r == 0, "r = %d\n", r); ok(str[0] == 'c', "str[0] = %d\n", str[0]); ok(str[1] == 0, "str[1] = %d\n", str[1]); ok(str[2] == 'b', "str[2] = %d\n", str[2]);

1 0