November 2020 - Wine-Commits

Piotr Caban : msvcr90/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 0ce524f09c4267095e18caadc76671238c7711ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce524f09c4267095e18caad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 10:10:16 2020 +0100 msvcr90/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 35967b2831c..08cc4e9cf0e 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -722,12 +722,11 @@ static void test__itoa_s(void) static void test_wcsncat_s(void) { - static wchar_t abcW[] = {'a','b','c',0}; int ret; wchar_t dst[4]; wchar_t src[4]; - memcpy(src, abcW, sizeof(abcW)); + wcscpy(src, L"abc"); dst[0] = 0; SET_EXPECT(invalid_parameter_handler); ret = p_wcsncat_s(NULL, 4, src, 4); @@ -758,8 +757,7 @@ static void test_wcsncat_s(void) ok(ret == STRUNCATE, "err = %d\n", ret); ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); - memcpy(dst, abcW, sizeof(abcW)); - dst[3] = 'd'; + memcpy(dst, L"abcd", 4 * sizeof(wchar_t)); SET_EXPECT(invalid_parameter_handler); ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); @@ -1081,16 +1079,15 @@ static void test__sopen_s(void) static void test__wsopen_s(void) { - wchar_t testW[] = {'t','e','s','t',0}; int ret, fd; SET_EXPECT(invalid_parameter_handler); - ret = p_wsopen_s(NULL, testW, _O_RDONLY, _SH_DENYNO, _S_IREAD); + ret = p_wsopen_s(NULL, L"test", _O_RDONLY, _SH_DENYNO, _S_IREAD); ok(ret == EINVAL, "got %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler, EINVAL); fd = 0xdead; - ret = p_wsopen_s(&fd, testW, _O_RDONLY, _SH_DENYNO, _S_IREAD); + ret = p_wsopen_s(&fd, L"test", _O_RDONLY, _SH_DENYNO, _S_IREAD); ok(ret == ENOENT, "got %d, expected ENOENT\n", ret); ok(fd == -1, "got %d\n", fd); } @@ -1176,7 +1173,7 @@ static void test_getptd(void) { struct __thread_data *ptd = p_getptd(); DWORD tid = GetCurrentThreadId(); - wchar_t testW[] = {'t','e','s','t',0}, tW[] = {'t',0}, *wp; + wchar_t testW[] = L"test", *wp; char test[] = "test", *p; unsigned char mbstok_test[] = "test", *up; struct tm time; @@ -1192,7 +1189,7 @@ static void test_getptd(void) ok(ptd->random_seed == 1234, "ptd->random_seed = %d\n", ptd->random_seed); p = p_strtok(test, "t"); ok(ptd->strtok_next == p+3, "ptd->strtok_next is incorrect\n"); - wp = p_wcstok(testW, tW); + wp = p_wcstok(testW, L"t"); ok(ptd->wcstok_next == wp+3, "ptd->wcstok_next is incorrect\n"); up = p__mbstok(mbstok_test, (unsigned char*)"t"); ok(ptd->mbstok_next == up+3, "ptd->mbstok_next is incorrect\n"); @@ -1243,20 +1240,16 @@ static int WINAPIV _vswprintf_l_wrapper(wchar_t *buf, static void test__vswprintf_l(void) { - static const wchar_t format[] = {'t','e','s','t',0}; - wchar_t buf[32]; int ret; - ret = __vswprintf_l_wrapper(buf, format, NULL); + ret = __vswprintf_l_wrapper(buf, L"test", NULL); ok(ret == 4, "ret = %d\n", ret); - ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", - wine_dbgstr_w(buf), wine_dbgstr_w(format)); + ok(!wcscmp(buf, L"test"), "buf = %s\n", wine_dbgstr_w(buf)); - ret = _vswprintf_l_wrapper(buf, format, NULL); + ret = _vswprintf_l_wrapper(buf, L"test", NULL); ok(ret == 4, "ret = %d\n", ret); - ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", - wine_dbgstr_w(buf), wine_dbgstr_w(format)); + ok(!wcscmp(buf, L"test"), "buf = %s\n", wine_dbgstr_w(buf)); } struct block_file_arg

1 0

Piotr Caban : msvcr100/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 847367dfc9ff4e757788d3eff4f6f39f76e30feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=847367dfc9ff4e757788d3ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 10:10:20 2020 +0100 msvcr100/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 8ac8f4ea3b8..bdd44fa405a 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -374,8 +374,8 @@ static BOOL init(void) static void test_wmemcpy_s(void) { static wchar_t dest[8], buf[32]; - static const wchar_t tiny[] = {'T',0,'I','N','Y',0}; - static const wchar_t big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; + static const wchar_t tiny[] = L"T\0INY"; + static const wchar_t big[] = L"atoolongstring"; const wchar_t XX = 0x5858; /* two 'X' bytes */ int ret; @@ -455,8 +455,8 @@ static void test_wmemcpy_s(void) static void test_wmemmove_s(void) { static wchar_t dest[8]; - static const wchar_t tiny[] = {'T',0,'I','N','Y',0}; - static const wchar_t big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; + static const wchar_t tiny[] = L"T\0INY"; + static const wchar_t big[] = L"atoolongstring"; const wchar_t XX = 0x5858; /* two 'X' bytes */ int ret;

1 0

Rémi Bernon : ntdll: Initialize local variable (valgrind).
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 141c55a72d000382a75ef305baa1e88b506c3e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=141c55a72d000382a75ef305… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 30 10:40:21 2020 +0100 ntdll: Initialize local variable (valgrind). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 61c8f5e18f5..0e827315ac3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1446,7 +1446,7 @@ static void load_ntdll(void) { NTSTATUS status; SECTION_IMAGE_INFORMATION info; - void *module; + void *module = NULL; char *name = build_path( dll_dir, "ntdll.dll.so" ); name[strlen(name) - 3] = 0; /* remove .so */

1 0

Derek Lesho : mf/topoloader: Move node connection responsibility to connection function.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: eb28343c477705b7ca64b5865fc950e3f6500095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb28343c477705b7ca64b586… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:13 2020 +0300 mf/topoloader: Move node connection responsibility to connection function. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8032e438b73..a09f6ef0ef4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2022,8 +2022,6 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context if (FAILED(IMFTopology_GetNodeByID(context->output_topology, id, &node))) topology_loader_clone_node(context, downstream_node, &node, context->marker + 1); - IMFTopologyNode_ConnectOutput(upstream_node, output_index, node, input_index); - IMFTopologyNode_GetNodeType(upstream_node, &u_type); IMFTopologyNode_GetNodeType(downstream_node, &d_type); @@ -2033,7 +2031,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context return E_FAIL; } - return connectors[u_type][d_type](context, upstream_node, output_index, downstream_node, input_index); + return connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); } static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size)

