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

Józef Kucia : dxgi: Avoid recreating swapchain when we don't have user images.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 715a52a61cf8b21f658bc31aa8bde56c5a44af08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715a52a61cf8b21f658bc31a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:50 2019 +0100 dxgi: Avoid recreating swapchain when we don't have user images. 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> --- dlls/dxgi/swapchain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 991a505..cf084f7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2138,7 +2138,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface vr = d3d12_swapchain_acquire_next_image(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { + if (!d3d12_swapchain_have_user_images(swapchain)) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); }

1 0

Matteo Bruni : d3d8: Don't upload unused system memory vertex buffers.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: c79fbdd3bf95cf91708386bf470970a881e7bfaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79fbdd3bf95cf91708386bf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 5 18:47:20 2019 +0100 d3d8: Don't upload unused system memory vertex buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 12 +++++++++++- dlls/d3d8/vertexdeclaration.c | 9 +++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 7c44f07..0f86165 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -251,6 +251,7 @@ struct d3d8_vertex_declaration { DWORD *elements; DWORD elements_size; /* Size of elements, in bytes */ + DWORD stream_map; struct wined3d_vertex_declaration *wined3d_vertex_declaration; DWORD shader_handle; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d367f42..56c363c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2269,15 +2269,25 @@ static HRESULT WINAPI d3d8_device_GetCurrentTexturePalette(IDirect3DDevice8 *ifa static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, unsigned int start_vertex, unsigned int vertex_count) { + struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d8_vertexbuffer *d3d8_buffer; struct wined3d_resource *dst_resource; + struct d3d8_vertex_declaration *decl; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; HRESULT hr; - map = device->sysmem_vb; + if (!device->sysmem_vb) + return; + + wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); + if (!wined3d_decl) + return; + + decl = wined3d_vertex_declaration_get_parent(wined3d_decl); + map = decl->stream_map & device->sysmem_vb; while (map) { i = wined3d_bit_scan(&map); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 709e04b..c2d0b9f 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -250,7 +250,7 @@ wined3d_usage_lookup[] = /* TODO: find out where rhw (or positionT) is for declaration8 */ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, - struct wined3d_vertex_element **wined3d_elements) + struct wined3d_vertex_element **wined3d_elements, DWORD *stream_map) { struct wined3d_vertex_element *element; const DWORD *token = d3d8_elements; @@ -261,6 +261,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 TRACE("d3d8_elements %p, d3d8_elements_size %p, wined3d_elements %p\n", d3d8_elements, d3d8_elements_size, wined3d_elements); + *stream_map = 0; /* 128 should be enough for anyone... */ *wined3d_elements = heap_alloc_zero(128 * sizeof(**wined3d_elements)); while (D3DVSD_END() != *token) @@ -288,6 +289,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->usage = wined3d_usage_lookup[reg].usage; element->usage_idx = wined3d_usage_lookup[reg].usage_idx; + *stream_map |= 1u << stream; + offset += wined3d_type_sizes[type]; } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); @@ -337,7 +340,8 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration declaration->shader_handle = shader_handle; - wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, &wined3d_elements); + wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, + &wined3d_elements, &declaration->stream_map); if (!(declaration->elements = heap_alloc(declaration->elements_size))) { ERR("Failed to allocate vertex declaration elements memory.\n"); @@ -369,6 +373,7 @@ HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declara declaration->elements = NULL; declaration->elements_size = 0; + declaration->stream_map = 1; declaration->shader_handle = fvf; hr = wined3d_vertex_declaration_create_from_fvf(device->wined3d_device, fvf, declaration,

1 0

Alexandre Julliard : winebuild: Specify the correct linker emulation for Windows platforms.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: b9c5bac673aa1a4c4e6fcb6ef65f2ce3e04db021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9c5bac673aa1a4c4e6fcb6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:40:23 2019 +0100 winebuild: Specify the correct linker emulation for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index fa9169b..beff2ab 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -449,6 +449,9 @@ struct strarray get_ld_command(void) case PLATFORM_FREEBSD: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; + case PLATFORM_WINDOWS: + strarray_add( &args, "-m", (force_pointer_size == 8) ? "i386pep" : "i386pe", NULL ); + break; default: switch(target_cpu) {

1 0

Alexandre Julliard : winebuild: Output the module filename along with the stub data.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: a3229faf59d9e562a5eb1e73cd38a21183978d72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3229faf59d9e562a5eb1e73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:10:49 2019 +0100 winebuild: Output the module filename along with the stub data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 45 ++++++++++++++++----------------------------- tools/winebuild/spec32.c | 1 - 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6ab7765..2816c65 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1187,14 +1187,14 @@ static void output_external_link_imports( DLLSPEC *spec ) void output_stubs( DLLSPEC *spec ) { const char *name, *exp_name; - int i, count; + int i; if (!has_stubs( spec )) return; output( "\n/* stub functions */\n\n" ); output( "\t.text\n" ); - for (i = count = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; @@ -1231,7 +1231,6 @@ void output_stubs( DLLSPEC *spec ) { output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); output( "\tmovl %%ecx,4(%%esp)\n" ); - count++; } else output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); @@ -1241,10 +1240,7 @@ void output_stubs( DLLSPEC *spec ) else { if (exp_name) - { output( "\tmovl $.L%s_string,4(%%esp)\n", name ); - count++; - } else output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); output( "\tmovl $.L__wine_spec_file_name,(%%esp)\n" ); @@ -1256,10 +1252,7 @@ void output_stubs( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset 8" ); output( "\tleaq .L__wine_spec_file_name(%%rip),%%rdi\n" ); if (exp_name) - { output( "leaq .L%s_string(%%rip),%%rsi\n", name ); - count++; - } else output( "\tmovq $%d,%%rsi\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); @@ -1269,24 +1262,19 @@ void output_stubs( DLLSPEC *spec ) output( "\tadd r0,PC\n"); output( "\tldr r1,2f+4\n"); output( "1:" ); - if (exp_name) - { - output( "\tadd r1,PC\n"); - count++; - } + if (exp_name) output( "\tadd r1,PC\n"); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); output( "2:\t.long .L__wine_spec_file_name-1b\n" ); if (exp_name) output( "\t.long .L%s_string-2b\n", name ); else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadrp x0, %s\n", asm_name("__wine_spec_file_name") ); - output( "\tadd x0, x0, #:lo12:%s\n", asm_name("__wine_spec_file_name") ); + output( "\tadrp x0, .L__wine_spec_file_name\n" ); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_file_name\n" ); if (exp_name) { output( "\tadrp x1, .L%s_string\n", name ); output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); - count++; } else output( "\tmov x1, %u\n", odp->ordinal ); @@ -1301,20 +1289,19 @@ void output_stubs( DLLSPEC *spec ) output_function_size( name ); } - if (count) + output( "\t%s\n", get_asm_string_section() ); + output( ".L__wine_spec_file_name:\n" ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); + for (i = 0; i < spec->nb_entry_points; i++) { - output( "\t%s\n", get_asm_string_section() ); - for (i = 0; i < spec->nb_entry_points; i++) + ORDDEF *odp = &spec->entry_points[i]; + if (odp->type != TYPE_STUB) continue; + exp_name = odp->name ? odp->name : odp->export_name; + if (exp_name) { - ORDDEF *odp = &spec->entry_points[i]; - if (odp->type != TYPE_STUB) continue; - exp_name = odp->name ? odp->name : odp->export_name; - if (exp_name) - { - name = get_stub_name( odp, spec ); - output( ".L%s_string:\n", name ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), exp_name ); - } + name = get_stub_name( odp, spec ); + output( ".L%s_string:\n", name ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), exp_name ); } } } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 0547ba2..80124f0 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -685,7 +685,6 @@ void output_module( DLLSPEC *spec ) output( "\n\t%s\n", get_asm_string_section() ); output( "%s\n", asm_globl("__wine_spec_file_name") ); - output( ".L__wine_spec_file_name:\n" ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); if (target_platform == PLATFORM_APPLE) output( "\t.lcomm %s,4\n", asm_name("_end") );

1 0

Alexandre Julliard : winebuild: Add a helper for generating data directories.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 7d41cde73f56bd363bc354d9960290f6ca0ee14c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d41cde73f56bd363bc354d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:37:12 2019 +0100 winebuild: Add a helper for generating data directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 59 +++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ee38702..7b4d661 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -138,6 +138,21 @@ static void get_arg_string( ORDDEF *odp, char str[MAX_ARGUMENTS + 1] ) strcpy( str + i, "I" ); } +static void output_data_directories( const char *names[16] ) +{ + int i; + + for (i = 0; i < 16; i++) + { + if (names[i]) + { + output_rva( "%s", names[i] ); + output( "\t.long %s_end - %s\n", names[i], names[i] ); + } + else output( "\t.long 0,0\n" ); + } +} + /******************************************************************* * build_args_string */ @@ -546,6 +561,7 @@ void output_module( DLLSPEC *spec ) { int machine = 0; unsigned int page_size = get_page_size(); + const char *data_dirs[16] = { NULL }; /* Reserve some space for the PE header */ @@ -650,43 +666,14 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* LoaderFlags */ output( "\t.long 16\n" ); /* NumberOfRvaAndSizes */ - if (spec->base <= spec->limit) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ - { - output_rva( ".L__wine_spec_exports" ); - output( "\t.long .L__wine_spec_exports_end-.L__wine_spec_exports\n" ); - } - else - output( "\t.long 0,0\n" ); + if (spec->base <= spec->limit) + data_dirs[0] = ".L__wine_spec_exports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ + if (has_imports()) + data_dirs[1] = ".L__wine_spec_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ + if (spec->nb_resources) + data_dirs[2] = ".L__wine_spec_resources"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - if (has_imports()) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ - { - output_rva( ".L__wine_spec_imports" ); - output( "\t.long .L__wine_spec_imports_end-.L__wine_spec_imports\n" ); - } - else - output( "\t.long 0,0\n" ); - - if (spec->nb_resources) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - { - output_rva( ".L__wine_spec_resources" ); - output( "\t.L__wine_spec_resources_end-.L__wine_spec_resources\n" ); - } - else - output( "\t.long 0,0\n" ); - - output( "\t.long 0,0\n" ); /* DataDirectory[3] */ - output( "\t.long 0,0\n" ); /* DataDirectory[4] */ - output( "\t.long 0,0\n" ); /* DataDirectory[5] */ - output( "\t.long 0,0\n" ); /* DataDirectory[6] */ - output( "\t.long 0,0\n" ); /* DataDirectory[7] */ - output( "\t.long 0,0\n" ); /* DataDirectory[8] */ - output( "\t.long 0,0\n" ); /* DataDirectory[9] */ - output( "\t.long 0,0\n" ); /* DataDirectory[10] */ - output( "\t.long 0,0\n" ); /* DataDirectory[11] */ - output( "\t.long 0,0\n" ); /* DataDirectory[12] */ - output( "\t.long 0,0\n" ); /* DataDirectory[13] */ - output( "\t.long 0,0\n" ); /* DataDirectory[14] */ - output( "\t.long 0,0\n" ); /* DataDirectory[15] */ + output_data_directories( data_dirs ); output( "\n\t%s\n", get_asm_string_section() ); output( "%s\n", asm_globl("__wine_spec_file_name") );

1 0

Alexandre Julliard : winebuild: Add a helper for generating RVA pointers.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 7555fd57e3956d7cfc0fa5a43b87bd7d20101087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7555fd57e3956d7cfc0fa5a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:13:45 2019 +0100 winebuild: Add a helper for generating RVA pointers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 9 +++------ tools/winebuild/res32.c | 6 ++++-- tools/winebuild/spec32.c | 31 ++++++++++++++++++------------- tools/winebuild/utils.c | 22 ++++++++++++++++++++++ 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e76a87a..44fa317 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -248,6 +248,8 @@ extern int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern void output_rva( const char *format, ... ) + __attribute__ ((__format__ (__printf__, 1, 2))); extern void spawn( struct strarray array ); extern struct strarray find_tool( const char *name, const char * const *names ); extern struct strarray get_as_command(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5c4de1c..984bffd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -722,14 +722,11 @@ static void output_immediate_imports(void) j = 0; LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) { - output( "\t.long .L__wine_spec_import_data_names+%d-.L__wine_spec_rva_base\n", /* OriginalFirstThunk */ - j * get_ptr_size() ); + output_rva( ".L__wine_spec_import_data_names + %d", j * get_ptr_size() ); /* OriginalFirstThunk */ output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* ForwarderChain */ - output( "\t.long .L__wine_spec_import_name_%s-.L__wine_spec_rva_base\n", /* Name */ - import->c_name ); - output( "\t.long .L__wine_spec_import_data_ptrs+%d-.L__wine_spec_rva_base\n", /* FirstThunk */ - j * get_ptr_size() ); + output_rva( ".L__wine_spec_import_name_%s", import->c_name ); /* Name */ + output_rva( ".L__wine_spec_import_data_ptrs + %d", j * get_ptr_size() ); /* FirstThunk */ j += import->nb_imports + 1; } output( "\t.long 0\n" ); /* OriginalFirstThunk */ diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index b20dfb4..16e5c65 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -476,8 +476,10 @@ void output_resources( DLLSPEC *spec ) /* dump the resource data entries */ for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) - output( "\t.long .L__wine_spec_res_%d-.L__wine_spec_rva_base,%u,0,0\n", - i, res->data_size ); + { + output_rva( ".L__wine_spec_res_%d", i ); + output( "\t.long %u,0,0\n", res->data_size ); + } /* dump the name strings */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 69b6d2f..ee38702 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -378,15 +378,15 @@ void output_exports( DLLSPEC *spec ) output( "\t.long 0\n" ); /* Characteristics */ output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ - output( "\t.long .L__wine_spec_exp_names-.L__wine_spec_rva_base\n" ); /* Name */ + output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ output( "\t.long %u\n", nr_exports ); /* NumberOfFunctions */ output( "\t.long %u\n", spec->nb_names ); /* NumberOfNames */ - output( "\t.long .L__wine_spec_exports_funcs-.L__wine_spec_rva_base\n" ); /* AddressOfFunctions */ + output_rva( ".L__wine_spec_exports_funcs " ); /* AddressOfFunctions */ if (spec->nb_names) { - output( "\t.long .L__wine_spec_exp_name_ptrs-.L__wine_spec_rva_base\n" ); /* AddressOfNames */ - output( "\t.long .L__wine_spec_exp_ordinals-.L__wine_spec_rva_base\n" ); /* AddressOfNameOrdinals */ + output_rva( ".L__wine_spec_exp_name_ptrs" ); /* AddressOfNames */ + output_rva( ".L__wine_spec_exp_ordinals" ); /* AddressOfNameOrdinals */ } else { @@ -440,7 +440,7 @@ void output_exports( DLLSPEC *spec ) output( "\n.L__wine_spec_exp_name_ptrs:\n" ); for (i = 0; i < spec->nb_names; i++) { - output( "\t.long .L__wine_spec_exp_names+%u-.L__wine_spec_rva_base\n", namepos ); + output_rva( ".L__wine_spec_exp_names + %u", namepos ); namepos += strlen(spec->names[i]->name) + 1; } @@ -636,8 +636,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short %u,%u\n", /* Major/MinorSubsystemVersion */ spec->subsystem_major, spec->subsystem_minor ); output( "\t.long 0\n" ); /* Win32VersionValue */ - output( "\t.long %s-.L__wine_spec_rva_base\n", /* SizeOfImage */ - asm_name("_end") ); + output_rva( "%s", asm_name("_end") ); /* SizeOfImage */ output( "\t.long %u\n", page_size ); /* SizeOfHeaders */ output( "\t.long 0\n" ); /* CheckSum */ output( "\t.short 0x%04x\n", /* Subsystem */ @@ -652,20 +651,26 @@ void output_module( DLLSPEC *spec ) output( "\t.long 16\n" ); /* NumberOfRvaAndSizes */ if (spec->base <= spec->limit) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ - output( "\t.long .L__wine_spec_exports-.L__wine_spec_rva_base," - ".L__wine_spec_exports_end-.L__wine_spec_exports\n" ); + { + output_rva( ".L__wine_spec_exports" ); + output( "\t.long .L__wine_spec_exports_end-.L__wine_spec_exports\n" ); + } else output( "\t.long 0,0\n" ); if (has_imports()) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ - output( "\t.long .L__wine_spec_imports-.L__wine_spec_rva_base," - ".L__wine_spec_imports_end-.L__wine_spec_imports\n" ); + { + output_rva( ".L__wine_spec_imports" ); + output( "\t.long .L__wine_spec_imports_end-.L__wine_spec_imports\n" ); + } else output( "\t.long 0,0\n" ); if (spec->nb_resources) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - output( "\t.long .L__wine_spec_resources-.L__wine_spec_rva_base," - ".L__wine_spec_resources_end-.L__wine_spec_resources\n" ); + { + output_rva( ".L__wine_spec_resources" ); + output( "\t.L__wine_spec_resources_end-.L__wine_spec_resources\n" ); + } else output( "\t.long 0,0\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 63be3af..87761c2 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1107,6 +1107,28 @@ void output_cfi( const char *format, ... ) va_end( valist ); } +/* output an RVA pointer */ +void output_rva( const char *format, ... ) +{ + va_list valist; + + va_start( valist, format ); + switch (target_platform) + { + case PLATFORM_WINDOWS: + output( "\t.rva " ); + vfprintf( output_file, format, valist ); + fputc( '\n', output_file ); + break; + default: + output( "\t.long " ); + vfprintf( output_file, format, valist ); + output( " - .L__wine_spec_rva_base\n" ); + break; + } + va_end( valist ); +} + /* output the GNU note for non-exec stack */ void output_gnu_stack_note(void) {

1 0

Jacek Caban : mshtml: Don't store NSContainer in nsWineURI.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 842207e260a446140d92565d4550af9d7a520c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842207e260a446140d92565d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:46:56 2019 +0100 mshtml: Don't store NSContainer in nsWineURI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 59 +++++++++--------------------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 63038d2..d818889 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -57,7 +57,6 @@ struct nsWineURI { LONG ref; - NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; IUri *uri; @@ -157,7 +156,7 @@ static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) return hres; } -static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLOuterWindow*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -305,7 +304,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post if(window->uri_nofrag) { nsWineURI *referrer_uri; - nsres = create_nsuri(window->uri_nofrag, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, NULL, &referrer_uri); + nsres = create_nsuri(window->uri_nofrag, window, NULL, &referrer_uri); if(NS_SUCCEEDED(nsres)) { nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); assert(nsres == NS_OK); @@ -330,20 +329,6 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post return S_OK; } -static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) -{ - if(This->container) { - if(This->container == nscontainer) - return; - TRACE("Changing %p -> %p\n", This->container, nscontainer); - nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - } - - if(nscontainer) - nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface); - This->container = nscontainer; -} - static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window) { if(This->window_ref) { @@ -356,9 +341,6 @@ static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window) if(window) { windowref_addref(window->window_ref); This->window_ref = window->window_ref; - - if(window->doc_obj) - set_uri_nscontainer(This, window->doc_obj->nscontainer); }else { This->window_ref = NULL; } @@ -1115,22 +1097,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->is_doc_uri) { window = get_channel_window(This); - if(window) { + if(window) set_uri_window(This->uri, window); - }else if(This->uri->container) { - BOOL b; - - /* nscontainer->doc should be NULL which means navigation to a new window */ - if(This->uri->container->doc) - FIXME("nscontainer->doc = %p\n", This->uri->container->doc); - - nsres = before_async_open(This, This->uri->container, &b); - if(NS_FAILED(nsres)) - return nsres; - if(b) - FIXME("Navigation not cancelled\n"); - return NS_ERROR_UNEXPECTED; - } } if(!window) { @@ -2356,8 +2324,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) if(!ref) { if(This->window_ref) windowref_release(This->window_ref); - if(This->container) - nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); if(This->uri_builder) @@ -2860,7 +2826,7 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) return NS_ERROR_UNEXPECTED; nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, - This->container, This->origin_charset, &wine_uri); + This->origin_charset, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -3042,7 +3008,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->origin_charset, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { @@ -3438,7 +3404,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_SetDefaultPort }; -static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, +static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, const char *origin_charset, nsWineURI **_retval) { nsWineURI *ret; @@ -3453,7 +3419,6 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c ret->ref = 1; ret->is_mutable = TRUE; - set_uri_nscontainer(ret, container); set_uri_window(ret, window); IUri_AddRef(iuri); @@ -3481,8 +3446,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) nsWineURI *uri; nsresult nsres; - nsres = create_nsuri(iuri, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, - NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3533,7 +3497,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, window, NULL, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3909,7 +3873,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(FAILED(hres)) return NS_SUCCESS_DEFAULT_ACTION; - nsres = create_nsuri(urlmon_uri, window, NULL, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); @@ -4025,11 +3989,6 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret if(!wine_uri->is_doc_uri) { wine_uri->is_doc_uri = TRUE; - if(!wine_uri->container) { - nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface); - wine_uri->container = nscontainer; - } - if(nscontainer->doc) *_retval = translate_url(nscontainer->doc, wine_uri); }

