December 2020 - Wine-Devel - list.winehq.org

[PATCH 3/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in directmanipulation.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH 2/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in mfreadwrite.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH 1/3] include: Add more GUIDs in mfreadwrite.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH] ieframe: Fix memory leak in PersistFile_Save.

by Haidong Yu

Dec. 18, 2020

Re: [PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura (she/her)

On 12/17/20 3:27 PM, Andrew Eikum wrote: > Well, you found a new bug. Your tests crash: > > https://testbot.winehq.org/JobDetails.pl?Key=83551#k401 > > This is because in mmioOpenW, we allocate only the space required to > fit the input filename, but MMIO_PARSE needs room for at least 128 > characters. (128 per the docs. Might as well do MAX_PATH.) > > I think you need the below diff before applying your patches. It ought > to also copy the resulting filename back to the input buffer, but, > code freeze. > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..4f13a34303c 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -733,10 +733,9 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, > > if (szFileName) > { > - INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); > - szFn = HeapAlloc( GetProcessHeap(), 0, len ); > + szFn = HeapAlloc( GetProcessHeap(), 0, MAX_PATH ); > if (!szFn) return NULL; > - WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); > + WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, MAX_PATH, NULL, NULL ); > } > > ret = MMIO_Open(szFn, lpmmioinfo, dwOpenFlags, TRUE); I'd be more comfortable with allocating at least MAX_PATH (or 128) bytes rather than always allocating MAX_PATH, especially during code freeze; I've sent a v3 that does this. I've also written some tests that show the interesting effects of buffer size on MMIO_PARSE... > > Andrew > > On Thu, Dec 17, 2020 at 02:34:26PM -0600, Zebediah Figura wrote: >> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >> --- >> v2: don't assume cwd == executable directory >> >> dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ >> 1 file changed, 52 insertions(+), 8 deletions(-) >> >> diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c >> index e3984fbaf3a..0236855f246 100644 >> --- a/dlls/winmm/tests/mmio.c >> +++ b/dlls/winmm/tests/mmio.c >> @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) >> WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; >> /* According to docs, filename must be no more than 128 bytes, but it will >> * actually allow longer than that. */ >> - WCHAR filename[] = L"very_long_filename_" >> + WCHAR long_filename[] = L"very_long_filename_" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; >> + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; >> + char exedir_filename[MAX_PATH]; >> + MMIOINFO info = {0}; >> + BOOL ret; >> + FILE *f; >> + >> + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); >> + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); >> + f = fopen(exedir_filename, "w"); >> + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); >> + fclose(f); >> >> GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); >> GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); >> SetCurrentDirectoryW(temp_dir); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> >> /* open with MMIO_DENYNONE */ >> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); >> + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); >> ok(hmmio != NULL, "mmioOpen failed\n"); >> >> /* MMIO_DENYNONE lets us open it here, too */ >> - handle = CreateFileW(filename, GENERIC_READ, >> + handle = CreateFileW(long_filename, GENERIC_READ, >> FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, >> OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); >> ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); >> @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) >> >> mmioClose(hmmio, 0); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> >> /* open with MMIO_EXCLUSIVE */ >> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); >> + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); >> ok(hmmio != NULL, "mmioOpen failed\n"); >> >> /* should fail due to MMIO_EXCLUSIVE */ >> - handle = CreateFileW(filename, GENERIC_READ, >> + handle = CreateFileW(long_filename, GENERIC_READ, >> FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, >> OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); >> ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); >> @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) >> >> mmioClose(hmmio, 0); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); >> + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); >> + mmioClose(hmmio, 0); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); >> + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); >> + wcscpy(expect, temp_dir); >> + wcscat(expect, L"test_mmio_path"); >> + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + info.wErrorRet = 0xdead; >> + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); >> + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); >> + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); >> + >> + ret = DeleteFileA("test_mmio_path"); >> + ok(!ret, "expected failure\n"); >> + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); >> + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); >> + mmioClose(hmmio, 0); >> + >> + ret = DeleteFileA("test_mmio_path"); >> + ok(ret, "got error %u\n", GetLastError()); >> >> SetCurrentDirectoryW(cwd); >> + >> + ret = DeleteFileA(exedir_filename); >> + ok(ret, "got error %u\n", GetLastError()); >> } >> >> static void test_mmioSetBuffer(char *fname) >> -- >> 2.29.2 >> >> >

Dec. 17, 2020

[PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index cb3175c5cd7..da536357416 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index c9ceda24f3f..a232070064c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0236855f246..c9ceda24f3f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void) L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; WCHAR buffer[MAX_PATH], expect[MAX_PATH]; - char exedir_filename[MAX_PATH]; + char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH]; MMIOINFO info = {0}; BOOL ret; FILE *f; @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void) DeleteFileW(long_filename); + wcscpy(buffer, long_filename); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, long_filename); + expect[127] = 0; + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL); + info.wErrorRet = 0xdead; + hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL); + todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA)); + wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); -- 2.29.2

