wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH] devpropdef.h: Fix DECLSPEC_SELECTANY usage.
by Jacek Caban 14 Apr '20

14 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/devpropdef.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH] winapi_test: Add support for more base types.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- That's not scalable though. To improve winapi will need to exploit the typedef so it knows that INT is int, PINT is int*, etc. Then only the base types will be needed. For the types that have multiple definitions, like DWORD, hardcoding the definition will probably still make sense. tools/winapi/winapi_test | 98 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4ad..9d32f4eb78a 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -177,42 +177,74 @@ sub _find_align_kind_size($) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; + } elsif (/^(?:void|VOID)$/) { + $align = 4; + $kind = "signed"; + $size = 4; } elsif(/^char$/) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; + } elsif(/^CHAR$/) { + $align = 1; + $kind = "signed"; + $size = 1; + } elsif(/^(?:byte|BOOLEAN|BYTE|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int16|short(?:\s+int)?)$/) { $align = 2; $kind = defined($1) ? $1 : "signed"; $size = 2; - } elsif (/^(?:wchar_t)$/) { + } elsif (/^SHORT$/) { $align = 2; $kind = "signed"; $size = 2; + } elsif (/^(?:char16_t|wchar_t|USHORT|WCHAR|WORD)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; } elsif (/^(signed|unsigned)$/) { $align = 4; - $kind = defined($1) ? $1 : "signed"; + $kind = $1; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int32|int)$/) { $align = 4; $kind = defined($1) ? $1 : "signed"; $size = 4; + } elsif (/^(?:BOOL|INT|LONG)$/) { + $align = 4; + $kind = "signed"; + $size = 4; + } elsif (/^(?:DWORD|FOURCC|LCID|UINT|ULONG)$/) { + $align = 4; + $kind = "unsigned"; + $size = 4; + } elsif (/^(?:float|FLOAT)$/) { + $align = 4; + $kind = "float"; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { $align = $pointer_size; $kind = defined($1) ? $1 : "signed"; $size = $pointer_size; - } elsif (/^(?:float)$/) { - $align = 4; - $kind = "float"; - $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; $size = 8; + } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { + $align = 8; + $kind = "signed"; + $size = 8; + } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { + $align = 8; + $kind = "unsigned"; + $size = 8; } elsif (/^(?:double|DOUBLE|DATE)$/) { $align = 8; $kind = "float"; @@ -221,58 +253,38 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { + } elsif (/^(?:INT|LONG)_PTR$/) { + $align = $pointer_size; + $kind = "signed"; + $size = $pointer_size; + } elsif (/^(?:UINT|MMVERSION|ULONG|DWORD)_PTR$/) { + $align = $pointer_size; + $kind = "unsigned"; + $size = $pointer_size; + } elsif (/^H(?:ANDLE|DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|MMIO|TASK|WND)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { + } elsif (/^(?:HPSTR|LP[A-Z0-9_]+|PVOID)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^(?:FILETIME)$/) { + } elsif (/^POINTS$/) { + $align = 2; + $kind = "struct"; + $size = 4; + } elsif (/^(?:FILETIME|LUID|POINT|POINTL)$/) { $align = 4; $kind = "struct"; $size = 8; - } elsif (/^GUID$/) { + } elsif (/^(?:CLSID|GUID|RECT|RECTL)$/) { $align = 4; $kind = "struct"; $size = 16; - } elsif (/^(?:VOID)$/) { - $align = 4; - $kind = "signed"; - $size = 4; - } elsif (/^(?:SHORT)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:BYTE)$/) { - $align = 1; - $kind = "unsigned"; - $size = 1; - } elsif (/^(?:DWORD)$/) { - $align = 4; - $kind = "unsigned"; - $size = 4; - } elsif (/^(?:WORD)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { - $align = 8; - $kind = "signed"; - $size = 8; - } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { - $align = 8; - $kind = "unsigned"; - $size = 8; } elsif (/^(?:LARGE_INTEGER)$/) { $align = 8; $kind = "union"; $size = 8; - } elsif (/^(?:POINTS)$/) { - $align = 2; - $kind = "struct"; - $size = 4; } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) { -- 2.20.1

1 0

[PATCH v2] d3dcompiler: Implement D3DCompileFromFile().
by Jactry Zeng 14 Apr '20

14 Apr '20

