July 2021 - Wine-devel - list.winehq.org

[PATCH] msvcrt: Make the cosh/sinh/tanh functions NAN preserving
by Martin Storsjo 16 Jul '21

16 Jul '21

When a NAN is fed as input, return it as-is without mangling it through the calculation (which e.g. loses the sign of the input value). This fixes a regression in a testcase of mine, after switching to the internal implementation of these functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- As these routines are imported from musl, I guess I should try to upstream the same fix to them too. --- dlls/msvcrt/math.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ecf5fdce4d8..2a12c02a4f5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1139,6 +1139,9 @@ float CDECL coshf( float x ) UINT32 ui = *(UINT32*)&x; float t; + if (isnan(x)) + return x; + /* |x| */ ui &= 0x7fffffff; x = *(float*)&ui; @@ -1676,6 +1679,9 @@ float CDECL sinhf( float x ) UINT32 ui = *(UINT32*)&x; float t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ui >> 31) h = -h; @@ -1877,6 +1883,9 @@ float CDECL tanhf( float x ) int sign; float t; + if (isnan(x)) + return x; + /* x = |x| */ sign = ui >> 31; ui &= 0x7fffffff; @@ -2769,6 +2778,9 @@ double CDECL cosh( double x ) UINT32 w; double t; + if (isnan(x)) + return x; + /* |x| */ ux &= (uint64_t)-1 / 2; x = *(double*)&ux; @@ -4035,6 +4047,9 @@ double CDECL sinh( double x ) UINT32 w; double t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ux >> 63) h = -h; @@ -4322,6 +4337,9 @@ double CDECL tanh( double x ) int sign; double t; + if (isnan(x)) + return x; + /* x = |x| */ sign = ui >> 63; ui &= (UINT64)-1 / 2; -- 2.25.1

2 1

