June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : start: Avoid duplicate backslashes in command line.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: ea2a235727c3c3dbf018d2168d215c86c5e8b99d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea2a235727c3c3dbf018d216… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 11:57:44 2021 +0100 start: Avoid duplicate backslashes in command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1b4b4a9bb5b6287019f09f09cf96c6b0dda666e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/start/start.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index e3071a3a09a..4b31e07dfee 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -280,7 +280,7 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */ - lstrcatW(thisDir, L"\\"); + if (thisDir[lstrlenW(thisDir) - 1] != '\\') lstrcatW(thisDir, L"\\"); lstrcatW(thisDir, stemofsearch); pos = &thisDir[lstrlenW(thisDir)]; /* Pos = end of name */

1 0

Brendan Shanks : loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 497025d144fb738a60f9463027f993e5a8d04368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=497025d144fb738a60f94630… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:45 2021 -0800 loader: On Mac, move the top-down allocations area down to avoid Rosetta regions. On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 720611e28e750b42c7b8d7a2b72047e3027c1ec5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Brendan Shanks : loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: f1a7cae5cb46a84e2b57ffdd0b7096f5a7ba26dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1a7cae5cb46a84e2b57ffdd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:46 2021 -0800 loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher. On Apple Silicon, Rosetta allocates memory starting at 0x100000000 (the 4GB line) before the preloader runs. The .NET 3.5 installer and DirectX Jun2010 redistributable both contain non-relocatable EXEs with that base address, which fail to run. The workaround is to create an empty linker section at that address, which is mapped by the kernel before Rosetta runs and forces Rosetta's allocations higher in memory. The linker section runs from 0x100000000-0x114000000. Rosetta's allocations are ~132MB, and should end below 0x120000000. This is not an exact science: a non-relocatable EXE with base address between 0x114000000-0x120000000 will fail to run. If one is discovered, the section size will need to be changed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 307f5d00f17d71fe0030acb6ba9f28c3c9d76615) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader_mac.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6a0f0ad92c2..53556675b21 100755 --- a/configure +++ b/configure @@ -8722,7 +8722,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index 2c4bd667e8f..6eedc151e83 100644 --- a/configure.ac +++ b/configure.ac @@ -745,7 +745,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d86675538bb..fc07b7da0ed 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -54,6 +54,17 @@ #include "wine/asm.h" #include "main.h" +/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) + * before the preloader runs, which prevents any nonrelocatable EXEs with that + * base address from running. + * + * This empty linker section forces Rosetta's allocations (currently ~132 MB) + * to start at 0x114000000, and they should end below 0x120000000. + */ +#if defined(__x86_64__) +__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +#endif + #ifndef LC_MAIN #define LC_MAIN 0x80000028 struct entry_point_command @@ -79,6 +90,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -395,6 +407,10 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; + static const char reserved_segname[] = "WINE_4GB_RESERVE"; + + if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) + continue; if (end > seg_start && start <= seg_end) {

1 0