1 0

Zebediah Figura : qcap/tests: Add some tests for smart tee streaming using the strmbase infrastructure.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: c431868593a9e48d921fda3750641501214e7254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c431868593a9e48d921fda37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 29 23:05:28 2020 -0600 qcap/tests: Add some tests for smart tee streaming using the strmbase infrastructure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 268 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c431868593a9e48d921f…

1 0

Nikolay Sivov : dwrite/layout: Use consistent tracing format for default trimming sign.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 44e444487fcad60650e42c46596c3dc81f20562d URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e444487fcad60650e42c46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:12:45 2020 +0300 dwrite/layout: Use consistent tracing format for default trimming sign. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 90 +++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index cedcd914b3f..1f6201a6a93 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -302,9 +302,10 @@ struct dwrite_textformat struct dwrite_textformat_data format; }; -struct dwrite_trimmingsign { +struct dwrite_trimmingsign +{ IDWriteInlineObject IDWriteInlineObject_iface; - LONG ref; + LONG refcount; IDWriteTextLayout *layout; }; @@ -5221,9 +5222,7 @@ HRESULT create_textlayout(const struct textlayout_desc *desc, IDWriteTextLayout static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *iface, REFIID riid, void **obj) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteInlineObject)) { *obj = iface; @@ -5239,51 +5238,55 @@ static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *ifa static ULONG WINAPI dwritetrimmingsign_AddRef(IDWriteInlineObject *iface) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); + ULONG refcount = InterlockedIncrement(&sign->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI dwritetrimmingsign_Release(IDWriteInlineObject *iface) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); + ULONG refcount = InterlockedDecrement(&sign->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { - IDWriteTextLayout_Release(This->layout); - heap_free(This); + if (!refcount) + { + IDWriteTextLayout_Release(sign->layout); + heap_free(sign); } - return ref; + return refcount; } static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void *context, IDWriteTextRenderer *renderer, FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); DWRITE_LINE_METRICS line; UINT32 line_count; - TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, + TRACE("%p, %p, %p, %.2f, %.2f, %d, %d, %p.\n", iface, context, renderer, originX, originY, is_sideways, is_rtl, effect); - IDWriteTextLayout_GetLineMetrics(This->layout, &line, 1, &line_count); - return IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); + IDWriteTextLayout_GetLineMetrics(sign->layout, &line, 1, &line_count); + return IDWriteTextLayout_Draw(sign->layout, context, renderer, originX, originY - line.baseline); } static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *ret) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); + struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); DWRITE_TEXT_METRICS metrics; HRESULT hr; - TRACE("(%p)->(%p)\n", This, ret); + TRACE("%p, %p.\n", iface, ret); - hr = IDWriteTextLayout_GetMetrics(This->layout, &metrics); - if (FAILED(hr)) { + hr = IDWriteTextLayout_GetMetrics(sign->layout, &metrics); + if (FAILED(hr)) + { memset(ret, 0, sizeof(*ret)); return hr; } @@ -5297,23 +5300,24 @@ static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, static HRESULT WINAPI dwritetrimmingsign_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - TRACE("(%p)->(%p)\n", This, overhangs); - return IDWriteTextLayout_GetOverhangMetrics(This->layout, overhangs); + struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); + + TRACE("%p, %p.\n", iface, overhangs); + + return IDWriteTextLayout_GetOverhangMetrics(sign->layout, overhangs); } static HRESULT WINAPI dwritetrimmingsign_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, DWRITE_BREAK_CONDITION *after) { - struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - - TRACE("(%p)->(%p %p)\n", This, before, after); + TRACE("%p, %p, %p.\n", iface, before, after); *before = *after = DWRITE_BREAK_CONDITION_NEUTRAL; return S_OK; } -static const IDWriteInlineObjectVtbl dwritetrimmingsignvtbl = { +static const IDWriteInlineObjectVtbl dwritetrimmingsignvtbl = +{ dwritetrimmingsign_QueryInterface, dwritetrimmingsign_AddRef, dwritetrimmingsign_Release, @@ -5350,7 +5354,7 @@ static inline BOOL is_flow_direction_vert(DWRITE_FLOW_DIRECTION direction) HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat *format, IDWriteInlineObject **sign) { static const WCHAR ellipsisW = 0x2026; - struct dwrite_trimmingsign *This; + struct dwrite_trimmingsign *object; DWRITE_READING_DIRECTION reading; DWRITE_FLOW_DIRECTION flow; HRESULT hr; @@ -5366,24 +5370,24 @@ HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat *format, (is_reading_direction_vert(reading) && is_flow_direction_vert(flow))) return DWRITE_E_FLOWDIRECTIONCONFLICTS; - This = heap_alloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; - This->IDWriteInlineObject_iface.lpVtbl = &dwritetrimmingsignvtbl; - This->ref = 1; + object->IDWriteInlineObject_iface.lpVtbl = &dwritetrimmingsignvtbl; + object->refcount = 1; - hr = IDWriteFactory7_CreateTextLayout(factory, &ellipsisW, 1, format, 0.0f, 0.0f, &This->layout); - if (FAILED(hr)) { - heap_free(This); + hr = IDWriteFactory7_CreateTextLayout(factory, &ellipsisW, 1, format, 0.0f, 0.0f, &object->layout); + if (FAILED(hr)) + { + heap_free(object); return hr; } - IDWriteTextLayout_SetWordWrapping(This->layout, DWRITE_WORD_WRAPPING_NO_WRAP); - IDWriteTextLayout_SetParagraphAlignment(This->layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); - IDWriteTextLayout_SetTextAlignment(This->layout, DWRITE_TEXT_ALIGNMENT_LEADING); + IDWriteTextLayout_SetWordWrapping(object->layout, DWRITE_WORD_WRAPPING_NO_WRAP); + IDWriteTextLayout_SetParagraphAlignment(object->layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); + IDWriteTextLayout_SetTextAlignment(object->layout, DWRITE_TEXT_ALIGNMENT_LEADING); - *sign = &This->IDWriteInlineObject_iface; + *sign = &object->IDWriteInlineObject_iface; return S_OK; }

1 0

Michael Stefaniuc : wbemdisp: Use wide-char string literals.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 2863952c1d1dda532482d4da1caa23c17224343f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2863952c1d1dda532482d4da… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:32 2020 +0100 wbemdisp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 16 +++++------- dlls/wbemdisp/main.c | 5 ++-- dlls/wbemdisp/tests/wbemdisp.c | 58 +++++++++++++----------------------------- 3 files changed, 25 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2863952c1d1dda532482…

1 0

Alexandre Julliard : libwine: Move libwine private definitions out of the global wine/unicode.h
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

1 0

Alexandre Julliard : libport: Move the case mapping table back to libwine and stop updating it.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: c7196dc945879e24e0f255c9e108fe116b3b11f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7196dc945879e24e0f255c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:35:16 2020 +0100 libport: Move the case mapping table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 ++ include/wine/unicode.h | 7 +++---- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/casemap.c | 6 ++++++ libs/wine/wine.map | 4 ++-- tools/make_unicode | 47 ------------------------------------------- 7 files changed, 14 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..ba722721ad2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -37,6 +37,8 @@ #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ +/* avoid conflict with field names in included win32 headers */ +#undef Status #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a346f4cbecd..011aacf7386 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -26,6 +26,7 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#include <winternl.h> #ifdef __WINE_WINE_TEST_H #error This file should not be used in Wine tests @@ -45,14 +46,12 @@ extern "C" { WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { - extern const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; + return RtlDowncaseUnicodeChar( ch ); } WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { - extern const WCHAR wine_casemap_upper[]; - return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; + return RtlUpcaseUnicodeChar( ch ); } /* the character type contains the C1_* flags in the low 12 bits */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index aabcc833ec6..5d1019aa801 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,7 +1,6 @@ STATICLIB = libwine_port.a C_SRCS = \ - casemap.c \ ffs.c \ fstatvfs.c \ getopt.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 74ffc0d5f83..f4086b1a763 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -66,6 +66,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + casemap.c \ collation.c \ compose.c \ config.c \ diff --git a/libs/port/casemap.c b/libs/wine/casemap.c similarity index 99% rename from libs/port/casemap.c rename to libs/wine/casemap.c index 540f5ad653c..518575faad5 100644 --- a/libs/port/casemap.c +++ b/libs/wine/casemap.c @@ -2,6 +2,10 @@ /* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const WCHAR wine_casemap_lower[4122] = @@ -1101,3 +1105,5 @@ const WCHAR wine_casemap_upper[4557] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 192bf4bd46f..6147dccc77e 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -7,8 +7,6 @@ WINE_1.0 __wine_main_environ; __wine_main_wargv; wine_anon_mmap; - wine_casemap_lower; - wine_casemap_upper; wine_dll_set_callback; wine_init; wine_init_argv0_path; @@ -64,6 +62,8 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_casemap_lower; + wine_casemap_upper; wine_compare_string; wine_cp_enum_table; wine_cp_get_table; diff --git a/tools/make_unicode b/tools/make_unicode index 8d5747ce253..c454c74440f 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1716,52 +1716,6 @@ sub dump_digit_folding($) } -################################################################ -# dump the case mapping tables -sub dump_case_mappings($) -{ - my $filename = shift; - open OUTPUT,">$filename.new" or die "Cannot create $filename"; - print "Building $filename\n"; - print OUTPUT "/* Unicode case mappings */\n"; - print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n"; - print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"windef.h\"\n\n"; - - my @upper = @toupper_table; - my @lower = @tolower_table; - remove_linguistic_mappings( \@upper, \@lower ); - - dump_case_table( "wine_casemap_lower", @lower ); - print OUTPUT "\n"; - dump_case_table( "wine_casemap_upper", @upper ); - close OUTPUT; - save_file($filename); -} - - -################################################################ -# dump a case mapping table -sub dump_case_table($@) -{ - my ($name,@table) = @_; - - for (my $i = 0; $i < 65536; $i++) - { - next unless defined $table[$i]; - $table[$i] = ($table[$i] - $i) & 0xffff; - } - - my @array = compress_array( 256, 0, @table[0..65535] ); - - printf OUTPUT "const WCHAR %s[%d] =\n", $name, scalar @array; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s,\n", dump_array( 16, 0, @array[0..255] ); - printf OUTPUT " /* data */\n"; - printf OUTPUT "%s", dump_array( 16, 0, @array[256..$#array] ); - printf OUTPUT "\n};\n"; -} - ################################################################ # compress a mapping table by removing identical rows sub compress_array($$@) @@ -2784,7 +2738,6 @@ sub save_file($) chdir ".." if -f "./make_unicode"; load_data(); -dump_case_mappings( "libs/port/casemap.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_ctype_tables( "libs/port/wctype.c" ); dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" );

1 0

Alexandre Julliard : libport: Move the char type table back to libwine and stop updating it.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 875f506b33ad11f563de4ed710b7a174b0e9fcfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=875f506b33ad11f563de4ed7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:38:12 2020 +0100 libport: Move the char type table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 5 +++-- libs/port/Makefile.in | 3 +-- libs/wine/Makefile.in | 3 ++- libs/{port => wine}/wctype.c | 6 ++++++ libs/wine/wine.map | 2 +- tools/make_unicode | 40 ---------------------------------------- 6 files changed, 13 insertions(+), 46 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 011aacf7386..7a9e07fa1bc 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -58,8 +58,9 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) /* and the C2_* type in the high 4 bits */ WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { - extern const unsigned short wine_wctype_table[]; - return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; + unsigned short type; + GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); + return type; } WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 5d1019aa801..51cfdb4df54 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -18,5 +18,4 @@ C_SRCS = \ statvfs.c \ strnlen.c \ symlink.c \ - usleep.c \ - wctype.c + usleep.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index f4086b1a763..885a7326568 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -84,7 +84,8 @@ C_SRCS = \ sortkey.c \ string.c \ utf8.c \ - wctomb.c + wctomb.c \ + wctype.c config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ diff --git a/libs/port/wctype.c b/libs/wine/wctype.c similarity index 99% rename from libs/port/wctype.c rename to libs/wine/wctype.c index 9b38bd0a0e2..e384e573f64 100644 --- a/libs/port/wctype.c +++ b/libs/wine/wctype.c @@ -1,6 +1,10 @@ /* Unicode ctype tables */ /* Automatically generated; DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned short wine_wctype_table[16242] = @@ -2039,3 +2043,5 @@ const unsigned short wine_wctype_table[16242] = 0x0000, 0x0000, 0x0000, 0xb220, 0xb220, 0xb220, 0xb200, 0xb200, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 6147dccc77e..1b0df15eef5 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -14,7 +14,6 @@ WINE_1.0 wine_mmap_enum_reserved_areas; wine_mmap_is_in_reserved_area; wine_mmap_remove_reserved_area; - wine_wctype_table; /* the following functions are obsolete and only exported for backwards compatibility */ @@ -120,6 +119,7 @@ WINE_1.0 wine_switch_to_stack; wine_utf8_mbstowcs; wine_utf8_wcstombs; + wine_wctype_table; local: *; }; diff --git a/tools/make_unicode b/tools/make_unicode index c454c74440f..02bb0afdb66 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1753,19 +1753,6 @@ sub compress_array($$@) return @array, unpack "U*", $data; } -################################################################ -# dump a simple char -> 16-bit value mapping table -sub dump_simple_mapping($$@) -{ - my $name = shift; - my $def = shift; - my @array = compress_array( 256, $def, @_[0..65535] ); - - printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; - printf OUTPUT " /* offsets */\n%s,\n", dump_array( 16, 0, @array[0..255] ); - printf OUTPUT " /* values */\n%s\n};\n", dump_array( 16, 0, @array[256..$#array] ); -} - ################################################################ # dump a char -> 16-bit value mapping table using two-level tables sub dump_two_level_mapping($$@) @@ -1882,32 +1869,6 @@ sub dump_bidi_dir_table($) } -################################################################ -# dump the ctype tables -sub dump_ctype_tables($) -{ - my $filename = shift; - open OUTPUT,">$filename.new" or die "Cannot create $filename"; - printf "Building $filename\n"; - printf OUTPUT "/* Unicode ctype tables */\n"; - printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; - printf OUTPUT "#include \"windef.h\"\n\n"; - - my @table = map { ($_ || 0) & 0xffff; } @category_table; - - # add the direction in the high 4 bits of the category - for (my $i = 0; $i < 65536; $i++) - { - $table[$i] |= $directions{$direction_table[$i]} << 12 if defined $direction_table[$i]; - } - - dump_simple_mapping( "wine_wctype_table", 0, @table ); - - close OUTPUT; - save_file($filename); -} - - sub rol($$) { my ($byte, $count) = @_; @@ -2739,7 +2700,6 @@ sub save_file($) chdir ".." if -f "./make_unicode"; load_data(); dump_sortkeys( "dlls/kernelbase/collation.c" ); -dump_ctype_tables( "libs/port/wctype.c" ); dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_digit_folding( "dlls/kernelbase/digitmap.c" );

1 0