[PATCH v3 2/2] dbghelp: Initialize new structure members
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/coff.c | 2 ++ dlls/dbghelp/dwarf.c | 2 ++ dlls/dbghelp/module.c | 4 ++++ dlls/dbghelp/msc.c | 4 ++++ dlls/dbghelp/stabs.c | 2 ++ 5 files changed, 14 insertions(+) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 285182f682a..769e2c54196 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -452,6 +452,8 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) msc_dbg->module->module.TypeInfo = FALSE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; ret = TRUE; } diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..b9726f5f4c8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3561,6 +3561,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.TypeInfo = TRUE; dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + dwarf2_modfmt->module->module.MachineType = 0; + dwarf2_modfmt->module->module.Reserved = 0; /* set the word_size for eh_frame parsing */ dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cadb285accb..247aadcef0e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -207,6 +207,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TypeInfo = FALSE; module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->module.MachineType = 0; + module->module.Reserved = 0; module->reloc_delta = 0; module->type = type; @@ -1201,6 +1203,8 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.TypeInfo = miw64.TypeInfo; mi64.SourceIndexed = miw64.SourceIndexed; mi64.Publics = miw64.Publics; + mi64.MachineType = miw64.MachineType; + mi64.Reserved = miw64.Reserved; memcpy(ModuleInfo, &mi64, ModuleInfo->SizeOfStruct); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b6811ea97f5..51edcaa2210 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2901,6 +2901,8 @@ static BOOL pdb_process_file(const struct process* pcs, msc_dbg->module->module.TypeInfo = TRUE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; } else { @@ -3343,6 +3345,8 @@ static BOOL codeview_process_info(const struct process* pcs, msc_dbg->module->module.TypeInfo = TRUE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; codeview_clear_type_table(); ret = TRUE; break; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 517299897c4..e6aacc063aa 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1676,6 +1676,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, module->module.TypeInfo = TRUE; module->module.SourceIndexed = TRUE; module->module.Publics = TRUE; + module->module.MachineType = 0; + module->module.Reserved = 0; done: HeapFree(GetProcessHeap(), 0, stabbuff); stabs_free_includes(); -- 2.30.2

2 1

[PATCH v3 1/2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

WoW64 on Catalina
by Theodore Dubois 16 Jul '21

16 Jul '21

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

1 0

WoW64 on Catalina
by Theodore Dubois 16 Jul '21

16 Jul '21

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

1 0

[PATCH] user32: During destroy, don't send WM_ERASEBKGND to parent window if WS_CHILD is not set
by Andrew Eikum 15 Jul '21

15 Jul '21

Prior to this change, Wine would hang during the DestroyWindow(child) call because it is waiting for the parent window thread to process a WM_ERASEBKGND message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/tests/msg.c | 130 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..a3d30dd005b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11374,6 +11374,20 @@ static const struct message destroy_window_with_children[] = { { 0 } }; +static const struct message destroy_child_window_with_ws_child[] = { + { HCBT_DESTROYWND, hook }, + { WM_PARENTNOTIFY, sent }, + { WM_ERASEBKGND, sent }, + { 0 } +}; + +static const struct message destroy_child_window_no_ws_child[] = { + { HCBT_DESTROYWND, hook }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|beginpaint }, + { 0 } +}; + static void test_DestroyWindow(void) { BOOL ret; @@ -11478,6 +11492,121 @@ static void test_DestroyWindow(void) ok(!test, "wrong capture window %p\n", test); } +struct destroy_child_window_test_data { + HANDLE evt; + HWND parent; + BOOL stop_processing; + BOOL quit; +}; + +static DWORD WINAPI destroy_child_window_parent_threadproc(void *user) +{ + struct destroy_child_window_test_data *data = user; + + data->parent = CreateWindowA("TestWindowClass", "test parent", + WS_VISIBLE | WS_OVERLAPPEDWINDOW, 100, 200, 300, 400, + NULL, NULL, NULL, NULL); + + SetEvent(data->evt); + + while(!data->stop_processing) + flush_events(); + + SetEvent(data->evt); + + while(data->stop_processing) + Sleep(10); + + flush_events(); + + SetEvent(data->evt); + + while(!data->quit) + Sleep(10); + + DestroyWindow(data->parent); + + flush_events(); + + return 0; +} + +static void test_destroy_child_window(void) +{ + struct destroy_child_window_test_data data = {0}; + HWND child; + HANDLE parent_thread; + + /* create parent on this thread to demonstrate WM_ERASEBKGND message */ + data.parent = CreateWindowA("TestWindowClass", "test parent", + WS_VISIBLE | WS_OVERLAPPEDWINDOW, 100, 200, 300, 400, + NULL, NULL, NULL, NULL); + ok(data.parent != NULL, "parent window create failed\n"); + + child = CreateWindowA("SimpleWindowClass", "test child", + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 100, 200, 50, 50, NULL, NULL, NULL, NULL); + ok(child != NULL, "child window create failed\n"); + + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) | WS_CHILD); + SetParent(child, data.parent); + + ShowWindow(child, SW_SHOW); + ShowWindow(data.parent, SW_SHOW); + + flush_events(); + flush_sequence(); + + DestroyWindow(child); + + ok_sequence(destroy_child_window_with_ws_child, "destroy child with WS_CHILD", FALSE); + + DestroyWindow(data.parent); + + /* create parent on separate thread to demonstrate avoiding deadlock on WM_ERASEBKGND message */ + data.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + + parent_thread = CreateThread(NULL, 0, destroy_child_window_parent_threadproc, &data, 0, NULL); + + WaitForSingleObject(data.evt, INFINITE); + ok(data.parent != NULL, "parent window create failed\n"); + + child = CreateWindowA("SimpleWindowClass", "test child", + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 100, 200, 50, 50, NULL, NULL, NULL, NULL); + ok(child != NULL, "child window create failed\n"); + + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) | WS_CHILD); + SetParent(child, data.parent); + + ShowWindow(child, SW_SHOW); + ShowWindow(data.parent, SW_SHOW); + + /* removing WS_CHILD avoids deadlock on WM_PARENTNOTIFY */ + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) & ~WS_CHILD); + + data.stop_processing = TRUE; + WaitForSingleObject(data.evt, INFINITE); + + flush_events(); + flush_sequence(); + + DestroyWindow(child); + + data.stop_processing = FALSE; + WaitForSingleObject(data.evt, INFINITE); + + ok_sequence(destroy_child_window_no_ws_child, "destroy child without WS_CHILD", FALSE); + + data.quit = TRUE; + WaitForSingleObject(parent_thread, INFINITE); + + flush_events(); + flush_sequence(); + + CloseHandle(data.evt); + CloseHandle(parent_thread); +} static const struct message WmDispatchPaint[] = { { WM_NCPAINT, sent }, @@ -18333,6 +18462,7 @@ START_TEST(msg) test_recursive_hook(); } test_DestroyWindow(); + test_destroy_child_window(); test_DispatchMessage(); test_SendMessageTimeout(); test_edit_messages(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b5964..d047d714e79 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2367,8 +2367,10 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)) { HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; - erase_now( parent, 0 ); + if (!parent || parent == GetDesktopWindow()) + erase_now( winpos->hwnd, 0 ); + else if((GetWindowLongW(winpos->hwnd, GWL_STYLE) & WS_CHILD) == WS_CHILD) + erase_now( parent, 0 ); } /* Give newly shown windows a chance to redraw */ -- 2.32.0