Floris Renaud : documentation: Change obsolete Debian and Red Hat packages.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 27fc09f67cde1acd398dc65dcfe548012b32725e URL: https://source.winehq.org/git/wine.git/?a=commit;h=27fc09f67cde1acd398dc65d… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jan 28 13:32:40 2021 +0100 documentation: Change obsolete Debian and Red Hat packages. xlib6g-dev on Debian and XFree86-devel on Red Hat no longer exist. Replaced with: xorg-dev (Debian) and libX11-devel (Red Hat) Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c65205d2245e83b00c62911469b082fd3689143) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 4 ++-- documentation/README.fr | 4 ++-- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 4 ++-- documentation/README.no | 4 ++-- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 4 ++-- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 6 ++---- 17 files changed, 23 insertions(+), 25 deletions(-) diff --git a/README b/README index 21ab6f23b20..7d834db0a8f 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ Supported file systems: Basic requirements: You need to have the X11 development include files installed - (called xlib6g-dev in Debian and XFree86-devel in Red Hat). + (called xorg-dev in Debian and libX11-devel in Red Hat). Of course you also need "make" (most likely GNU make). diff --git a/documentation/README.de b/documentation/README.de index b30575a356d..be8c033dba5 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -80,7 +80,7 @@ Unterstützte Dateisysteme: Grundsätzliche Voraussetzungen: Sie müssen die Entwicklungsdateien für X11 installiert haben - (Debian nennt diese xlib6g-dev, Red Hat XFree86-devel). + (Debian nennt diese xorg-dev, Red Hat libX11-devel). Selbstverständlich benötigen Sie auch "make" (höchstwahrscheinlich GNU make). diff --git a/documentation/README.es b/documentation/README.es index 8068217ebcd..19b43dd02ec 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -68,7 +68,7 @@ Sistemas de ficheros soportados: Requisitos básicos: Necesitará tener instalados los archivos include X11 para desarrollo - (llamados xlib6g-dev en Debian y XFree86-devel en RedHat). + (llamados xorg-dev en Debian y libX11-devel en RedHat). Además necesitará "make" (preferiblemente GNU make). diff --git a/documentation/README.fi b/documentation/README.fi index b2c6524548e..13af44b1e9b 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -71,8 +71,8 @@ Tuetut tiedostojärjestelmät: on suotavaa. Perusvaatimukset: - Koneella täytyy olla X11:n kehitystiedostot (Debianissa xlib6g-dev, - Red Hatissa XFree86-devel). + Koneella täytyy olla X11:n kehitystiedostot (Debianissa xorg-dev, + Red Hatissa libX11-devel). Luonnollisesti myös make (yleensä GNU make) on tarpeen. diff --git a/documentation/README.fr b/documentation/README.fr index 28729a5b41e..2105502cf55 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -74,8 +74,8 @@ Systèmes de fichiers pris en charge : est recommandée. Configuration de base requise : - Les fichiers d'en-tête de X11 (appelés xlib6g-dev sous Debian et - XFree86-devel sous Red Hat) doivent être installés. + Les fichiers d'en-tête de X11 (appelés xorg-dev sous Debian et + libX11-devel sous Red Hat) doivent être installés. Bien entendu, vous aurez besoin du programme « make » (très probablement GNU make). diff --git a/documentation/README.hu b/documentation/README.hu index f672dea43d2..e28c534c51e 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -73,7 +73,7 @@ Támogatott fájlrendszerek: Alap követelmények: Önnek fel kell telepítenie az X11 fejlesztõi fájlokat - (xlib6g-dev néven van a Debianban és XFree86-devel néven a Red Hat-ben). + (xorg-dev néven van a Debianban és libX11-devel néven a Red Hat-ben). Fordítási eszköz követelmények: x86 rendszereken gcc >= 2.7.2 szükséges. diff --git a/documentation/README.it b/documentation/README.it index ecb4aed75e8..68f0df1f75f 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -68,7 +68,7 @@ File system supportati: Requisiti basilari: Devono essere installati i file include di sviluppo di X11 - (chiamato xlib6g-dev in Debian e XFree86-devel in Red Hat). + (chiamato xorg-dev in Debian e libX11-devel in Red Hat). Ovviamente necessario anche "make" (possibilmente GNU make). diff --git a/documentation/README.ja b/documentation/README.ja index ea584853db1..72e1ce2fe46 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -77,7 +77,7 @@ Mac OS X情報: 基本的な要件: X11開発includeファイルをインストールする必要があります。 - （Debianではxlib6g-devでRed HatではXFree86-develと呼ばれます。[訳注: 最近の + （Debianではxorg-devでRed HatではlibX11-develと呼ばれます。[訳注: 最近のディストリビューションでは別のパッケージで置き換えられています]）もちろん"make"も必要です（大概はGNU make）。 diff --git a/documentation/README.ko b/documentation/README.ko index a22cc1ea149..17fcfee318a 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -72,8 +72,8 @@ Mac OS X 정보: 기본 요구 사항: - X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xlib6g-dev, - 레드햇에서는 XFree86-devel이란 패키지명으로 되어 있습니다). + X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xorg-dev, + 레드햇에서는 libX11-devel이란 패키지명으로 되어 있습니다). 당연히 "make" 프로그램도 필요합니다 (대부분 GNU make 사용). diff --git a/documentation/README.no b/documentation/README.no index 14d7ebcd498..a25b47f7fce 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -64,8 +64,8 @@ Støttede filsystemer: programmer trenger. Det anbefales å bruke et ekte Unix-filsystem. Basiskrav: - Inkluderingsfilene for X11 må være installert (kalt «xlib6g-dev» i - Debian og «XFree86-devel» i RedHat). + Inkluderingsfilene for X11 må være installert (kalt «xorg-dev» i + Debian og «libX11-devel» i RedHat). Du må selvfølgelig også ha «make», sannsynligvis «GNU make». diff --git a/documentation/README.pt b/documentation/README.pt index 848d2d2eb26..256eb2310c0 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -73,7 +73,7 @@ possa escrever. Requisitos básicos: Tu precisas de ter instalados os fucheiros de include do X11 development -(chamados xlib6g-dev em Debian e Xfree86-devel no RedHat). +(chamados xorg-dev em Debian e libX11-devel no RedHat). Requisitos para as ferramentas de construção: Em sistemas x86 o gcc >= 2.7.2 é requerido. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 05a3d037bd5..a8025b55ac0 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -68,7 +68,7 @@ Sistemas de arquivo suportados: Requisitos básicos: Você necessita ter instalados os arquivos de inclusão para desenvolvimento - do X11 (chamados de xlib6g-dev no Debian e XFree86-devel no RedHat). + do X11 (chamados de xorg-dev no Debian e libX11-devel no RedHat). Obviamente você também irá precisar do "make" (comumente o GNU make). diff --git a/documentation/README.ru b/documentation/README.ru index f3328edd13a..78ee9a50959 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -66,7 +66,7 @@ Mac OS X: Базовые требования: У вас должны быть установлены заголовочные файлы X11 - (xlib6g-dev в Debian и XFree86-devel в Red Hat). + (xorg-dev в Debian и libX11-devel в Red Hat). Разумеется, вам необходим «make» (лучше всего использовать GNU make). diff --git a/documentation/README.sv b/documentation/README.sv index b68e6997d92..be017d40d7f 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -70,8 +70,8 @@ Stödda filsystem: program. Det rekommenderas att använda ett riktigt Unix-filsystem. Grundläggande krav: - Utvecklingsfilerna för X11 måste vara installerade (de kallas xlib6g-dev i - Debian och XFree86-devel i Red Hat). + Utvecklingsfilerna för X11 måste vara installerade (de kallas xorg-dev i + Debian och libX11-devel i Red Hat). Du måste givetvis också ha "make" (mest troligt "GNU make"). diff --git a/documentation/README.tr b/documentation/README.tr index 28b17b8c377..ae145171269 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -69,7 +69,7 @@ Desteklenen dosya sistemleri: Temel gereksinimler: X11 geliştirme dosyalarının kurulu olması gereklidir. - (Debian'da xlib6g-dev, Red Hat'da XFree86-devel adlı paketler). + (Debian'da xorg-dev, Red Hat'da libX11-devel adlı paketler). "make" komutuna kesinlikle ihtiyacınız vardır. (çoğunlukla GNU make) diff --git a/documentation/README.uk b/documentation/README.uk index a70e4979f11..8fea73571af 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -70,7 +70,7 @@ Mac OS X: Базові вимоги: У вас повинні бути встановлені файли заголовків X11 - (Xlib6g-dev в Debian та XFree86-devel в Red Hat). + (xorg-dev в Debian та libX11-devel в Red Hat). Звісно, вам потрібен "make" (краще всього використовувати GNU make). diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index 963b15720b0..934079fdef4 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -63,10 +63,8 @@ Mac OS X 信息: 文件系统。基本要求： - 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xlib6g-dev - ，在 Red Hat 中可能被称为 XFree86-devel [译注：在新版本的 Linux - 发行版中可能有其它名称，例如使用替代 Xlib 的 XCB library，此时 - Debian 的包名称应为 libxcb1-dev]）。 + 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xorg-dev + ，在 Red Hat 中可能被称为 libX11-devel）。当然您同样需要“make”工具（一般应当为 GNU make）。

