March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernelbase: Avoid depending on the mount manager in CopyFileExW().
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 4d7b49eae6613246f623957d2f7686a94a13010b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d7b49eae6613246f623957d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 10:21:42 2021 +0100 kernelbase: Avoid depending on the mount manager in CopyFileExW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 765bb41ab98..23a36b0a765 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -499,7 +499,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; - BY_HANDLE_FILE_INFORMATION info; + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; DWORD count; BOOL ret = FALSE; char *buffer; @@ -525,7 +526,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } - if (!GetFileInformationByHandle( h1, &info )) + if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -553,7 +554,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, - info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) + info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open dest %s\n", debugstr_w(dest)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -575,7 +576,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT ret = TRUE; done: /* Maintain the timestamp of source file to destination file */ - SetFileTime( h2, NULL, NULL, &info.ftLastWriteTime ); + info.FileAttributes = 0; + NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 );

1 0

Zebediah Figura : opencl: Move libOpenCL support to a new Unix library.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 6b15f4d614fd33ec2c81b377fe6609f2bb7bfa6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b15f4d614fd33ec2c81b377… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:50 2021 -0500 opencl: Move libOpenCL support to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/Makefile.in | 6 +- dlls/opencl/make_opencl | 120 +++++++-- dlls/opencl/opencl.c | 236 ---------------- dlls/opencl/opencl_private.h | 5 + dlls/opencl/{opencl_thunks.c => pe_thunks.c} | 142 ++++++---- dlls/opencl/pe_wrappers.c | 128 +++++++++ dlls/opencl/unix_private.h | 45 ++++ dlls/opencl/unix_thunks.c | 388 +++++++++++++++++++++++++++ dlls/opencl/unix_wrappers.c | 146 ++++++++++ dlls/opencl/unixlib.h | 73 +++++ 10 files changed, 972 insertions(+), 317 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b15f4d614fd33ec2c81…

1 0

Michael Stefaniuc : gameux: Use wide-char string literals.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 84aa9b911df0295fe0a4d275945099710f82bcba URL: https://source.winehq.org/git/wine.git/?a=commit;h=84aa9b911df0295fe0a4d275… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 16 23:09:04 2021 +0100 gameux: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gameexplorer.c | 67 +++++++++++--------------------------------- dlls/gameux/gamestatistics.c | 57 +++++++++++-------------------------- 2 files changed, 32 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84aa9b911df0295fe0a4…

1 0

Zebediah Figura : opencl: Do not prepend "wine_" to export names.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 379d3752d5eab6c787d208f71ab3a682f3b3944a URL: https://source.winehq.org/git/wine.git/?a=commit;h=379d3752d5eab6c787d208f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:52 2021 -0500 opencl: Do not prepend "wine_" to export names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 4 +- dlls/opencl/opencl.spec | 132 +++++++++++++++++++++++----------------------- dlls/opencl/pe_thunks.c | 126 +++++++++++++++++++++---------------------- dlls/opencl/pe_wrappers.c | 10 ++-- 4 files changed, 136 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=379d3752d5eab6c787d2…

1 0

Huw Davies : riched20: Handle the client rect changes in the host.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: a1f88602b49774a006d7e782da6801826ed19d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1f88602b49774a006d7e782… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 17 08:45:27 2021 +0000 riched20: Handle the client rect changes in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 81 -------------------------------------------- dlls/riched20/editstr.h | 3 -- dlls/riched20/tests/editor.c | 15 +++++++- dlls/riched20/txthost.c | 76 +++++++++++++++++++++++++++++++++++++++-- dlls/riched20/txtsrv.c | 25 ++++++++++++++ 5 files changed, 112 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1f88602b49774a006d7…

1 0