3 3

[PATCH 1/5] crypt32: Rename "crl" and "cloned" to "dst" and "src" in CRL_clone().
by Zebediah Figura 15 Jul '21

15 Jul '21

"cloned" is very ambiguous and can be interpreted as the destination rather than the source. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/crypt32/crl.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 31bf35bd041..4dc77c2a246 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -40,40 +40,38 @@ static const context_vtbl_t crl_vtbl; static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link) { - crl_t *crl; + crl_t *dst; if(use_link) { - crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); - if(!crl) + if (!(dst = (crl_t *)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store))) return NULL; }else { - const crl_t *cloned = (const crl_t*)context; + const crl_t *src = (const crl_t*)context; DWORD size = 0; BOOL res; - crl = (crl_t*)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store); - if(!crl) + if (!(dst = (crl_t *)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store))) return NULL; - Context_CopyProperties(&crl->ctx, &cloned->ctx); + Context_CopyProperties(&dst->ctx, &src->ctx); - crl->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType; - crl->ctx.pbCrlEncoded = CryptMemAlloc(cloned->ctx.cbCrlEncoded); - memcpy(crl->ctx.pbCrlEncoded, cloned->ctx.pbCrlEncoded, cloned->ctx.cbCrlEncoded); - crl->ctx.cbCrlEncoded = cloned->ctx.cbCrlEncoded; + dst->ctx.dwCertEncodingType = src->ctx.dwCertEncodingType; + dst->ctx.pbCrlEncoded = CryptMemAlloc(src->ctx.cbCrlEncoded); + memcpy(dst->ctx.pbCrlEncoded, src->ctx.pbCrlEncoded, src->ctx.cbCrlEncoded); + dst->ctx.cbCrlEncoded = src->ctx.cbCrlEncoded; - /* FIXME: We don't need to decode the object here, we could just clone crl info. */ - res = CryptDecodeObjectEx(crl->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, - crl->ctx.pbCrlEncoded, crl->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, - &crl->ctx.pCrlInfo, &size); + /* FIXME: We don't need to decode the object here, we could just clone dst info. */ + res = CryptDecodeObjectEx(dst->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + dst->ctx.pbCrlEncoded, dst->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + &dst->ctx.pCrlInfo, &size); if(!res) { - CertFreeCRLContext(&crl->ctx); + CertFreeCRLContext(&dst->ctx); return NULL; } } - crl->ctx.hCertStore = store; - return &crl->base; + dst->ctx.hCertStore = store; + return &dst->base; } static const context_vtbl_t crl_vtbl = { -- 2.30.2

1 4

[PATCH 1/4] reg/tests: Test use of registry views when exporting registry data
by Hugh McMaster 15 Jul '21

15 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/export.c | 165 ++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index af00262212b..79135b0efb0 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -216,6 +216,15 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Test registry export with an empty key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -429,6 +438,150 @@ static void test_export(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword = 0x100; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + add_key(hkey, "Subkey1", sam, &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + close_key(subkey); + + close_key(hkey); +} + +static const char *registry_view_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n"; + +static void test_registry_view_win32(void) +{ + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", registry_view_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(export) { DWORD r; @@ -439,4 +592,16 @@ START_TEST(export) } test_export(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } -- 2.32.0

1 3

[PATCH] evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types.
by Nikolay Sivov 15 Jul '21

15 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 187a13be364..66c3960511a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -657,11 +657,28 @@ static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned *count += 1; } +static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_VideoDesc *video_desc) +{ + switch (video_desc->SampleFormat.SampleFormat) + { + case DXVA2_SampleFieldInterleavedEvenFirst: + return MFVideoInterlace_FieldInterleavedUpperFirst; + case DXVA2_SampleFieldInterleavedOddFirst: + return MFVideoInterlace_FieldInterleavedLowerFirst; + case DXVA2_SampleFieldSingleEven: + return MFVideoInterlace_FieldSingleUpper; + case DXVA2_SampleFieldSingleOdd: + return MFVideoInterlace_FieldSingleLower; + default: + return MFVideoInterlace_Progressive; + } +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count; + unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; MFVideoArea aperture; @@ -702,6 +719,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memset(&aperture, 0, sizeof(aperture)); aperture.Area.cx = video_desc->SampleWidth; aperture.Area.cy = video_desc->SampleHeight; + interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -714,6 +732,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 91fff21ebed..d240ebe4456 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,6 +1056,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); IMFMediaType_Release(media_type); } -- 2.30.2

