wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : ntdll: Use syscall frame for x86 YMM context in NtGetContextThread.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 8064d9786a0b1e06d5c52cbbb321f4c3b1ec8055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8064d9786a0b1e06d5c52cbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 2 18:46:42 2021 +0100 ntdll: Use syscall frame for x86 YMM context in NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 81 +++++++++++++------------------------------ 1 file changed, 25 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 68d532c6f3f..129d719a96c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -713,56 +713,6 @@ static inline void save_fpu( CONTEXT *context ) } -/*********************************************************************** - * save_xstate - * - * Save the XState context - */ -static inline NTSTATUS save_xstate( CONTEXT *context ) -{ - CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - DECLSPEC_ALIGN(64) struct - { - XSAVE_FORMAT xsave; - XSTATE xstate; - } - xsave_area; - XSTATE *xs; - - if (!(cpu_info.FeatureSet & CPU_FEATURE_AVX) || !(xs = xstate_from_context( context ))) - return STATUS_SUCCESS; - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; - - if (xstate_compaction_enabled) - { - /* xsavec doesn't use anything from the save area. */ - __asm__ volatile( "xsavec %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); - } - else - { - /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ - xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; - __asm__ volatile( "xsave %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); - } - - memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); - if (xs->Mask & (1 << XSTATE_AVX)) - { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - - memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); - } - - return STATUS_SUCCESS; -} - - /*********************************************************************** * restore_fpu * @@ -1334,14 +1284,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret, xsave_status; struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); - - /* Save xstate before any calls which can potentially change volatile ymm registers. - * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; + NTSTATUS ret; /* debug registers require a server call */ if (needed_flags & CONTEXT_DEBUG_REGISTERS) self = FALSE; @@ -1359,6 +1305,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (self) { struct syscall_xsave *xsave = get_syscall_xsave( frame ); + XSTATE *xstate; if (needed_flags & CONTEXT_INTEGER) { context->Eax = frame->eax; @@ -1410,6 +1357,28 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) x86_thread_data()->dr6 = context->Dr6; x86_thread_data()->dr7 = context->Dr7; } + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = xsave->xstate.mask & mask; + xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy( &xstate->YmmContext, xsave->xstate.ymm_high, sizeof(xsave->xstate.ymm_high) ); + } + } } if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386)) @@ -1425,7 +1394,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) TRACE( "%p: dr0=%08x dr1=%08x dr2=%08x dr3=%08x dr6=%08x dr7=%08x\n", handle, context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 ); - return xsave_status; + return STATUS_SUCCESS; }

1 0

