October 2021 - Wine-commits

Zebediah Figura : winegstreamer: Move the IWMHeaderInfo3 implementation to the wm_reader object.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 3dd8eeeebdeec619570c764285bdcae82dee5868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd8eeeebdeec619570c7642… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:48 2021 -0500 winegstreamer: Move the IWMHeaderInfo3 implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 227 ------------------------------------ dlls/winegstreamer/wm_reader.c | 215 +++++++++++++++++++++++++++++++++- dlls/wmvcore/tests/wmvcore.c | 6 +- 4 files changed, 218 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd8eeeebdeec619570c…

1 0

Zebediah Figura : winegstreamer: Move the IWMLanguageList implementation to the wm_reader object.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 4239f2acf77d9eaa8166628d25c1336c1599df33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4239f2acf77d9eaa8166628d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:49 2021 -0500 winegstreamer: Move the IWMLanguageList implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 61 ------------------------------------- dlls/winegstreamer/wm_reader.c | 61 +++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 2 +- 4 files changed, 63 insertions(+), 62 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 71d3bb2b509..6dc0ad3e291 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -116,6 +116,7 @@ HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; + IWMLanguageList IWMLanguageList_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 1361b20932f..a36718ef453 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -32,7 +32,6 @@ struct async_reader IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; - IWMLanguageList IWMLanguageList_iface; IReferenceClock IReferenceClock_iface; IWMPacketSize2 IWMPacketSize2_iface; }; @@ -1257,62 +1256,6 @@ static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = playlist_EndPlaylistBurn }; -static struct async_reader *impl_from_IWMLanguageList(IWMLanguageList *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMLanguageList_iface); -} - -static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI langlist_Release(IWMLanguageList *iface) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, - WCHAR *language, WORD *length) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %d, %p, %p\n", This, index, language, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, - WORD *index) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p, %p\n", This, language, index); - return E_NOTIMPL; -} - -static const IWMLanguageListVtbl WMLanguageListVtbl = -{ - langlist_QueryInterface, - langlist_AddRef, - langlist_Release, - langlist_GetLanguageCount, - langlist_GetLanguageDetails, - langlist_AddLanguageByRFC1766String -}; - static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface); @@ -1455,9 +1398,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMLanguageList)) - return &reader->IWMLanguageList_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) || IsEqualIID(iid, &IID_IWMPacketSize2)) return &reader->IWMPacketSize2_iface; @@ -1522,7 +1462,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 09d5c3bddcc..b72ff98cd18 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -37,6 +37,10 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMHeaderInfo3_iface; } + else if (IsEqualIID(iid, &IID_IWMLanguageList)) + { + *out = &reader->IWMLanguageList_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -512,9 +516,66 @@ static const IWMHeaderInfo3Vtbl header_info_vtbl = header_info_AddCodecInfo, }; +static struct wm_reader *impl_from_IWMLanguageList(IWMLanguageList *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMLanguageList_iface); +} + +static HRESULT WINAPI language_list_QueryInterface(IWMLanguageList *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI language_list_AddRef(IWMLanguageList *iface) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI language_list_Release(IWMLanguageList *iface) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI language_list_GetLanguageCount(IWMLanguageList *iface, WORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI language_list_GetLanguageDetails(IWMLanguageList *iface, + WORD index, WCHAR *lang, WORD *len) +{ + FIXME("iface %p, index %u, lang %p, len %p, stub!\n", iface, index, lang, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI language_list_AddLanguageByRFC1766String(IWMLanguageList *iface, + const WCHAR *lang, WORD *index) +{ + FIXME("iface %p, lang %s, index %p, stub!\n", iface, debugstr_w(lang), index); + return E_NOTIMPL; +} + +static const IWMLanguageListVtbl language_list_vtbl = +{ + language_list_QueryInterface, + language_list_AddRef, + language_list_Release, + language_list_GetLanguageCount, + language_list_GetLanguageDetails, + language_list_AddLanguageByRFC1766String, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; + reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 75d1f9e0c35..9f9c5ed393f 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -147,7 +147,7 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo, TRUE); check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); - todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + check_interface(reader, &IID_IWMLanguageList, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE);

1 0

Paul Gofman : ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c310c8050debea8677f3e0cb6b62f3d117ccd2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c310c8050debea8677f3e0cb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 20 20:54:22 2021 +0300 ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c4853568599..c6bbabd85c5 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3064,7 +3064,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); - if (size < len) + if (size >= len) integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; else ret = STATUS_INFO_LENGTH_MISMATCH;

1 0

Eric Pouech : msvcrt: Support I width modifier in *scanf* family.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 74a42c54019f28c1facc2fd8009fc0533db68207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74a42c54019f28c1facc2fd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 20 13:39:02 2021 +0200 msvcrt: Support I width modifier in *scanf* family. Despite what msdn states, I and I32 are supported width modifiers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/ucrtbase/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 3d77746d23b..12a08864642 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -43,6 +43,7 @@ static void test_sscanf(void) char buffer[100], buffer1[100]; int result, ret, hour, min, count; LONGLONG result64; + DWORD_PTR result_ptr; char c; void *ptr; float ret_float1, ret_float2; @@ -296,6 +297,30 @@ static void test_sscanf(void) ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); ok(ret_size == 1, "got wrong size_t %s for flags %#x\n", wine_dbgstr_longlong((LONGLONG)ret_size), tests[i]); + + result64 = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I64d", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234ll, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I32d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == (int)12345678901234ll, /* this is always truncated to 32bit */ + "got wrong number 0x%d for flags %#x\n", result, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x87654321", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == 0x87654321, + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x123456789", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == (DWORD_PTR)0x123456789ull, /* this is truncated on 32bit systems */ + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); } }

1 0

Huw Davies : gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 0d8428fbc5e876977520c00d8a87f50d81bb23d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d8428fbc5e876977520c00d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 19 08:45:33 2021 +0100 gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record. This is done even if the emf contains a previous EMR_SETSTRETCHBLTMODE record. Thanks to Sebastián Aedo for some of the testing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d79c939218c..1b4bba18048 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2486,6 +2486,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); + if (record->iType == EMR_BITBLT || record->iType == EMR_STRETCHBLT) + SetStretchBltMode(metafile->playback_dc, STRETCH_HALFTONE); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, record, metafile->handle_count) == 0) ERR("PlayEnhMetaFileRecord failed\n");

