December 2020 - Wine-Devel - list.winehq.org

[PATCH] asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons

by Martin Storsjo

When targeting arm64 in MSVC mode, LLVM treats semicolons in assembly as comment char, instead of as statement separator (contrary to in mingw mode, where semicolons still work as separator). In generated code, there's no need to keep these directives on one single line though, so just separate them with newlines. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- (There's no reference for how msvc should interpret gas-style assembly, so one could also think LLVM should change and treat semicolons as statement separator there, like for other architectures. But when I suggested fixing that a couple years ago, it was suggested to only change it for GNU style targets, see [1]. I guess the matter could be brought up again though.) [1] https://reviews.llvm.org/D36366#833185 --- include/wine/asm.h | 2 +- tools/winebuild/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b5e6c6efd3d..ed44a7dd6dd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -56,7 +56,7 @@ #endif #ifdef _WIN32 -# define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" +# define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" #elif defined(__arm__) || defined(__arm64__) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1af42f10005..5cffc74accd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -686,7 +686,7 @@ void output_standard_file_header(void) output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); if (safe_seh) { - output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.def @feat.00\n\t.scl 3\n\t.type 0\n\t.endef\n" ); output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } @@ -1119,7 +1119,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); break; default: free( buffer ); -- 2.17.1

Dec. 18, 2020

[PATCH] ntdll, ntoskrnl: Implement a no-op __chkstk for arm64

by Martin Storsjo

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 949b262a592..ee2e3f8ad31 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1647,7 +1647,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 36d0492857f..b02737f045b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1742,7 +1742,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b9acb120844..f3ec8fd9e39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1445,7 +1445,7 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c31eb510382..6ca49481c77 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -100,6 +100,13 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret") + /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4092e33db43..23ca0c1c51d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3858,6 +3858,13 @@ __ASM_GLOBAL_FUNC( _chkstk, */ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) +#elif defined(__aarch64__) +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); #endif /********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ac70c718f1..d57a2f81df6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1522,7 +1522,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -- 2.17.1

Dec. 18, 2020

Re: [PATCH] ntdll: Always copy context in call_user_apc_dispatcher() on x86.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83587 Your paranoid android. === w2008s64 (32 bit report) === ntdll: exception.c:2046: Test failed: Should not get here, status 0x770f9b00. exception.c:2048: Test failed: Got unexpected pass 2.

Dec. 18, 2020

