October 2019 - Wine-commits

Francois Gouget : mshtml: Fix the spelling of some variable and field names.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: fd23136ef9e89b0d7f242e3e05680bf28d408449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd23136ef9e89b0d7f242e3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:22:36 2019 +0200 mshtml: Fix the spelling of some variable and field names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 10 +++++----- dlls/mshtml/script.c | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index accf468a25..9926fa0dc3 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -80,7 +80,7 @@ struct BSCallback { LONG ref; request_data_t request_data; - ULONG readed; + ULONG read; DWORD bindf; DWORD bindinfo_options; BOOL bindinfo_ready; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 193b4fe37c..744db468d8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -690,7 +690,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW hres = IStream_Read(stream, buf, size, &read_size); - if(!This->readed && This->bom == BOM_NONE) { + if(!This->read && This->bom == BOM_NONE) { if(read_size >= 2 && data[0] == 0xff && data[1] == 0xfe) { This->bom = BOM_UTF16; skip = 2; @@ -705,7 +705,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW } } - This->readed += read_size; + This->read += read_size; *ret_size = read_size; return hres; } @@ -1092,7 +1092,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } do { - BOOL first_read = !This->bsc.readed; + BOOL first_read = !This->bsc.read; hres = read_stream(&This->bsc, stream, This->nsstream->buf+This->nsstream->buf_size, sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); @@ -1135,7 +1135,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, - &This->nsstream->nsIInputStream_iface, This->bsc.readed-This->nsstream->buf_size, + &This->nsstream->nsIInputStream_iface, This->bsc.read-This->nsstream->buf_size, This->nsstream->buf_size); if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); @@ -1365,7 +1365,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) { stop_request_task_t *task; - if(!This->bsc.readed) { + if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e337b1c900..6f06d3b091 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -824,7 +824,7 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) UINT cp = CP_UTF8; WCHAR *text; - if(!bsc->bsc.readed) { + if(!bsc->bsc.read) { text = heap_alloc(sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; @@ -835,17 +835,17 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) switch(bsc->bsc.bom) { case BOM_UTF16: - if(bsc->bsc.readed % sizeof(WCHAR)) { + if(bsc->bsc.read % sizeof(WCHAR)) { FIXME("The buffer is not a valid utf16 string\n"); return E_FAIL; } - text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); + text = heap_alloc(bsc->bsc.read+sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - memcpy(text, bsc->buf, bsc->bsc.readed); - text[bsc->bsc.readed/sizeof(WCHAR)] = 0; + memcpy(text, bsc->buf, bsc->bsc.read); + text[bsc->bsc.read/sizeof(WCHAR)] = 0; break; default: @@ -855,12 +855,12 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) case BOM_UTF8: { DWORD len; - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, text, len); text[len] = 0; } } @@ -988,7 +988,7 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) { ScriptBSC *This = impl_from_BSCallback(bsc); - DWORD readed; + DWORD read; HRESULT hres; if(!This->buf) { @@ -999,7 +999,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) } do { - if(This->bsc.readed >= This->size) { + if(This->bsc.read >= This->size) { void *new_buf; new_buf = heap_realloc(This->buf, This->size << 1); if(!new_buf) @@ -1008,7 +1008,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) This->buf = new_buf; } - hres = read_stream(&This->bsc, stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); + hres = read_stream(&This->bsc, stream, This->buf+This->bsc.read, This->size-This->bsc.read, &read); }while(hres == S_OK); return S_OK;

1 0

Francois Gouget : mshtml/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: bbf0602cb4cda118166351482c7f9456ee70e0f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf0602cb4cda11816635148… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:23:09 2019 +0200 mshtml/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 6 +++--- dlls/mshtml/tests/style.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 80e356344d..8f37d09c55 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -640,7 +640,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -650,7 +650,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(test_html), "cb=%d\n", cb); - ok(!memcmp(buf, test_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, test_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -660,7 +660,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 52a3a5ccdf..37a1426270 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2719,7 +2719,7 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderTopColor(style, &v); ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); - ok(!strcmp_wa(V_BSTR(&v), "red"), "expecte red = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!strcmp_wa(V_BSTR(&v), "red"), "expected red = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderTopColor(style, vDefault);

1 0

Francois Gouget : mshtml/tests: Fix the name of an unused function parameter.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: f09f5f80f7397b9f1465a6d348cf4ca005c6054f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09f5f80f7397b9f1465a6d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:23:24 2019 +0200 mshtml/tests: Fix the name of an unused function parameter. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d13381aa0a..4b55fdd0c8 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1672,7 +1672,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

Fabian Maurer : ws2_32: Handle more IGMP socket options.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: bf24c316f443185c16513118e30e160b20223134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf24c316f443185c16513118… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Oct 18 19:32:53 2019 +0200 ws2_32: Handle more IGMP socket options. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47956 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aa0a164ff9..5c3d1a0dc0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -692,6 +692,10 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_MULTICAST_LOOP ), MAP_OPTION( IP_ADD_MEMBERSHIP ), MAP_OPTION( IP_DROP_MEMBERSHIP ), + MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_BLOCK_SOURCE ), + MAP_OPTION( IP_UNBLOCK_SOURCE ), MAP_OPTION( IP_OPTIONS ), #ifdef IP_HDRINCL MAP_OPTION( IP_HDRINCL ), @@ -5801,6 +5805,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, int woptval; struct linger linger; struct timeval tval; + struct ip_mreq_source mreq_source; TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), @@ -6011,6 +6016,22 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_SOURCE_MEMBERSHIP: + case WS_IP_DROP_SOURCE_MEMBERSHIP: + case WS_IP_BLOCK_SOURCE: + case WS_IP_UNBLOCK_SOURCE: + { + WS_IP_MREQ_SOURCE* val = (void*)optval; + mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; + mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; + mreq_source.imr_sourceaddr.s_addr = val->imr_sourceaddr.S_un.S_addr; + + optval = (char*)&mreq_source; + optlen = sizeof(mreq_source); + + convert_sockopt(&level, &optname); + break; + } case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL

