- Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Rewrite IDirectInputDevice8W_BuildActionMap.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 7b3f3d60782c63edd621353a635616f4cea029da URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3f3d60782c63edd621353a635616… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:07:36 2023 +0100 dinput: Rewrite IDirectInputDevice8W_BuildActionMap. --- dlls/dinput/device.c | 139 +++++++++++++++++++++--------------------- dlls/dinput/tests/joystick8.c | 79 +++++------------------- 2 files changed, 84 insertions(+), 134 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for itof instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: cbc25006388af5c729ff459792630d2598549450 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbc25006388af5c729ff459792630d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 20:53:50 2023 +0100 d3d10/effect: Add support for itof instruction. --- dlls/d3d10/effect.c | 10 ++ dlls/d3d10/tests/effect.c | 305 ++++++++++++++++++++++++++-------------------- 2 files changed, 185 insertions(+), 130 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for ineg instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 8e2412fcc3feea85c71d2274cf2a6eab05b3d3f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e2412fcc3feea85c71d2274cf2a6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 20:59:37 2023 +0100 d3d10/effect: Add support for ineg instruction. --- dlls/d3d10/effect.c | 14 ++++++++++++++ dlls/d3d10/tests/effect.c | 29 +++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 142ba7bec72..d61c94c982f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -252,6 +252,19 @@ static void pres_cos(float **args, unsigned int n, const struct preshader_instr retval[i] = cos(args[0][i]); } +static void pres_ineg(float **args, unsigned int n, const struct preshader_instr *instr) +{ + int *arg1 = (int *)args[0]; + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + { + int v = -arg1[i]; + retval[i] = *(float *)&v; + } +} + static void pres_itof(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -344,6 +357,7 @@ static const struct preshader_op_info preshader_ops[] = { 0x104, "frc", pres_frc }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, + { 0x120, "ineg", pres_ineg }, { 0x130, "itof", pres_itof }, { 0x133, "ftou", pres_ftou }, { 0x137, "ftob", pres_ftob }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5a265adc07a..a39c15601c1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8182,15 +8182,15 @@ technique10 tech } pass p8 { - SetBlendState( NULL, 0.1 * g_var3.x, 0 ); + SetBlendState( NULL, 0.1 * -g_var3.x, 0 ); } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xd57994e8, 0xc1f47b80, 0x5ab836c5, 0x02ff0a6e, 0x00000001, 0x000012c0, 0x00000001, - 0x00000024, 0x30315846, 0x00001294, 0xfeff1001, 0x00000001, 0x00000003, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000f8c, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0xa151a4d6, 0x36eec21c, 0xfbe6ea0f, 0xb267f68f, 0x00000001, 0x000012e0, 0x00000001, + 0x00000024, 0x30315846, 0x000012b4, 0xfeff1001, 0x00000001, 0x00000003, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000fac, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x746e6900, 0x003d0034, 0x00010000, @@ -8301,20 +8301,21 @@ static DWORD fx_test_value_expression[] = 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00000434, 0x00000000, 0x4c584600, 0x00003043, 0x00000100, 0x40000400, 0x00000110, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, - 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00387000, 0x000001ac, - 0x43425844, 0x56d4ee7a, 0x14d0efda, 0x7f2a38e0, 0x183b28f2, 0x00000001, 0x000001ac, 0x00000003, + 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00387000, 0x000001cc, + 0x43425844, 0xe22c15f6, 0xc12fca9e, 0x201275ad, 0x6952a463, 0x00000001, 0x000001cc, 0x00000003, 0x0000002c, 0x000000a8, 0x000000c4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xab003372, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000014, 0x00000004, 0x3dcccccd, 0x00000000, 0x00000000, - 0x00000000, 0x434c5846, 0x000000e0, 0x00000005, 0x13000001, 0x00000001, 0x00000000, 0x00000002, - 0x00000000, 0x00000000, 0x00000007, 0x00000000, 0x20500001, 0x00000002, 0x00000000, 0x00000007, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x20500001, - 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, - 0x00000004, 0x00000001, 0x20500001, 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, + 0x00000000, 0x434c5846, 0x00000100, 0x00000006, 0x12000001, 0x00000001, 0x00000000, 0x00000002, + 0x00000000, 0x00000000, 0x00000007, 0x00000000, 0x13000001, 0x00000001, 0x00000000, 0x00000007, + 0x00000000, 0x00000000, 0x00000007, 0x00000004, 0x20500001, 0x00000002, 0x00000000, 0x00000007, + 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x20500001, + 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000004, 0x00000001, 0x20500001, 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x20500001, 0x00000002, 0x00000000, - 0x00000007, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, + 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000004, 0x00000030, 0x00000000, 0x00000003, 0xffffffff, 0x00000000, 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, 0x00000014, @@ -8337,7 +8338,7 @@ static DWORD fx_test_value_expression[] = 0x00000001, 0x00000caa, 0x00000cb6, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000cb9, 0x0000000b, 0x00000000, 0x00000001, 0x00000da9, 0x00000002, 0x00000000, 0x00000001, 0x00000db5, 0x00000dc1, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000dc4, - 0x0000000b, 0x00000000, 0x00000001, 0x00000f74, 0x00000002, 0x00000000, 0x00000001, 0x00000f80, + 0x0000000b, 0x00000000, 0x00000001, 0x00000f94, 0x00000002, 0x00000000, 0x00000001, 0x00000fa0, }; static float get_frc(float v) @@ -8525,7 +8526,7 @@ static void test_effect_value_expression(void) pass = t->lpVtbl->GetPassByName(t, "p8"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); - f[0] = 2.0f; + f[0] = -2.0f; hr = g_var3->lpVtbl->SetFloatVector(g_var3, f); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d3d10/effect: Add support for imax instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: c96c6b9826a9f8807441ac3ef8da2016eb9ca55d URL: https://gitlab.winehq.org/wine/wine/-/commit/c96c6b9826a9f8807441ac3ef8da20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 21:09:08 2023 +0100 d3d10/effect: Add support for imax instruction. --- dlls/d3d10/effect.c | 14 ++++++++ dlls/d3d10/tests/effect.c | 87 ++++++++++++++++++++++++----------------------- 2 files changed, 59 insertions(+), 42 deletions(-)

