November 2017 - Wine-Devel - list.winehq.org

[PATCH 07/29] loader/man: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- loader/wine.de.UTF-8.man.in | 16 ++++++++-------- loader/wine.fr.UTF-8.man.in | 8 ++++---- loader/wine.man.in | 8 ++++---- loader/wine.pl.UTF-8.man.in | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/loader/wine.de.UTF-8.man.in b/loader/wine.de.UTF-8.man.in index 25dff945e9..847ac8a0a7 100644 --- a/loader/wine.de.UTF-8.man.in +++ b/loader/wine.de.UTF-8.man.in @@ -279,36 +279,36 @@ im obersten Ordner der Quellcodedistribution. .SH FEHLER .PP Statusberichte für viele Anwendungen sind unter -.I http://appdb.winehq.org +.I https://appdb.winehq.org verfügbar. Bitte fügen Sie Anwendungen, die Sie mit Wine nutzen, der Liste hinzu, sofern noch kein Eintrag existiert. .PP Fehler können unter -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. Wenn Sie einen Fehler melden möchten, lesen Sie bitte vorher -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs im .B wine -Quellcode, um zu sehen, welche Informationen benötigt werden. .PP Probleme und Hinweise mit/zu dieser Manpage können auch auf -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. .SH VERFÜGBARKEIT Die aktuellste öffentliche Wine-Version kann auf -.I http://www.winehq.org/download +.I https://www.winehq.org/download bezogen werden. .PP Ein Schnappschuss des Entwicklungscodes kann via GIT besorgt werden, siehe dazu .I -http://www.winehq.org/site/git +https://wiki.winehq.org/Git_Wine_Tutorial .PP WineHQ, die Hauptseite der .B wine -Entwicklung, befindet sich auf -.IR http://www.winehq.org . +.IR https://www.winehq.org . Diese Website bietet viele Informationen und Ressourcen zu .BR wine . .PP @@ -317,7 +317,7 @@ Für nähere Informationen zur Entwicklung von können Sie sich als Abonnement bei der .B wine -Mailingliste auf -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums eintragen. .SH "SIEHE AUCH" .BR wineserver (1),\ winedbg (1) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index c2a2ae66c6..0016f16fa3 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -273,25 +273,25 @@ licence se trouve dans le fichier .SH BUGS .PP Un rapport sur la compatibilité de nombreuses applications est disponible sur la -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B base de données d'applications de Wine .UE . N'hésitez pas à y ajouter des entrées pour les applications que vous exécutez actuellement, si nécessaire. .PP Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ La version publique la plus récente de Wine est disponible sur WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général du développement de Wine .UE . .SH "VOIR AUSSI" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/loader/wine.man.in b/loader/wine.man.in index 5482896284..ff37586d5f 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -287,27 +287,27 @@ in the top-level directory of the source distribution. .SH BUGS .PP A status report on many applications is available from the -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B Wine Application Database .UE . Please add entries to this list for applications you currently run, if necessary. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY The most recent public version of .B wine is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE . diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 1718d65561..a9792f7612 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -282,35 +282,35 @@ w głównym katalogu dystrybucyjnym źródła. .SH BŁĘDY .PP Raporty stanu działania programów są dostępne na stronie -.IR http://appdb.winehq.org . +.IR https://appdb.winehq.org . Jeżeli brakuje na liście aplikacji, której używasz, to nie wahaj się dodać jej samodzielnie. .PP Raporty błędów mogą być wysyłane do Wine Bugzilla -.I http://bugs.winehq.org +.I https://bugs.winehq.org Jeżeli chcesz zgłosić błąd zapoznaj się z -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs w źródle .B wine , aby dowiedzieć się jakie informacje są niezbędne .PP Sugestie i problemy dotyczące tej instrukcji również przesyłaj do -.I http://bugs.winehq.org +.I https://bugs.winehq.org .SH DOSTĘPNOŚĆ Najaktualniejszą publiczną wersję .B wine można pobrać ze strony -.I http://www.winehq.org/download +.I https://www.winehq.org/download .PP Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/site/git +https://wiki.winehq.org/Git_Wine_Tutorial .PP WineHQ, siedziba rozwoju .B wine , mieści się na stronie -.IR http://www.winehq.org . +.IR https://www.winehq.org . Strona ta zawiera wiele informacji o .BR wine . .PP @@ -319,7 +319,7 @@ Po dalsze informacje na temat rozwoju zapisz się na listę mailingową .B wine na stronie -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums .SH "ZOBACZ TAKŻE" .BR wineserver (1), -- 2.13.6

