February 2021 - Wine-commits

Alexandre Julliard : tdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 4d52323893f95ea8b8f3308a4e815cdf70635c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d52323893f95ea8b8f3308a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:29:16 2021 +0100 tdh: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/Makefile.in | 2 +- dlls/tdh/tdh_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 66bc18c88ee..eab8b56e264 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -1,6 +1,6 @@ MODULE = tdh.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ tdh_main.c diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 29e7d50c241..2e6a9e69a38 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(tdh); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - ULONG WINAPI TdhLoadManifest(LPWSTR manifest) { FIXME("(%s): stub\n", debugstr_w(manifest));

1 0

Alexandre Julliard : traffic: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 7905c3164224399a6ef7dc92a95b661182e366ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7905c3164224399a6ef7dc92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:29:19 2021 +0100 traffic: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 2 +- dlls/traffic/traffic_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index e823eb380cb..a18224ac4e1 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,6 +1,6 @@ MODULE = traffic.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ traffic_main.c diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 6b8a9751e19..87646622346 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -26,24 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -} - /***************************************************************************** * TcRegisterClient [TRAFFIC.@] */

1 0

Alexandre Julliard : winebuild: Set Thumb bit in CPSR register on syscall entry.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 4ef8e946f161ec5f7140699f6f97d9119a4ec7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef8e946f161ec5f7140699f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:34:15 2021 +0100 winebuild: Set Thumb bit in CPSR register on syscall entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- tools/winebuild/import.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 06d8246a566..397de7dad98 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4233,7 +4233,8 @@ static void test_thread_context(void) COMPARE( R9 ); COMPARE( R10 ); COMPARE( R11 ); - COMPARE( Cpsr ); + ok( (context.Cpsr & 0xff0f0000) == (expect.Cpsr & 0xff0f0000), + "wrong Cpsr %08x/%08x\n", context.Cpsr, expect.Cpsr ); ok( context.Sp == expect.Sp - 8, "wrong Sp %08x/%08x\n", context.Sp, expect.Sp - 8 ); /* Pc is somewhere close to the NtGetContextThread implementation */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2fa9d3d430b..791ea6e400c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1611,6 +1611,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ output( "\tmrs ip, CPSR\n" ); + output( "\tbfi ip, lr, #5, #1\n" ); /* set thumb bit */ output( "\tstr ip, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */ output( "\tldr r5, 6f+4\n");

1 0

Alexandre Julliard : winebuild: Fix relay entry points for Thumb mode.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fe783adee51b5c3d3c0dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:34:58 2021 +0100 winebuild: Fix relay entry points for Thumb mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 8d7e48d2da4..546d058b199 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -236,7 +236,7 @@ static void output_relay_debug( DLLSPEC *spec ) ORDDEF *odp = spec->ordinals[i]; if (needs_relay( odp )) - output( "\t.long .L__wine_spec_relay_entry_point_%d-__wine_spec_relay_entry_points\n", i ); + output( "\t.long __wine_spec_relay_entry_point_%d-__wine_spec_relay_entry_points\n", i ); else output( "\t.long 0\n" ); } @@ -249,7 +249,6 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -264,7 +263,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_x86: output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\t.byte 0x8b,0xff,0x55,0x8b,0xec,0x5d\n" ); /* hotpatch prolog */ if (odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)) /* add the register arguments */ @@ -308,7 +307,7 @@ static void output_relay_debug( DLLSPEC *spec ) val = (odp->u.func.args_str_offset << 16) | (i - spec->base); output( "\t.align %d\n", get_alignment(4) ); if (thumb_mode) output( "\t.thumb_func\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); @@ -333,7 +332,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM64: output( "\t.align %d\n", get_alignment(4) ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) { @@ -372,7 +371,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_x86_64: output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) {

1 0

Alexandre Julliard : winebuild: Simplify constant loading on ARM.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: abf4747ba786931a431533e84870d6b3af7e55c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abf4747ba786931a431533e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:38:50 2021 +0100 winebuild: Simplify constant loading on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 43 ++++++++++++++++++++++--------------------- tools/winebuild/spec32.c | 20 ++++++++++++-------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 791ea6e400c..57b79ff187d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1166,23 +1166,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) switch(target_cpu) { case CPU_x86: - output( "\tmovl $%d, %%eax\n", (idx << 16) | j ); - output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); - break; case CPU_x86_64: - output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); + output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_ARM: - { - unsigned int mask, count = 0, val = (idx << 16) | j; - - for (mask = 0xff; mask; mask <<= 8) - if (val & mask) output( "\t%s IP,#%u\n", count++ ? "add" : "mov", val & mask ); - if (!count) output( "\tmov IP,#0\n" ); + output( "\tmov ip, #%u\n", j ); + if (idx) output( "\tmovt ip, #%u\n", idx ); output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); break; - } case CPU_ARM64: if (idx) { @@ -1370,12 +1362,15 @@ void output_stubs( DLLSPEC *spec ) } else { - output( "\tldr r0,1f\n"); - output( "\tldr r1,1f+4\n"); + output( "\tmovw r0,:lower16:.L__wine_spec_file_name\n"); + output( "\tmovt r0,:upper16:.L__wine_spec_file_name\n"); + if (exp_name) + { + output( "\tmovw r1,:lower16:.L%s_string\n", name ); + output( "\tmovt r1,:upper16:.L%s_string\n", name ); + } + else output( "\tmov r1,#%u\n", odp->ordinal ); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "1:\t.long .L__wine_spec_file_name\n" ); - if (exp_name) output( "\t.long .L%s_string\n", name ); - else output( "\t.long %u\n", odp->ordinal ); } break; case CPU_ARM64: @@ -1823,15 +1818,21 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r4,lr}\n" ); - output( "\tldr r4, 3f\n"); - output( "\tldr ip, 2f\n"); - if (UsePIC) output( "1:\tadd ip, pc\n" ); + output( "\tmov r4, #%u\n", i ); + if (UsePIC) + { + output( "\tldr ip, 2f\n"); + output( "1:\tadd ip, pc\n" ); + } + else + { + output( "\tmovw ip, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tmovt ip, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); + } output( "\tldr ip, [ip]\n"); output( "\tblx ip\n"); output( "\tpop {r4,pc}\n" ); if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); - else output( "2:\t.long %s\n", asm_name("__wine_syscall_dispatcher") ); - output( "3:\t.long %u\n", i ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 546d058b199..02029056b30 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -297,14 +297,12 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM: { - unsigned int mask, val, count = 0; int j, has_float = 0; if (strcmp( float_abi_option, "soft" )) for (j = 0; j < odp->u.func.nb_args && !has_float; j++) has_float = is_float_arg( odp, j ); - val = (odp->u.func.args_str_offset << 16) | (i - spec->base); output( "\t.align %d\n", get_alignment(4) ); if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); @@ -314,18 +312,24 @@ static void output_relay_debug( DLLSPEC *spec ) if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); - for (mask = 0xff; mask; mask <<= 8) - if (val & mask) output( "\t%s r1,#%u\n", count++ ? "add" : "mov", val & mask ); - if (!count) output( "\tmov r1,#0\n" ); - output( "\tldr r0, 2f\n"); - if (UsePIC) output( "1:\tadd r0, PC\n"); + output( "\tmov r1,#%u\n", i - spec->base ); + output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset ); + if (UsePIC) + { + output( "\tldr r0, 2f\n"); + output( "1:\tadd r0, PC\n"); + } + else + { + output( "\tmovw r0, :lower16:.L__wine_spec_relay_descr\n" ); + output( "\tmovt r0, :upper16:.L__wine_spec_relay_descr\n" ); + } output( "\tldr IP, [r0, #4]\n"); output( "\tblx IP\n"); output( "\tldr IP, [SP, #4]\n" ); output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); if (UsePIC) output( "2:\t.long .L__wine_spec_relay_descr-1b-%u\n", thumb_mode ? 4 : 8 ); - else output( "2:\t.long .L__wine_spec_relay_descr\n" ); output_cfi( ".cfi_endproc" ); break; }