Dec. 17, 2020

[PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

[PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..cb3175c5cd7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); + if (len < MAX_PATH) len = MAX_PATH; szFn = HeapAlloc( GetProcessHeap(), 0, len ); if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); -- 2.29.2

Dec. 17, 2020

[PATCH] gdi32/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/gdi32/tests/font.c | 24 +++++++++++------------- dlls/gdi32/tests/icm.c | 4 +--- dlls/gdi32/tests/metafile.c | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 2110765835f..eb0da18b32e 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..ad7408f5620 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1136,7 +1136,6 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; @@ -1201,7 +1200,7 @@ static void test_GetCharABCWidths(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); @@ -1382,7 +1381,7 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); @@ -1433,8 +1432,7 @@ static void test_GetCharABCWidths(void) static void test_text_extents(void) { - static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR wt[] = L"One\ntwo 3"; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1484,7 +1482,7 @@ static void test_text_extents(void) ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); memset(&sz, 0xcc, sizeof(sz)); - ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ret = GetTextExtentPointW(hdc, L"", 0, &sz); ok(ret, "got %d\n", ret); ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); @@ -1633,7 +1631,7 @@ static void test_GetGlyphIndices(void) DWORD charcount; LOGFONTA lf; DWORD flags = 0; - WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR testtext[] = L"Test\xffff"; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -4445,7 +4443,7 @@ static void test_RealizationInfo(void) static void test_GetTextFace(void) { static const char faceA[] = "Tahoma"; - static const WCHAR faceW[] = {'T','a','h','o','m','a', 0}; + static const WCHAR faceW[] = L"Tahoma"; LOGFONTA fA = {0}; LOGFONTW fW = {0}; char bufA[LF_FACESIZE]; @@ -6822,7 +6820,7 @@ static void test_fake_bold_font(void) static void test_bitmap_font_glyph_index(void) { - const WCHAR text[] = {'#','!','/','b','i','n','/','s','h',0}; + const WCHAR text[] = L"#!/bin/sh"; const struct { LPCSTR face; BYTE charset; @@ -7117,10 +7115,10 @@ static void test_ttf_names(void) static void test_lang_names(void) { - static const WCHAR name_cond_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',0}; - static const WCHAR name_cond_ja_reg_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',0}; - static const WCHAR name_cond_ja_reg_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',' ','(','j','a',')',0}; - static const WCHAR name_wws_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','W','W','S',' ','(','j','a',')',0}; + static const WCHAR name_cond_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja)"; + static const WCHAR name_cond_ja_reg_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg"; + static const WCHAR name_cond_ja_reg_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg (ja)"; + static const WCHAR name_wws_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d WWS (ja)"; struct enum_fullname_data efnd; struct enum_fullname_data_w efnd_w; diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 340ebeef55a..509d5c0c579 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -27,8 +27,6 @@ #include "wine/test.h" -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - static void test_GetICMProfileA( HDC dc ) { BOOL ret; @@ -167,7 +165,7 @@ static void test_SetICMMode( HDC dc ) ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); SetLastError( 0xdeadbeef ); - dc = CreateDCW( displayW, NULL, NULL, NULL ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { win_skip( "CreateDCW is not implemented\n" ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5a64fe6d60a..8dae908126d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -312,7 +312,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_ExtTextOutScale(void) { const RECT rc = { 0, 0, 100, 100 }; - const WCHAR str[] = {'a',0 }; struct eto_scale_test_record test; HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; @@ -392,7 +391,7 @@ static void test_ExtTextOutScale(void) ok(ret, "SetViewportExtEx failed\n"); } - ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, L"a", 1, NULL); ok(ret, "ExtTextOutW failed\n"); hMetafile = CloseEnhMetaFile(hdcMetafile); -- 2.26.2

Dec. 17, 2020

Re: [PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Andrew Eikum

Well, you found a new bug. Your tests crash: https://testbot.winehq.org/JobDetails.pl?Key=83551#k401 This is because in mmioOpenW, we allocate only the space required to fit the input filename, but MMIO_PARSE needs room for at least 128 characters. (128 per the docs. Might as well do MAX_PATH.) I think you need the below diff before applying your patches. It ought to also copy the resulting filename back to the input buffer, but, code freeze. diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..4f13a34303c 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -733,10 +733,9 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { - INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); - szFn = HeapAlloc( GetProcessHeap(), 0, len ); + szFn = HeapAlloc( GetProcessHeap(), 0, MAX_PATH ); if (!szFn) return NULL; - WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, MAX_PATH, NULL, NULL ); } ret = MMIO_Open(szFn, lpmmioinfo, dwOpenFlags, TRUE); Andrew On Thu, Dec 17, 2020 at 02:34:26PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > v2: don't assume cwd == executable directory > > dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 52 insertions(+), 8 deletions(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index e3984fbaf3a..0236855f246 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) > WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; > /* According to docs, filename must be no more than 128 bytes, but it will > * actually allow longer than that. */ > - WCHAR filename[] = L"very_long_filename_" > + WCHAR long_filename[] = L"very_long_filename_" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > + char exedir_filename[MAX_PATH]; > + MMIOINFO info = {0}; > + BOOL ret; > + FILE *f; > + > + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); > + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); > + f = fopen(exedir_filename, "w"); > + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); > + fclose(f); > > GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); > GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); > SetCurrentDirectoryW(temp_dir); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_DENYNONE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* MMIO_DENYNONE lets us open it here, too */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); > @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_EXCLUSIVE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* should fail due to MMIO_EXCLUSIVE */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); > @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, L"test_mmio_path"); > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + wcscpy(buffer, L"test_mmio_path"); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); > + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); > + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(!ret, "expected failure\n"); > + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(ret, "got error %u\n", GetLastError()); > > SetCurrentDirectoryW(cwd); > + > + ret = DeleteFileA(exedir_filename); > + ok(ret, "got error %u\n", GetLastError()); > } > > static void test_mmioSetBuffer(char *fname) > -- > 2.29.2 > >

Dec. 17, 2020

[PATCH v2 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..c4838f388b6 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0236855f246..a2abb6c5f5c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -533,7 +533,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: don't assume cwd == executable directory dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

Re: [PATCH] inetcpl.cpl: If memory allocation fails,the program will carsh.

by Alexandre Julliard

"Haidong Yu" <yhd986(a)163.com> writes: > @@ -301,10 +301,10 @@ static INT_PTR security_on_initdialog(HWND hsec) > DWORD i; > > sd = heap_alloc_zero(sizeof(secdlg_data)); > - SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); > if (!sd) { > return FALSE; > } > + SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); This won't make any difference. -- Alexandre Julliard julliard(a)winehq.org

Dec. 17, 2020

Re: [PATCH 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Andrew Eikum

This fails for me: wine.win64$ WINEPREFIX=$HOME/tmp/tmppfx/ make dlls/winmm/tests/mmio.ok ../wine/tools/runtest -q -P wine -T . -M winmm.dll -p dlls/winmm/tests/winmm_test.exe mmio && touch dlls/winmm/tests/mmio.ok mmio.c:533: Test failed: failed to open file, error 0x101 make: *** [Makefile:171981: dlls/winmm/tests/mmio.ok] Error 1 Excerpts from a +file log: 00d8:trace:file:CreateFileW L"test_mmio_path" GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WRITE creation 2 attributes 0x80 00d8:trace:file:nt_to_unix_file_name L"\\??\\Z:\\home\\andrew\\src\\wine.win64\\test_mmio_path" -> "/home/andrew/tmp/tmppfx/dosdevices/z:/home/andrew/src/wine.win64/test_mmio_path" 0034:trace:file:CreateFileW returning 0000000000000094 ... 00d8:trace:mmio:MMIO_Open ("test_mmio_path", 000000000031F180, 00000001, unicode); ... 00d8:warn:file:NtQueryAttributesFile L"\\??\\Z:\\home\\andrew\\src\\wine.win64\\dlls\\winmm\\tests\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\users\\andrew\\Temp\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\wbem\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\WindowsPowershell\\v1.0\\test_mmio_path" not found (c0000034) mmio.c:533: Test failed: failed to open file, error 0x101 The same happens if I run it while in the <dlls/winmm/tests/> dir. Andrew On Thu, Dec 17, 2020 at 11:55:06AM -0600, Zebediah Figura wrote: > Based on a patch by Alistair Leslie-Hughes. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- > dlls/winmm/tests/mmio.c | 2 +- > 2 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..c4838f388b6 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; > /* From kernel32 */ > static HANDLE create_file_OF( LPCSTR path, INT mode ) > { > - DWORD access, sharing, creation; > + DWORD access, sharing, creation, len; > + char *full_path; > + HANDLE ret; > > if (mode & OF_CREATE) > { > @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) > case OF_SHARE_COMPAT: > default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; > } > - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (mode & OF_CREATE) > + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) > + return INVALID_HANDLE_VALUE; > + if (!(full_path = malloc(len + 1))) > + { > + SetLastError( ERROR_OUTOFMEMORY ); > + return INVALID_HANDLE_VALUE; > + } > + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) > + { > + free(full_path); > + return INVALID_HANDLE_VALUE; > + } > + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + free(full_path); > + return ret; > } > > /************************************************************************** > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index 5ad20eec521..fc9ec802657 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -530,7 +530,7 @@ static void test_mmioOpen_create(void) > > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > mmioClose(hmmio, 0); > > wcscpy(buffer, L"test_mmio_path"); > -- > 2.29.2 > >

Dec. 17, 2020

[PATCH 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..c4838f388b6 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5ad20eec521..fc9ec802657 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -530,7 +530,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 57 +++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..5ad20eec521 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,31 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + f = fopen("test_mmio_path", "w"); + ok(!!f, "failed to create file: %s\n", strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +510,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +526,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

Re: [RFC] Announcing Wayland driver development

by Alexandros Frantzis

On Wed, Dec 16, 2020 at 10:07:09AM -0600, Zebediah Figura (she/her) wrote: > On 12/16/20 2:44 AM, Julian Rüger wrote: <snip> > > > > You should talk to our tireless and competent staging developers, > > Zebediah Figura and Alistair Leslie-Hughes about that. > > That's probably about right. I would like to be sure that a Wayland > driver will be accepted upstream in some form or another before we take > it—I don't want to maintain any patch set in wine-staging forever, but > an entire graphics driver least of all. > > In particular I've seen a lot of concerns about the long list of things > Wayland can't support. Window positioning is one, but not the only by > far. See also [1] (not that I can personally verify the veracity of any > of these; I don't work with window managers). > > [1] https://bugs.winehq.org/show_bug.cgi?id=42284#c17 Hi Zebediah, Thank you for your comments and the link to the bug! I would like to use this opportunity to address some of the points mentioned in the bug report, since quite a few people may also have similar concerns. There is no question that the direct Wine->X11 path is likely to remain the most capable for the foreseeable future. However, since Wayland adoption is growing, and, by some accounts at least, X11 is becoming legacy, I think it's worth it for Wine to begin exploring the Wayland path. It won't be perfect in the beginning, although it may be "good enough" for most people, and given the special weight that Wine has, it may also help incentivize the implementation of missing Wayland functionality in the form of new extensions. Direct support for Wayland also provides access to modern features that may not be available to X11 clients. An example is HDR support, which is currently being worked on for Wayland [1], but unlikely to be supported on X11. --- Regarding some specific concerns: > global keybindings, clipboard, layout switching, screen capturing, > tray icons, With the exception of clipboard operations, for which Wayland has an official protocol, Wayland doesn't directly support the rest. However, a feature not being supported by Wayland doesn't mean much about its availability on a Wayland based system. Some features which were previously X11 requests, are now implemented using a completely different mechanism, mostly due to security considerations. For example, screen capturing is already supported through the xdg-portal mechanism on KDE, GNOME and wlroots based desktops. There are also discussions about implementing global key bindings in a similar way, or potentially as a Wayland protocol. --- I think some notes on XWayland are also warranted, since some may consider it to be a the way forward for Wine under Wayland. XWayland is privileged in many ways, being closely integrated with Wayland compositors. A Wayland compositor acts as the X11 window manager, which is how absolute window positioning from X11 can work on Wayland. Despite its special status, XWayland is still not given free rein over the compositor. There are many features which do not work through the X11 protocol on XWayland, and are likely to remain that way. Here is a list of such features that may be of interest to Wine: * screenshots, screencasting (except of other X11 windows) * global hotkeys * input grabs and eavesdropping * changing global state like "video card LUT" or video mode * controlling or inspecting other applications' windows (except possibly for other X11 apps) Some of these features will need to be accessed through the same alternative methods that one would need to use on direct Wayland too, some are waiting to be implemented with a Wayland protocol or other method, others are unlikely to ever be permitted on normal desktop systems. Due to the above, my opinion is that a direct Wayland driver is a much better long-term option for running Wine on Wayland. Thanks, Alexandros [1] https://www.collabora.com/news-and-blog/blog/2020/11/19/developing-wayland-…

Dec. 17, 2020

Re: [PATCH 2/2] widl: open files to write in binary mode

by Jacek Caban

On 17.12.2020 08:06, Steve Lhomme wrote: > > I meant that for generated files it's fine, so I agree with you. I > fear that forcing binary mode for input files as well may break > reading some files with windows line ending on Windows. I don't think > that's the case in mingw-w64 but it may have some side effects elsewhere. Note that binary mode results in more or less what we use on Unix, so if reading in text or binary mode changes output, it would most likely mean that we don't do it right on one of hosts. In practice, new lines are consumed by lexer and both modes should be fine. Jacek

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Paul Gofman

Thanks. Yes, there are two problems with SIO_GET_INTERFACE_LIST: - It doesn't report loopback interface while it should (as GetAdaptersInfo() does not report it by design; I guess GetIpAddrTable() should be used instead); - There is a check to skip unconfigured interfaces with zero address, and the check is wrong (checks for '\0' char instead of '0'), so intrefaces with zero IP addresses are still returned. But fixes for these should probably wait until the code freeze end. On 12/17/20 13:40, Francois Gouget wrote: > On Thu, 17 Dec 2020, Paul Gofman wrote: > [...] >> Is it possible to see the output of 'ifconfig' from debiant? > You can't because it's not installed. But this should do: > > > diff --git a/Makefile.in b/Makefile.in > index b52495f741f..e07b8c39fab 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -91,6 +91,7 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ > > all: wine > @echo "Wine build complete." > + ip address > > # Rules for re-running configure > > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 98cc3881853..5d28df13498 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -1,4 +1,4 @@ > -/* > +/* Dummy > * Unit test suite for winsock functions > * > * Copyright 2002 Martin Wilck > >

Dec. 17, 2020

[tools] testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.

by Francois Gouget

Normally virsh undefine --remove-all-storage handles it but it does not follow the symbolic links. So tell rm not to complain if it finds no file to delete. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index a31f3ea71d..bf99e4978a 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -641,7 +641,7 @@ then then fatal_no_cleanup "could not remove the existing '$opt_vm' VM" fi - [ -z "$olddisks" ] || dry_run rm $olddisks + [ -z "$olddisks" ] || dry_run rm -f $olddisks fi -- 2.20.1

Dec. 17, 2020

[tools] testbot/TestAgent: Also dereference symbolic links to better find $::RootDir.

by Francois Gouget

This allows putting a symbolic link to TestAgent in $PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 40f443e462..10bdc63d1b 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,12 +23,10 @@ use strict; sub BEGIN { - if ($0 !~ m=^/=) - { - # Turn $0 into an absolute path so it can safely be used in @INC - require Cwd; - $0 = Cwd::cwd() . "/$0"; - } + # Turn $0 into an absolute path so it can safely be used in @INC. + # Also dereference symbolic links to better find $::RootDir. + use Cwd 'abs_path'; + $0 = abs_path($0); if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; -- 2.20.1

Dec. 17, 2020

[tools] testbot/RestoreVM: Avoid errors when restoring a VM with no snapshot.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index bf99e4978a..a1b9d15846 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -677,6 +677,7 @@ then _dir="$1" for snapxml in "$_dir"/*.xml do + [ -f "$snapxml" ] || continue name=`basename "$snapxml" .xml` ctime=`sed -e 's~^.*<creationTime>$[0-9][0-9]*$</creationTime>.*$~\1~' -e t -e d "$snapxml"` echo "$ctime $name" -- 2.20.1

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Francois Gouget

On Thu, 17 Dec 2020, Paul Gofman wrote: [...] > Is it possible to see the output of 'ifconfig' from debiant? You can't because it's not installed. But this should do: diff --git a/Makefile.in b/Makefile.in index b52495f741f..e07b8c39fab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,6 +91,7 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ all: wine @echo "Wine build complete." + ip address # Rules for re-running configure diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98cc3881853..5d28df13498 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1,4 +1,4 @@ -/* +/* Dummy * Unit test suite for winsock functions * * Copyright 2002 Martin Wilck -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Paul Gofman

On 12/17/20 12:25, Francois Gouget wrote: > On Wed, 16 Dec 2020, Paul Gofman wrote: > >> On 12/16/20 12:10, Marvin wrote: >>> ws2_32: >>> sock.c:10534: Test failed: Got unexpected ret 0. >>> sock.c:10535: Test failed: Got unexpected error 6. >>> sock.c:10536: Test failed: Got unexpected size 76. >> Can it be that Wine is not getting updated on Testbot? The tests results >> are like the changes to test are applied but ws2_32.dll is unchanged. > The "Show full task log" links show that ws2_32.dll.so was rebuilt. > > https://testbot.winehq.org/JobDetails.pl?Key=83503&f401=task.log#k401 > https://testbot.winehq.org/JobDetails.pl?Key=83503&f402=task.log#k402 > > Also, as far as I can tell, the WinePrefix only contains a fake dll so > it does not look like there any way the WinePrefix could use an old > version. > Yeah, indeed, and I figured that the failure is still there with the dummy patch after that patch was committed. That happens because WSAIoctl(...,SIO_GET_INTERFACE_LIST,...) finds just one appropriate interface which I honestly didn't expect. I've sent the patch which will avoid such test failure, but I am still curious how that can happen, I was under impression that at least loopback should be available besides the "normal" interface on Testbot. Maybe that indicates some issue in ws2_32 SIO_GET_INTERFACE_LIST or iphlpapi. Is it possible to see the output of 'ifconfig' from debiant?

Dec. 17, 2020