1 0

Simon McVittie : winebus.sys: Add code path to bypass udevd and use inotify.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: ab3416c61fb17207e0831f7709da4d2911b07fb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3416c61fb17207e0831f77… Author: Simon McVittie <smcv(a)collabora.com> Date: Wed Oct 20 11:07:27 2021 +0200 winebus.sys: Add code path to bypass udevd and use inotify. In a container with a non-trivial user namespace, we cannot rely on libudev communicating with udevd as a way to monitor device nodes, for the following reasons: * If uid 0 from the host is not mapped to uid 0 in the container, libudev cannot authenticate netlink messages from the host, because their sender uid appears to be the overflowuid. Resolving this by mapping uid 0 into the container is not allowed when creating user namespaces as an unprivileged user, and even when running as a privileged user, it might be desirable for the real uid 0 to not be mapped as a way to harden the security boundary between container and host. * Depending on the container configuration, initial enumeration might not be able to read /run/udev from the host system. If it can't, sysfs attributes will still work because those are read directly from the kernel via sysfs, but udev properties coming from user-space rules (in particular ID_INPUT_JOYSTICK and friends) will appear to be missing. * The protocols between udevd and libudev (netlink messages for monitoring, and /run/udev for initial enumeration) are considered to be private to a particular version of udev, and are not a stable API; but in a container, we cannot expect that our copy of libudev is at exactly the same version as udevd on the host system. Sidestep this by adding a code path that continues to use libudev for the parts that work regardless of whether udevd is running or can be communicated with. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 276 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/main.c | 2 + dlls/winebus.sys/unixlib.h | 1 + 3 files changed, 268 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab3416c61fb17207e083…