1 0

Jefferson Carpenter : msxml3/tests: Test mxwriter domdoc output.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: eca796bf75da6325a479352d0983eaba7455237c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca796bf75da6325a479352d… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Wed Feb 24 12:48:02 2021 +0300 msxml3/tests: Test mxwriter domdoc output. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 194 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ab814c5f764..35d0e71545b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4367,6 +4367,199 @@ static void test_mxwriter_stream(void) free_bstrs(); } +static void test_mxwriter_domdoc(void) +{ + ISAXContentHandler *content; + IXMLDOMDocument *domdoc; + IMXWriter *writer; + HRESULT hr; + VARIANT dest; + IXMLDOMElement *root = NULL; + IXMLDOMNodeList *node_list = NULL; + IXMLDOMNode *node = NULL; + LONG list_length = 0; + BSTR str; + + /* Create writer and attach DOMDocument output */ + hr = CoCreateInstance(&CLSID_MXXMLWriter60, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&domdoc); + ok(hr == S_OK, "Failed to create a document, hr %#x.\n", hr); + + V_VT(&dest) = VT_DISPATCH; + V_DISPATCH(&dest) = (IDispatch *)domdoc; + + hr = IMXWriter_put_output(writer, dest); +todo_wine + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + if (FAILED(hr)) + { + IXMLDOMDocument_Release(domdoc); + IMXWriter_Release(writer); + return; + } + + /* Add root element to document. */ + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IXMLDOMDocument_appendChild(domdoc, (IXMLDOMNode *)root, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + IXMLDOMElement_Release(root); + + /* startDocument clears root element and disables methods. */ + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* startElement allows document root node to be accessed. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"BankAccount", 11, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + + hr = IXMLDOMElement_get_nodeName(root, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* startElement immediately updates previous node. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Number", 6, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &node_list); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(list_length == 1, "list length %i, expected 1\n", list_length); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Number", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters not immediately visible. */ + hr = ISAXContentHandler_characters(content, L"12345", 5); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters visible after endElement. */ + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Number", 6); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"12345", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + + /* second startElement updates the existing node list. */ + + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Name", 4, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_characters(content, L"Captain Ahab", 12); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Name", 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"BankAccount", 11); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(2 == list_length, "list length %i, expected 2\n", list_length); +} + hr = IXMLDOMNodeList_get_item(node_list, 1, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Name", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Captain Ahab", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMNodeList_Release(node_list); + IXMLDOMElement_Release(root); + + /* endDocument makes document modifiable again. */ + + hr = ISAXContentHandler_endDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + /* finally check doc output */ + hr = IXMLDOMDocument_get_xml(domdoc, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW( + L"<BankAccount>" + "<Number>12345</Number>" + "<Name>Captain Ahab</Name>" + "</BankAccount>\r\n", + str), + "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMDocument_Release(domdoc); + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + static const char *encoding_names[] = { "iso-8859-1", "iso-8859-2", @@ -5768,6 +5961,7 @@ START_TEST(saxreader) test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream(); + test_mxwriter_domdoc(); test_mxwriter_encoding(); test_mxwriter_dispex(); test_mxwriter_indent();

1 0

Nikolay Sivov : wbemprox: Implement WbemContext stub.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 0eaccbb15e737aa2532d84d63b4e5991fd05b055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eaccbb15e737aa2532d84d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 23:06:33 2021 +0300 wbemprox: Implement WbemContext stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/main.c | 5 ++ dlls/wbemprox/services.c | 175 +++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/services.c | 12 +++ dlls/wbemprox/wbemprox.idl | 7 ++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 9 ++ 6 files changed, 209 insertions(+) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 09084414983..0ebbd55aba9 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -112,6 +112,7 @@ static const struct IClassFactoryVtbl wbemprox_cf_vtbl = }; static wbemprox_cf wbem_locator_cf = { { &wbemprox_cf_vtbl }, WbemLocator_create }; +static wbemprox_cf wbem_context_cf = { { &wbemprox_cf_vtbl }, WbemContext_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -139,6 +140,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &wbem_locator_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_WbemContext )) + { + cf = &wbem_context_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index ab7146db2d8..965f1b168f1 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -954,3 +954,178 @@ HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +struct wbem_context +{ + IWbemContext IWbemContext_iface; + LONG refs; +}; + +static struct wbem_context *impl_from_IWbemContext( IWbemContext *iface ) +{ + return CONTAINING_RECORD( iface, struct wbem_context, IWbemContext_iface ); +} + +static HRESULT WINAPI wbem_context_QueryInterface( + IWbemContext *iface, + REFIID riid, + void **obj) +{ + TRACE("%p, %s, %p\n", iface, debugstr_guid( riid ), obj ); + + if ( IsEqualGUID( riid, &IID_IWbemContext ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWbemContext_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI wbem_context_AddRef( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + return InterlockedIncrement( &context->refs ); +} + +static ULONG WINAPI wbem_context_Release( + IWbemContext *iface ) +{ + struct wbem_context *context = impl_from_IWbemContext( iface ); + LONG refs = InterlockedDecrement( &context->refs ); + + if (!refs) + { + TRACE("destroying %p\n", context); + heap_free( context ); + } + return refs; +} + +static HRESULT WINAPI wbem_context_Clone( + IWbemContext *iface, + IWbemContext **newcopy ) +{ + FIXME("%p, %p\n", iface, newcopy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetNames( + IWbemContext *iface, + LONG flags, + SAFEARRAY **names ) +{ + FIXME("%p, %#x, %p\n", iface, flags, names); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_BeginEnumeration( + IWbemContext *iface, + LONG flags ) +{ + FIXME("%p, %#x\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_Next( + IWbemContext *iface, + LONG flags, + BSTR *name, + VARIANT *value ) +{ + FIXME("%p, %#x, %p, %p\n", iface, flags, name, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_EndEnumeration( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_SetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_GetValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags, + VARIANT *value ) +{ + FIXME("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteValue( + IWbemContext *iface, + LPCWSTR name, + LONG flags ) +{ + FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wbem_context_DeleteAll( + IWbemContext *iface ) +{ + FIXME("%p\n", iface); + + return E_NOTIMPL; +} + +static const IWbemContextVtbl wbem_context_vtbl = +{ + wbem_context_QueryInterface, + wbem_context_AddRef, + wbem_context_Release, + wbem_context_Clone, + wbem_context_GetNames, + wbem_context_BeginEnumeration, + wbem_context_Next, + wbem_context_EndEnumeration, + wbem_context_SetValue, + wbem_context_GetValue, + wbem_context_DeleteValue, + wbem_context_DeleteAll, +}; + +HRESULT WbemContext_create( void **obj ) +{ + struct wbem_context *context; + + TRACE("(%p)\n", obj); + + context = heap_alloc( sizeof(*context) ); + if (!context) return E_OUTOFMEMORY; + + context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; + context->refs = 1; + + *obj = &context->IWbemContext_iface; + + TRACE("returning iface %p\n", *obj); + return S_OK; +} diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index cf45ed712b6..a60d39f1ef2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -149,10 +149,22 @@ static void test_IWbemLocator(void) IWbemLocator_Release( locator ); } +static void test_IWbemContext(void) +{ + IWbemContext *context; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); + ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + + IWbemContext_Release( context ); +} + START_TEST(services) { CoInitialize( NULL ); test_IClientSecurity(); test_IWbemLocator(); + test_IWbemContext(); CoUninitialize(); } diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl index 5c6255a39dc..32fee800ee4 100644 --- a/dlls/wbemprox/wbemprox.idl +++ b/dlls/wbemprox/wbemprox.idl @@ -27,6 +27,13 @@ ] coclass WbemLocator { interface IWbemLocator; } +[ + helpstring("WBEM Call Context"), + threading(both), + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext { interface IWbemContext; } + [ helpstring("WBEM Administrative Locator"), threading(both), diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ff9a7f6ff82..ac857b859e8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -237,6 +237,7 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a2c1f785c9..f5c7f1bf44a 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -936,3 +936,12 @@ coclass WbemRefresher interface IWbemRefresher; interface IWbemConfigureRefresher; }; + +[ + restricted, + uuid(674b6698-ee92-11d0-ad71-00c04fd8fdff) +] +coclass WbemContext +{ + interface IWbemContext; +}

1 0

Nikolay Sivov : wbemdisp: Add SWbemNamedValueSet stub.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 1922298fe3a0a0ebca788905547d99d2dc65a9e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1922298fe3a0a0ebca788905… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 24 09:40:23 2021 +0300 wbemdisp: Add SWbemNamedValueSet stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 237 ++++++++++++++++++++++++++++++++++++++- dlls/wbemdisp/main.c | 3 + dlls/wbemdisp/tests/wbemdisp.c | 12 ++ dlls/wbemdisp/wbemdisp_private.h | 1 + include/wbemdisp.idl | 11 ++ 5 files changed, 263 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 28c8e5b4120..bbb0625f4e8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -47,6 +47,7 @@ enum type_id ISWbemPropertySet_tid, ISWbemServices_tid, ISWbemSecurity_tid, + ISWbemNamedValueSet_tid, last_tid }; @@ -61,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices, - &IID_ISWbemSecurity + &IID_ISWbemSecurity, + &IID_ISWbemNamedValueSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -2456,3 +2458,236 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; +}; + +static struct namedvalueset *impl_from_ISWbemNamedValueSet( ISWbemNamedValueSet *iface ) +{ + return CONTAINING_RECORD( iface, struct namedvalueset, ISWbemNamedValueSet_iface ); +} + +static HRESULT WINAPI namedvalueset_QueryInterface( + ISWbemNamedValueSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemNamedValueSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemNamedValueSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI namedvalueset_AddRef( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI namedvalueset_Release( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfoCount( + ISWbemNamedValueSet *iface, + UINT *count ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + TRACE( "%p, %p\n", set, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfo( + ISWbemNamedValueSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemNamedValueSet_tid, info ); +} + +static HRESULT WINAPI namedvalueset_GetIDsOfNames( + ISWbemNamedValueSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_Invoke( + ISWbemNamedValueSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemNamedValueSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_get__NewEnum( + ISWbemNamedValueSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Item( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags, + ISWbemNamedValue **value ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Count( + ISWbemNamedValueSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Add( + ISWbemNamedValueSet *iface, + BSTR name, + VARIANT *value, + LONG flags, + ISWbemNamedValue **namedvalue ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Remove( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Clone( + ISWbemNamedValueSet *iface, + ISWbemNamedValueSet **valueset ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_DeleteAll( + ISWbemNamedValueSet *iface ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = +{ + namedvalueset_QueryInterface, + namedvalueset_AddRef, + namedvalueset_Release, + namedvalueset_GetTypeInfoCount, + namedvalueset_GetTypeInfo, + namedvalueset_GetIDsOfNames, + namedvalueset_Invoke, + namedvalueset_get__NewEnum, + namedvalueset_Item, + namedvalueset_Count, + namedvalueset_Add, + namedvalueset_Remove, + namedvalueset_Clone, + namedvalueset_DeleteAll, +}; + +HRESULT SWbemNamedValueSet_create( void **obj ) +{ + struct namedvalueset *set; + + TRACE( "%p\n", obj ); + + if (!(set = heap_alloc_zero( sizeof(*set) ))) return E_OUTOFMEMORY; + set->ISWbemNamedValueSet_iface.lpVtbl = &namedvalueset_vtbl; + set->refs = 1; + + *obj = &set->ISWbemNamedValueSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index cfaf7d787eb..b0064582187 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -262,6 +262,7 @@ static const struct IClassFactoryVtbl factory_vtbl = }; static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create }; +static struct factory swbem_namedvalueset_cf = { { &factory_vtbl }, SWbemNamedValueSet_create }; static struct factory winmgmts_cf = { { &factory_vtbl }, WinMGMTS_create }; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) @@ -289,6 +290,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) cf = &swbem_locator_cf.IClassFactory_iface; else if (IsEqualGUID( rclsid, &CLSID_WinMGMTS )) cf = &winmgmts_cf.IClassFactory_iface; + else if (IsEqualGUID( rclsid, &CLSID_SWbemNamedValueSet )) + cf = &swbem_namedvalueset_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index fa51ce6d756..24225ad1ac1 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -402,12 +402,24 @@ static void test_locator(void) ISWbemLocator_Release( locator ); } +static void test_namedvalueset(void) +{ + ISWbemNamedValueSet *set; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemNamedValueSet_Release(set); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); test_ParseDisplayName(); test_locator(); + test_namedvalueset(); CoUninitialize(); } diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index b03a13e2ea0..1648843fcba 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,3 +17,4 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemNamedValueSet_create(void **) DECLSPEC_HIDDEN; diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 8ccdd0ca5e2..6f09f7ee154 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -1196,4 +1196,15 @@ coclass SWbemLocator interface ISWbemLocator; } +[ + threading(apartment), + uuid(9aed384e-ce8b-11d1-8b05-00600806d9b6), + progid("WbemScripting.SWbemNamedValueSet.1"), + vi_progid("WbemScripting.SWbemNamedValueSet") +] +coclass SWbemNamedValueSet +{ + interface ISWbemNamedValueSet; +} + } /* WbemScripting */

1 0

Zebediah Figura : ntdll/tests: Avoid passing an uninitialized timeout to NtNotifyChangeKey().
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: db0fe3381310ba7613a7458f25ce5610cc6091c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db0fe3381310ba7613a7458f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 19:40:01 2021 -0600 ntdll/tests: Avoid passing an uninitialized timeout to NtNotifyChangeKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ac1dec9f2f8..7463f98aa29 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1850,7 +1850,7 @@ static void test_NtQueryKey(void) static void test_notify(void) { OBJECT_ATTRIBUTES attr; - LARGE_INTEGER timeout; + static const LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; HANDLE key, key2, events[4], subkey; @@ -1952,7 +1952,6 @@ static void test_notify(void) status = pNtNotifyChangeMultipleKeys(key, 0, NULL, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - timeout.QuadPart = 0; status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status);

1 0

Alexandre Julliard : ncrypt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: a3a0fc94e2eaf43ce2d95621a500c3045f745749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3a0fc94e2eaf43ce2d95621… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:27:53 2021 +0100 ncrypt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/Makefile.in | 2 +- dlls/ncrypt/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index c387c35d854..9e6c9f5ff9a 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,6 +1,6 @@ MODULE = ncrypt.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index a8dda3c54a0..f23b239d93f 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags)

1 0