Jacek Caban : ntdll: Store x86 YMM context insyscall dispatcher.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 5d228d6fc977d0b7927f78d28f712e88954599e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d228d6fc977d0b7927f78d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 2 18:46:29 2021 +0100 ntdll: Store x86 YMM context insyscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 14 ++++++++++++-- tools/winebuild/import.c | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index cc1e1d24e2a..68d532c6f3f 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -468,9 +468,16 @@ struct syscall_xsave XSAVE_FORMAT xsave; FLOATING_SAVE_AREA fsave; } u; + struct + { + ULONG64 mask; + ULONG64 compaction_mask; + ULONG64 reserved[6]; + M128A ymm_high[8]; + } xstate; }; -C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); +C_ASSERT( sizeof(struct syscall_xsave) == 0x2c0 ); struct syscall_frame { @@ -2551,8 +2558,11 @@ void signal_init_process(void) void *signal_init_syscalls(void) { extern void __wine_syscall_dispatcher_fxsave(void) DECLSPEC_HIDDEN; + extern void __wine_syscall_dispatcher_xsave(void) DECLSPEC_HIDDEN; - if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) + syscall_dispatcher = __wine_syscall_dispatcher_xsave; + else if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) syscall_dispatcher = __wine_syscall_dispatcher_fxsave; else syscall_dispatcher = __wine_syscall_dispatcher; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 53d77a19e23..2905f1a4100 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1425,6 +1425,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) { const unsigned int invalid_param = 0xc000000d; /* STATUS_INVALID_PARAMETER */ const char *symbol = strmake( "__wine_syscall_dispatcher%s", variant ); + unsigned int i; output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(symbol) ); @@ -1456,17 +1457,27 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovl %%ecx,-0x28(%%ebp)\n" ); /* frame->esp */ output( "\tmovl 4(%%ebp),%%ecx\n" ); output( "\tmovl %%ecx,-0x2c(%%ebp)\n" ); /* frame->eip */ - output( "\tsubl $0x200,%%esp\n") ; + output( "\tsubl $0x2c0,%%esp\n") ; output( "\tandl $~63,%%esp\n" ); if (!*variant) { output( "\tfnsave (%%esp)\n" ); output( "\tfwait\n" ); } - else + else if(!strcmp( variant, "_fxsave" )) { output( "\tfxsave (%%esp)\n" ); } + else + { + output( "\tmovl %%eax,%%ecx\n "); + output( "\tmovl $7,%%eax\n" ); + output( "\txorl %%edx,%%edx\n" ); + for (i = 0; i < 6; i++) + output( "\tmovl %%edx,0x%x(%%esp)\n", 0x200 + i * 4 ); + output( "\txsave (%%esp)\n" ); + output( "\tmovl %%ecx,%%eax\n "); + } output( "\tleal -0x30(%%ebp),%%ecx\n" ); output( "\tmovl %%ecx,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ output( "\tcmpl $%u,%%eax\n", count ); @@ -1491,7 +1502,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); output( "2:\tmovl $0,%%fs:0x1f8\n" ); - output( "\tleal -0x230(%%ebp),%%ebx\n") ; + output( "\tleal -0x2f0(%%ebp),%%ebx\n") ; output( "\tandl $~63,%%ebx\n" ); if (!*variant) { @@ -1817,6 +1828,7 @@ void output_syscalls( DLLSPEC *spec ) { case CPU_x86: output_syscall_dispatcher( count, "_fxsave" ); + output_syscall_dispatcher( count, "_xsave" ); break; case CPU_x86_64: output_syscall_dispatcher( count, "_xsave" );

1 0

Dmitry Kislyuk : msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 0712b6b1a08a01ee397035372345f1ad38abe393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0712b6b1a08a01ee39703537… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 1 18:31:26 2021 -0600 msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50744 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 7cb59f94460..ac7fad67548 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -866,8 +866,14 @@ static HRESULT WINAPI InputProcessorProfileMgr_UnregisterProfile(ITfInputProcess static HRESULT WINAPI InputProcessorProfileMgr_GetActiveProfile(ITfInputProcessorProfileMgr *iface, REFGUID catid, TF_INPUTPROCESSORPROFILE *pProfile) { - InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + static int once; + + if (!once++) + { + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + } + return E_NOTIMPL; }

1 0

Rémi Bernon : widl: Fix missing delegate declaration namespace.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 4b24b6be06170ace71b47e51c6b0f2c3a6359537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b24b6be06170ace71b47e51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 1 19:33:20 2021 +0100 widl: Fix missing delegate declaration namespace. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a1e7abc31e5..591a58b2849 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -901,7 +901,7 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref type_t *type_delegate_declare(char *name, struct namespace *namespace) { - type_t *type = get_type(TYPE_DELEGATE, name, NULL, 0); + type_t *type = get_type(TYPE_DELEGATE, name, namespace, 0); if (type_get_type_detect_alias(type) != TYPE_DELEGATE) error_loc("delegate %s previously not declared a delegate at %s:%d\n", type->name, type->loc_info.input_name, type->loc_info.line_number);

1 0

Hugh McMaster : reg/tests: Comprehensively check for elevated privileges before starting Windows 3.1 import tests.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 17023a8100a62852bbad342e5e7c705cafae9a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=17023a8100a62852bbad342e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 2 23:17:50 2021 +1100 reg/tests: Comprehensively check for elevated privileges before starting Windows 3.1 import tests. The existing check fails to adequately determine the program's elevation status on systems where the test key already exists. This can cause all Windows 3.1 import tests to fail on systems with a standard user account. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index f769e0020f5..58831625fa5 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3468,25 +3468,34 @@ static void test_import_win31(void) { LONG err; HKEY hkey; - DWORD dispos, r; + DWORD r; /* Check if reg.exe is running with elevated privileges */ - err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); if (err == ERROR_ACCESS_DENIED) { win_skip("reg.exe is not running with elevated privileges; " "skipping Windows 3.1 import tests\n"); return; } - - if (dispos == REG_OPENED_EXISTING_KEY) - delete_value(hkey, NULL); + if (err == ERROR_FILE_NOT_FOUND) + { + if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL)) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + } /* Test simple value */ test_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + open_key(HKEY_CLASSES_ROOT, KEY_BASE, KEY_SET_VALUE, &hkey); verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); /* Test proper handling of spaces and equals signs */

1 0

Hugh McMaster : reg/tests: Fix copy/paste typo in reg.exe availability check.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: b369af9ac5861f0ec49933ef657a53feeafefc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b369af9ac5861f0ec49933ef… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 2 23:17:49 2021 +1100 reg/tests: Fix copy/paste typo in reg.exe availability check. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- programs/reg/tests/copy.c | 2 +- programs/reg/tests/export.c | 2 +- programs/reg/tests/import.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bdfd429367c..bd0888ae831 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -630,7 +630,7 @@ START_TEST(add) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'add' tests\n"); return; } diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index b91352c9d46..a8956d7e9a0 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -102,7 +102,7 @@ START_TEST(copy) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'copy' tests\n"); return; } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index e03b1f3db25..9a3f7d5fbf0 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -408,7 +408,7 @@ START_TEST(export) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'export' tests\n"); return; } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 5b520f11d5f..f769e0020f5 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3584,7 +3584,7 @@ START_TEST(import) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping 'query' tests\n"); + win_skip("reg.exe not available, skipping 'import' tests\n"); return; }

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 3dca00f1dd7e8ff1abe0a15af3365b4f7c7ae042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dca00f1dd7e8ff1abe0a15a… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 2 12:09:32 2021 +0100 msvcrt: Update source pointer in wcsrtombs in C locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4d61cff11c0..dbc93dc93f5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2094,6 +2094,22 @@ static void test_mbstowcs(void) ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); ok(!mOut[0], "mOut = %s\n", mOut); + if(pwcsrtombs) { + pwstr = wSimple; + err = -3; + ret = pwcsrtombs(mOut, &pwstr, 4, &err); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(err == 0, "err = %d\n", err); + ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); + ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); + + pwstr = wSimple; + ret = pwcsrtombs(mOut, &pwstr, 5, NULL); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(pwstr == NULL, "pwstr != NULL\n"); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + } + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..343dec70477 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + + if(i < count) *wcstr = NULL; + else *wcstr += i; return i; }