Superseded patch 182804. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 36 +++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 85 ++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 9fc7c1d773..8f00dfb16c 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -949,10 +949,42 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) { - FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + HANDLE file, mapping = NULL; + char *source = NULL; + SIZE_T source_size; + HRESULT hr; + + TRACE("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p.\n", debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); - return E_NOTIMPL; + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + source_size = GetFileSize(file, NULL); + if (source_size == INVALID_FILE_SIZE) + goto error; + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + goto error; + + source = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (!source) + goto error; + + hr = D3DCompile(source, source_size, NULL, defines, includes, entrypoint, target, flags1, flags2, code, errors); + CloseHandle(mapping); + CloseHandle(file); + return hr; + +error: + hr = HRESULT_FROM_WIN32(GetLastError()); + if (!mapping) + CloseHandle(mapping); + CloseHandle(file); + + return hr; } HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b96ab16679..cd93aa497d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -26,6 +26,8 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static HRESULT (WINAPI *pD3DCompileFromFile)(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); struct vec2 { @@ -37,10 +39,40 @@ struct vec4 float x, y, z, w; }; +static BOOL create_file(WCHAR *filename, const char *code, DWORD code_size) +{ + static WCHAR temp_dir[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (code) + { + WriteFile(file, code, code_size, &written, NULL); + if (written != code_size) + { + CloseHandle(file); + DeleteFileW(filename); + return FALSE; + } + } + CloseHandle(file); + return TRUE; +} + #define compile_shader(a, b) compile_shader_(__LINE__, a, b) static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { - ID3D10Blob *blob = NULL, *errors = NULL; + ID3D10Blob *blob = NULL, *errors = NULL, *file_blob = NULL, *file_errors = NULL; + WCHAR filename[MAX_PATH] = {0}; + DWORD *data, *file_data; + SIZE_T size, file_size; HRESULT hr; hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); @@ -49,8 +81,38 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const { if (winetest_debug > 1) trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); } + + if (SUCCEEDED(hr)) + { + if (!pD3DCompileFromFile || !create_file(filename, source, strlen(source))) + skip("D3DCompileFromFile() isn't supported or file creation failed.\n"); + else + { + hr = pD3DCompileFromFile(filename, NULL, NULL, "main", target, 0, 0, &file_blob, &file_errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader from file, hr %#x.\n", hr); + size = ID3D10Blob_GetBufferSize(blob); + file_size = ID3D10Blob_GetBufferSize(blob); + ok_(__FILE__, line)(hr == D3D_OK, "Got unexpected buffer size: %lu vs %lu.\n", size, file_size); + data = ID3D10Blob_GetBufferPointer(blob); + file_data = ID3D10Blob_GetBufferPointer(file_blob); + ok_(__FILE__, line)(!memcmp(data, file_data, size), "Got unexpected data.\n"); + ok_(__FILE__, line)(!!file_errors == !!errors, "Got unexpected errors.\n"); + if (file_errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(file_errors)); + ID3D10Blob_Release(file_errors); + } + + ID3D10Blob_Release(file_blob); + DeleteFileW(filename); + } + } + + if (errors) + ID3D10Blob_Release(errors); + return blob; } @@ -1003,6 +1065,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + pD3DCompileFromFile = (void*)GetProcAddress(module, "D3DCompileFromFile"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1011,6 +1074,23 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static void test_compile(void) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + if (!pD3DCompileFromFile) + { + skip("D3DCompileFromFile() isn't supported.\n"); + return; + } + + hr = pD3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1038,4 +1118,5 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_constant_table(); test_fail(); + test_compile(); } -- 2.26.0

2 1

[PATCH 1/7] d3dcompiler: Parse array types.
by Zebediah Figura 14 Apr '20

14 Apr '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 + dlls/d3dcompiler_43/hlsl.y | 61 ++++++++++++++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 59 ++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 4 +- 4 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2d8eba0b554..1a155736fd0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1154,8 +1154,10 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; +const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; +const char *debug_node_type(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e46bdbade3f..46d815d0144 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -926,6 +926,47 @@ static struct list *make_list(struct hlsl_ir_node *node) return list; } +static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) +{ + if (node->data_type->type != HLSL_CLASS_SCALAR) + return 0; + + switch (node->type) + { + case HLSL_IR_CONSTANT: + { + struct hlsl_ir_constant *constant = constant_from_node(node); + + switch (constant->node.data_type->base_type) + { + case HLSL_TYPE_UINT: + return constant->v.value.u[0]; + case HLSL_TYPE_INT: + return constant->v.value.i[0]; + case HLSL_TYPE_FLOAT: + return constant->v.value.f[0]; + case HLSL_TYPE_DOUBLE: + return constant->v.value.d[0]; + case HLSL_TYPE_BOOL: + return constant->v.value.b[0]; + default: + WARN("Invalid type %s.\n", debug_base_type(constant->node.data_type)); + return 0; + } + } + case HLSL_IR_CONSTRUCTOR: + case HLSL_IR_DEREF: + case HLSL_IR_EXPR: + case HLSL_IR_SWIZZLE: + FIXME("Unhandled type %s.\n", debug_node_type(node->type)); + return 0; + case HLSL_IR_ASSIGNMENT: + default: + WARN("Invalid node type %s.\n", debug_node_type(node->type)); + return 0; + } +} + %} %locations @@ -1651,9 +1692,25 @@ array: /* Empty */ } | '[' expr ']' { - FIXME("Array.\n"); - $$ = 0; + unsigned int size = evaluate_array_dimension(node_from_list($2)); + free_instr_list($2); + + if (!size) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size is not a positive integer constant\n"); + YYABORT; + } + TRACE("Array size %u.\n", size); + + if (size > 65536) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size must be between 1 and 65536"); + YYABORT; + } + $$ = size; } var_modifiers: /* Empty */ diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index c673e2be327..525de9910be 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -654,10 +654,47 @@ static void test_return(void) release_test_context(&test_context); } +static void test_array_dimensions(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char shader[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " const int dim = 4;\n" + " float a[2 * 2] = {0.1, 0.2, 0.3, 0.4};\n" + " float b[4.1] = a;\n" + " float c[dim] = b;\n" + " float d[true] = {c[0]};\n" + " float e[65536];\n" + " return float4(d[0], c[0], c[1], c[3]);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(shader, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.1f, 0.2f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = { + /* 0 */ "float4 test() : SV_TARGET\n" "{\n" " return y;\n" @@ -689,6 +726,7 @@ static void test_fail(void) " return float4(x.x, x.y, 0, 0);\n" "}", + /* 5 */ "float4 test() : SV_TARGET\n" "{\n" " struct { int b,c; } x = {0};\n" @@ -715,6 +753,26 @@ static void test_fail(void) "{\n" " return pos;\n" "}", + + /* 10 */ + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " float a[0];\n" + " return float4(0, 0, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " float a[65537];\n" + " return float4(0, 0, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " int x;\n" + " float a[(x = 2)];\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"}; @@ -776,5 +834,6 @@ START_TEST(hlsl_d3d9) test_trig(); test_comma(); test_return(); + test_array_dimensions(); test_fail(); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5eaff1730b3..fe2d23b623e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1652,7 +1652,7 @@ void init_functions_tree(struct wine_rb_tree *funcs) wine_rb_init(&hlsl_ctx.functions, compare_function_rb); } -static const char *debug_base_type(const struct hlsl_type *type) +const char *debug_base_type(const struct hlsl_type *type) { const char *name = "(unknown)"; @@ -1744,7 +1744,7 @@ const char *debug_modifiers(DWORD modifiers) return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); } -static const char *debug_node_type(enum hlsl_ir_node_type type) +const char *debug_node_type(enum hlsl_ir_node_type type) { static const char * const names[] = { -- 2.25.1

4 24

[PATCH 2/2] kernelbase: Implement CreateThreadpoolIo.
by Jacek Caban 14 Apr '20

14 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/thread.c | 15 ++++++++++++--- dlls/ntdll/tests/threadpool.c | 4 +--- dlls/ntdll/threadpool.c | 1 + 3 files changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH] winapi_test: Fix handling of byte and UCHAR types.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/winapi_test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4ad..adee5e24a65 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -181,7 +181,11 @@ sub _find_align_kind_size($) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:byte|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; -- 2.20.1