[PATCH] ntdll: Always copy context in call_user_apc_dispatcher() on x86.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 48 ++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 84 ++++++++++++++++++++++------------- 2 files changed, 101 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 48785f229e9..3aa8b7a4eb9 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2003,6 +2003,53 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL test_apc_called; + +static void CALLBACK test_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + test_apc_called = TRUE; +} + +static void test_user_apc(void) +{ + NTSTATUS status; + CONTEXT context; + int pass; + + if (!pNtQueueApcThread) + { + win_skip("NtQueueApcThread is not available.\n"); + return; + } + + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&context); + InterlockedIncrement(&pass); + + if (pass == 2) + { + /* Try to make sure context data is far enough below context.Esp. */ + CONTEXT c[4]; + + c[0] = context; + + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + SleepEx(0, TRUE); + ok(test_apc_called, "Test user APC was not called.\n"); + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtContinue(&c[0], TRUE ); + + /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ + ok(0, "Should not get here, status %#x.\n", status); + } + ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(test_apc_called, "Test user APC was not called.\n"); +} #elif defined(__x86_64__) #define UNW_FLAG_NHANDLER 0 @@ -8291,6 +8338,7 @@ START_TEST(exception) test_kiuserexceptiondispatcher(); test_extended_context(); test_copy_context(); + test_user_apc(); #elif defined(__x86_64__) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index f1fd2cd2e41..ff9d8a12c14 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1675,6 +1675,42 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) setup_raise_exception( sigcontext, stack, rec, &xcontext ); } +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + void *context_ptr; + void *ctx; + void *arg1; + void *arg2; + void *func; + CONTEXT context; +}; + +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *ctx, void *arg1, void *arg2, void *func ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + stack->context_ptr = &stack->context; + stack->ctx = ctx; + stack->arg1 = arg1; + stack->arg2 = arg2; + stack->func = func; + stack->context.Eax = STATUS_USER_APC; + return stack; +} + +C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); +C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x14 ); +C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** * call_user_apc_dispatcher @@ -1682,41 +1718,27 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl 4(%esp),%esi\n\t" /* context_ptr */ "movl 24(%esp),%edi\n\t" /* dispatcher */ + "leal 4(%esp),%ebp\n\t" "test %esi,%esi\n\t" "jz 1f\n\t" - "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Rsp */ - "leal -0x2f8(%eax),%eax\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) + params */ - "movl 20(%esp),%ecx\n\t" /* func */ - "movl %ecx,20(%eax)\n\t" - "movl 8(%esp),%ebx\n\t" /* ctx */ - "movl 12(%esp),%edx\n\t" /* arg1 */ - "movl 16(%esp),%ecx\n\t" /* arg2 */ - "leal 4(%eax),%esp\n\t" - "jmp 2f\n" + "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Esp */ + "jmp 2f\n\t" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "leal -0x2cc(%eax),%esi\n\t" - "movl %esp,%ebx\n\t" - "cmpl %esp,%esi\n\t" - "cmovbl %esi,%esp\n\t" - "pushl 20(%ebx)\n\t" /* func */ - "pushl 16(%ebx)\n\t" /* arg2 */ - "pushl 12(%ebx)\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ - "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "pushl %esi\n\t" /* context */ - "pushl $0xfffffffe\n\t" - "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" - "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "popl %edx\n\t" - "popl %ecx\n\t" - "popl %eax\n\t" - "leal -20(%esi),%esp\n\t" - "movl %eax,16(%esp)\n" /* func */ - "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ - "movl %edx,8(%esp)\n\t" /* arg1 */ - "movl %ebx,4(%esp)\n\t" /* ctx */ - "movl %esi,(%esp)\n\t" /* context */ + "leal 0x14(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ + "2:\tsubl $0x2e0,%eax\n\t" /* sizeof(struct apc_stack_layout) */ + "movl %ebp,%esp\n\t" /* pop return address */ + "cmpl %esp,%eax\n\t" + "cmovbl %eax,%esp\n\t" + "pushl 16(%ebp)\n\t" /* func */ + "pushl 12(%ebp)\n\t" /* arg2 */ + "pushl 8(%ebp)\n\t" /* arg1 */ + "pushl 4(%ebp)\n\t" /* ctx */ + "pushl %eax\n\t" + "pushl %esi\n\t" + "call " __ASM_STDCALL("setup_user_apc_dispatcher_stack",24) "\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movl %eax,%esp\n\t" + "leal 20(%eax),%esi\n\t" "movl 0xb4(%esi),%ebp\n\t" /* context.Ebp */ "pushl 0xb8(%esi)\n\t" /* context.Eip */ "jmp *%edi\n" ) -- 2.29.2

Dec. 18, 2020

Re: [PATCH] ieframe: Fix memory leak in PersistFile_Save.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Dec. 18, 2020

Re: [PATCH v2 1/2] widl: don't use local methods when writing async interfaces

by Jacek Caban

On 16.12.2020 15:38, Steve Lhomme wrote: > The same entries can have a different call_as between the synchronous and > asynchronous interfaces and shouldn't be mixed up. Looking closer at it, I think that we shouldn't apply call_as methods to async interfaces in the first place. Sorry for not catching it earlier, I sent a patch: https://source.winehq.org/patches/data/197632 Thanks, Jacek

Dec. 18, 2020

[PATCH] widl: Don't apply call_as methods to async interface.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 2 ++ 1 file changed, 2 insertions(+)

Dec. 18, 2020