1 0

Nikolay Sivov : oleaut32: Fix Var*FromDec() prototypes.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 02d29c6a9d3707751a2b3ee17b22de9cb124b141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d29c6a9d3707751a2b3ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:27:17 2021 +0300 oleaut32: Fix Var*FromDec() prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d29c6a9d3707751a2b…

1 0

Nikolay Sivov : wbemdisp: Pass context value to ExecMethod().
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 8ea157aca6bfc2c73b1887e4640258d7c9b4e0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea157aca6bfc2c73b1887e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:07 2021 +0300 wbemdisp: Pass context value to ExecMethod(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e2bcf09c6e3..0ef73bdbd56 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -2499,6 +2499,7 @@ static HRESULT WINAPI services_ExecMethod( struct services *services = impl_from_ISWbemServices( iface ); IWbemClassObject *out_params = NULL; struct object *in_params; + IWbemContext *context; HRESULT hr; TRACE( "%p, %s, %s, %p, %#x, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, @@ -2507,10 +2508,9 @@ static HRESULT WINAPI services_ExecMethod( in_params = unsafe_object_impl_from_IDispatch( in_sparams ); out_params = NULL; - if (valueset) - FIXME("Named value set is unused\n"); + context = unsafe_get_context_from_namedvalueset( valueset ); - hr = IWbemServices_ExecMethod( services->services, path, method, flags, NULL, in_params ? in_params->object : NULL, + hr = IWbemServices_ExecMethod( services->services, path, method, flags, context, in_params ? in_params->object : NULL, out_sparams ? &out_params : NULL, NULL ); if (SUCCEEDED(hr) && out_params)

1 0

Nikolay Sivov : wbemdisp: Pass context value to ConnectServer().
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 93858d787d02053840dc388e37dc0c9e1acb8b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=93858d787d02053840dc388e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:06 2021 +0300 wbemdisp: Pass context value to ConnectServer(). 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 | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 8c37cc92eb1..e2bcf09c6e3 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -35,6 +35,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; + + IWbemContext *context; +}; + +static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *iface); + +static IWbemContext * unsafe_get_context_from_namedvalueset( IDispatch *disp ) +{ + struct namedvalueset *valueset = unsafe_valueset_impl_from_IDispatch( disp ); + return valueset ? valueset->context : NULL; +} + static WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; @@ -2751,6 +2767,7 @@ static HRESULT WINAPI locator_ConnectServer( { struct locator *locator = impl_from_ISWbemLocator( iface ); IWbemServices *services; + IWbemContext *context; BSTR resource; HRESULT hr; @@ -2758,8 +2775,6 @@ static HRESULT WINAPI locator_ConnectServer( debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); - if (objWbemNamedValueSet) FIXME( "context not supported\n" ); - if (!locator->locator) { hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, @@ -2767,9 +2782,11 @@ static HRESULT WINAPI locator_ConnectServer( if (hr != S_OK) return hr; } + context = unsafe_get_context_from_namedvalueset( objWbemNamedValueSet ); + if (!(resource = build_resource_string( strServer, strNamespace ))) return E_OUTOFMEMORY; hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword, strLocale, - iSecurityFlags, strAuthority, NULL, &services ); + iSecurityFlags, strAuthority, context, &services ); SysFreeString( resource ); if (hr != S_OK) return hr; @@ -3047,14 +3064,6 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) return S_OK; } -struct namedvalueset -{ - ISWbemNamedValueSet ISWbemNamedValueSet_iface; - LONG refs; - - IWbemContext *context; -}; - struct namedvalue { ISWbemNamedValue ISWbemNamedValue_iface; @@ -3478,6 +3487,18 @@ static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = namedvalueset_DeleteAll, }; +static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDispatchVtbl *)&namedvalueset_vtbl) + { + FIXME( "External implementations are not supported.\n" ); + return NULL; + } + return CONTAINING_RECORD(iface, struct namedvalueset, ISWbemNamedValueSet_iface); +} + HRESULT SWbemNamedValueSet_create( void **obj ) { struct namedvalueset *set;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021