1 0

Alistair Leslie-Hughes : oledb32: Support milliseconds when converting BSTR -> DBTIMESTAMP.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: f437d15100997c37d1dfa1fae66744b44f081d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f437d15100997c37d1dfa1fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 21 00:23:54 2019 +0000 oledb32: Support milliseconds when converting BSTR -> DBTIMESTAMP. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 12 ++++++++++++ dlls/oledb32/tests/convert.c | 25 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a5bbdbc245..2fc65c7403 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -566,6 +566,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + if(swscanf( s, L"%d-%d-%d %d:%d:%d.%d", &d->year, &d->month, &d->day, &d->hour, &d->minute, + &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51fd2f7fa3..28401e68c9 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3953,10 +3953,27 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013-05-14 02:04:12.017000000"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013/05/14 02:04:12.01700"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL;

1 0

Louis Lenders : include: Set threading model on UIAnimation* interfaces.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 30e6e49ad48539d2d0f9bfe1660578ea0c07e98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e6e49ad48539d2d0f9bfe1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 21 00:37:22 2019 +0000 include: Set threading model on UIAnimation* interfaces. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uianimation.idl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/uianimation.idl b/include/uianimation.idl index 631af11899..70c710cdf8 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -585,7 +585,8 @@ interface IUIAnimationTransitionLibrary : IUnknown library UIAnimation { [ - uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e) + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e), + threading(both) ] coclass UIAnimationTimer { @@ -593,7 +594,8 @@ library UIAnimation } [ - uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8), + threading(both) ] coclass UIAnimationManager { @@ -601,7 +603,8 @@ library UIAnimation } [ - uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887), + threading(both) ] coclass UIAnimationTransitionFactory { @@ -609,7 +612,8 @@ library UIAnimation } [ - uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145), + threading(both) ] coclass UIAnimationTransitionLibrary {

1 0

Francois Gouget : msi/tests: Fix the case of an ok() message.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 3f2cae1378cc14e98747af6c0de02cb1e6a69928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2cae1378cc14e98747af6c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:21:28 2019 +0200 msi/tests: Fix the case of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6cb52cf04d..88d8180a50 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1771,7 +1771,7 @@ static void test_formatrecord_package(void) ok( 0 == strcmp(buffer,"1: 2: 3: 4: 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); r = MsiSetPropertyA(package, "prop", "val"); - ok( r == ERROR_SUCCESS, "failed to set propertY: %d\n", r); + ok( r == ERROR_SUCCESS, "failed to set property: %d\n", r); r = MsiRecordSetStringA(hrec, 0, NULL); ok( r == ERROR_SUCCESS, "set string failed\n");

1 0

Alexandre Julliard : ntdll: Initialize Unix codepage early during startup.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 4f4208876261737d69923552ddfc317beea38553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4208876261737d69923552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 14:16:19 2019 +0200 ntdll: Initialize Unix codepage early during startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 22 --------- 2 files changed, 128 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e3f805a48f..398f25e290 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -30,6 +30,8 @@ #endif #include <errno.h> #include <fcntl.h> +#include <locale.h> +#include <langinfo.h> #include <stdarg.h> #include <string.h> #include <stdlib.h> @@ -167,6 +169,8 @@ struct file_identity static struct file_identity ignored_files[MAX_IGNORED_FILES]; static unsigned int ignored_files_count; +static const union cptable *unix_table; /* NULL if UTF8 */ + union file_directory_info { ULONG next; @@ -229,6 +233,109 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = static RTL_CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +#if !defined(__APPLE__) && !defined(__ANDROID__) /* these platforms always use UTF-8 */ + +/* charset to codepage map, sorted by name */ +static const struct { const char *name; UINT cp; } charset_names[] = +{ + { "ANSIX341968", 20127 }, + { "BIG5", 950 }, + { "BIG5HKSCS", 950 }, + { "CP1250", 1250 }, + { "CP1251", 1251 }, + { "CP1252", 1252 }, + { "CP1253", 1253 }, + { "CP1254", 1254 }, + { "CP1255", 1255 }, + { "CP1256", 1256 }, + { "CP1257", 1257 }, + { "CP1258", 1258 }, + { "CP932", 932 }, + { "CP936", 936 }, + { "CP949", 949 }, + { "CP950", 950 }, + { "EUCJP", 20932 }, + { "EUCKR", 949 }, + { "GB18030", 936 /* 54936 */ }, + { "GB2312", 936 }, + { "GBK", 936 }, + { "IBM037", 37 }, + { "IBM1026", 1026 }, + { "IBM424", 424 }, + { "IBM437", 437 }, + { "IBM500", 500 }, + { "IBM850", 850 }, + { "IBM852", 852 }, + { "IBM855", 855 }, + { "IBM857", 857 }, + { "IBM860", 860 }, + { "IBM861", 861 }, + { "IBM862", 862 }, + { "IBM863", 863 }, + { "IBM864", 864 }, + { "IBM865", 865 }, + { "IBM866", 866 }, + { "IBM869", 869 }, + { "IBM874", 874 }, + { "IBM875", 875 }, + { "ISO88591", 28591 }, + { "ISO885910", 28600 }, + { "ISO885911", 28601 }, + { "ISO885913", 28603 }, + { "ISO885914", 28604 }, + { "ISO885915", 28605 }, + { "ISO885916", 28606 }, + { "ISO88592", 28592 }, + { "ISO88593", 28593 }, + { "ISO88594", 28594 }, + { "ISO88595", 28595 }, + { "ISO88596", 28596 }, + { "ISO88597", 28597 }, + { "ISO88598", 28598 }, + { "ISO88599", 28599 }, + { "KOI8R", 20866 }, + { "KOI8U", 21866 }, + { "TIS620", 28601 }, + { "UTF8", CP_UTF8 } +}; + +static void init_unix_codepage(void) +{ + char charset_name[16]; + const char *name; + size_t i, j; + int min = 0, max = ARRAY_SIZE(charset_names) - 1; + + setlocale( LC_CTYPE, "" ); + if (!(name = nl_langinfo( CODESET ))) return; + + /* remove punctuation characters from charset name */ + for (i = j = 0; name[i] && j < sizeof(charset_name)-1; i++) + if (isalnum((unsigned char)name[i])) charset_name[j++] = name[i]; + charset_name[j] = 0; + + while (min <= max) + { + int pos = (min + max) / 2; + int res = _strnicmp( charset_names[pos].name, charset_name, -1 ); + if (!res) + { + if (charset_names[pos].cp == CP_UTF8) return; + unix_table = wine_cp_get_table( charset_names[pos].cp ); + return; + } + if (res > 0) max = pos - 1; + else min = pos + 1; + } + ERR( "unrecognized charset '%s'\n", name ); +} + +#else /* __APPLE__ || __ANDROID__ */ + +static void init_unix_codepage(void) { } + +#endif /* __APPLE__ || __ANDROID__ */ + /* check if a given Unicode char is OK in a DOS short name */ static inline BOOL is_invalid_dos_char( WCHAR ch ) { @@ -395,6 +502,26 @@ static void free_dir_data( struct dir_data *data ) RtlFreeHeap( GetProcessHeap(), 0, data ); } +int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ +#ifdef __APPLE__ + /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ + flags |= MB_COMPOSITE; +#endif + return unix_table ? + wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : + wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); +} + +int ntdll_wcstoumbs( DWORD flags, const WCHAR *src, int srclen, char *dst, int dstlen, + const char *defchar, int *used ) +{ + if (unix_table) + return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); + if (used) *used = 0; /* all chars are valid for UTF-8 */ + return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); +} + /* support for a directory queue for filesystem searches */ @@ -2319,6 +2446,7 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l */ void init_directories(void) { + init_unix_codepage(); #ifndef _WIN64 if (is_wow64) init_redirects(); #endif diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 977f57a907..94370e7ff6 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -48,7 +48,6 @@ extern const union cptable cptable_20127; /* 7-bit ASCII */ static const union cptable *ansi_table = &cptable_20127; static const union cptable *oem_table = &cptable_20127; -static const union cptable* unix_table; /* NULL if UTF8 */ /************************************************************************** @@ -61,30 +60,9 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable { ansi_table = ansi; oem_table = oem; - unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; } -int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) -{ -#ifdef __APPLE__ - /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ - if (!unix_table) flags |= MB_COMPOSITE; -#endif - return (unix_table) ? - wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : - wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); -} - -int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen, - const char* defchar, int *used ) -{ - if (unix_table) - return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); - if (used) *used = 0; /* all chars are valid for UTF-8 */ - return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); -} - /************************************************************************** * RtlInitAnsiString (NTDLL.@) *

1 0

Alexandre Julliard : kernel32: Retrieve the Unix codepage from ntdll.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 6d8c58d7cc2a54a61a15aa83cd5e32ad4914fa59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8c58d7cc2a54a61a15aa83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 14:17:40 2019 +0200 kernel32: Retrieve the Unix codepage from ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 156 +++++-------------------------------------------- dlls/ntdll/directory.c | 6 ++ dlls/ntdll/ntdll.spec | 3 +- dlls/ntdll/rtlstr.c | 3 +- 4 files changed, 24 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d8c58d7cc2a54a61a15…

1 0

Alexandre Julliard : kernelbase: Fix variable name aliasing issue.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 9551cb0b84dc0c0c9c1778cc37d7bafef4fd4299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9551cb0b84dc0c0c9c1778cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 15:23:32 2019 +0200 kernelbase: Fix variable name aliasing issue. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 5b70dfd874..456a9f2da4 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -114,12 +114,12 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE) { - struct exclusive_datafile *file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) ); - if (!file) goto failed; - file->module = *mod_ret; - file->file = file; - list_add_head( &exclusive_datafile_list, &file->entry ); - TRACE( "delaying close %p for module %p\n", file->file, file->module ); + struct exclusive_datafile *datafile = HeapAlloc( GetProcessHeap(), 0, sizeof(*datafile) ); + if (!datafile) goto failed; + datafile->module = *mod_ret; + datafile->file = file; + list_add_head( &exclusive_datafile_list, &datafile->entry ); + TRACE( "delaying close %p for module %p\n", datafile->file, datafile->module ); return TRUE; } }

1 0