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

[PATCH] ntdll/tests: Add a broken result for Win7u in test_extended_context().
by Paul Gofman Dec. 7, 2020

Dec. 7, 2020

Fixes test failures on w7u testbot machines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 89ffe98f0ad..5686e39ab9e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7675,9 +7675,10 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0) || broken(sizeof(void *) == 4 && !xs->Mask) /* Win7u */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (sizeof(void *) == 4 ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); bret = ResumeThread(thread); -- 2.28.0

2 1

[PATCH] ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64.
by Paul Gofman Dec. 7, 2020

Dec. 7, 2020

Required to correctly restore non-volatile registers during unwind. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 58 ++++++++++++++++++++++++++++----- dlls/ntdll/unix/signal_x86_64.c | 57 +++++++++++++++++++++++--------- 2 files changed, 91 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3451a7d6465..89ffe98f0ad 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -56,6 +56,7 @@ static void * (WINAPI *pRtlLocateExtendedFeature)(CONTEXT_EX *context_ex, ULO static void * (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG *length); static void (WINAPI *pRtlSetExtendedFeaturesMask)(CONTEXT_EX *context_ex, ULONG64 feature_mask); static ULONG64 (WINAPI *pRtlGetExtendedFeaturesMask)(CONTEXT_EX *context_ex); +static NTSTATUS (WINAPI *pNtRaiseException)(EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -1828,7 +1829,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE } /* Use CDECL to leave arguments on stack. */ -void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +static void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n", @@ -3716,6 +3717,8 @@ static struct } test_kiuserexceptiondispatcher_regs; +static ULONG64 test_kiuserexceptiondispatcher_saved_r12; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -3738,6 +3741,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + if (rec->ExceptionCode == 0xceadbeef) + { + ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#lx.\n", context->P1Home); + context->R12 = test_kiuserexceptiondispatcher_saved_r12; + return EXCEPTION_CONTINUE_EXECUTION; + } + ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode); got_exception = 1; @@ -3752,7 +3762,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE return EXCEPTION_CONTINUE_EXECUTION; } -void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +static void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", @@ -3760,7 +3770,7 @@ void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *conte hook_called = TRUE; /* Broken on Win2008, probably rec offset in stack is different. */ - ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + ok(rec->ExceptionCode == 0x80000003 || rec->ExceptionCode == 0xceadbeef || broken(!rec->ExceptionCode), "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; @@ -3810,15 +3820,15 @@ static void test_kiuserexceptiondispatcher(void) 0x48, 0x89, 0xe2, /* mov %rsp,%rdx */ 0x48, 0x8d, 0x8c, 0x24, 0xf0, 0x04, 0x00, 0x00, /* lea 0x4f0(%rsp),%rcx */ - + 0x4c, 0x89, 0x22, /* mov %r12,(%rdx) */ 0xff, 0x14, 0x25, - /* offset: 14 bytes */ + /* offset: 17 bytes */ 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ 0xff, 0x24, 0x25, - /* offset: 27 bytes */ + /* offset: 30 bytes */ 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ }; @@ -3827,6 +3837,8 @@ static void test_kiuserexceptiondispatcher(void) DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; void *bpt_address; + CONTEXT ctx; + LONG pass; BYTE *ptr; BOOL ret; @@ -3845,8 +3857,8 @@ static void test_kiuserexceptiondispatcher(void) ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), "Address is too long.\n"); - *(unsigned int *)(hook_trampoline + 14) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; - *(unsigned int *)(hook_trampoline + 27) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 17) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 30) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -3954,6 +3966,35 @@ static void test_kiuserexceptiondispatcher(void) NtCurrentTeb()->Peb->BeingDebugged = 0; + vectored_handler = AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + pass = 0; + InterlockedIncrement(&pass); + pRtlCaptureContext(&ctx); + if (InterlockedIncrement(&pass) == 2) /* interlocked to prevent compiler from moving before capture */ + { + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + + record.ExceptionCode = 0xceadbeef; + test_kiuserexceptiondispatcher_saved_r12 = ctx.R12; + ctx.R12 = (ULONG64)0xdeadbeeffeedcafe; + +#ifdef __GNUC__ + /* Spoil r12 value to make sure it doesn't come from the current userspace registers. */ + __asm__ volatile("movq $0xdeadcafe, %%r12" : : : "%r12"); +#endif + pNtRaiseException(&record, &ctx, TRUE); + ok(0, "Shouldn't be reached.\n"); + } + else + { + ok(pass == 3, "Got unexpected pass %d.\n", pass); + } + ok(hook_called, "Hook was not called.\n"); + RemoveVectoredExceptionHandler(vectored_handler); + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -8046,6 +8087,7 @@ START_TEST(exception) X(NtQueryInformationThread); X(NtSetInformationProcess); X(NtSuspendProcess); + X(NtRaiseException); X(NtResumeProcess); X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 124032714c7..d049cc8b3f0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1551,6 +1551,34 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon } +/*********************************************************************** + * set_nonvolatile_regs_from_context + * + * Set the non-volatile registers from CPU context. + */ +extern void WINAPI set_nonvolatile_regs_from_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_nonvolatile_regs_from_context, + "movq 0xa0(%rcx),%rbp\n\t" + "movq 0x90(%rcx),%rbx\n\t" + "movq 0xa8(%rcx),%rsi\n\t" + "movq 0xb0(%rcx),%rdi\n\t" + "movq 0xd8(%rcx),%r12\n\t" + "movq 0xe0(%rcx),%r13\n\t" + "movq 0xe8(%rcx),%r14\n\t" + "movq 0xf0(%rcx),%r15\n\t" + "movdqa 0x200(%rcx),%xmm6\n\t" + "movdqa 0x210(%rcx),%xmm7\n\t" + "movdqa 0x220(%rcx),%xmm8\n\t" + "movdqa 0x230(%rcx),%xmm9\n\t" + "movdqa 0x240(%rcx),%xmm10\n\t" + "movdqa 0x250(%rcx),%xmm11\n\t" + "movdqa 0x260(%rcx),%xmm12\n\t" + "movdqa 0x270(%rcx),%xmm13\n\t" + "movdqa 0x280(%rcx),%xmm14\n\t" + "movdqa 0x290(%rcx),%xmm15\n\t" + "ret" ); + + /*********************************************************************** * set_full_cpu_context * @@ -2081,19 +2109,7 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, /*********************************************************************** * call_user_exception_dispatcher */ - -extern void WINAPI user_exception_dispatcher_trampoline( struct stack_layout *stack, - void *pKiUserExceptionDispatcher ); - -__ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, - "movq %rcx,%rsp\n\t" - "movq 0x98(%rsp),%rcx\n\t" /* context->Rsp */ - "movq 0xa0(%rsp),%rbp\n\t" - "movq 0xa8(%rsp),%rsi\n\t" - "movq 0xb0(%rsp),%rdi\n\t" - "jmpq *%rdx") - -void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, +struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), struct stack_layout *stack ) { @@ -2127,8 +2143,7 @@ void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *c /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) stack->context.Rip--; - amd64_thread_data()->syscall_frame = NULL; - user_exception_dispatcher_trampoline( stack, dispatcher ); + return stack; } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, @@ -2141,7 +2156,17 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" - "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") + "pushq %r8\n\t" + "subq $0x20,%rsp\n\t" + "call " __ASM_NAME("setup_user_exception_dispatcher_stack") "\n\t" + "mov %rax,%rcx\n\t" + "call " __ASM_NAME("set_nonvolatile_regs_from_context") "\n\t" + "addq $0x20,%rsp\n\t" + "popq %r8\n\t" + "mov %rcx,%rsp\n\t" + "movq %gs:0x30,%rax\n\t" + "movq $0,0x328(%rax)\n\t" /* amd64_thread_data()->syscall_frame */ + "jmpq *%r8") /*********************************************************************** * is_privileged_instr -- 2.28.0

1 0

[RFC PATCH 1/4] winex11.drv: Allow keyboard score to be negative.
by Giovanni Mascellani Dec. 7, 2020

Dec. 7, 2020

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c0292..e92d2bf35f2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1433,7 +1433,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) KeySym keysym = 0; const char (*lkey)[MAIN_LEN][4]; unsigned max_seq = 0; - int max_score = 0, ismatch = 0; + int max_score = INT_MIN, ismatch = 0; char ckey[256][4]; syms = keysyms_per_keycode; -- 2.29.2

