April 2021 - Wine-commits - list.winehq.org

Arkadiusz Hiler : msvcp140_1: Implement the DLL.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 9cbff7e68c6138eac567eeecbc8022ae54e7760a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbff7e68c6138eac567eeec… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:02:45 2021 +0200 msvcp140_1: Implement the DLL. This backs C++17's std::pmr implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49954 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 7 +- dlls/msvcp140_1/msvcp140_1.c | 290 +++++++++++++++++++++++++++++++++++ dlls/msvcp140_1/msvcp140_1.spec | 14 +- dlls/msvcp140_1/tests/Makefile.in | 3 + dlls/msvcp140_1/tests/msvcp140_1.c | 305 +++++++++++++++++++++++++++++++++++++ 7 files changed, 613 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cbff7e68c6138eac567…

1 0

Hugh McMaster : reg: Remove unneeded ternary operator in RegDeleteValueW().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: fa24d458f5d9663fbefb1eb7406961b1c6ec3def URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa24d458f5d9663fbefb1eb7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 6 23:39:26 2021 +1000 reg: Remove unneeded ternary operator in RegDeleteValueW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 626fcf3b341..239bbbc672b 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -93,7 +93,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) + if (RegDeleteValueW(key, value_name)) { RegCloseKey(key); output_message(STRING_VALUE_NONEXIST);

1 0

Hans Leidekker : include: Add winber.h.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 3f25be74fc3a2c8e1cbe6cf980d0e31b617064a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f25be74fc3a2c8e1cbe6cf9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:51 2021 +0200 include: Add winber.h. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winber.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/winber.h b/include/winber.h new file mode 100644 index 00000000000..40ab0f40ed8 --- /dev/null +++ b/include/winber.h @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINBER_H +#define __WINE_WINBER_H + +#define LBER_ERROR (~0L) +#define LBER_DEFAULT (~0L) + +typedef int ber_int_t; +typedef unsigned int ber_tag_t; +typedef unsigned int ber_len_t; + +BerElement * CDECL ber_alloc_t( int ); +void CDECL ber_bvfree( BERVAL * ); +int CDECL ber_flatten( BerElement *, BERVAL ** ); +void CDECL ber_free( BerElement *, int ); +BerElement * CDECL ber_init( BERVAL * ); +int WINAPIV ber_printf( BerElement *, char *, ... ); +ULONG WINAPIV ber_scanf( BerElement *, char *, ... ); + +#endif /* __WINE_WINBER_H */

1 0

Alexandre Julliard : regedit: 64-bit regedit.exe is in c:\windows.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 8f2f59eee1ef872e22cd4b578cae49091f50ef9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f2f59eee1ef872e22cd4b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 10:55:30 2021 +0200 regedit: 64-bit regedit.exe is in c:\windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50933 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 80f935027e8..df92a13ab69 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -148,15 +148,14 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { + static const WCHAR filename[] = L"C:\\windows\\regedit.exe"; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR filename[MAX_PATH]; void *redir; DWORD exit_code; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : ntdll: Also fallback to native if builtin is for the wrong architecture.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 7c0d6e8067ac20a249a2aef0237faf54fe77aa01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0d6e8067ac20a249a2aef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:21:40 2021 +0200 ntdll: Also fallback to native if builtin is for the wrong architecture. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c13055a5549..3d613425b68 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1372,7 +1372,8 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); default: status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_DEFAULT) ); - if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; + if (status == STATUS_DLL_NOT_FOUND || status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + return STATUS_IMAGE_ALREADY_LOADED; return status; } }

1 0

Alexandre Julliard : ntdll: Avoid closing a handle twice.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 6d5a6c346681b57db7c5d1cddf7b40543a365b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d5a6c346681b57db7c5d1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:24:22 2021 +0200 ntdll: Avoid closing a handle twice. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7a714a5aa6d..e1810bc5ab9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2282,6 +2282,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDL TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; NtClose( *mapping ); + *mapping = NULL; } } NtClose( handle );

1 0