1 0

Francois Gouget : mscoree/tests: Avoid temporary directory name collisions.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: c11e923422f40ab0ee5e512d81cb14c85faff6a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c11e923422f40ab0ee5e512d81cb14… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 19 20:07:33 2023 +0100 mscoree/tests: Avoid temporary directory name collisions. test_loadpaths_execute() was sometimes getting ERROR_ALREADY_EXISTS when creating its temporary directoryi. That was probably because GetTempFileNameW() only uses the low 16-bits of the 'random' LUID which goes over a wider range, potentially leading to collisions in the lower 16-bits. Avoid AllocateLocallyUniqueId() entirely and add a helper function to create a guaranteed new directory. Also try to use the current directory first as it is assumed to have been configured to ward off anti-virus programs (specifically Microsoft Defender) which is especially important when writing executables to that location. Only switch to the system's temporary directory if the current directory is not a writable location. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54560 --- dlls/mscoree/tests/mscoree.c | 55 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index e5065a41d88..adac72e5f4c 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -592,25 +592,55 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty return ret; } +static BOOL create_new_dir(WCHAR newdir[MAX_PATH], const WCHAR* parent, + const WCHAR* prefix) +{ + WCHAR path[MAX_PATH]; + BOOL try_tmpdir = TRUE; + static unsigned i = 0; + + if (!parent) + { + GetCurrentDirectoryW(ARRAY_SIZE(path), path); + parent = path; + } + while (1) + { + swprintf(newdir, MAX_PATH, L"%s\\%s%04d", path, prefix, i); + if (CreateDirectoryW(newdir, NULL)) + return TRUE; + switch (GetLastError()) + { + case ERROR_ACCESS_DENIED: + if (!try_tmpdir) + return FALSE; + try_tmpdir = FALSE; + GetTempPathW(ARRAY_SIZE(path), path); + path[wcslen(path) - 1] = 0; /* redundant trailing backslash */ + parent = path; + break; + case ERROR_ALREADY_EXISTS: + i++; + break; + default: + return FALSE; + } + } +} + static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, const WCHAR *cfg_name, const WCHAR *dll_dest, BOOL expect_failure, BOOL todo) { - WCHAR tmp[MAX_PATH], tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; + WCHAR tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; PROCESS_INFORMATION pi; STARTUPINFOW si = { 0 }; WCHAR *ptr, *end; DWORD exit_code = 0xdeadbeef; - LUID id; BOOL ret; - GetTempPathW(MAX_PATH, tmp); - ret = AllocateLocallyUniqueId(&id); - ok(ret, "AllocateLocallyUniqueId failed: %lu\n", GetLastError()); - ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); - ok(ret, "GetTempFileNameW failed: %lu\n", GetLastError()); - - ret = CreateDirectoryW(tmpdir, NULL); - ok(ret, "CreateDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); + ok(create_new_dir(tmpdir, NULL, L"loadpaths"), + "failed to create a new dir %lu\n", GetLastError()); + end = tmpdir + wcslen(tmpdir); wcscpy(tmpexe, tmpdir); PathAppendW(tmpexe, exe_name); @@ -673,9 +703,8 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, ret = DeleteFileW(tmpexe); ok(ret, "DeleteFileW(%s) failed: %lu\n", debugstr_w(tmpexe), GetLastError()); - end = tmpdir + wcslen(tmp); - ptr = tmpdir + wcslen(tmpdir) - 1; - while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) + ptr = end; + while (ptr >= end && (ptr = wcsrchr(tmpdir, '\\'))) { ret = RemoveDirectoryW(tmpdir); ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError());