Nov. 30, 2017

[PATCH 06/29] fonts/: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- fonts/courier.sfd | 2 +- fonts/fixedsys.sfd | 2 +- fonts/marlett.sfd | 2 +- fonts/ms_sans_serif.sfd | 2 +- fonts/small_fonts.sfd | 2 +- fonts/small_fonts_jp.sfd | 2 +- fonts/symbol.sfd | 2 +- fonts/system.sfd | 2 +- fonts/tahoma.sfd | 2 +- fonts/tahomabd.sfd | 2 +- fonts/wingding.sfd | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index 27851e1432..265fa1d50d 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -43,7 +43,7 @@ Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 0" {"'liga' Standard Li Lookup: 4 0 1 "'liga' Standard Ligatures lookup 1" {"'liga' Standard Ligatures lookup 1 subtable" } ['liga' ('DFLT' <'dflt' > ) ] Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 2" {"'frac' Diagonal Fractions lookup 2 subtable" } ['frac' ('DFLT' <'dflt' > ) ] DEI: 91125 -LangName: 1033 "" "" "" "FontForge 1.0 : Courier : 9-7-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "FontForge 1.0 : Courier : 9-7-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/fixedsys.sfd b/fonts/fixedsys.sfd index e618cb3cbb..7a2833669d 100644 --- a/fonts/fixedsys.sfd +++ b/fonts/fixedsys.sfd @@ -41,7 +41,7 @@ HheadDOffset: 0 OS2Vendor: 'Wine' MarkAttachClasses: 1 DEI: 91125 -LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/marlett.sfd b/fonts/marlett.sfd index eba4731bcd..2cfb23b12f 100644 --- a/fonts/marlett.sfd +++ b/fonts/marlett.sfd @@ -44,7 +44,7 @@ ShortTable: cvt 2 68 1297 EndShort -LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: Symbol UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 751b35d064..181f7bf89b 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -47,7 +47,7 @@ ShortTable: cvt 2 0 8 EndShort -LangName: 1033 "" "" "" "FontForge 1.0 : MS Sans Serif : 14-6-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "FontForge 1.0 : MS Sans Serif : 14-6-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 28dcee28e1..f13bf98e60 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -52,7 +52,7 @@ OS2StrikeYPos: 11729 OS2Vendor: 'Wine' Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 0" {"'frac' Diagonal Fractions lookup 0 subtable" } ['frac' ('DFLT' <'dflt' > ) ] DEI: 91125 -LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/small_fonts_jp.sfd b/fonts/small_fonts_jp.sfd index 10d24e3ead..4ac2aae703 100644 --- a/fonts/small_fonts_jp.sfd +++ b/fonts/small_fonts_jp.sfd @@ -52,7 +52,7 @@ OS2StrikeYPos: 11729 OS2Vendor: 'Wine' Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 0" {"'frac' Diagonal Fractions lookup 0 subtable" } ['frac' ('DFLT' <'dflt' > ) ] DEI: 91125 -LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index f5b8bee89c..4ab24393d4 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -71,7 +71,7 @@ ShortTable: maxp 16 0 0 EndShort -LangName: 1033 "" "" "Regular" "WineSymbol:Version 1.1" "" "Version 1.1 February 3, 2009, initial release" "" "" "Wine" "Jon Parshall for CodeWeavers" "" "http://www.winehq.org" "http://www.codeweavers.com" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-A copy of the GNU Lesser General Public License is included in the Wine distribution in the file COPYING.LIB. If you did not receive this copy, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "Regular" "WineSymbol:Version 1.1" "" "Version 1.1 February 3, 2009, initial release" "" "" "Wine" "Jon Parshall for CodeWeavers" "" "https://www.winehq.org" "https://www.codeweavers.com" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-A copy of the GNU Lesser General Public License is included in the Wine distribution in the file COPYING.LIB. If you did not receive this copy, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." "https://www.gnu.org/licenses/lgpl.html" GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none diff --git a/fonts/system.sfd b/fonts/system.sfd index cc279a44e1..715620bf92 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -43,7 +43,7 @@ Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 0" {"'liga' Standard Li Lookup: 4 0 1 "'liga' Standard Ligatures lookup 1" {"'liga' Standard Ligatures lookup 1 subtable" } ['liga' ('DFLT' <'dflt' > ) ] Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 2" {"'frac' Diagonal Fractions lookup 2 subtable" } ['frac' ('DFLT' <'dflt' > ) ] DEI: 91125 -LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 3d6b44ee13..917669e437 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -103,7 +103,7 @@ TtfTable: VDMX 1504 !=/YK EndTtf LangName: 1038 "" "" "Norm+AOEA-l" -LangName: 1033 "" "" "" "Wine Tahoma Regular" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "Wine Tahoma Regular" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp UnicodeInterp: none diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index b132f9ab2c..d0c3493d38 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -103,7 +103,7 @@ TtfTable: VDMX 1504 !=/YK EndTtf LangName: 1038 "" "" "F+AOkA-lk+APYA-v+AOkA-r" "" "Tahoma F+AOkA-lk+APYA-v+AOkA-r" -LangName: 1033 "" "" "" "Wine Tahoma Bold" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "Wine Tahoma Bold" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp UnicodeInterp: none diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index c46152b077..f426076f29 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -43,7 +43,7 @@ ShortTable: cvt 2 68 1297 EndShort -LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "https://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "https://www.gnu.org/licenses/lgpl.html" Encoding: Symbol UnicodeInterp: none NameList: Adobe Glyph List -- 2.13.6