1 1

[PATCH 1/3] mf: Add support for end of presentation state change.
by Nikolay Sivov 14 Apr '20

14 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 67 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3474b242a4..992b9a5cfb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -826,9 +826,18 @@ static void session_pause(struct media_session *session) LeaveCriticalSection(&session->cs); } +static void session_set_stopped(struct media_session *session, HRESULT status) +{ + MediaEventType event_type; + + session->state = SESSION_STATE_STOPPED; + event_type = session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION ? MESessionEnded : MESessionStopped; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, &GUID_NULL, status, NULL); +} + static void session_stop(struct media_session *session) { - HRESULT hr = S_OK; + HRESULT hr; EnterCriticalSection(&session->cs); @@ -840,18 +849,14 @@ static void session_stop(struct media_session *session) /* Transition in two steps - pause clock, wait for sinks and pause sources. */ if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS; + else + session_set_stopped(session, hr); break; default: ; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } - LeaveCriticalSection(&session->cs); } @@ -2215,14 +2220,9 @@ static void session_set_source_object_state(struct media_session *session, IUnkn session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS) - { session_finalize_sinks(session); - } else - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); - } + session_set_stopped(session, S_OK); break; default: @@ -2237,8 +2237,8 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre enum object_state state; IMFMediaEvent *event; DWORD caps, flags; + HRESULT hr = S_OK; BOOL changed; - HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; @@ -2311,15 +2311,14 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = IMFMediaSource_Stop(source->source))) + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION) + IMFMediaSource_Stop(source->source); + else if (FAILED(hr = IMFMediaSource_Stop(source->source))) break; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION || FAILED(hr)) + session_set_stopped(session, hr); break; default: @@ -2771,6 +2770,27 @@ static void session_handle_end_of_presentation(struct media_session *session, IM } } +static void session_sink_stream_marker(struct media_session *session, IMFStreamSink *stream_sink) +{ + struct topo_node *node; + + if (!(node = session_get_node_object(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE)) + || node->flags & TOPO_NODE_END_OF_STREAM) + { + return; + } + + node->flags |= TOPO_NODE_END_OF_STREAM; + + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION && + session_nodes_is_mask_set(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_END_OF_STREAM)) + { + session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED); + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + session_stop(session); + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2847,6 +2867,13 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_set_sink_stream_state(session, (IMFStreamSink *)event_source, event_type); LeaveCriticalSection(&session->cs); + break; + case MEStreamSinkMarker: + + EnterCriticalSection(&session->cs); + session_sink_stream_marker(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + break; case MEStreamSinkRequestSample: -- 2.25.1

1 2

[PATCH] adsldp: Fix the spelling of some FIXME() messages.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/adsldp/adsldp.c | 4 ++-- dlls/adsldp/schema.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index dce462d685a..c2f7ca80239 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1147,7 +1147,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_SEARCH_SCOPE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1178,7 +1178,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 63c95bdae6f..c8bcf3de663 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -227,7 +227,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) if (*p != '\'') { - FIXME("not suported NAME start at %s\n", debugstr_w(p)); + FIXME("not supported NAME start at %s\n", debugstr_w(p)); return NULL; } -- 2.20.1