Alexandre Julliard : ntdll: Check for DLL files when creating new processes.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 89db25afda90d1d5d57787398ba80fcf4f5abb5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89db25afda90d1d5d5778739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:24:38 2021 +0200 ntdll: Check for DLL files when creating new processes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50912 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 +++++- dlls/ntdll/unix/process.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ab2e828dacd..5b4a2254659 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1917,7 +1917,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) env[env_pos++] = 0; status = load_main_exe( NULL, main_argv[1], curdir, &image, &module, &image_info ); - if (!status && image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + if (!status) + { + if (image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; + if (image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + } if (status) /* try launching it through start.exe */ { diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b020e15eaee..54410261c91 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -365,6 +365,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image } SERVER_END_REQ; NtClose( mapping ); + if (info->image_charact & IMAGE_FILE_DLL) return STATUS_INVALID_IMAGE_FORMAT; } else if (status == STATUS_INVALID_IMAGE_NOT_MZ) {

1 0

Alexandre Julliard : regsvr32: Don't use GetBinaryType() on DLL files.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 44f0a67ba5ab782c7722a682e721ab8f7371dca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f0a67ba5ab782c7722a682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:01:15 2021 +0200 regsvr32: Don't use GetBinaryType() on DLL files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ecfd95234dd..ee915ed3e21 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -23,6 +23,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <winternl.h> #include <ole2.h> #include "regsvr32.h" #include "wine/debug.h" @@ -166,9 +167,9 @@ static void reexec_self(void) } #ifdef _WIN64 -# define ALT_BINARY_TYPE SCS_32BIT_BINARY +# define ALT_MACHINE IMAGE_FILE_MACHINE_I386 #else -# define ALT_BINARY_TYPE SCS_64BIT_BINARY +# define ALT_MACHINE IMAGE_FILE_MACHINE_AMD64 #endif /** @@ -187,12 +188,12 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - DWORD binary_type; + HMODULE module; if (firstDll && GetLastError() == ERROR_BAD_EXE_FORMAT && - GetBinaryTypeW(strDll, &binary_type) && - binary_type == ALT_BINARY_TYPE) + (module = LoadLibraryExW(strDll, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE))) { - reexec_self(); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( (HMODULE)((ULONG_PTR)module & ~3) ); + if (nt->FileHeader.Machine == ALT_MACHINE) reexec_self(); } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED);

1 0

Alexandre Julliard : kernel32: Return failure in GetBinaryType() for DLL files.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 1e1f110c99fba4c33ebe85bf112c9d37899d3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e1f110c99fba4c33ebe85bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:31:19 2021 +0200 kernel32: Return failure in GetBinaryType() for DLL files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 0449bedf83f..2f47423e74b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -190,6 +190,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); CloseHandle( mapping ); if (status) return FALSE; + if (!(info.ImageCharacteristics & IMAGE_FILE_DLL)) return FALSE; switch (info.Machine) { case IMAGE_FILE_MACHINE_I386:

1 0

Connor McAdams : winegstreamer: Add corresponding 'IYUV' type alongside 'I420'.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: aa20f3c084b964b28ecfe0d5fd3468edb29d318f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa20f3c084b964b28ecfe0d5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 2 21:00:24 2021 -0400 winegstreamer: Add corresponding 'IYUV' type alongside 'I420'. Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 68278838458..821657f8dd8 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -521,6 +521,7 @@ video_formats[] = {&MFVideoFormat_RGB565, WG_VIDEO_FORMAT_RGB16}, {&MFVideoFormat_AYUV, WG_VIDEO_FORMAT_AYUV}, {&MFVideoFormat_I420, WG_VIDEO_FORMAT_I420}, + {&MFVideoFormat_IYUV, WG_VIDEO_FORMAT_I420}, {&MFVideoFormat_NV12, WG_VIDEO_FORMAT_NV12}, {&MFVideoFormat_UYVY, WG_VIDEO_FORMAT_UYVY}, {&MFVideoFormat_YUY2, WG_VIDEO_FORMAT_YUY2},

1 0