1 0

Rémi Bernon : dinput: Pass device object format index to queue_event.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 1e594b1c0fd23c1aedc13b3c2d8c91c1fc00f8ee URL: https://gitlab.winehq.org/wine/wine/-/commit/1e594b1c0fd23c1aedc13b3c2d8c91… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 15:07:46 2023 +0100 dinput: Pass device object format index to queue_event. --- dlls/dinput/device.c | 61 +++++++++++++++++++---------- dlls/dinput/device_private.h | 3 +- dlls/dinput/joystick_hid.c | 10 +++-- dlls/dinput/keyboard.c | 8 ++-- dlls/dinput/mouse.c | 91 +++++++++++++++++++------------------------- 5 files changed, 92 insertions(+), 81 deletions(-)

1 0

Jinoh Kang : ntdll: Open application manifest files with FILE_SHARE_DELETE.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: bc854efd7c20802a28499779dc35e3394ff9ac5e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc854efd7c20802a28499779dc35e3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 18 17:02:22 2023 +0900 ntdll: Open application manifest files with FILE_SHARE_DELETE. Today, RtlCreateActivationContext (CreateActCtxW) opens the source manifest file via NtOpenFile without the FILE_SHARE_DELETE sharing mode. This causes CreateActCtxW to fail if the source manifest file was created with the FILE_DELETE_ON_CLOSE flag. FILE_DELETE_ON_CLOSE is often used for temporary files that should be automatically deleted after use, even if the creator process crashes. Fix this by specifying FILE_SHARE_DELETE for sharing mode when opening the source manifest or module file. This allows the source manifest or module file to be marked as deleted while it is open. Note that concurrent deletion is not an issue for the following reasons: - The ability to read from an open file handle is unaffected by deletion of the corresponding file's name. - RtlCreateActivationContext does not open the source manifest or module file by the given filename (lpSource) more than once. --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9dbf77bc761..da351e70466 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2917,7 +2917,6 @@ static void test_CreateActCtx_share_mode(void) actctx.lpSource = tmp_manifest_pathname; handle = CreateActCtxW(&actctx); - todo_wine ok(handle != INVALID_HANDLE_VALUE, "CreateActCtxW returned error %lu\n", GetLastError()); ok(handle != NULL, "CreateActCtxW returned %p\n", handle); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 721a2f339a5..b275a7f5b49 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2925,7 +2925,8 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai,

1 0