1 0

Alexandre Julliard : ntdll: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 832724282bc1bc4f59e06d4978ff807e433a1ac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832724282bc1bc4f59e06d49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:39:13 2021 +0200 ntdll: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 10 +++------- dlls/ntdll/unix/debug.c | 8 ++++---- dlls/ntdll/unix/file.c | 8 ++------ dlls/ntdll/unix/loader.c | 11 +++++++---- dlls/ntdll/unix/process.c | 5 +---- dlls/ntdll/unix/serial.c | 9 ++------- dlls/ntdll/unix/server.c | 10 +++------- dlls/ntdll/unix/signal_arm.c | 6 ++---- dlls/ntdll/unix/signal_arm64.c | 6 ++---- dlls/ntdll/unix/signal_i386.c | 5 +---- dlls/ntdll/unix/signal_x86_64.c | 5 +---- dlls/ntdll/unix/sync.c | 7 +++---- dlls/ntdll/unix/system.c | 5 ++++- dlls/ntdll/unix/tape.c | 5 ++++- dlls/ntdll/unix/thread.c | 3 ++- dlls/ntdll/unix/virtual.c | 13 ++++++------- 16 files changed, 47 insertions(+), 69 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 479d4058068..db3b9cd25c2 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -26,19 +26,15 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <stdlib.h> +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> #elif defined(MAJOR_IN_SYSMACROS) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index a2a63b5a9f4..26e7decc059 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -23,16 +23,16 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7e47e32bab9..1acd999a3c5 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <sys/types.h> @@ -37,15 +36,12 @@ #include <stdlib.h> #include <stdio.h> #include <limits.h> +#include <unistd.h> #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_STATVFS_H # include <sys/statvfs.h> #endif diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df309814c0c..4e807744862 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -23,17 +23,20 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <signal.h> #include <math.h> -#ifdef HAVE_LINK_H -# include <link.h> -#endif +#include <string.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H # include <pwd.h> #endif diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b35765ba2fe..10a88db9291 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -24,7 +24,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <fcntl.h> @@ -47,9 +46,7 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACH_MACH_H # include <mach/mach.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ab2ef9330a5..ece9966f12b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> @@ -35,13 +34,9 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <sys/types.h> #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 53d34e1858a..46d403df326 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -23,7 +23,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -41,6 +40,7 @@ #include <signal.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -58,9 +58,7 @@ #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif @@ -70,9 +68,7 @@ #ifdef HAVE_SYS_THR_H #include <sys/thr.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef __APPLE__ #include <crt_externs.h> #include <spawn.h> diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 88f0f4ff76d..798d7b9cc87 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -26,7 +26,6 @@ #ifdef __arm__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -34,9 +33,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ce7e1689434..0f72bf3c89d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -25,7 +25,6 @@ #ifdef __aarch64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -33,9 +32,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c38c4d046d7..bf3abc1a587 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -25,7 +25,6 @@ #ifdef __i386__ #include "config.h" -#include "wine/port.h" #include <errno.h> #include <signal.h> @@ -34,9 +33,7 @@ #include <stdio.h> #include <sys/types.h> #include <assert.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a99cf2ae9c1..0085bd42410 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -25,7 +25,6 @@ #ifdef __x86_64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -35,9 +34,7 @@ #include <stdio.h> #include <sys/types.h> #include <sys/mman.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 86a836a908f..a246fc19618 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -26,12 +26,13 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> +#include <sys/types.h> #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -44,9 +45,7 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SCHED_H # include <sched.h> #endif diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..c4853568599 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -23,12 +23,15 @@ #endif #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #include <errno.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 6824d42a745..741de2f6d95 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -23,11 +23,14 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 384ac1d4119..38a03bd4b60 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -23,17 +23,18 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> #include <limits.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6db08de6473..facecffcf37 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -23,29 +23,28 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> +#include <stdlib.h> #include <signal.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif

1 0

Alexandre Julliard : loader: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 28d7d5ba9348495eaccb22f934f27bc083e5f246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d7d5ba9348495eaccb22f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:53:26 2021 +0200 loader: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 7 ++++++- loader/preloader.c | 9 ++------- loader/preloader_mac.c | 10 +++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/loader/main.c b/loader/main.c index 86c2b28263e..fdc77c56162 100644 --- a/loader/main.c +++ b/loader/main.c @@ -19,11 +19,16 @@ */ #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <pthread.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #include "main.h" diff --git a/loader/preloader.c b/loader/preloader.c index 86308484182..7bd6afaeb66 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -63,16 +63,13 @@ #ifdef __linux__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -80,9 +77,7 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_ELF_H # include <elf.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index fc07b7da0ed..23eee44975f 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -25,16 +25,13 @@ #ifdef __APPLE__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -42,9 +39,8 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h>

1 0

Alexandre Julliard : libwine: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 06f6637363295b6ac9ddd1718358968d09db88d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f6637363295b6ac9ddd171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:58:36 2021 +0200 libwine: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 7 +++---- libs/wine/debug.c | 7 +++---- libs/wine/ldt.c | 3 ++- libs/wine/loader.c | 6 ++---- libs/wine/mmap.c | 5 +---- libs/wine/port.c | 1 - 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index b8f1bd5f86d..cb42421c168 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,10 +28,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H #include <pwd.h> #endif diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 95e6fe6e58c..9cb918d272d 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,9 +28,9 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "wine/debug.h" diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 18b0b9be9bf..3fc1c0cb3d8 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -20,14 +20,15 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <sys/types.h> #include <errno.h> +#include <unistd.h> #include "windef.h" #include "winbase.h" diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4245beea94b..edb6e37061d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,8 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef __APPLE__ #include <crt_externs.h> diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b72d2af20d3..86b25b0a7ac 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,7 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> #endif diff --git a/libs/wine/port.c b/libs/wine/port.c index ee804f414a0..b019e1d2fd4 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE

1 0

Alexandre Julliard : msxml3: Always set output length in encoding conversion.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 9a335d89d0cc9c8cca04d41a8cd43b09a9488a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a335d89d0cc9c8cca04d41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:31:58 2021 +0200 msxml3: Always set output length in encoding conversion. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 25400b698ca..e9a43ab64b2 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -233,9 +233,9 @@ static void init_libxslt(void) static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { WCHAR *tmp; - int len; + int len = 0; - if (!in || !inlen) return 0; + if (!in || !inlen) goto done; len = MultiByteToWideChar(cp, 0, (const char *)in, *inlen, NULL, 0); tmp = heap_alloc(len * sizeof(WCHAR)); @@ -245,7 +245,7 @@ static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char len = WideCharToMultiByte(CP_UTF8, 0, tmp, len, (char *)out, *outlen, NULL, NULL); heap_free(tmp); if (!len) return -1; - +done: *outlen = len; return len; } @@ -253,9 +253,9 @@ static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char static int from_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { WCHAR *tmp; - int len; + int len = 0; - if (!in || !inlen) return 0; + if (!in || !inlen) goto done; len = MultiByteToWideChar(CP_UTF8, 0, (const char *)in, *inlen, NULL, 0); tmp = heap_alloc(len * sizeof(WCHAR)); @@ -265,7 +265,7 @@ static int from_utf8(int cp, unsigned char *out, int *outlen, const unsigned cha len = WideCharToMultiByte(cp, 0, tmp, len, (char *)out, *outlen, NULL, NULL); heap_free(tmp); if (!len) return -1; - +done: *outlen = len; return len; }

1 0