1 0

Floris Renaud : documentation: Add Dutch README translation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 71902db007998234efc34ad0c6fe8b4d65c79194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71902db007998234efc34ad0… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jan 28 13:40:03 2021 +0100 documentation: Add Dutch README translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f72ef20e88fba67254caf0124ab8713e3d15fa2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.nl | 181 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/documentation/README.nl b/documentation/README.nl new file mode 100644 index 00000000000..2b54c33b5dc --- /dev/null +++ b/documentation/README.nl @@ -0,0 +1,181 @@ +1. INTRODUCTIE + +Wine is een programma wat het mogelijk maakt om Microsoft Windows +programma's (waaronder uitvoerbare DOS, Windows 3.x, Win32 en Win64 +bestanden) op Unix uit te voeren. Het bestaat uit een programma- +lader die het Microsoft Windows binaire bestand laadt en uitvoert. +Een bibliotheek (Winelib genaamd) die de Windows API aanroepen laat +uitvoeren door overeenkomstige Unix, X11 of Mac varianten. Deze +bibliotheek kan ook worden gebruikt om Windows code om te zetten in +echte Unix uitvoerbare bestanden. + +Wine is vrije software, uitgebracht onder de GNU LGPL. Zie het +LICENCE bestand voor meer informatie. + + +2. SNEL AAN DE SLAG + +Voer in de hoofdmap van de Wine broncode (waar het README bestand staat), +het volgende uit: + +./configure +make + +Installeer daarna Wine met: + +make install + +Of voer Wine uit in de map waarin die gebouwd is: + +./wine notepad + +Programma's kunnen uitgevoerd worden met "wine programma". Lees voor meer +informatie en het oplossingen van problemen de rest van dit bestand, de +man pagina's van Wine en vooral de overvloed aan informatie op +https://winehq.org . + + +3. BENODIGDHEDEN + +Om Wine te kunnen compileren en uit te voeren, is één van het volgende +besturingssystemen nodig: + + Linux versie 2.0.36 of nieuwer + FreeBSD 8.0 of nieuwer + Solaris x86 9 of nieuwer + NetBSD-current + Mac OS X 10.8 of nieuwer + +Omdat Wine threadondersteuning op kernelniveau vereist, worden alleen de +bovenstaande besturingssystemen ondersteund. Andere besturingssystemen +die threadondersteuning op kernelniveau hebben, kunnen mogelijk in de +toekomst ook ondersteund worden. + +FreeBSD informatie: + Over het algemeen werkt Wine niet goed op versies die ouder zijn dan + FreeBSD 8.0. Zie https://wiki.freebsd.org/Wine voor meer informatie. + +Solaris informatie: + Hoogst waarschijnlijk moet Wine gebouwd worden met de GNU toolchain + (gcc, gas, enz.). Waarschuwing: het installeren van gas houdt *niet* + in dat het gebruikt wordt door gcc. Hercompileren van gcc nadat gas + is geïnstalleerd of symbolische verwijzingen maken voor cc, as en + ld naar de gnu-tools is waarschijnlijk noodzakelijk. + +NetBSD informatie: + Zorg er voor dat de volgende opties aan staan in de kernel: USER_LDT, + SYSVSHM, SYSVSEM, en SYSVMSG. + +Mac OS X informatie: + Xcode/Xcode Command Line Tools of Apple cctools zijn nodig. De minimale + vereisten om Wine te kunnen compileren zijn clang 3.8 met MacOSX10.10.sdk + en mingw-w64 v8. MacOSX10.14.sdk en nieuwer kunnen alleen wine64 bouwen. + +Ondersteunde bestandssystemen: + Wine zou op de meeste bestandssystemen uitgevoerd moeten kunnen worden. + Er zijn enkele compatibiliteitsproblemen bekend met bestanden die via + Samba worden benaderd. Ook heeft NTFS niet alle bestandssysteemopties die + nodig zijn met sommige programma's. Een oorspronkelijk Unix + bestandssysteem wordt aangeraden. + +Basis benodigdheden: + De X11-ontwikkel-bestanden moeten geïnstalleerd zijn. (Voor Debian is dat + pakket xorg-dev in RedHat is dit libX11-devel). + + Natuurlijk is ook "make" nodig. (Hoogst waarschijnlijk GNU make.) + + Ook zijn bison en flex versie 2.5.33 of nieuwer nodig. + +Optionele bibliotheken: + Tijdens het uitvoeren van ./configure wordt er aangegeven of de optionele + bibliotheken zijn gevonden op het systeem. Bekijk + https://wiki.winehq.org/Building_Wine voor meer informatie over welke + pakketten er geïnstalleerd zouden moeten worden. Op 64-bit systemen + moeten ook de 32-bit versies van deze pakketten geïnstalleerd worden. + + +4. COMPILEREN + +Om Wine te bouwen, voer het volgende uit: + +./configure +make + +Hiermee wordt het programma "wine" en talrijke ondersteunende bibliotheken +en uitvoerbare bestanden gemaakt. Het programma "wine" laadt en voert de +uitvoerbare Windows bestanden uit. +De bibliotheek "libwine" ("Winelib") kan worden gebruikt om Windows +broncode te compileren en te linken in Unix. + +Voor alle opties tijdens het compileren, voer ./configure --help uit. + +Voor meer informatie bekijk: https://wiki.winehq.org/Building_Wine + + +5. SETUP + +Wanneer Wine goed in elkaar is gezet, kan Wine geïnstalleerd worden met +"make install". Deze opdracht installeert het uitvoerbare wine bestand, +de bibliotheken, de Wine man pagina's en alle andere benodigde bestanden. + +Vergeet niet om eerst elke tegenstrijdige Wine installatie te verwijderen. +Dit kan voor de installatie met "dpkg -r wine", "rpm -e wine" of met +"make uninstall" + +Eenmaal geïnstalleerd, kan het configuratie programma "winecfg" worden +uitgevoerd. Bekijk de Support pagina op https://www.winehq.org/ voor +configuratiehints. + + +6. PROGRAMMA'S UITVOEREN + +Bij het gebruiken van Wine kan het gehele pad naar het uitvoerbare bestand +worden gebruikt of alleen de bestandsnaam. + +Voorbeeld: het Kladblok (Notepad) uitvoeren: + + wine notepad (gebruikt het zoek-pad, zoals in het register is + wine notepad.exe opgegeven, om het bestand te vinden) + + wine c:\\windows\\notepad.exe (met een DOS bestandsnaam constructie) + + wine ~/.wine/drive_c/windows/notepad.exe (een Unix constructie) + + wine notepad.exe readme.txt (een programma met parameters) + +Wine is niet perfect. Dus sommige programma's kunnen crashen. Als dat +gebeurd komt er een logboek van de crash. Deze kan bijgevoegd worden als de +fout wordt gerapporteerd. + + +7. MEER INFORMATIE + +WWW: Een grote verscheidenheid aan informatie voor Wine is beschikbaar + gemaakt door WineHQ op https://www.winehq.org/ : verschillende + handleidingen, programma database, bug tracking. Dit is + waarschijnlijk de beste plek om te beginnen. + +FAQ: Veel vragen over Wine zijn te vinden op https://www.winehq.org/FAQ + +Wiki: De Wine-Wiki staat op https://wiki.winehq.org + +Mail-lijsten: + Er zijn meerdere mail-lijsten voor gebruikers en ontwikkelaars van + Wine. Bekijk https://www.winehq.org/forums voor meer informatie. + +Fouten: Op https://bugs.winehq.org kunnen fouten gemeld worden aan de Wine + Bugzilla. Doorzoek eerst de database van bugzilla om te kijken of + de fout al bekend of gerepareerd is voordat de fout gemeld wordt. + +IRC: Online hulp is beschikbaar in kanaal #WineHQ op irc.freenode.net + +Git: De huidige ontwikkeling van Wine is beschikbaar op Git. Bezoek + https://www.winehq.org/git voor meer informatie. + +Om iets toe te voegen aan de volgende uitgave van Wine of om een fout op te +lossen, stuur een patch (de voorkeur heeft een git-format-patch) naar de +wine-devel(a)winehq.org lijst. + +-- +Alexandre Julliard +julliard(a)winehq.org