Alexandre Julliard : msvcrt: Avoid depending on the mount manager in fstat().
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 23ed647773546ab3e0817580f6ac28ed8c948c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ed647773546ab3e0817580… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 10:29:28 2021 +0100 msvcrt: Avoid depending on the mount manager in fstat(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 89d6e7d721f..bf7496cc233 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1754,7 +1754,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf) ioinfo *info = get_ioinfo(fd); DWORD dw; DWORD type; - BY_HANDLE_FILE_INFORMATION hfi; TRACE(":fd (%d) stat (%p)\n", fd, buf); if (info->handle == INVALID_HANDLE_VALUE) @@ -1771,7 +1770,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf) return -1; } - memset(&hfi, 0, sizeof(hfi)); memset(buf, 0, sizeof(struct _stat64)); type = GetFileType(info->handle); if (type == FILE_TYPE_PIPE) @@ -1788,25 +1786,30 @@ int CDECL _fstat64(int fd, struct _stat64* buf) } else /* FILE_TYPE_DISK etc. */ { - if (!GetFileInformationByHandle(info->handle, &hfi)) + FILE_BASIC_INFORMATION basic_info; + FILE_STANDARD_INFORMATION std_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + if ((status = NtQueryInformationFile( info->handle, &io, &basic_info, sizeof(basic_info), FileBasicInformation )) || + (status = NtQueryInformationFile( info->handle, &io, &std_info, sizeof(std_info), FileStandardInformation ))) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-error %x\n",status); msvcrt_set_errno(ERROR_INVALID_PARAMETER); release_ioinfo(info); return -1; } buf->st_mode = _S_IFREG | 0444; - if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + if (!(basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY)) buf->st_mode |= 0222; - buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_size = std_info.EndOfFile.QuadPart; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastAccessTime, &dw); buf->st_atime = dw; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; - buf->st_nlink = hfi.nNumberOfLinks; + buf->st_nlink = std_info.NumberOfLinks; + TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode); } - TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, - buf->st_mode); release_ioinfo(info); return 0; }

1 0

Alexandre Julliard : ntoskrnl: Load driver dependencies from the driver directory.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 31816a90c604f209387dda887a17ac9a8072a2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31816a90c604f209387dda88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 11:49:16 2021 +0100 ntoskrnl: Load driver dependencies from the driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a818a6e88b3..066e87cf977 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3691,7 +3691,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); - module = LoadLibraryW( str ); + module = LoadLibraryExW( str, 0, LOAD_WITH_ALTERED_SEARCH_PATH ); if (module && load_image_notify_routine_count) {

1 0

Michael Stefaniuc : evr: Remove superfluous cast to self.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 23d899c00c0d714ab32d03bd7cc2e4e83c222ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d899c00c0d714ab32d03bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 16 23:09:05 2021 +0100 evr: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 52fc7d0cfcc..c59ec002340 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -899,7 +899,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *if hr = MF_E_TRANSFORM_TYPE_NOT_SET; else { - *type = (IMFMediaType *)stream->media_type; + *type = stream->media_type; IMFMediaType_AddRef(*type); } } @@ -925,7 +925,7 @@ static HRESULT WINAPI video_mixer_transform_GetOutputCurrentType(IMFTransform *i hr = MF_E_TRANSFORM_TYPE_NOT_SET; else { - *type = (IMFMediaType *)mixer->output.media_type; + *type = mixer->output.media_type; IMFMediaType_AddRef(*type); }

1 0

Zebediah Figura : winegstreamer: Don't invert the proportion twice in wg_parser_stream_notify_qos().
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 11612cd3a8dc672640737326c64e04d5b7bf6bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=11612cd3a8dc672640737326… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 16:06:31 2021 -0500 winegstreamer: Don't invert the proportion twice in wg_parser_stream_notify_qos(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f76ca903b80..51d7e3d9748 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -694,7 +694,7 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, GstEvent *event; if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - 1000.0 / proportion, diff * 100, timestamp * 100))) + proportion, diff * 100, timestamp * 100))) ERR("Failed to create QOS event.\n"); gst_pad_push_event(stream->my_sink, event); }

1 0

Zebediah Figura : opencl: Build with msvcrt.
by Alexandre Julliard March 17, 2021

March 17, 2021

Module: wine Branch: master Commit: 08032c7831dbfb1bf3d144c749793db09eda97fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=08032c7831dbfb1bf3d144c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:51 2021 -0500 opencl: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/Makefile.in | 2 + dlls/opencl/make_opencl | 92 ++++++++++-- dlls/opencl/opencl_private.h | 15 +- dlls/opencl/opencl_types.h | 343 +++++++++++++++++++++++++++++++++++++++++++ dlls/opencl/pe_thunks.c | 51 +++---- dlls/opencl/pe_wrappers.c | 3 +- dlls/opencl/unix_private.h | 14 ++ 7 files changed, 468 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08032c7831dbfb1bf3d1…

1 0