July 2023 - Wine-Commits - list.winehq.org

Torge Matthies : ntdll: Only infer hidden attribute from file name if xattr is not present.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 773b9206fec529ff06717dd6652278cce68466ca URL: https://gitlab.winehq.org/wine/wine/-/commit/773b9206fec529ff06717dd6652278… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Only infer hidden attribute from file name if xattr is not present. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit d433986924c142ab807363b0146160b2b6986a42) --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index beaa4734931..cdd924a7226 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4107,7 +4107,7 @@ static void test_dotfile_file_attributes(void) status = nt_get_file_attrs(filename, &attrs); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); ok( attrs & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", attrs ); - todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index de22250ea60..02e1ac805b8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1681,14 +1681,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) } *attr |= get_file_attributes( st ); - if (is_hidden_file( path )) - *attr |= FILE_ATTRIBUTE_HIDDEN; - attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); else { + if (is_hidden_file( path )) + *attr |= FILE_ATTRIBUTE_HIDDEN; if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret;

1 0

Zebediah Figura : ntdll: Make fd_set_file_info() static.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: dedb9185d829d01b944dc8b432bf8ee78550bc81 URL: https://gitlab.winehq.org/wine/wine/-/commit/dedb9185d829d01b944dc8b432bf8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:56:02 2023 -0600 ntdll: Make fd_set_file_info() static. (cherry picked from commit 4827ae13928259b22e48765be3f14aef5bc26146) --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 957d9f3b801..981b0c57b35 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1618,7 +1618,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr ) { struct stat st;

1 0

