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

[PATCH] d3d9/tests: Introduce absdiff().
by Chip Davis April 6, 2020

April 6, 2020

Sorry, but this one really does need this function. It has a comparison that doesn't fit the pattern 'abs(x - y) <= max_diff' that compare_uint() is intended for, and I'm not sure how to rewrite it to fit that pattern. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f873f3ae9b3..ab754f9d3bc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -63,11 +63,14 @@ static HWND create_window(void) return hwnd; } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +static unsigned int absdiff(unsigned int x, unsigned int y) { - unsigned int diff = x > y ? x - y : y - x; + return x > y ? x - y : y - x; +} - return diff <= max_diff; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + return absdiff(x, y) <= max_diff; } static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) @@ -3191,7 +3194,7 @@ static void generate_bumpmap_textures(IDirect3DDevice9 *device) { WORD *ptr = (WORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); for (x = 0; x < 128; ++x) { - if(abs(x-64)>abs(y-64)) + if(absdiff(x,64)>absdiff(y,64)) { if(x < 64) *ptr++ = 0xc000; -- 2.24.0

1 0

[PATCH 3/3] configure: Get rid of no longer needed zlib checks.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 13 ------------- 1 file changed, 13 deletions(-)

2 1

[PATCH 2/3] dbghelp: Get rid of no longer needed #ifdefs.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/stabs.c | 17 ----------------- 1 file changed, 17 deletions(-)

2 1

[PATCH 1/3] dbghelp: Get rid of no loner needed HAVE_ZLIB checks.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dwarf.c | 7 ------- 1 file changed, 7 deletions(-)

1 0

[PATCH] shell32/tests: Use explicit NULL instead of 0
by Serge Gautherie April 6, 2020

April 6, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/tests/appbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 229d616..07db4f4 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -128,7 +128,7 @@ static void do_events_until(boolean_function test) UINT_PTR timerid; BOOL timedout=FALSE; - timerid = SetTimer(0, 0, 3000, NULL); + timerid = SetTimer(NULL, 0, 3000, NULL); while (1) { @@ -144,7 +144,7 @@ static void do_events_until(boolean_function test) WaitMessage(); } - KillTimer(0, timerid); + KillTimer(NULL, timerid); } /* process any pending messages */ -- 2.10.0.windows.1

1 0

[PATCH 2/2 v4] winmm: Test mmioOpen with long file name
by Andrew Eikum April 6, 2020

April 6, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/mmio.c | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c319c57..e3984fbaf3a 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -471,6 +471,58 @@ static void test_mmioOpen(char *fname) mmioClose(hmmio, 0); } +static void test_mmioOpen_create(void) +{ + HMMIO hmmio; + HANDLE handle; + 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_" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + SetCurrentDirectoryW(temp_dir); + + DeleteFileW(filename); + + /* open with MMIO_DENYNONE */ + hmmio = mmioOpenW(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, + 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"); + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + /* open with MMIO_EXCLUSIVE */ + hmmio = mmioOpenW(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, + 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"); + if(handle != INVALID_HANDLE_VALUE) + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + SetCurrentDirectoryW(cwd); +} + static void test_mmioSetBuffer(char *fname) { char buf[256]; @@ -1016,6 +1068,7 @@ START_TEST(mmio) test_mmioDescend(fname); test_mmioOpen(NULL); test_mmioOpen(fname); + test_mmioOpen_create(); test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc(); -- 2.25.1

2 1

[PATCH] include: Avoid _onexit_t redefinition.
by Jacek Caban April 6, 2020

April 6, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48888 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_startup.h | 3 +++ include/msvcrt/stdlib.h | 3 +++ 2 files changed, 6 insertions(+)

1 0

[PATCH 1/2 v4] winmm: Use CreateFileA instead of OpenFile.
by Andrew Eikum April 6, 2020

April 6, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> OpenFile has a filepath limit of 128. Use CreateFile which doesn't have this limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48832 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27324 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v4: Match surrounding tab style. dlls/winmm/mmio.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 6f143019751..48bbd3ed48d 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -48,6 +48,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmio); static WINE_MMIO *MMIOList; +/* From kernel32 */ +static HANDLE create_file_OF( LPCSTR path, INT mode ) +{ + DWORD access, sharing, creation; + + if (mode & OF_CREATE) + { + creation = CREATE_ALWAYS; + access = GENERIC_READ | GENERIC_WRITE; + } + else + { + creation = OPEN_EXISTING; + switch(mode & 0x03) + { + case OF_READ: access = GENERIC_READ; break; + case OF_WRITE: access = GENERIC_WRITE; break; + case OF_READWRITE: access = GENERIC_READ | GENERIC_WRITE; break; + default: access = 0; break; + } + } + + switch(mode & 0x70) + { + case OF_SHARE_EXCLUSIVE: sharing = 0; break; + case OF_SHARE_DENY_WRITE: sharing = FILE_SHARE_READ; break; + case OF_SHARE_DENY_READ: sharing = FILE_SHARE_WRITE; break; + case OF_SHARE_DENY_NONE: + case OF_SHARE_COMPAT: + default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; + } + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); +} + /************************************************************************** * mmioDosIOProc [internal] */ @@ -76,9 +110,14 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, /* if filename NULL, assume open file handle in adwInfo[0] */ if (szFileName) { - OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); - } + HANDLE file; + + file = create_file_OF( szFileName, lpmmioinfo->dwFlags ); + if (file != INVALID_HANDLE_VALUE) + lpmmioinfo->adwInfo[0] = HandleToLong(file); + else + lpmmioinfo->adwInfo[0] = HFILE_ERROR; + } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_FILENOTFOUND; } -- 2.25.1

1 0

[PATCH] makefiles: Remove no longer needed explicit ucrtbase imports.
by Jacek Caban April 6, 2020

April 6, 2020

1 0

[PATCH v2] winegcc: Only add -static-libgcc if -nodefaultlibs weren't given.
by Chip Davis April 6, 2020

April 6, 2020

The flag does nothing if -nodefaultlibs or -nostdlib be given, because the driver does not automatically link to libgcc/compiler-rt in that case. Clang will warn about this, which is annoying, which clutters up the output, and which makes it impossible to use -Werror when building with Clang. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Make sure we do add the flag for -print-libgcc-file-name. tools/winegcc/winegcc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 026bfe35de3..90b598667c0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -508,7 +508,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-Wl,--large-address-aware" ); /* make sure we don't need a libgcc_s dll on Windows */ - strarray_add( flags, "-static-libgcc" ); + if (!opts->nodefaultlibs && !opts->use_msvcrt) strarray_add( flags, "-static-libgcc" ); strarray_addall( link_args, flags ); return link_args; @@ -977,6 +977,8 @@ static const char *find_libgcc(const strarray *prefix, const strarray *link_tool int ret; strarray_add( link, "-print-libgcc-file-name" ); + /* make sure we don't need a libgcc_s dll on Windows */ + strarray_add( link, "-static-libgcc" ); sout = dup( fileno(stdout) ); freopen( out, "w", stdout ); -- 2.24.0

1 0