November 2021 - Wine-Devel - list.winehq.org

[PATCH v2 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm Nov. 23, 2021

Nov. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e55615eb4da..c42a3155c4f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2522,9 +2522,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..bdd5de77775 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,86 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +/* shameless copy of test_CreateTextFile(void) */ +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + str = SysAllocString(dirW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + SysFreeString(str); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + + hr = IFileSystem3_OpenTextFile(fs3, pathW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2596,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH v2 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 109 +++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..e55615eb4da 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,63 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT WINAPI build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + TRACE("%s %s %p\n", debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3091,9 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); - if (!Result) return E_POINTER; - - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

1 0

[PATCH 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm Nov. 23, 2021

Nov. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e55615eb4da..c42a3155c4f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2522,9 +2522,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..352e986944a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,84 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +/* shameless copy of test_CreateTextFile(void) */ +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + hr = IFileSystem3_GetFolder(fs3, dirW, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + + hr = IFileSystem3_OpenTextFile(fs3, pathW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2594,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 109 +++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..e55615eb4da 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,63 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT WINAPI build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + TRACE("%s %s %p\n", debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3091,9 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); - if (!Result) return E_POINTER; - - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

1 0

[PATCH v2 1/2] oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Connor McAdams Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/usrmarshal.c | 112 ++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..623bd679485 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -268,7 +268,7 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) } /* WdtpInterfacePointer_UserSize takes care of 2 additional DWORDs to store marshalling buffer size */ -static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *punk) +static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) { ULONG size = 0; @@ -283,7 +283,7 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun } size += sizeof(ULONG); TRACE("wire-size extra of interface variant is %d\n", size); - return size; + return Start + size; } static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) @@ -304,13 +304,13 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) case VT_VARIANT | VT_BYREF: return VARIANT_UserSize(pFlags, Start, V_VARIANTREF(pvar)); case VT_UNKNOWN: - return Start + interface_variant_size(pFlags, &IID_IUnknown, V_UNKNOWN(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, V_UNKNOWN(pvar)); case VT_UNKNOWN | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, *V_UNKNOWNREF(pvar)); case VT_DISPATCH: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); case VT_DISPATCH | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); case VT_RECORD: FIXME("wire-size record\n"); return Start; @@ -324,7 +324,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer */ -static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); @@ -345,7 +345,7 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer */ -static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown **ppunk) { DWORD ptr; @@ -459,16 +459,16 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos = VARIANT_UserMarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -590,16 +590,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe Pos = VARIANT_UserUnmarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -733,22 +733,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,8 +813,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("size interfaces\n"); + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + memcpy(&guid, &IID_IUnknown, sizeof(guid)); + else + memcpy(&guid, &IID_IDispatch, sizeof(guid)); + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_user_size(pFlags, size, &guid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -870,7 +902,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +948,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + Buffer = interface_user_marshal(pFlags, Buffer, iid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1139,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + Buffer = interface_user_unmarshal(pFlags, Buffer, iid, lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; -- 2.25.1

1 1

[PATCH] configure: Diagnose if NetAPI is not present
by Gerald Pfeifer Nov. 23, 2021

Nov. 23, 2021

For most other configure options we are warning when some dependency is not present, in particular when it's been explicitly requested. Also do this for Samba NetAPI now. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 1c716b4ec00..535eb5d8793 100644 --- a/configure.ac +++ b/configure.ac @@ -1722,6 +1722,10 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_netapi" != xyes], + [libnetapi not found, Samba NetAPI won't be supported.], + [enable_netapi]) + dnl **** Check for any sound system **** if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \ -- 2.32.0

1 0

[PATCH 1/2] oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Connor McAdams Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/usrmarshal.c | 84 ++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..69c7c1cfdda 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -286,6 +286,12 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun return size; } +static ULONG interface_safearray_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) +{ + TRACE("(%x,%d,%p)\n", *pFlags, Start, punk); + return Start + interface_variant_size(pFlags, riid, punk); +} + static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) { if (V_ISARRAY(pvar)) @@ -733,22 +739,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,6 +819,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + memcpy(&guid, &IID_IUnknown, sizeof(guid)); + else + memcpy(&guid, &IID_IDispatch, sizeof(guid)); + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_safearray_size(pFlags, size, &guid, *lpUnk); + + break; + } FIXME("size interfaces\n"); break; case SF_VARIANT: @@ -870,7 +910,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +956,21 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + { + if (sftype == SF_HAVEIID) + Buffer = interface_variant_marshal(pFlags, Buffer, &guid, *lpUnk); + else if (sftype == SF_UNKNOWN) + Buffer = interface_variant_marshal(pFlags, Buffer, &IID_IUnknown, *lpUnk); + else + Buffer = interface_variant_marshal(pFlags, Buffer, &IID_IDispatch, *lpUnk); + } + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1146,21 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + { + if (sftype == SF_HAVEIID) + Buffer = interface_variant_unmarshal(pFlags, Buffer, &guid, lpUnk); + else if (sftype == SF_UNKNOWN) + Buffer = interface_variant_unmarshal(pFlags, Buffer, &IID_IUnknown, lpUnk); + else + Buffer = interface_variant_unmarshal(pFlags, Buffer, &IID_IDispatch, lpUnk); + } + break; + } case SF_VARIANT: { VARIANT* lpVariant; -- 2.25.1

2 2

[PATCH] gdiplus: Mark a Windows behavior as broken.
by Esme Povirk Nov. 23, 2021

Nov. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51989 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/gdiplus/tests/graphics.c | 4 ++-- dlls/gdiplus/tests/graphicspath.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 572aa88cb79..d0454edb4a4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4140,7 +4140,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + ok(size == td[i].cx || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cx, size); min = -1; max = -2; @@ -4165,7 +4165,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + ok(size == td[i].cy || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cy, size); status = GdipBitmapUnlockBits(u.bitmap, &bd); expect(Ok, status); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a987cd165dc..07e6dd166ad 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1447,7 +1447,7 @@ static void test_widen(void) status = GdipGetPointCount(path, &count); expect(Ok, status); - expect(0, count); + ok(count == 0 || broken(count == 4), "expected 0, got %i\n", count); /* pen width = 0 pixels, UnitWorld - result is a path 1 unit wide */ GdipDeletePen(pen); @@ -1711,6 +1711,21 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); + + if (i == 9) + { + INT size; + status = GdipGetPointCount(path, &size); + expect(Ok, status); + ok(size == caps[i].expected_size || broken(size == 12), "unexpected path size %i\n", size); + + if (size == 12) + { + GdipDeletePen(pen); + continue; + } + } + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); GdipDeletePen(pen); -- 2.30.2

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.200.
by Georg Lehmann Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 92dc71ab9d8..e5f8d1a46c6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.199" +VK_XML_VERSION = "1.2.200" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -119,6 +119,9 @@ UNSUPPORTED_EXTENSIONS = [ # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", + + # Broken extensions + "VK_ARM_rasterization_order_attachment_access", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1703 ] # Either internal extensions which aren't present on the win32 platform which -- 2.34.0

