March 2022 - Wine-devel - list.winehq.org

[PATCH 1/3] server: fix some error detection
by Eric Pouech 08 Mar '22

08 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- server/mapping.c | 4 ++-- server/request.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..6b0785c1c0c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -691,13 +691,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!file_size) return STATUS_INVALID_FILE_FOR_SECTION; size = pread( unix_fd, &mz, sizeof(mz), 0 ); - if (size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; + if (size < 0 || size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; if (mz.dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; mz_size = size; pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); - if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; + if (size < 0 || size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); diff --git a/server/request.c b/server/request.c index 7021741c765..1bc92d479ae 100644 --- a/server/request.c +++ b/server/request.c @@ -265,7 +265,8 @@ static void send_reply( union generic_reply *reply ) vec[1].iov_base = current->reply_data; vec[1].iov_len = current->reply_size; - if ((ret = writev( get_unix_fd( current->reply_fd ), vec, 2 )) < sizeof(*reply)) goto error; + ret = writev( get_unix_fd( current->reply_fd ), vec, 2 ); + if (ret < 0 || ret < sizeof(*reply)) goto error; if ((current->reply_towrite = current->reply_size - (ret - sizeof(*reply)))) {

2 1

[PATCH 3/3] include: fix prototype of NtQueryInformationFile
by Eric Pouech 08 Mar '22

08 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..cc8bf0c6e82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4021,7 +4021,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC * NtQueryInformationFile (NTDLL.@) */ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, LONG len, FILE_INFORMATION_CLASS class ) + void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { static const size_t info_sizes[] = { diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..4c49f5eae47 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4048,7 +4048,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOL NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG);

1 0

[PATCH] maintainers: Add dllhost.
by Huw Davies 08 Mar '22

08 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a90c91b60b7..9ceae9e80bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -233,6 +233,7 @@ F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c +F: programs/dllhost/ OLE Storage M: Esme Povirk <esme(a)codeweavers.com> -- 2.23.0

1 0

[PATCH v2 06/11] win32u: Move GetParent implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 34 +---------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-)

2 1

[PATCH v2 05/11] win32u: Move GetWindow implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 51 +-------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-)

2 1

[PATCH v2 04/11] win32u: Move GetWindowLong implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 166 +++--------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-)

2 1

[PATCH v2 02/11] user32: Use NtUserInternalGetWindowText in GetWindowText.
by Jacek Caban 08 Mar '22

08 Mar '22

Instead of get_server_window_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH] winevulkan: Update to VK spec version 1.3.207.
by Georg Lehmann 08 Mar '22

08 Mar '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..9d2146c9194 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.204" +VK_XML_VERSION = "1.3.207" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[PATCH 01/11] win32u: Move NtUserInternalGetWindowText implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

2 1

[PATCH] po: Update Dutch Translation.
by Floris Renaud 08 Mar '22

08 Mar '22

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 72 +++++++++++++++----------------------------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/po/nl.po b/po/nl.po index 03b653aa5c0..088a3d52a25 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-02-05 10:30+0100\n" +"PO-Revision-Date: 2022-03-08 13:40+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10590,11 +10590,9 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Mountain Standaard Tijd (Mexico)" +msgstr "Mountain St. Tijd (Mexico)" #: dlls/tzres/tzres.rc:241 msgctxt "maximum 31 characters" @@ -10662,16 +10660,14 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howe-eiland" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "Arabic Standard Time" msgctxt "maximum 31 characters" msgid "Arabic Standard Time" -msgstr "Arabisch Schiereiland Standaard Tijd" +msgstr "Arab. Schiereiland St. Tijd" #: dlls/tzres/tzres.rc:49 msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" -msgstr "Arabisch Schiereiland Zomertijd" +msgstr "Arab. Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10985,18 +10981,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Buenos Aires (stad)" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- en Caicoseilanden Standaard Tijd" +msgstr "Turks en Caicos Standaard Tijd" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- en Caicoseilanden Zomertijd" +msgstr "Turks en Caicos Zomertijd" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11236,11 +11228,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Noordcentraal-Azië Standaard Tijd" +msgstr "Noordcentraal-Azië St. Tijd" #: dlls/tzres/tzres.rc:247 msgctxt "maximum 31 characters" @@ -11457,11 +11447,9 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 -#, fuzzy -#| msgid "Cen. Australia Standard Time" msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" -msgstr "Centraal Australië Standaard Tijd" +msgstr "Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:97 msgctxt "maximum 31 characters" @@ -11524,11 +11512,9 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Zuid-Amerika Oost Standaard Tijd" +msgstr "Zuid-Amerika Oost St. Tijd" #: dlls/tzres/tzres.rc:310 msgctxt "maximum 31 characters" @@ -11596,11 +11582,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskou, Sint-Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "W-Centraal Australië Standaard Tijd" +msgstr "W-Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:64 msgctxt "maximum 31 characters" @@ -11649,18 +11633,14 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtsjatski" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Bank Standard Time" msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Westelijke Jordaanoever Standaard Tijd" +msgstr "W. Jordaanoever Standaard Tijd" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Bank Daylight Time" msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Westelijke Jordaanoever Zomertijd" +msgstr "W. Jordaanoever Zomertijd" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11681,11 +11661,9 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 -#, fuzzy -#| msgid "AUS Central Standard Time" msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Centraal-Australië Standaard Tijd" +msgstr "Centraal-Australië St. Tijd" #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" @@ -11767,11 +11745,9 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:313 msgctxt "maximum 31 characters" @@ -11993,11 +11969,9 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Brazilian Standard Time" msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" -msgstr "Centraal Brazilië Standaard Tijd" +msgstr "Centraal Brazilië St. Tijd" #: dlls/tzres/tzres.rc:106 msgctxt "maximum 31 characters" @@ -12023,11 +11997,9 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:316 msgctxt "maximum 31 characters" @@ -12202,11 +12174,9 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Oost Zuid-Amerika Standaard Tijd" +msgstr "Oost Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:145 msgctxt "maximum 31 characters" @@ -12232,11 +12202,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Salomonseilanden, Nieuw-Caledonië" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "West Centraal-Afrika Standaard Tijd" +msgstr "West Centraal-Afrika St. Tijd" #: dlls/tzres/tzres.rc:424 msgctxt "maximum 31 characters" @@ -12248,11 +12216,9 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West Centraal-Afrika" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Pacific Zuid-Amerika Stand. Tijd" +msgstr "Pacific Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:277 msgctxt "maximum 31 characters" -- 2.35.1

1 0