Nikolay Sivov : mfplat: Implement MFCreatePathFromURL().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 8d6a9890a94bfb46dcebcabe9ed2d37b0d2d0277 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d6a9890a94bfb46dcebcabe9ed2d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 8 14:38:43 2023 +0200 mfplat: Implement MFCreatePathFromURL(). (cherry picked from commit 32cec5e6282edf0496ef0e6bb231fdc125df283f) --- dlls/mfplat/main.c | 25 +++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e1315de125a..7027b4f9516 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9464,3 +9464,28 @@ LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG return sign ? -(LONGLONG)ret : ret; #undef LLOVERFLOW } + +/*********************************************************************** + * MFCreatePathFromURL (mfplat.@) + */ +HRESULT WINAPI MFCreatePathFromURL(const WCHAR *url, WCHAR **ret_path) +{ + WCHAR path[MAX_PATH]; + DWORD length; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_w(url), ret_path); + + if (!url || !ret_path) + return E_POINTER; + + length = ARRAY_SIZE(path); + if (FAILED(hr = PathCreateFromUrlW(url, path, &length, 0))) + return hr; + + if (!(*ret_path = CoTaskMemAlloc((length + 1) * sizeof(*path)))) + return E_OUTOFMEMORY; + + memcpy(*ret_path, path, (length + 1) * sizeof(*path)); + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d9c8136cdd6..2f18d6380d6 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -62,7 +62,7 @@ @ stub MFCreateMediaTypeFromRepresentation @ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream -@ stub MFCreatePathFromURL +@ stdcall MFCreatePathFromURL(wstr ptr) @ stdcall MFCreatePresentationDescriptor(long ptr ptr) @ stdcall MFCreateSample(ptr) @ stub MFCreateSocket diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1f61e25d00..7c7907f8c54 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -263,6 +263,7 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreatePathFromURL)(const WCHAR *url, WCHAR **path); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); @@ -1123,6 +1124,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); + X(MFCreatePathFromURL); X(MFCreateTrackedSample); X(MFCreateTransformActivate); X(MFCreateVideoMediaTypeFromSubtype); @@ -8539,6 +8541,131 @@ static void test_MFInitMediaTypeFromAMMediaType(void) IMFMediaType_Release(media_type); } +static void test_MFCreatePathFromURL(void) +{ + static const struct + { + const WCHAR *url; + const WCHAR *path; + HRESULT hr; + } + tests[] = + { + /* 0 leading slash */ + { L"file:c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:cx|/foo/bar", L"cx|\\foo\\bar" }, + { L"file:c:foo/bar", L"c:foo\\bar" }, + { L"file:c|foo/bar", L"c:foo\\bar" }, + { L"file:c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:foo%20ba%2fr", L"foo ba/r" }, + { L"file:foo/bar/", L"foo\\bar\\" }, + + /* 1 leading (back)slash */ + { L"file:/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:/c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:/cx|/foo/bar", L"\\cx|\\foo\\bar" }, + { L"file:/c:foo/bar", L"c:foo\\bar" }, + { L"file:/c|foo/bar", L"c:foo\\bar" }, + { L"file:/c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:/foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:/foo/bar/", L"\\foo\\bar\\" }, + + /* 2 leading (back)slashes */ + { L"file://c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://c:/d:/foo/bar", L"c:\\d:\\foo\\bar" }, + { L"file://c|/d|/foo/bar", L"c:\\d|\\foo\\bar" }, + { L"file://cx|/foo/bar", L"\\\\cx|\\foo\\bar" }, + { L"file://c:foo/bar", L"c:foo\\bar" }, + { L"file://c|foo/bar", L"c:foo\\bar" }, + { L"file://c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file://c%3a/foo/../bar", L"\\\\c:\\foo\\..\\bar" }, + { L"file://c%7c/foo/../bar", L"\\\\c|\\foo\\..\\bar" }, + { L"file://foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://localhost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://localhost/c:/foo%20ba%5Cr", L"c:\\foo ba\\r" }, + { L"file://LocalHost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\\\localhost\\c:\\foo\\bar", L"c:\\foo\\bar" }, + { L"file://incomplete", L"\\\\incomplete" }, + + /* 3 leading (back)slashes (omitting hostname) */ + { L"file:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"File:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:///c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:///foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:///foo/bar/", L"\\foo\\bar\\" }, + { L"file:///localhost/c:/foo/bar", L"\\localhost\\c:\\foo\\bar" }, + + /* 4 leading (back)slashes */ + { L"file:////c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:////c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file:////foo%20ba%2fr", L"\\\\foo%20ba%2fr" }, + + /* 5 and more leading (back)slashes */ + { L"file://///c:/foo/bar", L"\\\\c:\\foo\\bar" }, + { L"file://///c:/foo%20ba%2fr", L"\\\\c:\\foo ba/r" }, + { L"file://///foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://////c:/foo/bar", L"\\\\c:\\foo\\bar" }, + + /* Leading (back)slashes cannot be escaped */ + { L"file:%2f%2flocalhost%2fc:/foo/bar", L"//localhost/c:\\foo\\bar" }, + { L"file:%5C%5Clocalhost%5Cc:/foo/bar", L"\\\\localhost\\c:\\foo\\bar" }, + + /* Hostname handling */ + { L"file://l%6fcalhost/c:/foo/bar", L"\\\\localhostc:\\foo\\bar" }, + { L"file://localhost:80/c:/foo/bar", L"\\\\localhost:80c:\\foo\\bar" }, + { L"file://host/c:/foo/bar", L"\\\\hostc:\\foo\\bar" }, + { L"file://host//c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/\\c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/c:foo/bar", L"\\\\hostc:foo\\bar" }, + { L"file://host/foo/bar", L"\\\\host\\foo\\bar" }, + { L"file:\\\\host\\c:\\foo\\bar", L"\\\\hostc:\\foo\\bar" }, + { L"file:\\\\host\\ca\\foo\\bar", L"\\\\host\\ca\\foo\\bar" }, + { L"file:\\\\host\\c|\\foo\\bar", L"\\\\hostc|\\foo\\bar" }, + { L"file:\\%5Chost\\c:\\foo\\bar", L"\\\\host\\c:\\foo\\bar" }, + { L"file:\\\\host\\cx:\\foo\\bar", L"\\\\host\\cx:\\foo\\bar" }, + { L"file:///host/c:/foo/bar", L"\\host\\c:\\foo\\bar" }, + + /* Not file URLs */ + { L"c:\\foo\\bar", NULL, E_INVALIDARG }, + { L"foo/bar", NULL, E_INVALIDARG }, + { L"http://foo/bar", NULL, E_INVALIDARG }, + }; + unsigned int i; + WCHAR *path; + HRESULT hr; + + if (!pMFCreatePathFromURL) + { + win_skip("MFCreatePathFromURL() is not available.\n"); + return; + } + + hr = pMFCreatePathFromURL(NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + path = (void *)0xdeadbeef; + hr = pMFCreatePathFromURL(NULL, &path); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(path == (void *)0xdeadbeef, "Unexpected pointer %p.\n", path); + + hr = pMFCreatePathFromURL(L"file://foo", NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = pMFCreatePathFromURL(tests[i].url, &path); + ok(hr == tests[i].hr, "Unexpected hr %#lx, expected %#lx.\n", hr, tests[i].hr); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(path, tests[i].path), "Unexpected path %s, expected %s.\n", + debugstr_w(path), debugstr_w(tests[i].path)); + CoTaskMemFree(path); + } + } +} + START_TEST(mfplat) { char **argv; @@ -8622,6 +8749,7 @@ START_TEST(mfplat) test_MFCreateVideoMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromAMMediaType(); + test_MFCreatePathFromURL(); CoUninitialize(); }

