February 2020 - Wine-commits

Zebediah Figura : d3dcompiler: Use wine_dbg_printf() to dump HLSL IR.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 05182695f2badcf465db105820ce0de4f339562d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05182695f2badcf465db1058… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 5 14:52:35 2020 -0600 d3dcompiler: Use wine_dbg_printf() to dump HLSL IR. So that we don't print function names. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 92 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c615b37e25..9eaa65e80f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1785,22 +1785,22 @@ static void debug_dump_instr_list(const struct list *list) LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) { debug_dump_instr(instr); - TRACE("\n"); + wine_dbg_printf("\n"); } } static void debug_dump_src(const struct hlsl_ir_node *node) { - TRACE("%p", node); + wine_dbg_printf("%p", node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) { if (var->modifiers) - TRACE("%s ", debug_modifiers(var->modifiers)); - TRACE("%s %s", debug_hlsl_type(var->data_type), var->name); + wine_dbg_printf("%s ", debug_modifiers(var->modifiers)); + wine_dbg_printf("%s %s", debug_hlsl_type(var->data_type), var->name); if (var->semantic) - TRACE(" : %s", debugstr_a(var->semantic)); + wine_dbg_printf(" : %s", debugstr_a(var->semantic)); } static void debug_dump_ir_deref(const struct hlsl_ir_deref *deref) @@ -1808,19 +1808,19 @@ static void debug_dump_ir_deref(const struct hlsl_ir_deref *deref) switch (deref->type) { case HLSL_IR_DEREF_VAR: - TRACE("deref("); + wine_dbg_printf("deref("); debug_dump_ir_var(deref->v.var); - TRACE(")"); + wine_dbg_printf(")"); break; case HLSL_IR_DEREF_ARRAY: debug_dump_src(deref->v.array.array); - TRACE("["); + wine_dbg_printf("["); debug_dump_src(deref->v.array.index); - TRACE("]"); + wine_dbg_printf("]"); break; case HLSL_IR_DEREF_RECORD: debug_dump_src(deref->v.record.record); - TRACE(".%s", debugstr_a(deref->v.record.field->name)); + wine_dbg_printf(".%s", debugstr_a(deref->v.record.field->name)); break; } } @@ -1831,39 +1831,39 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) unsigned int x, y; if (type->dimy != 1) - TRACE("{"); + wine_dbg_printf("{"); for (y = 0; y < type->dimy; ++y) { if (type->dimx != 1) - TRACE("{"); + wine_dbg_printf("{"); for (x = 0; x < type->dimx; ++x) { switch (type->base_type) { case HLSL_TYPE_FLOAT: - TRACE("%g ", (double)constant->v.value.f[y * type->dimx + x]); + wine_dbg_printf("%g ", (double)constant->v.value.f[y * type->dimx + x]); break; case HLSL_TYPE_DOUBLE: - TRACE("%g ", constant->v.value.d[y * type->dimx + x]); + wine_dbg_printf("%g ", constant->v.value.d[y * type->dimx + x]); break; case HLSL_TYPE_INT: - TRACE("%d ", constant->v.value.i[y * type->dimx + x]); + wine_dbg_printf("%d ", constant->v.value.i[y * type->dimx + x]); break; case HLSL_TYPE_UINT: - TRACE("%u ", constant->v.value.u[y * type->dimx + x]); + wine_dbg_printf("%u ", constant->v.value.u[y * type->dimx + x]); break; case HLSL_TYPE_BOOL: - TRACE("%s ", constant->v.value.b[y * type->dimx + x] == FALSE ? "false" : "true"); + wine_dbg_printf("%s ", constant->v.value.b[y * type->dimx + x] == FALSE ? "false" : "true"); break; default: - TRACE("Constants of type %s not supported\n", debug_base_type(type)); + wine_dbg_printf("Constants of type %s not supported\n", debug_base_type(type)); } } if (type->dimx != 1) - TRACE("}"); + wine_dbg_printf("}"); } if (type->dimy != 1) - TRACE("}"); + wine_dbg_printf("}"); } static const char *debug_expr_op(const struct hlsl_ir_expr *expr) @@ -1947,26 +1947,26 @@ static void debug_dump_ir_expr(const struct hlsl_ir_expr *expr) { unsigned int i; - TRACE("%s (", debug_expr_op(expr)); + wine_dbg_printf("%s (", debug_expr_op(expr)); for (i = 0; i < 3 && expr->operands[i]; ++i) { debug_dump_src(expr->operands[i]); - TRACE(" "); + wine_dbg_printf(" "); } - TRACE(")"); + wine_dbg_printf(")"); } static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) { unsigned int i; - TRACE("%s (", debug_hlsl_type(constructor->node.data_type)); + wine_dbg_printf("%s (", debug_hlsl_type(constructor->node.data_type)); for (i = 0; i < constructor->args_count; ++i) { debug_dump_src(constructor->args[i]); - TRACE(" "); + wine_dbg_printf(" "); } - TRACE(")"); + wine_dbg_printf(")"); } static const char *debug_writemask(DWORD writemask) @@ -1990,13 +1990,13 @@ static const char *debug_writemask(DWORD writemask) static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) { - TRACE("= ("); + wine_dbg_printf("= ("); debug_dump_src(assign->lhs); if (assign->writemask != BWRITERSP_WRITEMASK_ALL) - TRACE("%s", debug_writemask(assign->writemask)); - TRACE(" "); + wine_dbg_printf("%s", debug_writemask(assign->writemask)); + wine_dbg_printf(" "); debug_dump_src(assign->rhs); - TRACE(")"); + wine_dbg_printf(")"); } static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) @@ -2004,18 +2004,18 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) unsigned int i; debug_dump_src(swizzle->val); - TRACE("."); + wine_dbg_printf("."); if (swizzle->val->data_type->dimy > 1) { for (i = 0; i < swizzle->node.data_type->dimx; ++i) - TRACE("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); + wine_dbg_printf("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); } else { static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) - TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + wine_dbg_printf("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); } } @@ -2024,41 +2024,41 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) switch (jump->type) { case HLSL_IR_JUMP_BREAK: - TRACE("break"); + wine_dbg_printf("break"); break; case HLSL_IR_JUMP_CONTINUE: - TRACE("continue"); + wine_dbg_printf("continue"); break; case HLSL_IR_JUMP_DISCARD: - TRACE("discard"); + wine_dbg_printf("discard"); break; case HLSL_IR_JUMP_RETURN: - TRACE("return "); + wine_dbg_printf("return "); if (jump->return_value) debug_dump_src(jump->return_value); - TRACE(";"); + wine_dbg_printf(";"); break; } } static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) { - TRACE("if ("); + wine_dbg_printf("if ("); debug_dump_src(if_node->condition); - TRACE(")\n{\n"); + wine_dbg_printf(")\n{\n"); debug_dump_instr_list(if_node->then_instrs); - TRACE("}\n"); + wine_dbg_printf("}\n"); if (if_node->else_instrs) { - TRACE("else\n{\n"); + wine_dbg_printf("else\n{\n"); debug_dump_instr_list(if_node->else_instrs); - TRACE("}\n"); + wine_dbg_printf("}\n"); } } static void debug_dump_instr(const struct hlsl_ir_node *instr) { - TRACE("%p: ", instr); + wine_dbg_printf("%p: ", instr); switch (instr->type) { case HLSL_IR_EXPR: @@ -2086,7 +2086,7 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) debug_dump_ir_if(if_from_node(instr)); break; default: - TRACE("<No dump function for %s>", debug_node_type(instr->type)); + wine_dbg_printf("<No dump function for %s>", debug_node_type(instr->type)); } } @@ -2099,7 +2099,7 @@ void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) LIST_FOR_EACH_ENTRY(param, func->parameters, struct hlsl_ir_var, param_entry) { debug_dump_ir_var(param); - TRACE("\n"); + wine_dbg_printf("\n"); } if (func->semantic) TRACE("Function semantic: %s\n", debugstr_a(func->semantic));

