May 2019 - Wine-commits - list.winehq.org

Jacek Caban : ntoskrnl.exe: Set irp context handle in dispatch_irp.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 72876116068fb9d0e21d6f8c6724049eb82f4f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72876116068fb9d0e21d6f8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:39:15 2019 +0200 ntoskrnl.exe: Set irp context handle in dispatch_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c9b56b7..acfbec8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -587,6 +587,8 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte LARGE_INTEGER count; IoSetCompletionRoutine( irp, dispatch_irp_completion, context->handle, TRUE, TRUE, TRUE ); + context->handle = 0; + KeQueryTickCount( &count ); /* update the global KeTickCount */ device->CurrentIrp = irp; @@ -976,11 +978,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) case STATUS_SUCCESS: assert( context.params.type != IRP_CALL_NONE && context.params.type < ARRAY_SIZE(dispatch_funcs) ); status = dispatch_funcs[context.params.type]( &context ); - if (status == STATUS_SUCCESS) - { - context.handle = 0; /* status reported by IoCompleteRequest */ - if (!context.in_buff) context.in_size = 4096; - } + if (!context.in_buff) context.in_size = 4096; break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, context.in_buff );

1 0

Michael Stefaniuc : ntoskrnl: Add a macro to declare a static CRITICAL_SECTION.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 94e958c61a3cd2d20dc2bc118de695615f24f9d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e958c61a3cd2d20dc2bc11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 27 13:39:25 2019 +0200 ntoskrnl: Add a macro to declare a static CRITICAL_SECTION. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++------------------------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 7 +++++++ dlls/ntoskrnl.exe/sync.c | 9 +-------- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index acfbec8..c26e411 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -133,14 +133,7 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static CRITICAL_SECTION drivers_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drivers_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } -}; -static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(drivers_cs); static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { @@ -286,14 +279,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r return header + 1; } -static CRITICAL_SECTION obref_cs; -static CRITICAL_SECTION_DEBUG obref_critsect_debug = -{ - 0, 0, &obref_cs, - { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") } -}; -static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(obref_cs); /*********************************************************************** * ObDereferenceObject (NTOSKRNL.EXE.@) @@ -384,14 +370,7 @@ static const POBJECT_TYPE *known_types[] = &SeTokenObjectType }; -static CRITICAL_SECTION handle_map_cs; -static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = -{ - 0, 0, &handle_map_cs, - { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") } -}; -static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(handle_map_cs); NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 864a060..c003788 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -60,4 +60,11 @@ extern POBJECT_TYPE PsProcessType; extern POBJECT_TYPE PsThreadType; extern POBJECT_TYPE SeTokenObjectType; +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + #endif diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 07673f1..8b71126 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -49,14 +49,7 @@ enum object_type TYPE_AUTO_TIMER = 9, }; -static CRITICAL_SECTION sync_cs; -static CRITICAL_SECTION_DEBUG sync_cs_debug = -{ - 0, 0, &sync_cs, - { &sync_cs_debug.ProcessLocksList, &sync_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": sync_cs") } -}; -static CRITICAL_SECTION sync_cs = { &sync_cs_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(sync_cs); /*********************************************************************** * KeWaitForMultipleObjects (NTOSKRNL.EXE.@)

1 0

Alexandre Julliard : Wine release 4.9
by Alexandre Julliard 24 May '19

24 May '19

Module: website Branch: master Commit: 121024804f1458e53461f344f50a9bfd2c704bd1 URL: https://source.winehq.org/git/website.git/?a=commit;h=121024804f1458e53461f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:46:51 2019 +0200 Wine release 4.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019052401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019052401.xml b/news/en/2019052401.xml new file mode 100644 index 0000000..ce821e9 --- /dev/null +++ b/news/en/2019052401.xml @@ -0,0 +1,17 @@ +<news> +<date>May 24, 2019</date> +<title>Wine 4.9 Released</title> +<body> + The Wine development release 4.9 is now available. + <a href="{$root}/announce/4.9">What's new</a> in this release: +<ul> + <li>Initial support for installing Plug and Play drivers.</li> + <li>Support for building 16-bit modules in PE format.</li> + <li>A lot of code moved to the new KernelBase DLL.</li> + <li>Various game controller fixes.</li> + <li>Use higher performance system clocks if available.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : mfplat: Add timestamp support for system time source.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 7b014ff049254fa3b382ee6776c25a67647bdde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b014ff049254fa3b382ee67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 18:02:36 2019 +0300 mfplat: Add timestamp support for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 81 +++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 152 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b014ff049254fa3b382…

1 0

Michael Stefaniuc : kernel32/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 260e66ee8b46206ea5e684e2f40333c233d6fef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260e66ee8b46206ea5e684e2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 24 19:53:47 2019 +0200 kernel32/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8f55083..f15cc09 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1922,7 +1922,7 @@ static void test_SearchPathA(void) ret = GetCurrentDirectoryA(MAX_PATH, curdirA); ok(ret, "failed to obtain working directory.\n"); sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); - ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); bret = CopyFileA(path2A, pathA, FALSE); ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError());