1 0

Olivier F. R. Dierick : dxdiag: Ignore option /64bit on the commandline.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: d8b9460f17075b459d6737e990a4ccd6bb067426 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b9460f17075b459d6737e990a4cc… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Oct 6 19:59:25 2021 +0200 dxdiag: Ignore option /64bit on the commandline. The builtin dxdiag doesn't know about option /64bit and display an error dialog. Some games use that option internally on startup and the dialog is annoying. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49964 (cherry picked from commit 60ef0f86772559187c04098e4c3d8b4678062a1c) --- programs/dxdiag/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index f57eec99292..b6ea5306d06 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -159,6 +159,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info break; + case '6': + if (wcsnicmp(cmdline, L"64bit", 5)) + return FALSE; + cmdline += 5; + break; + case 'd': case 'D': if (wcsnicmp(cmdline, L"dontskip", 8))

1 0

Zhiyi Zhang : findstr: Add basic functionality.
by Alexandre Julliard July 19, 2023

July 19, 2023

1 0

Torge Matthies : ntdll/tests: Add test for file attributes of files with names beginning with a dot.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 316138ec2ba03c9c86e2c440bd687f5e7438b374 URL: https://gitlab.winehq.org/wine/wine/-/commit/316138ec2ba03c9c86e2c440bd687f… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll/tests: Add test for file attributes of files with names beginning with a dot. (cherry picked from commit 4ad7575884797335430673c47113c9ed43e09fba) --- dlls/ntdll/tests/file.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6186afdfb63..beaa4734931 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4051,6 +4051,97 @@ static void test_file_attribute_tag_information(void) CloseHandle( h ); } +static void rename_file( HANDLE h, const WCHAR *filename ) +{ + FILE_RENAME_INFORMATION *fri; + UNICODE_STRING ntpath; + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOLEAN ret; + ULONG size; + + ret = pRtlDosPathNameToNtPathName_U( filename, &ntpath, NULL, NULL ); + ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); + + size = offsetof( FILE_RENAME_INFORMATION, FileName ) + ntpath.Length; + fri = HeapAlloc( GetProcessHeap(), 0, size ); + ok( fri != NULL, "HeapAlloc failed\n" ); + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; + fri->FileNameLength = ntpath.Length; + memcpy( fri->FileName, ntpath.Buffer, ntpath.Length ); + pRtlFreeUnicodeString( &ntpath ); + + status = pNtSetInformationFile( h, &io, fri, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, fri ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); +} + +static void test_dotfile_file_attributes(void) +{ + char temppath[MAX_PATH], filename[MAX_PATH]; + WCHAR temppathW[MAX_PATH], filenameW[MAX_PATH]; + FILE_BASIC_INFORMATION info = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + DWORD attrs; + HANDLE h; + + GetTempPathA( MAX_PATH, temppath ); + GetTempFileNameA( temppath, ".foo", 0, filename ); + h = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + status = nt_get_file_attrs(filename, &attrs); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + info.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + status = pNtSetInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + + status = nt_get_file_attrs(filename, &attrs); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( attrs & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", attrs ); + todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( info.FileAttributes & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", info.FileAttributes ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); + + GetTempPathW( MAX_PATH, temppathW ); + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + h = CreateFileW( filenameW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + GetTempFileNameW( temppathW, L".foo", 0, filenameW ); + winetest_push_context("foo -> .foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + winetest_push_context(".foo -> foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); +} + static void test_file_mode(void) { UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; @@ -5499,6 +5590,7 @@ START_TEST(file) test_file_id_information(); test_file_access_information(); test_file_attribute_tag_information(); + test_dotfile_file_attributes(); test_file_mode(); test_file_readonly_access(); test_query_volume_information_file();