1 0

Zebediah Figura : d3dcompiler: Dump loops.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 1aa2beab734684998abc0d2a6f4dc5489dd50af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa2beab734684998abc0d2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 5 14:52:36 2020 -0600 d3dcompiler: Dump loops. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9eaa65e80f..0cae62b60f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1767,6 +1767,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_IF", + "HLSL_IR_LOOP", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", }; @@ -2056,6 +2057,13 @@ static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) } } +static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) +{ + wine_dbg_printf("for (;;)\n{\n"); + debug_dump_instr_list(loop->body); + wine_dbg_printf("}\n"); +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { wine_dbg_printf("%p: ", instr); @@ -2085,6 +2093,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_IF: debug_dump_ir_if(if_from_node(instr)); break; + case HLSL_IR_LOOP: + debug_dump_ir_loop(loop_from_node(instr)); + break; default: wine_dbg_printf("<No dump function for %s>", debug_node_type(instr->type)); }

1 0

Zebediah Figura : setupapi/tests: Add some tests for COM self-registration.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e0b5da7b34e9f38990939bd20cf4b2fa749c3f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b5da7b34e9f38990939bd2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:30 2020 -0600 setupapi/tests: Add some tests for COM self-registration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 6 ++- dlls/setupapi/tests/install.c | 90 ++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/tests/selfreg.c | 50 ++++++++++++++++++++++ dlls/setupapi/tests/selfreg.spec | 2 + 4 files changed, 147 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 83f751c7db..df7c668787 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = setupapi.dll -IMPORTS = advapi32 cabinet setupapi shell32 uuid user32 +IMPORTS = advapi32 cabinet ole32 setupapi shell32 uuid user32 + +selfreg_IMPORTS = uuid advapi32 ole32 SOURCES = \ coinst.c \ @@ -11,6 +13,8 @@ SOURCES = \ misc.c \ parser.c \ query.c \ + selfreg.c \ + selfreg.spec \ setupapi.rc \ setupcab.c \ stringtable.c diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fd10fd9133..b918bb21f6 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -54,6 +54,24 @@ static char CURR_DIR[MAX_PATH]; * Helpers */ +static void load_resource(const char *name, const char *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", filename, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; @@ -2040,6 +2058,77 @@ static void test_start_copy(void) delete_file("dst/"); } +static void test_register_dlls(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "RegisterDlls=register_section\n" + "UnregisterDlls=register_section\n" + "[register_section]\n" + "40000,,winetest_selfreg.dll,1\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + HRESULT hr; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + load_resource("selfreg.dll", "winetest_selfreg.dll"); + ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); + ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + todo_wine ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + CoUninitialize(); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); + ret = DeleteFileA("winetest_selfreg.dll"); + ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -2069,6 +2158,7 @@ START_TEST(install) test_close_queue(); test_install_file(); test_start_copy(); + test_register_dlls(); UnhookWindowsHookEx(hhook); diff --git a/dlls/setupapi/tests/selfreg.c b/dlls/setupapi/tests/selfreg.c new file mode 100644 index 0000000000..f687990f3b --- /dev/null +++ b/dlls/setupapi/tests/selfreg.c @@ -0,0 +1,50 @@ +/* + * DLL for testing COM self-registration + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "msxml.h" + +HRESULT WINAPI DllRegisterServer(void) +{ + IUnknown *unk; + HKEY key; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegCreateKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + RegCloseKey(key); + IUnknown_Release(unk); + } + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + IUnknown *unk; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + IUnknown_Release(unk); + } + return S_OK; +} diff --git a/dlls/setupapi/tests/selfreg.spec b/dlls/setupapi/tests/selfreg.spec new file mode 100644 index 0000000000..0f9b07355f --- /dev/null +++ b/dlls/setupapi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Zebediah Figura : setupapi: Initialize COM if necessary when registering DLLs.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e75d5b8dc7e4751ddce84a379306a5deb89ca29b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e75d5b8dc7e4751ddce84a37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:31 2020 -0600 setupapi: Initialize COM if necessary when registering DLLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 14 ++++++++++++++ dlls/setupapi/tests/install.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e166754168..86390b5a41 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1125,6 +1125,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, if (flags & SPINST_REGSVR) { struct register_dll_info info; + HRESULT hr; info.unregister = FALSE; info.modules_size = 0; @@ -1142,14 +1143,21 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, else return FALSE; + hr = CoInitialize(NULL); + ret = iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ); for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + + if (SUCCEEDED(hr)) + CoUninitialize(); + HeapFree( GetProcessHeap(), 0, info.modules ); if (!ret) return FALSE; } if (flags & SPINST_UNREGSVR) { struct register_dll_info info; + HRESULT hr; info.unregister = TRUE; info.modules_size = 0; @@ -1162,8 +1170,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; + hr = CoInitialize(NULL); + ret = iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info ); for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + + if (SUCCEEDED(hr)) + CoUninitialize(); + HeapFree( GetProcessHeap(), 0, info.modules ); if (!ret) return FALSE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index b918bb21f6..8a2f9eec35 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2092,7 +2092,7 @@ static void test_register_dlls(void) ok(ret, "Failed to install, error %#x.\n", GetLastError()); l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); - todo_wine ok(!l, "Got error %u.\n", l); + ok(!l, "Got error %u.\n", l); RegCloseKey(key); ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR,

1 0

Zebediah Figura : devenum: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 73a5417a022690addaf4642fac18c165fdf95c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a5417a022690addaf4642f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:32 2020 -0600 devenum: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index b17bc93291..a694e388ce 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -158,10 +158,6 @@ HRESULT WINAPI DllRegisterServer(void) if (FAILED(res)) return res; -/*** ActiveMovieFilter Categories ***/ - - CoInitialize(NULL); - res = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, &mapvptr); if (SUCCEEDED(res)) @@ -191,8 +187,6 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2_Release(pMapper); } - CoUninitialize(); - return res; }