1 0

[PATCH 1/2] loader: always ensure that WINELOADER is defined
by Eric Pouech Nov. 23, 2021

Nov. 23, 2021

when: - Wine is installed in a (configure:d) directory - running wine directly from <confdir>/bin/wine(64) (without setting any WINE specific env variables) - dbghelp cannot find back the loader/wine(64) file consequences: - dbghelp cannot get back to the ELF information, hence (on a live target) doesn't report the already loaded ELF modules (only the PE ones are listed) dbghelp searches: - WINELOADER env var (but it isn't set in that case) - LD_LIBRARY_PATH (isn't changed, and even if it would, it would point to <confdir>/lib directory) - WINEDLLDIR<NN>, but again could point to <confdir>/lib directory, not the bin one wine-staging has a solution by forcing dbghelp to search @bindir@ as well this patch proposes an alternate approach: the wine loader sets WINELOADER if it isn't already set by the calling environment Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- loader/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/loader/main.c b/loader/main.c index 242ff15accd..c5e0fdf68b2 100644 --- a/loader/main.c +++ b/loader/main.c @@ -41,18 +41,12 @@ extern char **environ; /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; -/* canonicalize path and return its directory name */ -static char *realpath_dirname( const char *name ) +/* remove filename from an (absolute) path */ +static void remove_filename( char *fullpath ) { - char *p, *fullpath = realpath( name, NULL ); - - if (fullpath) - { - p = strrchr( fullpath, '/' ); - if (p == fullpath) p++; - if (p) *p = 0; - } - return fullpath; + char *p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; } /* if string ends with tail, remove it */ @@ -141,8 +135,10 @@ static void *load_ntdll( char *argv0 ) char *path, *p; void *handle = NULL; - if (self && ((path = realpath_dirname( self )))) + if (self && (path = realpath( self, NULL ))) { + setenv( "WINELOADER", path, 0 ); + remove_filename( path ); if ((p = remove_tail( path, "/loader" ))) { handle = try_dlopen( p, "dlls/ntdll/ntdll.so" );

1 1