1 0

Nikolay Sivov : mfplat: Fix a leak on error path (Coverity).
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 3fb0b48e1ea85beab3656abf4f3f8b9c842445bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb0b48e1ea85beab3656abf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:12 2019 +0300 mfplat: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 96dd6de..408526f 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -577,6 +577,8 @@ static HRESULT alloc_user_queue(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue_ else { LeaveCriticalSection(&queues_section); + heap_free(queue); + WARN("Out of user queue handles.\n"); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : mfplat: Add a stub for system time source.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 58a93786e260586b6b92a0a4e197ed5c43a1513b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58a93786e260586b6b92a0a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:13 2019 +0300 mfplat: Add a stub for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 34 +++++++ include/mfidl.idl | 8 ++ 4 files changed, 258 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58a93786e260586b6b92…

1 0

Nikolay Sivov : mfplat: Implement time source state changes.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 3865a8c9d5633b9f9c71ed39ab74aba6308f31cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3865a8c9d5633b9f9c71ed39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:14 2019 +0300 mfplat: Implement time source state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 112 +++++++++++++++++++++++++++++++++++++++------ dlls/mfplat/tests/mfplat.c | 65 +++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4ce97b1..6bec418 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1,5 +1,4 @@ /* - * * Copyright 2014 Austin English * * This library is free software; you can redistribute it and/or @@ -44,6 +43,8 @@ struct system_time_source IMFPresentationTimeSource IMFPresentationTimeSource_iface; IMFClockStateSink IMFClockStateSink_iface; LONG refcount; + MFCLOCK_STATE state; + CRITICAL_SECTION cs; }; static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) @@ -3085,7 +3086,10 @@ static ULONG WINAPI system_time_source_Release(IMFPresentationTimeSource *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + DeleteCriticalSection(&source->cs); heap_free(source); + } return refcount; } @@ -3120,9 +3124,15 @@ static HRESULT WINAPI system_time_source_GetContinuityKey(IMFPresentationTimeSou static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *iface, DWORD reserved, MFCLOCK_STATE *state) { - FIXME("%p, %#x, %p.\n", iface, reserved, state); + struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, reserved, state); + + EnterCriticalSection(&source->cs); + *state = source->state; + LeaveCriticalSection(&source->cs); + + return S_OK; } static HRESULT WINAPI system_time_source_GetProperties(IMFPresentationTimeSource *iface, MFCLOCK_PROPERTIES *props) @@ -3170,32 +3180,107 @@ static ULONG WINAPI system_time_source_sink_Release(IMFClockStateSink *iface) return IMFPresentationTimeSource_Release(&source->IMFPresentationTimeSource_iface); } -static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, LONGLONG start_offset) +enum clock_command { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + CLOCK_CMD_START = 0, + CLOCK_CMD_STOP, + CLOCK_CMD_PAUSE, + CLOCK_CMD_RESTART, + CLOCK_CMD_MAX, +}; - return E_NOTIMPL; +static HRESULT system_time_source_change_state(struct system_time_source *source, enum clock_command command) +{ + static const BYTE state_change_is_allowed[MFCLOCK_STATE_PAUSED+1][CLOCK_CMD_MAX] = + { /* S S* P R */ + /* INVALID */ { 1, 0, 1, 0 }, + /* RUNNING */ { 1, 1, 1, 0 }, + /* STOPPED */ { 1, 1, 0, 0 }, + /* PAUSED */ { 1, 1, 0, 1 }, + }; + static const MFCLOCK_STATE states[CLOCK_CMD_MAX] = + { + /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, + /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, + /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + /* CLOCK_CMD_RESTART */ MFCLOCK_STATE_RUNNING, + }; + + /* Special case that go against usual state change vs return value behavior. */ + if (source->state == MFCLOCK_STATE_INVALID && command == CLOCK_CMD_STOP) + return S_OK; + + if (!state_change_is_allowed[source->state][command]) + return MF_E_INVALIDREQUEST; + + source->state = states[command]; + + return S_OK; +} + +static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, + LONGLONG start_offset) +{ + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; + + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_START); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_STOP); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_RESTART); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME system_time, float rate) @@ -3226,13 +3311,14 @@ HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source) TRACE("%p.\n", time_source); - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFPresentationTimeSource_iface.lpVtbl = &systemtimesourcevtbl; object->IMFClockStateSink_iface.lpVtbl = &systemtimesourcesinkvtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); *time_source = &object->IMFPresentationTimeSource_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cb3f2a9..c4685a3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1598,11 +1598,46 @@ static void test_presentation_descriptor(void) IMFMediaType_Release(media_type); } +enum clock_action +{ + CLOCK_START, + CLOCK_STOP, + CLOCK_PAUSE, + CLOCK_RESTART, +}; + static void test_system_time_source(void) { + static const struct clock_state_test + { + enum clock_action action; + MFCLOCK_STATE state; + BOOL is_invalid; + } + clock_state_change[] = + { + { CLOCK_STOP, MFCLOCK_STATE_INVALID }, + { CLOCK_RESTART, MFCLOCK_STATE_INVALID, TRUE }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, TRUE }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_RESTART, MFCLOCK_STATE_STOPPED, TRUE }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING, TRUE }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING, TRUE }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, TRUE }, + }; IMFPresentationTimeSource *time_source; IMFClockStateSink *statesink; MFCLOCK_STATE state; + unsigned int i; DWORD value; HRESULT hr; @@ -1620,12 +1655,38 @@ static void test_system_time_source(void) ok(value == 0, "Unexpected value %u.\n", value); hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); -todo_wine { ok(hr == S_OK, "Failed to get state, hr %#x.\n", hr); ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); -} + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&statesink); ok(hr == S_OK, "Failed to get state sink, hr %#x.\n", hr); + + /* State changes. */ + for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) + { + switch (clock_state_change[i].action) + { + case CLOCK_STOP: + hr = IMFClockStateSink_OnClockStop(statesink, 0); + break; + case CLOCK_RESTART: + hr = IMFClockStateSink_OnClockRestart(statesink, 0); + break; + case CLOCK_PAUSE: + hr = IMFClockStateSink_OnClockPause(statesink, 0); + break; + case CLOCK_START: + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + break; + default: + ; + } + ok(hr == (clock_state_change[i].is_invalid ? MF_E_INVALIDREQUEST : S_OK), "%u: unexpected hr %#x.\n", i, hr); + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].state, "%u: unexpected state %d.\n", i, state); + } + IMFClockStateSink_Release(statesink); IMFPresentationTimeSource_Release(time_source);

1 0