Jinoh Kang : kernel32/tests: Test for manifest file open share mode in CreateActCtxW.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 6cabfcc18792e110decd1c410a4421775bbb24ef URL: https://gitlab.winehq.org/wine/wine/-/commit/6cabfcc18792e110decd1c410a4421… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 18 17:01:41 2023 +0900 kernel32/tests: Test for manifest file open share mode in CreateActCtxW. --- dlls/kernel32/tests/actctx.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index bec04b7f066..9dbf77bc761 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -617,6 +617,50 @@ static BOOL create_wide_manifest(const char *filename, const char *manifest, BOO return ret; } +static HANDLE create_temp_manifest_file(const char *manifest, WCHAR *pathname) +{ + WCHAR tmp_path[MAX_PATH]; + DWORD size, tmp_path_len; + HANDLE file, file_w; + UINT unique; + + tmp_path_len = GetTempPathW(ARRAY_SIZE(tmp_path), tmp_path); + ok(tmp_path_len != 0, "GetTempPathW returned error %lu\n", GetLastError()); + ok(tmp_path_len < ARRAY_SIZE(tmp_path), "GetTempPathW return value %lu should be less than %Iu\n", + tmp_path_len, ARRAY_SIZE(tmp_path)); + + memset(pathname, 0, MAX_PATH * sizeof(WCHAR)); + unique = GetTempFileNameW(tmp_path, L"tst", 0, pathname); + ok(unique != 0, "GetTempFileNameW returned error %lu\n", GetLastError()); + + /* Open file handle that will be deleted on close or process termination */ + file = CreateFileW(pathname, + GENERIC_READ | DELETE, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, + NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile returned error %lu\n", GetLastError()); + + /* Re-open file with write access */ + file_w = CreateFileW(pathname, + GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + TRUNCATE_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(file_w != INVALID_HANDLE_VALUE, "CreateFile returned error %lu\n", GetLastError()); + + WriteFile(file_w, manifest, strlen(manifest), &size, NULL); + + /* Close file handle that was open for write to avoid sharing violation */ + CloseHandle(file_w); + + return file; +} + typedef struct { ULONG format_version; ULONG assembly_cnt_min; @@ -2860,6 +2904,28 @@ todo_wine { } } +static void test_CreateActCtx_share_mode(void) +{ + WCHAR tmp_manifest_pathname[MAX_PATH]; + HANDLE handle, manifest_file; + ACTCTXW actctx; + + manifest_file = create_temp_manifest_file(manifest1, tmp_manifest_pathname); + + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = tmp_manifest_pathname; + + handle = CreateActCtxW(&actctx); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "CreateActCtxW returned error %lu\n", GetLastError()); + ok(handle != NULL, "CreateActCtxW returned %p\n", handle); + + ReleaseActCtx(handle); + + CloseHandle(manifest_file); +} + static BOOL init_funcs(void) { HMODULE hLibrary = GetModuleHandleA("kernel32.dll"); @@ -3719,6 +3785,7 @@ START_TEST(actctx) test_actctx(); test_create_fail(); test_CreateActCtx(); + test_CreateActCtx_share_mode(); test_findsectionstring(); test_ZombifyActCtx(); run_child_process();

1 0

Tyson Whitehead : crypt32: Add some CertGetNameStringW fallback cases.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 01c69eb3023d2b85827020a8da8bb43c19560450 URL: https://gitlab.winehq.org/wine/wine/-/commit/01c69eb3023d2b85827020a8da8bb4… Author: Tyson Whitehead <twhitehead(a)gmail.com> Date: Tue Mar 14 09:57:48 2023 -0400 crypt32: Add some CertGetNameStringW fallback cases. When called with CERT_NAME_ATTR_TYPE and pvTypePara=NULL, Windows did the first of email, CN, OU, or O while Wine just did email. --- dlls/crypt32/str.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d74df308e4a..42046369652 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -965,11 +965,22 @@ static DWORD cert_get_name_from_rdn_attr(DWORD encodingType, if (CryptDecodeObjectEx(encodingType, X509_NAME, name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) { - PCERT_RDN_ATTR nameAttr; + PCERT_RDN_ATTR nameAttr = NULL; - if (!oid) - oid = szOID_RSA_emailAddr; - nameAttr = CertFindRDNAttr(oid, nameInfo); + if (oid) + nameAttr = CertFindRDNAttr(oid, nameInfo); + else + { + static const LPCSTR attributeOIDs[] = + { + szOID_RSA_emailAddr, szOID_COMMON_NAME, + szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME + }; + DWORD i; + + for (i = 0; !nameAttr && i < ARRAY_SIZE(attributeOIDs); i++) + nameAttr = CertFindRDNAttr(attributeOIDs[i], nameInfo); + } if (nameAttr) ret = rdn_value_to_strW(nameAttr->dwValueType, &nameAttr->Value, pszNameString, cchNameString, TRUE);

1 0

Alexandre Julliard : widl: Pass the correct parent name when opening an import file.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 78dc4ce7a0eed9c0bdeeea95e4ce895582eca4df URL: https://gitlab.winehq.org/wine/wine/-/commit/78dc4ce7a0eed9c0bdeeea95e4ce89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 13:36:14 2023 +0100 widl: Pass the correct parent name when opening an import file. Fixed a regression from 9d537999e315a74ef559fabb79d5b632b8a00208. --- tools/widl/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a1be68d8bd9..44741d4d63a 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -543,7 +543,7 @@ void push_import( char *import_name ) import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); - input_name = find_input_file( import_name, input_name ); + input_name = find_input_file( import_name, state->input_name ); file = open_input_file( input_name ); line_number = 1;

1 0