1 3

[PATCH] sxs: Query context that contains the GUID in SxsLookupClrGuid().
by Nikolay Sivov Dec. 7, 2020

Dec. 7, 2020

This restores pre-2cfc85dc55d403a7fcb885a62bb28f8d73498c2d logic; activation/deactivation still happens, and user context in this case is returned from FindActCtxSectionGuid(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50139 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/sxs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 7150f55c33e..cd1d0f7bb56 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -135,14 +135,20 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; + } } if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; + } } if (!retval) @@ -151,7 +157,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); if (!retval && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { @@ -159,7 +165,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff } assembly_info = heap_alloc(bytes_assembly_info); - if (!(retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) { @@ -225,6 +231,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SetLastError(0); out: + ReleaseActCtx(guid_info.hActCtx); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie); -- 2.29.2

1 0

[PATCH] gameux/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 6, 2020

Dec. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 101 +++++++++++++---------------- 1 file changed, 44 insertions(+), 57 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 192a245e096..c29c6b44470 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -89,12 +89,6 @@ static void test_unregister_game(IGameExplorer *ge) */ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpStatisticsFile) { - static const WCHAR sBackslash[] = {'\\',0}; - static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', - 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s','\\',0}; - static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; HRESULT hr; WCHAR sGuid[49], sPath[MAX_PATH]; @@ -105,11 +99,11 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta if(SUCCEEDED(hr)) { - lstrcatW(sPath, sStatisticsDir); + lstrcatW(sPath, L"\\Microsoft\\Windows\\GameExplorer\\GameStatistics\\"); lstrcatW(sPath, sGuid); - lstrcatW(sPath, sBackslash); + lstrcatW(sPath, L"\\"); lstrcatW(sPath, sGuid); - lstrcatW(sPath, sDotGamestats); + lstrcatW(sPath, L".gamestats"); *lpStatisticsFile = CoTaskMemAlloc((lstrlenW(sPath)+1)*sizeof(WCHAR)); if(!*lpStatisticsFile) hr = E_OUTOFMEMORY; @@ -145,22 +139,6 @@ static BOOL _isFileExists(LPCWSTR lpFile) static void test_gamestatisticsmgr( void ) { static const GUID guidApplicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 } }; - static const WCHAR sCategory0[] = {'C','a','t','e','g','o','r','y','0',0}; - static const WCHAR sCategory1[] = {'C','a','t','e','g','o','r','y','1',0}; - static const WCHAR sCategory2[] = {'C','a','t','e','g','o','r','y','2',0}; - static const WCHAR sCategory0a[] = {'C','a','t','e','g','o','r','y','0','a',0}; - static const WCHAR sStatistic00[] = {'S','t','a','t','i','s','t','i','c','0','0',0}; - static const WCHAR sStatistic01[] = {'S','t','a','t','i','s','t','i','c','0','1',0}; - static const WCHAR sStatistic10[] = {'S','t','a','t','i','s','t','i','c','1','0',0}; - static const WCHAR sStatistic11[] = {'S','t','a','t','i','s','t','i','c','1','1',0}; - static const WCHAR sStatistic20[] = {'S','t','a','t','i','s','t','i','c','2','0',0}; - static const WCHAR sStatistic21[] = {'S','t','a','t','i','s','t','i','c','2','1',0}; - static const WCHAR sValue00[] = {'V','a','l','u','e','0','0',0}; - static const WCHAR sValue01[] = {'V','a','l','u','e','0','1',0}; - static const WCHAR sValue10[] = {'V','a','l','u','e','1','0',0}; - static const WCHAR sValue11[] = {'V','a','l','u','e','1','1',0}; - static const WCHAR sValue20[] = {'V','a','l','u','e','2','0',0}; - static const WCHAR sValue21[] = {'V','a','l','u','e','2','1',0}; HRESULT hr; DWORD dwOpenResult; @@ -221,7 +199,7 @@ static void test_gamestatisticsmgr( void ) hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, NULL); ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); - hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, sCategory0); + hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, L"Category0"); ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); /* check what happen if string is too long */ @@ -234,45 +212,51 @@ static void test_gamestatisticsmgr( void ) ok(hr==S_FALSE, "setting category title invalid result: 0x%x\n", hr); CoTaskMemFree(sTooLongString); - ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0)); - ok(IGameStatistics_SetCategoryTitle(gs, 1, sCategory1)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); - ok(IGameStatistics_SetCategoryTitle(gs, 2, sCategory2)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, L"Category0")==S_OK, "setting category title failed: Category0\n"); + ok(IGameStatistics_SetCategoryTitle(gs, 1, L"Category1")==S_OK, "setting category title failed: Category1\n"); + ok(IGameStatistics_SetCategoryTitle(gs, 2, L"Category2")==S_OK, "setting category title failed: Category2\n"); /* check what happen if any string is NULL */ - hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, L"Value00"); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); - hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, NULL); + hr = IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", NULL); ok(hr == S_OK, "setting statistic returned unexpected value: 0x%x)\n", hr); /* check what happen if any string is too long */ sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxNameLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxNameLength+1)); sTooLongString[uMaxNameLength+1]=0; - hr = IGameStatistics_SetStatistic(gs, 0, 0, sTooLongString, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, 0, sTooLongString, L"Value00"); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxValueLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxValueLength+1)); sTooLongString[uMaxValueLength+1]=0; - hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sTooLongString); + hr = IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", sTooLongString); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); /* check what happen on too big index of category or statistic */ - hr = IGameStatistics_SetStatistic(gs, wMaxCategories, 0, sStatistic00, sValue00); + hr = IGameStatistics_SetStatistic(gs, wMaxCategories, 0, L"Statistic00", L"Value00"); ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); - hr = IGameStatistics_SetStatistic(gs, 0, wMaxStatsPerCategory, sStatistic00, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, wMaxStatsPerCategory, L"Statistic00", L"Value00"); ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); - ok(IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sValue00)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic00), wine_dbgstr_w(sValue00)); - ok(IGameStatistics_SetStatistic(gs, 0, 1, sStatistic01, sValue01)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic01), wine_dbgstr_w(sValue01)); - ok(IGameStatistics_SetStatistic(gs, 1, 0, sStatistic10, sValue10)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic10), wine_dbgstr_w(sValue10)); - ok(IGameStatistics_SetStatistic(gs, 1, 1, sStatistic11, sValue11)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic11), wine_dbgstr_w(sValue11)); - ok(IGameStatistics_SetStatistic(gs, 2, 0, sStatistic20, sValue20)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic20), wine_dbgstr_w(sValue20)); - ok(IGameStatistics_SetStatistic(gs, 2, 1, sStatistic21, sValue21)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic21), wine_dbgstr_w(sValue21)); + ok(IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", L"Value00")==S_OK, + "setting statistic failed: name=Statistic00, value=Value00\n"); + ok(IGameStatistics_SetStatistic(gs, 0, 1, L"Statistic01", L"Value01")==S_OK, + "setting statistic failed: name=Statistic01, value=Value01\n"); + ok(IGameStatistics_SetStatistic(gs, 1, 0, L"Statistic10", L"Value10")==S_OK, + "setting statistic failed: name=Statistic10, value=Value10\n"); + ok(IGameStatistics_SetStatistic(gs, 1, 1, L"Statistic11", L"Value11")==S_OK, + "setting statistic failed: name=Statistic11, value=Value11\n"); + ok(IGameStatistics_SetStatistic(gs, 2, 0, L"Statistic20", L"Value20")==S_OK, + "setting statistic failed: name=Statistic20, value=Value20\n"); + ok(IGameStatistics_SetStatistic(gs, 2, 1, L"Statistic21", L"Value21")==S_OK, + "setting statistic failed: name=Statistic21, value=Value21\n"); ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s already exists\n", wine_dbgstr_w(lpStatisticsFile)); @@ -281,7 +265,7 @@ static void test_gamestatisticsmgr( void ) ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); /* this value should not be stored in storage, we need it only to test is it not saved */ - ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0a)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0a)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, L"Category0a")==S_OK, "setting category title failed: Category0a\n"); hr = IGameStatistics_Release(gs); ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr); @@ -295,17 +279,20 @@ static void test_gamestatisticsmgr( void ) /* verify values with these which we stored before*/ hr = IGameStatistics_GetCategoryTitle(gs, 0, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category0")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 1, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category1")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 2, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category2")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); /* check result if category doesn't exists */ @@ -316,43 +303,43 @@ static void test_gamestatisticsmgr( void ) hr = IGameStatistics_GetStatistic(gs, 0, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic00)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue00)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic00")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value00")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 0, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic01)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue01)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic01")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value01")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic10)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue10)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic10")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value10")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic11)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue11)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic11")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value11")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic20)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue20)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic20")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value20")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic21)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue21)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic21")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value21")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); -- 2.26.2

