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

[PATCH 4/4] ntdll: Silence server_ioctl_file debug traces.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] server: Trace console ioctls.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/trace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH 2/4] wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)

1 0

[PATCH 4/4] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 15 Jul '20

15 Jul '20

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). Best, Erich

1 0

[PATCH 3/4] ntdll: Allow NtQueryVolumeInformationFile to query volume information from the mountmgr.
by Erich E. Hoover 15 Jul '20

15 Jul '20

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr. These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase. Best, Erich

1 0

[PATCH v2] mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo().
by Serge Gautherie 15 Jul '20

15 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- MSVC: '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed3..e3582cc 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = (SCRIPT_IDS)1 << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, -- 2.10.0.windows.1

1 0

[PATCH 1/4] server: Allow get_volume_info to issue IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 15 Jul '20

15 Jul '20

Per AJ's request for splitting, this patch allows the get_volume_info request to issue an IRP to request the volume information from the mountmgr. Sorry it's taken me awhile to get to this :/ Note that patch 1 and 2 can be applied in opposite order, if desired. Best, Erich

1 0

[PATCH] RegisterTypeLib: only cut off non-empty \[0-9]+$ resource-id
by Puetz Kevin A 15 Jul '20

15 Jul '20

Fixes mis-applied patch in 5ecd6e4807d4b145a06e653dc1bb2f16678d0c14 The check was mistakenly changed to check file_name[0] when merging. The original intent was that since wcsrchr returns a pointer to the '\\', if (file_name != NULL), we already know file_name[0] != '\0' because '\\'!='\0' The check was intentionally whether the *next* character, file_name[1], was '\0', i.e. whether szFullPath ended with '\\' (was explicitly a directory). Passing a directory is incorrect input (szFullPath should be a .tlb file), but for quality-of-implemnentation it still seems wrong to have this remove two path elements, e.g. currently "path\\to\\" truncates to "path\\to" as if the last "\\" delimited a resource id, then splits the filename yielding szHelpDir == "path" and file_name == "to", rather than szHelpDir=="path\\to" and file_name == "" as seems intended (and as the originally-submitted patch would have). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 01bb16efbc..06667850a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -730,7 +730,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { szHelpDir = freeHelpDir = SysAllocString(szFullPath); file_name = wcsrchr(szHelpDir, '\\'); - if (file_name && file_name[0]) { + if (file_name && file_name[1]) { /* possible remove a numeric \index (resource-id) */ WCHAR *end_ptr = file_name + 1; while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++;

1 0

[PATCH v5 1/5] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui 15 Jul '20

15 Jul '20

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v5: Remove the format validation in this patch to satisfy d3dx10 tests. dlls/windowscodecs/ddsformat.c | 126 +++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)

2 1

[PATCH 1/2] gdiplus/tests: Add additional logfont size tests.
by Shawn M. Chapla 15 Jul '20

15 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 10d1f3bd5a..74cf451e36 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -300,6 +300,56 @@ static void test_logfont(void) GdipDeleteFontFamily(family); GdipDeleteFont(font); + font = NULL; + + /* The next test must be done with a font where tmHeight - + tmInternalLeading != tmAscent. Times New Roman is such a font, + so make sure we really have it before continuing. */ + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + memset(&lfa2, 0, sizeof(lfa2)); + stat = GdipGetLogFontA(font, graphics, &lfa2); + expect(Ok, stat); + + GdipDeleteFont(font); + font = NULL; + + if (!lstrlenA(lfa.lfFaceName) || lstrcmpA(lfa.lfFaceName, lfa2.lfFaceName)) + { + skip("Times New Roman not installed\n"); + } + else + { + static const struct + { + INT input; + REAL expected; + } test_sizes[] = {{12, 9.0}, {36, 32.0}, {48, 42.0}, {72, 63.0}, {144, 127.0}}; + + UINT i; + + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + for (i = 0; i < sizeof(test_sizes)/sizeof(test_sizes[0]); ++i) + { + lfa.lfHeight = test_sizes[i].input; + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + todo_wine expectf(test_sizes[i].expected, rval); + + GdipDeleteFont(font); + font = NULL; + } + } GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); -- 2.27.0

2 3