1 0

[PATCH] secur32: Use default recv timeout function
by Alistair Leslie-Hughes 15 Jul '21

15 Jul '21

Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 The poll function currently always returns 0 which signals to gnutls that no data is available. However this might not be the case. Using the default gnutls_system_recv_timeout function returns the expect value when data is available. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..ff678c6cee1 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -62,6 +62,8 @@ static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); +static int (*pgnutls_system_recv_timeout)(gnutls_transport_ptr_t, unsigned int); + /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); static int (*pgnutls_alpn_set_protocols)(gnutls_session_t, const gnutls_datum_t *, @@ -165,6 +167,12 @@ static void compat_gnutls_transport_set_pull_timeout_function(gnutls_session_t s FIXME("\n"); } +static int compat_gnutls_system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms) +{ + FIXME("\n"); + return -1; +} + static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x509_privkey_t *key) { FIXME("\n"); @@ -292,7 +300,8 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + TRACE("\n"); + return pgnutls_system_recv_timeout(transport, timeout); } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred) @@ -1024,6 +1033,12 @@ static BOOL gnutls_initialize(void) WARN("gnutls_transport_set_pull_timeout_function not found\n"); pgnutls_transport_set_pull_timeout_function = compat_gnutls_transport_set_pull_timeout_function; } + + if (!(pgnutls_system_recv_timeout = dlsym(libgnutls_handle, "gnutls_system_recv_timeout"))) + { + WARN("gnutls_system_recv_timeout not found\n"); + pgnutls_system_recv_timeout = compat_gnutls_system_recv_timeout; + } if (!(pgnutls_alpn_set_protocols = dlsym(libgnutls_handle, "gnutls_alpn_set_protocols"))) { WARN("gnutls_alpn_set_protocols not found\n"); -- 2.30.2

2 1