Re: [PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:51PM -0600, Zebediah Figura wrote: > Based on a patch by Alistair Leslie-Hughes. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- > dlls/winmm/tests/mmio.c | 2 +- > 2 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index cb3175c5cd7..da536357416 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; > /* From kernel32 */ > static HANDLE create_file_OF( LPCSTR path, INT mode ) > { > - DWORD access, sharing, creation; > + DWORD access, sharing, creation, len; > + char *full_path; > + HANDLE ret; > > if (mode & OF_CREATE) > { > @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) > case OF_SHARE_COMPAT: > default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; > } > - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (mode & OF_CREATE) > + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) > + return INVALID_HANDLE_VALUE; > + if (!(full_path = malloc(len + 1))) > + { > + SetLastError( ERROR_OUTOFMEMORY ); > + return INVALID_HANDLE_VALUE; > + } > + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) > + { > + free(full_path); > + return INVALID_HANDLE_VALUE; > + } > + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + free(full_path); > + return ret; > } > > /************************************************************************** > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index c9ceda24f3f..a232070064c 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void) > > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > mmioClose(hmmio, 0); > > wcscpy(buffer, L"test_mmio_path"); > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:50PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index 0236855f246..c9ceda24f3f 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void) > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > - char exedir_filename[MAX_PATH]; > + char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH]; > MMIOINFO info = {0}; > BOOL ret; > FILE *f; > @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void) > > DeleteFileW(long_filename); > > + wcscpy(buffer, long_filename); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); > + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, long_filename); > + expect[127] = 0; > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE); > + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); > + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); > + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL); > + todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA)); > + > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:49PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 52 insertions(+), 8 deletions(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index e3984fbaf3a..0236855f246 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) > WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; > /* According to docs, filename must be no more than 128 bytes, but it will > * actually allow longer than that. */ > - WCHAR filename[] = L"very_long_filename_" > + WCHAR long_filename[] = L"very_long_filename_" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > + char exedir_filename[MAX_PATH]; > + MMIOINFO info = {0}; > + BOOL ret; > + FILE *f; > + > + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); > + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); > + f = fopen(exedir_filename, "w"); > + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); > + fclose(f); > > GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); > GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); > SetCurrentDirectoryW(temp_dir); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_DENYNONE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* MMIO_DENYNONE lets us open it here, too */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); > @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_EXCLUSIVE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* should fail due to MMIO_EXCLUSIVE */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); > @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, L"test_mmio_path"); > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + wcscpy(buffer, L"test_mmio_path"); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); > + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); > + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(!ret, "expected failure\n"); > + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(ret, "got error %u\n", GetLastError()); > > SetCurrentDirectoryW(cwd); > + > + ret = DeleteFileA(exedir_filename); > + ok(ret, "got error %u\n", GetLastError()); > } > > static void test_mmioSetBuffer(char *fname) > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:48PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..cb3175c5cd7 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, > if (szFileName) > { > INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); > + if (len < MAX_PATH) len = MAX_PATH; > szFn = HeapAlloc( GetProcessHeap(), 0, len ); > if (!szFn) return NULL; > WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); > -- > 2.29.2 > >

Dec. 18, 2020

[PATCH v4 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. v4: Accept WBEM_E_ACCESS_DENIED and print a message about it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..37b6fb4e8d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,67 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + else if (hr == WBEM_E_ACCESS_DENIED) + win_skip( "insufficient privs to test SystemRestore\n" ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1884,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1898,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

[PATCH v4 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

Re: [PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Fri, 2020-12-18 at 14:41 +0300, Dmitry Timoshkov wrote: > > > > > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > > > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > > > > > I would prefer to accept both results and print a message when access is > > > denied, like in test_SystemSecurity(). > > > > Sure. > > > > > Should we disable monitoring when this method succeeds? > > > > What do you mean by disabling monitoring? > > You're calling the Enable() method which starts the System Restore service > and filter driver according to MSDN. It seems that we should call Disable() > to give the system a chance to clean up. The service is already running by default, it takes considerable measures to disable it and turn off the system restore functionality, so I'd assume that calling Enable() should be a no-op, and disabling the service would be harmful to the system. -- Dmitry.

Dec. 18, 2020

Re: [PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Hans Leidekker

On Fri, 2020-12-18 at 14:41 +0300, Dmitry Timoshkov wrote: > > > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > > > I would prefer to accept both results and print a message when access is > > denied, like in test_SystemSecurity(). > > Sure. > > > Should we disable monitoring when this method succeeds? > > What do you mean by disabling monitoring? You're calling the Enable() method which starts the System Restore service and filter driver according to MSDN. It seems that we should call Disable() to give the system a chance to clean up.

Dec. 18, 2020

Re: [PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > I would prefer to accept both results and print a message when access is > denied, like in test_SystemSecurity(). Sure. > Should we disable monitoring when this method succeeds? What do you mean by disabling monitoring? -- Dmitry.

Dec. 18, 2020

Re: [PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Hans Leidekker

On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); I would prefer to accept both results and print a message when access is denied, like in test_SystemSecurity(). Should we disable monitoring when this method succeeds?

Dec. 18, 2020

[PATCH v3 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..0a0bd2c4f8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,65 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1882,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1896,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

[PATCH v3 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

Re: [PATCH v2 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83578 Your paranoid android. === w7u_adm (32 bit report) === wbemprox: 09c4:query: unhandled exception c0000005 at 00404ACA === w8adm (32 bit report) === wbemprox: 0c9c:query: unhandled exception c0000005 at 00404ACA

Dec. 18, 2020

[PATCH v2 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..d102c660e3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,64 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1881,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1895,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

[PATCH v2 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

Re: [PATCH 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83576 Your paranoid android. === w7u_adm (32 bit report) === wbemprox: query.c:1804: Test failed: failed to execute method 80041003 09d4:query: unhandled exception c0000005 at 00404A20 === w8adm (32 bit report) === wbemprox: query.c:1804: Test failed: failed to execute method 80041003 0cd4:query: unhandled exception c0000005 at 00404A20

Dec. 18, 2020

[PATCH 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..ae7cddc684 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,62 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1879,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1893,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

[PATCH 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020