1 0

Sanghoon Park : make_unicode: Add support for codepage 20949 (Korean Wansung).
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dbd00086d576debf97d38168749ca294d069b110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd00086d576debf97d38168… Author: Sanghoon Park <esifea1908(a)gmail.com> Date: Thu Mar 11 14:02:09 2021 +0900 make_unicode: Add support for codepage 20949 (Korean Wansung). Signed-off-by: Sanghoon Park <esifea1908(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd3a6402065a057e189d44905f62774bb6a381c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 1 + dlls/kernelbase/locale.c | 1 + loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/c_20949.nls | Bin 0 -> 177698 bytes tools/make_unicode | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 629f98ebafa..d35eb0a71a8 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -76,6 +76,7 @@ HKLM val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' } Normalization { diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..5c043113088 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -161,6 +161,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 20127, L"US-ASCII (7bit)" }, { 20866, L"Russian KOI8" }, { 20932, L"EUC-JP" }, + { 20949, L"Korean Wansung" }, { 21866, L"Ukrainian KOI8" }, { 28591, L"ISO 8859-1 Latin 1" }, { 28592, L"ISO 8859-2 Latin 2 (East European)" }, diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d5dd2d5b66b..e976a510a37 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4103,6 +4103,7 @@ c_1361.nls c_20127.nls c_20866.nls c_20932.nls +c_20949.nls c_21866.nls c_28591.nls c_28592.nls diff --git a/nls/Makefile.in b/nls/Makefile.in index a3c3b69b029..4352becac5f 100644 --- a/nls/Makefile.in +++ b/nls/Makefile.in @@ -30,6 +30,7 @@ SOURCES = \ c_20127.nls \ c_20866.nls \ c_20932.nls \ + c_20949.nls \ c_21866.nls \ c_28591.nls \ c_28592.nls \ diff --git a/nls/c_20949.nls b/nls/c_20949.nls new file mode 100644 index 00000000000..1ee157af003 Binary files /dev/null and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 02bb0afdb66..d71dcecbf3a 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,6 +26,7 @@ my $UNIVERSION = "13.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; +my $KSCDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC"; my $REPORTS = "http://www.unicode.org/reports"; my $MSDATA = "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6…"; my $MSCODEPAGES = "$MSDATA/Windows Supported Code Page Data Files.zip"; @@ -933,6 +934,45 @@ sub dump_eucjp_codepage() output_codepage_file( 20932 ); } +################################################################ +# build Korean Wansung table from the KSX1001 file +# FIXME: compare to Windows we should add extra mappings for +# characters added from Unicode 1.1 to enhance the completeness. +sub dump_krwansung_codepage() +{ + @cp2uni = (); + @glyph2uni = (); + @lead_bytes = (); + @uni2cp = (); + $default_char = 0x3f; + $default_wchar = 0x003f; + + # ASCII and undefined chars + foreach my $i (0x00 .. 0x9f) { add_mapping( $i, $i ); } + add_mapping( 0xa0, 0xf8e6 ); + add_mapping( 0xad, 0xf8e7 ); + add_mapping( 0xae, 0xf8e8 ); + add_mapping( 0xaf, 0xf8e9 ); + add_mapping( 0xfe, 0xf8ea ); + add_mapping( 0xff, 0xf8eb ); + + my $INPUT = open_data_file( $KSCDATA, "KSX1001.TXT" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\s+(\#.*)?/) + { + add_mapping( 0x8080 + hex $1, hex $2 ); + next; + } + die "Unrecognized line $_\n"; + } + close $INPUT; + + output_codepage_file( 20949 ); +} ################################################################ # build the sort keys table @@ -2723,6 +2763,7 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); +dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Alexandre Julliard : make_unicode: Use codepage 949 to add default mappings to codepage 20949.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 6cc71f92a356a3395a8014bf30eb445ac19a7198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc71f92a356a3395a8014bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 12:46:04 2021 +0100 make_unicode: Use codepage 949 to add default mappings to codepage 20949. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6f68543692a7588daa581d00c475715395036b15) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 74 ++++++++++++++++++++--------------------- nls/c_20949.nls | Bin 177698 -> 177698 bytes tools/make_unicode | 28 +++++++++++++--- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index d35eb0a71a8..0d9dbd29c43 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -10,41 +10,6 @@ HKLM { Codepage { - val '37' = s 'c_037.nls' - val '437' = s 'c_437.nls' - val '500' = s 'c_500.nls' - val '708' = s 'c_708.nls' - val '737' = s 'c_737.nls' - val '775' = s 'c_775.nls' - val '850' = s 'c_850.nls' - val '852' = s 'c_852.nls' - val '855' = s 'c_855.nls' - val '857' = s 'c_857.nls' - val '860' = s 'c_860.nls' - val '861' = s 'c_861.nls' - val '862' = s 'c_862.nls' - val '863' = s 'c_863.nls' - val '864' = s 'c_864.nls' - val '865' = s 'c_865.nls' - val '866' = s 'c_866.nls' - val '869' = s 'c_869.nls' - val '874' = s 'c_874.nls' - val '875' = s 'c_875.nls' - val '932' = s 'c_932.nls' - val '936' = s 'c_936.nls' - val '949' = s 'c_949.nls' - val '950' = s 'c_950.nls' - val '1026' = s 'c_1026.nls' - val '1250' = s 'c_1250.nls' - val '1251' = s 'c_1251.nls' - val '1252' = s 'c_1252.nls' - val '1253' = s 'c_1253.nls' - val '1254' = s 'c_1254.nls' - val '1255' = s 'c_1255.nls' - val '1256' = s 'c_1256.nls' - val '1257' = s 'c_1257.nls' - val '1258' = s 'c_1258.nls' - val '1361' = s 'c_1361.nls' val '10000' = s 'c_10000.nls' val '10001' = s 'c_10001.nls' val '10002' = s 'c_10002.nls' @@ -61,8 +26,21 @@ HKLM val '10079' = s 'c_10079.nls' val '10081' = s 'c_10081.nls' val '10082' = s 'c_10082.nls' + val '1026' = s 'c_1026.nls' + val '1250' = s 'c_1250.nls' + val '1251' = s 'c_1251.nls' + val '1252' = s 'c_1252.nls' + val '1253' = s 'c_1253.nls' + val '1254' = s 'c_1254.nls' + val '1255' = s 'c_1255.nls' + val '1256' = s 'c_1256.nls' + val '1257' = s 'c_1257.nls' + val '1258' = s 'c_1258.nls' + val '1361' = s 'c_1361.nls' val '20127' = s 'c_20127.nls' val '20866' = s 'c_20866.nls' + val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' val '21866' = s 'c_21866.nls' val '28591' = s 'c_28591.nls' val '28592' = s 'c_28592.nls' @@ -75,8 +53,30 @@ HKLM val '28599' = s 'c_28599.nls' val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' - val '20932' = s 'c_20932.nls' - val '20949' = s 'c_20949.nls' + val '37' = s 'c_037.nls' + val '437' = s 'c_437.nls' + val '500' = s 'c_500.nls' + val '708' = s 'c_708.nls' + val '737' = s 'c_737.nls' + val '775' = s 'c_775.nls' + val '850' = s 'c_850.nls' + val '852' = s 'c_852.nls' + val '855' = s 'c_855.nls' + val '857' = s 'c_857.nls' + val '860' = s 'c_860.nls' + val '861' = s 'c_861.nls' + val '862' = s 'c_862.nls' + val '863' = s 'c_863.nls' + val '864' = s 'c_864.nls' + val '865' = s 'c_865.nls' + val '866' = s 'c_866.nls' + val '869' = s 'c_869.nls' + val '874' = s 'c_874.nls' + val '875' = s 'c_875.nls' + val '932' = s 'c_932.nls' + val '936' = s 'c_936.nls' + val '949' = s 'c_949.nls' + val '950' = s 'c_950.nls' } Normalization { diff --git a/nls/c_20949.nls b/nls/c_20949.nls index 1ee157af003..2ff92aec922 100644 Binary files a/nls/c_20949.nls and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index d71dcecbf3a..69ce845b26a 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -936,10 +936,9 @@ sub dump_eucjp_codepage() ################################################################ # build Korean Wansung table from the KSX1001 file -# FIXME: compare to Windows we should add extra mappings for -# characters added from Unicode 1.1 to enhance the completeness. -sub dump_krwansung_codepage() +sub dump_krwansung_codepage(@) { + my @cp949 = @_; @cp2uni = (); @glyph2uni = (); @lead_bytes = (); @@ -971,6 +970,24 @@ sub dump_krwansung_codepage() } close $INPUT; + # get some extra mappings from cp 949 + my @defined_lb; + map { $defined_lb[$_] = 1; } @lead_bytes; + foreach my $i (0x0000 .. 0xffff) + { + next if ($i >= 0x1100 && $i <= 0x11ff); # range not used in 20949 + next unless defined $cp949[$i]; + if ($cp949[$i] >= 0xff) + { + # only add chars for lead bytes that exist in 20949 + my $hi = $cp949[$i] >> 8; + my $lo = $cp949[$i] & 0xff; + next unless $defined_lb[$hi]; + next unless $lo >= 0xa1 && $lo <= 0xfe; + } + add_mapping( $cp949[$i], $i ); + } + output_codepage_file( 20949 ); } @@ -2292,6 +2309,8 @@ sub dump_msdata_codepage($) close $INPUT; output_codepage_file( $codepage ); + + if ($codepage == 949) { dump_krwansung_codepage( @uni2cp ); } } ################################################################ @@ -2709,7 +2728,7 @@ sub dump_registry_script($%) $i == $#subkeys && $def ? " = s '$def'" : "", 4 * $indent, ""; $indent++; } - foreach my $v (@vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } + foreach my $v (sort @vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } for (my $i = 0; $i < @subkeys; $i++) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } } while ($indent) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } @@ -2763,7 +2782,6 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); -dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 114a580b2eea7a5debbb8f77cc4b963b5400f56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=114a580b2eea7a5debbb8f77… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jan 26 13:15:00 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0174f7072e64652f6d0e5d0a312f0917211feb63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/nl.po | 3136 ++++++++++++++++++++++++-------------------------------------- 1 file changed, 1191 insertions(+), 1945 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=114a580b2eea7a5debbb…

1 0

Akihiro Sagawa : krnl386.exe: Cap GetFreeSpace value to 2GB.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 0dc595d4e1ee612be0157bde8b27c7308b524091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc595d4e1ee612be0157bde… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 20 21:26:27 2021 +0900 krnl386.exe: Cap GetFreeSpace value to 2GB. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eca2bfd071ea2142f5c4126badb5bcf923a9a655) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index e66007784ee..0a8da28e99b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -750,7 +750,7 @@ DWORD WINAPI GetFreeSpace16( UINT16 wFlags ) { MEMORYSTATUS ms; GlobalMemoryStatus( &ms ); - return ms.dwAvailVirtual; + return min( ms.dwAvailVirtual, MAXLONG ); } /***********************************************************************

1 0

Zhiyi Zhang : user32: Send a WM_ACTIVATE message after restoring a minimized top level window.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1fdf148c585d22142ec3b201f9de0a0b68a32644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fdf148c585d22142ec3b201… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 10 14:33:27 2021 +0800 user32: Send a WM_ACTIVATE message after restoring a minimized top level window. The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3898ad408bb7ad50555ce6bce0fc02ab60eb5caf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 +- 2 files changed, 253 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdf148c585d22142ec3…

1 0