2 2

[PATCH] Revert "winegstreamer: Avoid performing color matrix conversions in videoconvert."
by Zebediah Figura Dec. 6, 2020

Dec. 6, 2020

This reverts commit fd25ba65e0eb9fedfb2cdfa2b7a4b16e0401dfdf. The relevant commit breaks visual correctness in many applications, for the sake of performance. As such I am rather inclined to revert it for 6.0, especially as a full solution will probably involve a revert of this patch along with upstream changes to GStreamer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49535 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e227ed9331d..77204bc55a2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1024,9 +1024,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - /* Avoid expensive color matrix conversions. */ - gst_util_set_object_arg(G_OBJECT(vconv), "matrix-mode", "none"); - /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(flip = gst_element_factory_make("videoflip", NULL))) { -- 2.29.2

1 0

Fwd: FOSDEM 21 emulator devroom
by Austin English Dec. 6, 2020

Dec. 6, 2020

---------- Forwarded message --------- From: Mahmoud Abdelghany <blackbeard334(a)protonmail.com> Date: Thu, Dec 3, 2020 at 8:44 AM Subject: FOSDEM 21 emulator devroom To: press(a)winehq.org <press(a)winehq.org> Cc: christophecreeten(a)hotmail.com <christophecreeten(a)hotmail.com> Hey guys, We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. If the answer is yes :D, please let us know. You can find more info here: https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp Regards, Christophe Creeten & Mahmoud Abdelghany Sent with ProtonMail Secure Email. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

3 2

[PATCH v3] odbccp32: Implement SQLWriteDSNToIni/W
by Alistair Leslie-Hughes Dec. 6, 2020

Dec. 6, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50150 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 96 +++++++++++++++++++++++++++++++-- dlls/odbccp32/tests/misc.c | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 5 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 420f206b700..53ca70c0b9f 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1691,16 +1691,102 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { + BOOL ret = FALSE; + HKEY hkey, hkeydriver; + WCHAR *filename = NULL; + DWORD size = 0, type; + + TRACE("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); + clear_errors(); - FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); - return TRUE; + + if (!SQLValidDSNW(lpszDSN)) + { + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + return FALSE; + } + + /* It doesn't matter if we cannot find the driver, windows just writes a blank value. */ + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if ((ret = RegOpenKeyW(hkey, lpszDriver, &hkeydriver)) == ERROR_SUCCESS) + { + ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, NULL, &size); + /* Windows ignores the fact the driver key is missing */ + if(ret == ERROR_SUCCESS && type == REG_SZ && size) + { + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return FALSE; + } + ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, filename, &size); + } + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ODBC\\ODBC.INI", &hkey) == ERROR_SUCCESS) + { + HKEY sources; + + if (RegCreateKeyW(hkey, L"ODBC Data Sources", &sources) == ERROR_SUCCESS) + { + RegSetValueExW(sources, lpszDSN, 0, REG_SZ, (BYTE*)lpszDriver, (lstrlenW(lpszDriver)+1)*sizeof(WCHAR)); + RegCloseKey(sources); + } + + RegDeleteTreeW(hkey, lpszDSN); + + if (RegCreateKeyW(hkey, lpszDSN, &hkeydriver) == ERROR_SUCCESS) + { + if (filename) + RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)filename, (lstrlenW(filename)+1)*sizeof(WCHAR)); + else + RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)L"", sizeof(L"")); + + RegCloseKey(hkeydriver); + ret = TRUE; + } + + RegCloseKey(hkey); + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(filename); + + return ret; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { - clear_errors(); - FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); - return TRUE; + BOOL ret = FALSE; + WCHAR *dsn, *driver; + + TRACE("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); + + dsn = SQLInstall_strdup(lpszDSN); + driver = SQLInstall_strdup(lpszDriver); + if (dsn && driver) + ret = SQLWriteDSNToIniW(dsn, driver); + else + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + heap_free(dsn); + heap_free(driver); + + return ret; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 0120504227d..f52dcee7acd 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -771,6 +771,113 @@ static void test_SQLConfigDataSource(void) check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } +static void test_SQLWriteDSNToIni(void) +{ + BOOL ret; + char buffer[MAX_PATH]; + char path[MAX_PATH]; + DWORD type, size; + + SQLSetConfigMode(ODBC_SYSTEM_DSN); + + ret = SQLWriteDSNToIni("wine_dbs", "SQL Server"); + if (!ret) + { + win_skip("Doesn't have permission to write a System DSN\n"); + return; + } + + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_dbs", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "SQL Server"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_dbs", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + /* WINE doesn't have a 'SQL Server' driver available */ + todo_wine ok(strlen(path) != 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_dbs"); + ok(ret, "got %d\n", ret); + } + + /* Show that values are writen, even though an invalid driver was specified. */ + ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); + ok(ret, "got %d\n", ret); + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_mis", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "Missing Access Driver (*.mis)"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_mis", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(strlen(path) == 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_mis"); + ok(ret, "got %d\n", ret); + } +} + START_TEST(misc) { test_SQLConfigMode(); @@ -785,4 +892,5 @@ START_TEST(misc) test_SQLValidDSN(); test_SQLValidDSNW(); test_SQLConfigDataSource(); + test_SQLWriteDSNToIni(); } -- 2.29.2