1 0

Zebediah Figura : quartz: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: ae5f9454429461507daba9c1ad95f2b13cc93124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5f9454429461507daba9c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:33 2020 -0600 quartz: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 015862f035..ff5db662f0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -158,8 +158,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) HRESULT hr; IFilterMapper2* pFM2; - CoInitialize(NULL); - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pFM2); if (SUCCEEDED(hr)) { @@ -168,8 +166,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) IFilterMapper2_Release(pFM2); } - CoUninitialize(); - return hr; }

1 0

Zebediah Figura : strmbase: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 6a3f4b8ee32997fe4a69e87ca225e38ba2c74968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a3f4b8ee32997fe4a69e87c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:34 2020 -0600 strmbase: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dllfunc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 842bee6121..ca5557ec24 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -149,8 +149,6 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - CoInitialize(NULL); - TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&pIFM2); @@ -162,10 +160,6 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (pIFM2) IFilterMapper2_Release(pIFM2); - /* and clear up */ - CoFreeUnusedLibraries(); - CoUninitialize(); - /* if unregistering, unregister all OLE servers */ if (SUCCEEDED(hr) && !bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, FALSE);

1 0

Zebediah Figura : winecrt0: Make __wine_(un)register_resources() cdecl.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 5c414922b4ae04a34a90afebaf5177682b6826aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c414922b4ae04a34a90afeb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 15:25:57 2020 -0600 winecrt0: Make __wine_(un)register_resources() cdecl. This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register CLSID_VideoProcessorMFT when run manually with regsvr32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/register.c | 4 ++-- include/rpcproxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 8c15d1be72..cb5e7a50f7 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -94,7 +94,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } -HRESULT __wine_register_resources( HMODULE module ) +HRESULT __cdecl __wine_register_resources( HMODULE module ) { struct reg_info info; @@ -106,7 +106,7 @@ HRESULT __wine_register_resources( HMODULE module ) return info.result; } -HRESULT __wine_unregister_resources( HMODULE module ) +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) { struct reg_info info; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 4d2c63e62d..5b184329bd 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -203,8 +203,8 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); -HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; -HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \

1 0

Brendan Shanks : include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: ca2ad6acbf8c6c1bcb899f9ff4137a35c8f79a06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2ad6acbf8c6c1bcb899f9f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 10 14:00:14 2020 -0800 include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index bed2c70798..0a456f8230 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3409,24 +3409,24 @@ typedef enum typedef enum { - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = (int) -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = (int) 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = (int) 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = (int) 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = (int) 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = (int) 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = (int) 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = (int) 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = (int) 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = (int) 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = (int) 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = (int) 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = (int) 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = (int) 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = (int) 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = (int) 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = (int) 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; typedef struct DISPLAYCONFIG_2DREGION

1 0

Zebediah Figura : quartz/tests: Add some tests for IBasicVideo::GetCurrentImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 309f0a0d6c533e003b69e0bf99bd26b71b8582dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=309f0a0d6c533e003b69e0bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:16 2020 -0600 quartz/tests: Add some tests for IBasicVideo::GetCurrentImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 76 ++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 101 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=309f0a0d6c533e003b69…

1 0