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

Brendan Shanks : loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Alexandre Julliard June 7, 2021

June 7, 2021

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

Rémi Bernon : winedbg: Don't dereference possibly NULL thread pointer.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 75158894700090e7867132e787a6778089619962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75158894700090e7867132e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 9 22:54:55 2021 +0100 winedbg: Don't dereference possibly NULL thread pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6eff0342ad6f8c262112e6aeb083bb386d37cf04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..392502032e8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -111,11 +111,11 @@ struct gdb_context static void gdbctx_delete_xpoint(struct gdb_context *gdbctx, struct dbg_thread *thread, dbg_ctx_t *ctx, struct gdb_xpoint *x) { - struct dbg_process *process = thread->process; + struct dbg_process *process = gdbctx->process; struct backend_cpu *cpu = process->be_cpu; if (!cpu->remove_Xpoint(process->handle, process->process_io, ctx, x->type, x->addr, x->value, x->size)) - ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, x->addr, x->size, x->type); + ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type); list_remove(&x->entry); HeapFree(GetProcessHeap(), 0, x);

1 0

Damjan Jovanovic : mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 087637e861ad9468b43875a3a9c0df7c537b8a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087637e861ad9468b43875a3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 12 17:42:50 2021 +0200 mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7464d1042a10e4b013f764e3bbb52bedb6817ede) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmsystem.dll16/mmsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 083ec2d6da6..445fc48d50e 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -66,7 +66,7 @@ CRITICAL_SECTION mmdrv_cs = { &mmdrv_critsect_debug, -1, 0, 0, 0, 0 }; * MMSYSTEM DLL entry point * */ -BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, +BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { static int done;

1 0

Nikolay Sivov : sc: Fix typos in CLI arguments parsing.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 9433c600f934febccaf19d67bde4aa59d01214eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9433c600f934febccaf19d67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 11 22:09:01 2021 +0300 sc: Fix typos in CLI arguments parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3ddc1186467172c564169e054a82c9f97e99c59) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a20813b8cd5..02b476957d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -82,7 +82,7 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) { if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; @@ -134,7 +134,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f { if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else if (!wcsicmp( p, L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -159,7 +159,7 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"actions=" )) { @@ -264,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], L"start="L"start" )) + else if (!wcsicmp( argv[1], L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service)

1 0

Chao Long : wmic: Add missing aliases.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 8d2e4ee83a776708ff2ce09e98c68675d712b3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2e4ee83a776708ff2ce09e… Author: Chao Long <longchao(a)uniontech.com> Date: Mon Mar 8 09:25:42 2021 +0100 wmic: Add missing aliases. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dba53a0f28f1a30c538744f4d76cdddacc6c8af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Andrey Gusev : wined3d: Add AMD Radeon RX 5500M.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 1256e6226f450bc0161eb9c3b57e142b2a976626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1256e6226f450bc0161eb9c3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 3 20:08:44 2021 +0200 wined3d: Add AMD Radeon RX 5500M. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c66e0e5723df466ec8e00c4d1589518efb1eb761) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..9338bd2ba10 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1646,8 +1646,9 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { - /* Navi 10 */ + /* Navi 10/14 */ {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, + {"NAVI14", CARD_AMD_RADEON_RX_NAVI_14}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2764b113065..9e8c611fd7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -512,6 +512,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04a931c9bfc..d7323e38a76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2897,6 +2897,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, + CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Alexandre Julliard : make_unicode: Use codepage 949 to add default mappings to codepage 20949.
by Alexandre Julliard June 7, 2021

June 7, 2021

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

Sanghoon Park : make_unicode: Add support for codepage 20949 (Korean Wansung).
by Alexandre Julliard June 7, 2021

June 7, 2021

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

Floris Renaud : documentation: Add Dutch README translation.
by Alexandre Julliard June 7, 2021

June 7, 2021

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

Floris Renaud : documentation: Change obsolete Debian and Red Hat packages.
by Alexandre Julliard June 7, 2021

June 7, 2021

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