1 0

Re: Wine staging 5.19 release
by Gerald Pfeifer Dec. 6, 2020

Dec. 6, 2020

Alistair Leslie-Hughes wrote: > As always, if you find a bug, please report it via > https://bugs.winehq.org I did that with https://bugs.winehq.org/show_bug.cgi?id=49829 ("file.c:237:37: error: 'EXTATTR_NAMESPACE_USER' undeclared on FreeBSD") and even have debugged this and found a first fix. Alas the instructions at https://wiki.winehq.org/Wine-Staging do not really apply: The link provided goes into Bugzilla. Anyway, here is that first step towards fixing things up on FreeBSD. Gerald Properly include sys/extattr.h when available. dlls/ntdll/unix/file.c special cases when sys/extattr.h is available, alas failed to actually include that file. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/file.c.orig 2020-10-14 19:03:39.476740000 +0000 +++ dlls/ntdll/unix/file.c 2020-10-14 19:49:03.226593000 +0000 @@ -112,6 +112,9 @@ #elif defined(HAVE_SYS_XATTR_H) #include <sys/xattr.h> #endif +#ifdef HAVE_SYS_EXTATTR_H +#include <sys/extattr.h> +#endif #include <time.h> #ifdef HAVE_UNISTD_H # include <unistd.h>

4 10

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad Dec. 5, 2020

Dec. 5, 2020

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

1 0