1 0

Brendan Shanks : include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: a4ca007083e6108654a02057af5253aed6bdef0b URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ca007083e6108654a02057af5253… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Dec 5 11:36:31 2022 -0800 include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup. (cherry picked from commit 3a688e81a6de77bbed1a21d9649339950847cd0a) --- include/msvcrt/corecrt.h | 12 ++++++++++++ include/msvcrt/corecrt_wstring.h | 3 ++- include/msvcrt/string.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index aba9bc9422e..9f403c7d10e 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -342,4 +342,16 @@ typedef struct threadlocaleinfostruct { #define __WINE_CRT_SCANF_ATTR(fmt,args) #endif +#if defined(__GNUC__) && (__GNUC__ > 10) +#define __WINE_DEALLOC(...) __attribute__((malloc (__VA_ARGS__))) +#else +#define __WINE_DEALLOC(...) +#endif + +#if defined(__GNUC__) && (__GNUC__ > 2) +#define __WINE_MALLOC __attribute__((malloc)) +#else +#define __WINE_MALLOC +#endif + #endif /* __WINE_CORECRT_H */ diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index bcf9f947625..4d012800f65 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -7,6 +7,7 @@ #define _WSTRING_DEFINED #include <corecrt.h> +#include <corecrt_malloc.h> #ifdef __cplusplus extern "C" { @@ -29,7 +30,7 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _ACRTIMP void* __cdecl memmove(void*,const void*,size_t); -_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 5e3d51076c6..18d424b1e6a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -8,6 +8,7 @@ #ifndef __WINE_STRING_H #define __WINE_STRING_H +#include <corecrt_malloc.h> #include <corecrt_wstring.h> #ifndef _NLSCMP_DEFINED @@ -22,7 +23,7 @@ extern "C" { _ACRTIMP size_t __cdecl __strncnt(const char*,size_t); _ACRTIMP int __cdecl _strcmpi(const char*,const char*); _ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t); -_ACRTIMP char* __cdecl _strdup(const char*); +_ACRTIMP char* __cdecl _strdup(const char*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP char* __cdecl _strerror(const char*); _ACRTIMP errno_t __cdecl strerror_s(char*,size_t,int); _ACRTIMP int __cdecl _stricmp(const char*,const char*);

1 0

Alex Henrie : ntdll: Increment offset by len in build_clr_surrogate_section.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 2ce8587ab39182d8651c267e44136691b91c8459 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ce8587ab39182d8651c267e441366… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Apr 20 09:03:47 2023 -0600 ntdll: Increment offset by len in build_clr_surrogate_section. Instead of multiplying it by 2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808 Co-authored-by: Nikolay Sivov <nsivov(a)codeweavers.com> (cherry picked from commit 7af7ff872b3b1f3ab82a2b666cae2bd3d9401006) --- dlls/kernel32/tests/actctx.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ntdll/actctx.c | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index af29a372f99..5b31518ad06 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -147,6 +147,11 @@ static const char manifest3[] = " name=\"testsurrogate\"" " runtimeVersion=\"v2.0.50727\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555556}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50728\"" +" />" " <clrClass " " clsid=\"{22345678-1234-5678-1234-111122223333}\"" " name=\"clrclass\"" @@ -1548,6 +1553,29 @@ struct clrclass_data { DWORD res2[2]; }; +static void validate_guid_index(const ACTCTX_SECTION_KEYED_DATA *data, int line) +{ +#define GUIDSECTION_MAGIC 0x64487347 /* dHsG */ + struct guidsection_header *header; + struct guid_index *index; + unsigned int i; + + header = (struct guidsection_header *)data->lpSectionBase; + + ok_(__FILE__, line)(header->magic == GUIDSECTION_MAGIC, "Unexpected magic %#lx.\n", header->magic); + ok_(__FILE__, line)(header->size == sizeof(*header), "Unexpected size %ld.\n", header->size); + ok_(__FILE__, line)(header->index_offset >= sizeof(*header), "Unexpected index offset %lu.\n", header->index_offset); + + index = (struct guid_index *)((BYTE *)data->lpSectionBase + header->index_offset); + for (i = 0; i < header->count; ++i) + { + ok_(__FILE__, line)(index[i].data_len <= data->ulSectionTotalLength, "Unexpected data length.\n"); + ok_(__FILE__, line)(index[i].data_offset <= data->ulSectionTotalLength - index[i].data_len, + "Unexpected data offset %ld, section total length %lu, data length %lu.\n", + index[i].data_offset, data->ulSectionTotalLength, index[i].data_len); + } +} + static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, const WCHAR *progid, ULONG exid, int line) { struct comclassredirect_data *comclass, *comclass2; @@ -1671,6 +1699,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + validate_guid_index(&data, line); /* generated guid for this class works as key guid in search */ memset(&data2, 0xfe, sizeof(data2)); @@ -1757,6 +1786,8 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } struct clrsurrogate_data @@ -1771,7 +1802,7 @@ struct clrsurrogate_data }; static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *name, const WCHAR *version, - ULONG exid, int line) + ULONG exid, int line) { struct clrsurrogate_data *surrogate; ACTCTX_SECTION_KEYED_DATA data; @@ -1827,6 +1858,8 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const char *progid, ULONG exid, int line) @@ -1867,6 +1900,8 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const comclass = (struct comclassredirect_data*)data2.lpData; ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, wine_dbgstr_guid(guid)); ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, wine_dbgstr_guid(clsid)); + + validate_guid_index(&data2, line); } header = (struct strsection_header*)data.lpSectionBase; @@ -2032,6 +2067,7 @@ static void test_typelib_section(void) section = (struct guidsection_header*)data.lpSectionBase; ok(section->count == 4, "got %ld\n", section->count); ok(section->size == sizeof(*section), "got %ld\n", section->size); + validate_guid_index(&data, __LINE__); /* For both GUIDs same section is returned */ ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 721a2f339a5..d8597e5c7fb 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4818,7 +4818,7 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g ptrW[data->version_len/sizeof(WCHAR)] = 0; } - data_offset += index->data_offset; + data_offset += index->data_len; index++; } }

1 0

Alex Henrie : kernel32/tests: Check that lpSectionBase != NULL before dereferencing.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 4e404052e73046e507d572cd97ffbf8cba2c27f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e404052e73046e507d572cd97ffbf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 12 22:58:06 2023 -0600 kernel32/tests: Check that lpSectionBase != NULL before dereferencing. If lpSectionBase is null then the tests will still crash, but at least we'll know why. (cherry picked from commit bd7459579d1fa448912151fd2d51564eb6b8716d) --- dlls/kernel32/tests/actctx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index bec04b7f066..af29a372f99 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1410,8 +1410,8 @@ static void test_find_activatable_class(HANDLE handle, const WCHAR *classid, enu ok_(__FILE__, line)(data.lpData != NULL, "got lpData %p\n", data.lpData); header = (struct strsection_header *)data.lpSectionBase; - ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.lpSectionBase != NULL, "got lpSectionBase %p\n", data.lpSectionBase); + ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "got ulSectionTotalLength %lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE *)header + header->global_offset, "got lpSectionGlobalData %p\n", data.lpSectionGlobalData); @@ -1662,10 +1662,10 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU } header = (struct guidsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == ((BYTE*)header + header->names_offset), "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->names_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); @@ -1870,9 +1870,9 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const } header = (struct strsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE*)header + header->global_offset, "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->global_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n",

1 0

Alexandre Julliard : kernelbase: Move to a higher address on 64-bit.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 67fcadd439ae48f92954417a245267eb2603a0ee URL: https://gitlab.winehq.org/wine/wine/-/commit/67fcadd439ae48f92954417a245267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 16:09:19 2023 +0200 kernelbase: Move to a higher address on 64-bit. (cherry picked from commit cab914c3aa66e26e6756c6704848265ddfcbf3a4) --- dlls/kernelbase/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 38db49d7034..1f10fe8cc0b 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -3,7 +3,9 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--image-base,0x7b000000 +EXTRADLLFLAGS = -nodefaultlibs -nostartfiles +i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b000000 +x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x174000000 C_SRCS = \ console.c \

1 0