1 0

[PATCH] dbghelp: Fix the spelling of a comment.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/elf_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ab2a693ecaf..00e5c12c2e6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -105,7 +105,7 @@ struct elf_module_info #define ELF_SHT_FINI_ARRAY 15 /* Array of destructors */ #define ELF_SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ #define ELF_SHT_GROUP 17 /* Section group */ -#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ +#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indices */ #define ELF_SHT_NUM 19 /* Number of defined types. */ /* Legal values for ST_TYPE subfield of st_info (symbol type). */ -- 2.20.1

1 0

[PATCH] winapi: Skip #if 0 sections.
by Francois Gouget 14 Apr '20

14 Apr '20

They are typically used as 'super comments' and may not contain C code. They are also typically not nested so this ignores nesting. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/winapi_parser.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 0ad7057a0e3..941fdfe5a0b 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -244,7 +244,21 @@ sub parse_c_file($$) { # remove preprocessor directives if(s/^\s*\#/\#/s) { - if(/^(\#.*?)\\$/s) { + if (/^#\s*if\s+0\s*$/ms) { + # Skip #if 0 ... #endif sections entirely. + # They are typically used as 'super comments' and may not + # contain C code. This totally ignores nesting. + if(s/^(\s*#\s*if\s+0\s*\n.*?\n\s*#\s*endif\s*)\n//s) { + my @lines = split(/\n/, $1); + $_ = "\n" x $#lines; + &$preprocessor_found_callback("if", "0"); + $again = 1; + } else { + $lookahead = 1; + } + next readmore; + } + elsif(/^(\#.*?)\\$/s) { $_ = "$1\n"; $lookahead = 1; next; -- 2.20.1

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2020