1 0

Alexandre Julliard : Release 4.9.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: fc8174a36483d9ddbcc1a82c1c7d1334b2efc702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8174a36483d9ddbcc1a82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:04 2019 +0200 Release 4.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 909 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 487 insertions(+), 445 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc8174a36483d9ddbcc1…

1 0

Tag wine-4.9 : Alexandre Julliard : Release 4.9
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: refs/tags/wine-4.9 Tag: aaad2d41795e85ea24498c870bb961b4c147349e URL: https://source.winehq.org/git/wine.git/?a=tag;h=aaad2d41795e85ea24498c870bb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:05 2019 +0200 Release 4.9

1 0

Zebediah Figura : setupapi: Always fill output parameters in SetupCopyOEMInfA().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 56aab6aaf83098115014512e0a6a5ab7e78bbef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56aab6aaf83098115014512e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:47 2019 -0500 setupapi: Always fill output parameters in SetupCopyOEMInfA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 12 +++--------- dlls/setupapi/tests/misc.c | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 7298ac6..67e2eaf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -851,12 +851,9 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (source && !(sourceW = strdupAtoW( source ))) goto done; if (location && !(locationW = strdupAtoW( location ))) goto done; - if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, - buffer_size, &size, NULL ))) - { - if (required_size) *required_size = size; - goto done; - } + ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, buffer_size, &size, NULL ); + + if (required_size) *required_size = size; if (dest) { @@ -866,10 +863,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (component) *component = strrchr( dest, '\\' ) + 1; } else - { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - goto done; - } } done: diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index e2dd12f..7e59770 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -246,7 +246,6 @@ static void test_SetupCopyOEMInf(void) ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); -todo_wine ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); SetLastError(0xdeadbeef);

1 0

Zebediah Figura : setupapi: Fix error handling in SetupInstallServicesFromInfSection().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 6b2b6cde8bbd18ab1645cbf31435eb7a8ceec91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b6cde8bbd18ab1645cbf3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:48 2019 -0500 setupapi: Fix error handling in SetupInstallServicesFromInfSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 40 +++++++++++++++++++++------------------- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 6a3213c..dae0bc1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1458,36 +1458,38 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = TRUE; + BOOL ret = TRUE; - if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + if (!SetupFindFirstLineW( hinf, section, NULL, &context )) { SetLastError( ERROR_SECTION_NOT_FOUND ); return FALSE; } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - ok = SetupFindFirstLineW( hinf, section, AddService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, AddService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) - goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) + goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } - ok = SetupFindFirstLineW( hinf, section, DelService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, DelService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } if (ret) SetLastError( ERROR_SUCCESS ); done: diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a0a4596..f9e5592 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -574,6 +574,20 @@ static void test_install_svc_from(void) SetupCloseInfFile(infhandle); DeleteFileA(inffile); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[Winetest.Services]\n"); + strcat(inf, "AddService=,2\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + /* TODO: Test the Flags */ }

1 0

Alexandre Julliard : make_unicode: Remove duplicate DECLSPEC_HIDDEN.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: c52b2f128472b704b9e799f2626370c09258e689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52b2f128472b704b9e799f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 10:13:29 2019 +0200 make_unicode: Remove duplicate DECLSPEC_HIDDEN. Spotted by Matteo Bruni. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/direction.c | 2 +- dlls/gdi32/direction.c | 2 +- dlls/kernel32/wctype.c | 2 +- dlls/usp10/direction.c | 2 +- tools/make_unicode | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 6adbb73..aafd342 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/gdi32/direction.c b/dlls/gdi32/direction.c index 6adbb73..aafd342 100644 --- a/dlls/gdi32/direction.c +++ b/dlls/gdi32/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/kernel32/wctype.c b/dlls/kernel32/wctype.c index f335fac..cf25ccc 100644 --- a/dlls/kernel32/wctype.c +++ b/dlls/kernel32/wctype.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN wctype_table[7664] = +const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/usp10/direction.c b/dlls/usp10/direction.c index 6adbb73..aafd342 100644 --- a/dlls/usp10/direction.c +++ b/dlls/usp10/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/tools/make_unicode b/tools/make_unicode index adf8c0f..4b79668 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2251,7 +2251,7 @@ sub dump_string_type_table($) $table[$i] |= $c2_types{$direction_table[$i]} << 12 if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN wctype_table", 0, @table ); + dump_two_level_mapping( "wctype_table", 0, @table ); close OUTPUT; save_file($filename); @@ -2276,8 +2276,7 @@ sub dump_bidi_dir_table($) $table[$i] = $bidi_types{$direction_table[$i]} if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN bidi_direction_table", - $bidi_types{"L"}, @table ); + dump_two_level_mapping( "bidi_direction_table", $bidi_types{"L"}, @table ); close OUTPUT; save_file($filename);

1 0