Nov. 30, 2017

[PATCH 05/29] dlls/gdi32/tests: update WineHQ URL

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/gdi32/tests/vertical.sfd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/vertical.sfd b/dlls/gdi32/tests/vertical.sfd index 9d085247ca..66705f8c56 100644 --- a/dlls/gdi32/tests/vertical.sfd +++ b/dlls/gdi32/tests/vertical.sfd @@ -744,7 +744,7 @@ ShortTable: maxp 16 1 1 EndShort -LangName: 1033 "" "" "" "FontForge 2.0 : WineTestVertical: 11-3-2013" "" "Version 1.055" "" "" "" "" "" "http://www.winehq.com" "" "" "" "" "WineTestVertical" "regular" +LangName: 1033 "" "" "" "FontForge 2.0 : WineTestVertical: 11-3-2013" "" "Version 1.055" "" "" "" "" "" "https://www.winehq.org" "" "" "" "" "WineTestVertical" "regular" GaspTable: 1 65535 2 0 Encoding: UnicodeFull UnicodeInterp: none -- 2.13.6

Nov. 30, 2017

[PATCH 04/29] dlls/appwiz.cpl/: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/appwiz.cpl/appwiz.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5ec49cfe6a..0bbc90f3eb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -86,7 +86,7 @@ static const addon_info_t addons_info[] = { "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", GECKO_SHA, - "http://source.winehq.org/winegecko.php", + "https://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG) }, @@ -95,7 +95,7 @@ static const addon_info_t addons_info[] = { "wine-mono-" MONO_VERSION ".msi", "mono", MONO_SHA, - "http://source.winehq.org/winemono.php", + "https://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG) } diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 5c8b31b525..589f27548f 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a Gecko package which is needed for applications embedding HTML " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for details.", + "See <a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a wine-mono package which is needed for .NET applications " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for details.", + "See <a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP -- 2.13.6

Nov. 30, 2017

[PATCH 03/29] configure.ac: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 4217def1ed..51004a2a2c 100755 --- a/configure +++ b/configure @@ -583,7 +583,7 @@ PACKAGE_TARNAME='wine' PACKAGE_VERSION='2.22' PACKAGE_STRING='Wine 2.22' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' -PACKAGE_URL='http://www.winehq.org' +PACKAGE_URL='https://www.winehq.org' ac_unique_file="server/atom.c" # Factoring default headers for most tests. @@ -2514,7 +2514,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>. +Wine home page: <https://www.winehq.org>. _ACEOF ac_status=$? fi @@ -19857,7 +19857,7 @@ Configuration commands: $config_commands Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>." +Wine home page: <https://www.winehq.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/configure.ac b/configure.ac index 22620ecab2..e372a17ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version $[-.0-9A-Za-z]+$],[ dnl autoconf versions before 2.62 don't handle source dir symlinks correctly AC_PREREQ(2.62) -AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org],[wine],[http://www.winehq.org]) +AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org],[wine],[https://www.winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) @@ -23,8 +23,8 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL m4_ifdef([AC_PACKAGE_URL],, - [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.]) - AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl + [AC_DEFINE([PACKAGE_URL], ["https://www.winehq.org"], [Define to the home page for this package.]) + AC_SUBST([PACKAGE_URL], ["https://www.winehq.org"])])dnl dnl **** Command-line arguments **** -- 2.13.6

Nov. 30, 2017

[PATCH 02/29] README: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- README | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 7e0f171367..0d44b45c8c 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ Or run Wine directly from the build directory: Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and -especially the wealth of information found at http://www.winehq.org. +especially the wealth of information found at https://www.winehq.org. 3. REQUIREMENTS @@ -48,7 +48,7 @@ support kernel threads may be supported in the future. FreeBSD info: Wine will generally not work properly on versions before FreeBSD 8.0. - See http://wiki.freebsd.org/Wine for more information. + See https://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -81,7 +81,7 @@ Basic requirements: Optional support libraries: Configure will display notices when optional libraries are not found - on your system. See http://wiki.winehq.org/Recommended_Packages for + on your system. See https://wiki.winehq.org/Recommended_Packages for hints about the packages you should install. On 64-bit platforms, you have to make sure to install the 32-bit versions of these libraries. @@ -115,7 +115,7 @@ first. Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall" before installing. Once installed, you can run the "winecfg" configuration tool. See the -Support area at http://www.winehq.org/ for configuration hints. +Support area at https://www.winehq.org/ for configuration hints. 6. RUNNING PROGRAMS @@ -142,25 +142,25 @@ a bug. 7. GETTING MORE INFORMATION WWW: A great deal of information about Wine is available from WineHQ at - http://www.winehq.org/ : various Wine Guides, application database, + https://www.winehq.org/ : various Wine Guides, application database, bug tracking. This is probably the best starting point. -FAQ: The Wine FAQ is located at http://www.winehq.org/FAQ +FAQ: The Wine FAQ is located at https://www.winehq.org/FAQ -Wiki: The Wine Wiki is located at http://wiki.winehq.org +Wiki: The Wine Wiki is located at https://wiki.winehq.org Mailing lists: There are several mailing lists for Wine users and developers; - see http://www.winehq.org/forums for more information. + see https://www.winehq.org/forums for more information. -Bugs: Report bugs to Wine Bugzilla at http://bugs.winehq.org +Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org Please search the bugzilla database to check whether your problem is already known or fixed before posting a bug report. IRC: Online help is available at channel #WineHQ on irc.freenode.net. Git: The current Wine development tree is available through Git. - Go to http://www.winehq.org/git for more information. + Go to https://wiki.winehq.org/Git_Wine_Tutorial for more information. If you add something, or fix a bug, please send a patch (preferably using git-format-patch) to the wine-devel(a)winehq.org list for -- 2.13.6

Nov. 30, 2017

[PATCH 01/29] ANNOUNCE: move WineHQ URLs to https

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16368ac168..6450ac35d5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -10,17 +10,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz + https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz http://mirrors.ibiblio.org/wine/source/2.x/wine-2.22.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://wiki.winehq.org/Git_Wine_Tutorial for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list. -- 2.13.6

Nov. 30, 2017

[PATCH] msvcrt: Change how fread splits reading into chunks

by Piotr Caban

It affects fd stream position and buffer content on unsuccessul reads. For bug #43116. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-)

Nov. 30, 2017

[PATCH 01/1] dlls/wined3d/: remove outdated comment

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0ff9ee44bb..317152ceec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2715,8 +2715,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /***************************************************************************** * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - * - * For more information, see http://wiki.winehq.org/DirectX-Shaders ****************************************************************************/ /* Prototypes */ -- 2.13.6

Nov. 30, 2017

[PATCH 3/3] ntdll: Don't require full-page reads in NtReadFileScatter

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 21 ++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 75b56e5d41..40cc66dd03 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4454,6 +4454,25 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6c3b571638..db45a5bcf3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.0

Nov. 30, 2017