April 2022 - Wine-Commits - list.winehq.org

Huw Davies : wineoss: Use the global lock to lock the session.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 13d69651f68eb6553725b6ab98707a2761413037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d69651f68eb6553725b6ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 07:55:53 2022 +0100 wineoss: Use the global lock to lock the session. Mainly for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index eb0ab7b8fc7..af49c88e6cf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -81,8 +81,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -835,9 +833,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -2565,13 +2560,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2600,11 +2595,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->mute = mute; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2856,13 +2851,13 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2906,14 +2901,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Alexandros Frantzis : win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 4f705f6f62185de6fa78b88b0aaec554a0fbf0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f705f6f62185de6fa78b88b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 11 12:53:50 2022 +0300 win32u: Avoid iterating over a NULL window list when broadcasting. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 5fc32a204d6e2590619e194d412d81d559eec1d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc32a204d6e2590619e194d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Apr 11 16:52:31 2022 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 54 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/po/de.po b/po/de.po index 596eb9974c9..ad81f08de43 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-01-10 13:49+0200\n" +"PO-Revision-Date: 2022-04-11 16:51+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3981,13 +3981,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Zyklischer __proto__-Wert" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Eigenschaft '|' kann nicht definiert werden: Objekt nicht erweiterbar" +msgstr "Eigenschaft für nicht-erweiterbares Objekt kann nicht angelegt werden" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -7014,54 +7012,40 @@ msgid "This network connection does not exist.\n" msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ungültig während eines Interrupts.\n" +msgstr "Aufruf unterbrochen.\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ungültiges Handle.\n" +msgstr "Ungültiges Dateihandle.\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ungültige Netzwerkadresse.\n" +msgstr "Ungültige Zeigeradresse.\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ungültiger Name.\n" +msgstr "Ungültiges Argument.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punkt nicht gefunden.\n" +msgstr "Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribut nicht gefunden.\n" +msgstr "Nicht-authoritativer Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Nicht ausgleichbarer Fehler aufgetreten.\n" +msgstr "Unausgleichbarer Fehler.\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Name gültig, kein Datensatz.\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -11042,18 +11026,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Stadt Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- und Caicosinseln Normalzeit" +msgstr "Turks-, Caicosinseln Normalzeit" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- und Caicosinseln Sommerzeit" +msgstr "Turks-, Caicosinseln Sommerzeit" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11647,18 +11627,14 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskau, St. Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "West-Zentralaustralische Normalzeit" +msgstr "West-Zentralaustr. Normalzeit" #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Aus Central W. Daylight Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" -msgstr "West-Zentralaustralische Sommerzeit" +msgstr "West-Zentralaustr. Sommerzeit" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla"

1 0

Gabriel Ivăncescu : urlmon: Return the currently set user agent when 'version' is invalid.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 6843cecb53ac134fae2ef22ed22a1d328516dccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6843cecb53ac134fae2ef22e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 11 18:58:49 2022 +0300 urlmon: Return the currently set user agent when 'version' is invalid. ObtainUserAgentString returns the currently set (custom) user agent unless the version requested is a valid one (7, 8, ... 11, or 7 | UAS_EXACTLEGACY), in which case it uses that version to build the user agent. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 14 +++++++++----- dlls/urlmon/tests/misc.c | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index e5dd26c3542..d533ee8cc97 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -508,9 +508,9 @@ static BOOL user_agent_set; static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { + BOOL is_wow, quirks = FALSE, use_current = FALSE; OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - BOOL is_wow, quirks = FALSE; DWORD res; size_t len = 0; HKEY key; @@ -519,17 +519,18 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) version &= ~UAS_EXACTLEGACY; if(version == 7) quirks = TRUE; - else + else { + use_current = TRUE; version = 7; - }else if(version < 7) { - version = 7; + } } + if(version > 11) { FIXME("Unsupported version %u\n", version); version = 11; } - if(version < 7 || (version == 7 && !quirks)) { + if(version < 7 || use_current) { EnterCriticalSection(&session_cs); if(user_agent) { len = wcslen(user_agent) + 1; @@ -539,6 +540,9 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) if(len) return len; } + if(version < 7) + version = 7; + swprintf(ret, size, L"Mozilla/%s (", version < 9 ? L"4.0" : L"5.0"); len = lstrlenW(ret); if(version < 11) { diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c67b1d589ab..638dcae16cd 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1635,6 +1635,26 @@ static void test_user_agent(void) ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08lx\n", hres); ok(size == sizeof(test_str) && !memcmp(str2, test_str, sizeof(test_str)), "wrong user agent\n"); + for(i = 0; i < 12; i++) { + size = sizeof(ua); + hres = pObtainUserAgentString(i, ua, &size); + ok(hres == S_OK, "[%u] ObtainUserAgentString failed: %08lx\n", i, hres); + ok(size == strlen(ua) + 1, "[%u] unexpected size %lu, expected %Iu\n", i, size, strlen(ua) + 1); + if(i >= 7) + ok(strcmp(ua, test_str), "[%u] unexpected UA, did not expect \"test\"\n", i); + else + ok(!strcmp(ua, test_str), "[%u] unexpected UA %s, expected \"test\"\n", i, wine_dbgstr_a(ua)); + + size = sizeof(ua); + hres = pObtainUserAgentString(i | UAS_EXACTLEGACY, ua, &size); + ok(hres == S_OK, "[%u] ObtainUserAgentString failed: %08lx\n", i, hres); + ok(size == strlen(ua) + 1, "[%u] unexpected size %lu, expected %Iu\n", i, size, strlen(ua) + 1); + if(i == 7) + ok(strcmp(ua, test_str), "[%u] unexpected UA, did not expect \"test\"\n", i); + else + ok(!strcmp(ua, test_str), "[%u] unexpected UA %s, expected \"test\"\n", i, wine_dbgstr_a(ua)); + } + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test2_str, sizeof(test2_str), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres);

1 0

Gabriel Ivăncescu : jscript: Make idx props enumerable.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 45d8af4cf35388f290df3f11c7e11bf3b30450c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d8af4cf35388f290df3f11… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 11 18:58:51 2022 +0300 jscript: Make idx props enumerable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 17 ++++++++++++++++- dlls/mshtml/tests/es5.js | 28 +++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 32265d34b9d..6ee02a0d0f5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -285,7 +285,10 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, for(ptr = name; is_digit(*ptr) && idx < 0x10000; ptr++) idx = idx*10 + (*ptr-'0'); if(!*ptr && idx < This->builtin_info->idx_length(This)) { - prop = alloc_prop(This, name, PROP_IDX, This->builtin_info->idx_put ? PROPF_WRITABLE : 0); + unsigned flags = PROPF_ENUMERABLE; + if(This->builtin_info->idx_put) + flags |= PROPF_WRITABLE; + prop = alloc_prop(This, name, PROP_IDX, flags); if(!prop) return E_OUTOFMEMORY; @@ -2444,6 +2447,18 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty HRESULT hres; if(id == DISPID_STARTENUM) { + if(obj->builtin_info->idx_length) { + unsigned i = 0, len = obj->builtin_info->idx_length(obj); + WCHAR name[12]; + + for(i = 0; i < len; i++) { + swprintf(name, ARRAY_SIZE(name), L"%d", i); + hres = find_prop_name(obj, string_hash(name), name, &iter); + if(FAILED(hres)) + return hres; + } + } + if (enum_type == JSDISP_ENUM_ALL) { hres = fill_protrefs(obj); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 0339d9b08fa..6baebbd372c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -654,12 +654,38 @@ sync_test("property_definitions", function() { }); sync_test("string_idx", function() { - var s = "foobar"; + var i, s = "foobar"; ok(s[0] === "f", "s[0] = " + s[0]); ok(s[5] === "r", "s[5] = " + s[5]); ok(s[6] === undefined, "s[6] = " + s[6]); ok((delete s[0]) === false, "delete s[0] returned true"); ok((delete s[6]) === true, "delete s[6] returned false"); + s[6] = "X"; + ok(s[6] === undefined, "s[6] = " + s[6]); + + s = new String(s); + test_own_data_prop_desc(s, "0", false, true, false); + test_own_data_prop_desc(s, "1", false, true, false); + ok(!s.hasOwnProperty("6"), "'6' is a property"); + + s[7] = "X"; + ok(s[7] === "X", "s[7] = " + s[7]); + // s.hasOwnProperty("7") returns false on Win8 likely due to a bug in its js engine + + Object.defineProperty(s, "8", {writable: false, enumerable: true, configurable: true, value: "Y"}); + ok(s[8] === "Y", "s[8] = " + s[8]); + ok(s.hasOwnProperty("8"), "'8' not a property"); + + String.prototype[9] = "Z"; + ok(s[9] === "Z", "s[9] = " + s[9]); + delete String.prototype[9]; + + i = 0; + for(var idx in s) { + ok(s[idx] === "foobar XY"[idx], "enum s[" + idx + "] = " + s[idx]); + i++; + } + ok(i === 8, "enum did " + i + " iterations"); }); sync_test("string_trim", function() {

1 0

Nikolay Sivov : mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType().
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: b159edc6793a2be16028ae28e41d47951c443a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b159edc6793a2be16028ae28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:44:35 2022 +0300 mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- dlls/mfplat/tests/mfplat.c | 54 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8ea2283e24b..eada3df18ad 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1596,6 +1596,8 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) WARN("Block alignment was not specified.\n"); + alignment = max(16, alignment); + if (block_alignment) { avg_length = 0; @@ -1610,8 +1612,6 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO } } - alignment = max(16, alignment); - length = buffer_get_aligned_length(avg_length + 1, alignment); length = buffer_get_aligned_length(length, block_alignment); } @@ -1620,7 +1620,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO length = max(length, min_length); - return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + return create_1d_buffer(length, alignment - 1, buffer); } else FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..8d21f2ed60e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6057,18 +6057,21 @@ static void test_MFCreateMediaBufferFromMediaType(void) unsigned int buffer_length; } audio_tests[] = { - { 0, 0, 0, 4, 0, 20 }, - { 0, 16, 0, 4, 0, 20 }, - { 0, 0, 32, 4, 0, 36 }, - { 0, 64, 32, 4, 0, 64 }, - { 1, 0, 0, 4, 16, 36 }, - { 2, 0, 0, 4, 16, 52 }, + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + { 2, 0, 64, 4, 16, 68 }, + { 2, 0, 128, 4, 16,132 }, }; + IMFMediaType *media_type, *media_type2; + unsigned int i, alignment; IMFMediaBuffer *buffer; - DWORD length; + DWORD length, max; + BYTE *data; HRESULT hr; - IMFMediaType *media_type; - unsigned int i; if (!pMFCreateMediaBufferFromMediaType) { @@ -6082,9 +6085,15 @@ static void test_MFCreateMediaBufferFromMediaType(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) { const struct audio_buffer_test *ptr = &audio_tests[i]; @@ -6107,10 +6116,37 @@ static void test_MFCreateMediaBufferFromMediaType(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %lu, expected %u.\n", i, length, ptr->buffer_length); + alignment = ptr->min_alignment ? ptr->min_alignment - 1 : MF_16_BYTE_ALIGNMENT; + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->buffer_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + + /* Only major type is set. */ + hr = pMFCreateMediaBufferFromMediaType(media_type2, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(ptr->min_length == length, "%u: unexpected buffer length %lu, expected %u.\n", i, length, ptr->min_length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->min_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); } static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format)

1 0

Alexandre Julliard : kernelbase: Support UTF-7/8 codepages in get_codepage_table().
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 8993e15cfa5b77ac2487239354ffe63bbc5e562d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8993e15cfa5b77ac24872393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:21:47 2022 +0200 kernelbase: Support UTF-7/8 codepages in get_codepage_table(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 34 ++++++++++++++++-- dlls/kernelbase/locale.c | 86 +++++++++++++------------------------------- 2 files changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9b95fcae640..8dc5814162a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4251,6 +4251,7 @@ static void test_GetCPInfo(void) { BOOL ret; CPINFO cpinfo; + CPINFOEXW cpiw; SetLastError(0xdeadbeef); ret = GetCPInfo(CP_SYMBOL, &cpinfo); @@ -4275,6 +4276,18 @@ static void test_GetCPInfo(void) for (i = 0; i < sizeof(cpinfo.LeadByte); i++) ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + + memset( &cpiw, 0xcc, sizeof(cpiw) ); + ret = GetCPInfoExW( CP_UTF7, 0, &cpiw ); + ok( ret, "GetCPInfoExW failed err %lu\n", GetLastError() ); + ok( cpiw.DefaultChar[0] == 0x3f, "wrong DefaultChar[0] %02x\n", cpiw.DefaultChar[0] ); + ok( cpiw.DefaultChar[1] == 0, "wrong DefaultChar[1] %02x\n", cpiw.DefaultChar[1] ); + for (i = 0; i < 12; i++) ok( cpiw.LeadByte[i] == 0, "wrong LeadByte[%u] %02x\n", i, cpiw.LeadByte[i] ); + ok( cpiw.MaxCharSize == 5, "wrong MaxCharSize %02x\n", cpiw.MaxCharSize ); + ok( cpiw.CodePage == CP_UTF7, "wrong CodePage %02x\n", cpiw.CodePage ); + ok( cpiw.UnicodeDefaultChar == 0xfffd, "wrong UnicodeDefaultChar %02x\n", cpiw.UnicodeDefaultChar ); + ok( !wcscmp( cpiw.CodePageName, L"65000 (UTF-7)" ), + "wrong CodePageName %s\n", debugstr_w(cpiw.CodePageName) ); } memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); @@ -4293,10 +4306,27 @@ static void test_GetCPInfo(void) ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); for (i = 0; i < sizeof(cpinfo.LeadByte); i++) ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); - ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, - "expected 4, got %u\n", cpinfo.MaxCharSize); + ok(cpinfo.MaxCharSize == 4, "expected 4, got %u\n", cpinfo.MaxCharSize); + + memset( &cpiw, 0xcc, sizeof(cpiw) ); + ret = GetCPInfoExW( CP_UTF8, 0, &cpiw ); + ok( ret, "GetCPInfoExW failed err %lu\n", GetLastError() ); + ok( cpiw.DefaultChar[0] == 0x3f, "wrong DefaultChar[0] %02x\n", cpiw.DefaultChar[0] ); + ok( cpiw.DefaultChar[1] == 0, "wrong DefaultChar[1] %02x\n", cpiw.DefaultChar[1] ); + for (i = 0; i < 12; i++) ok( cpiw.LeadByte[i] == 0, "wrong LeadByte[%u] %02x\n", i, cpiw.LeadByte[i] ); + ok( cpiw.MaxCharSize == 4, "wrong MaxCharSize %02x\n", cpiw.MaxCharSize ); + ok( cpiw.CodePage == CP_UTF8, "wrong CodePage %02x\n", cpiw.CodePage ); + ok( cpiw.UnicodeDefaultChar == 0xfffd, "wrong UnicodeDefaultChar %02x\n", cpiw.UnicodeDefaultChar ); + ok( !wcscmp( cpiw.CodePageName, L"65001 (UTF-8)" ), + "wrong CodePageName %s\n", debugstr_w(cpiw.CodePageName) ); } + + SetLastError( 0xdeadbeef ); + ret = GetCPInfoExW( 0xbeef, 0, &cpiw ); + ok( !ret, "GetCPInfoExW succeeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); + if (pNtGetNlsSectionPtr) { CPTABLEINFO table; diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 67052af7e4f..c0cd0307447 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -164,8 +164,8 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 28604, L"ISO 8859-14 Latin 8 (Celtic)" }, { 28605, L"ISO 8859-15 Latin 9 (Euro)" }, { 28606, L"ISO 8859-16 Latin 10 (Balkan)" }, - { 65000, L"Unicode (UTF-7)" }, - { 65001, L"Unicode (UTF-8)" } + { 65000, L"65000 (UTF-7)" }, + { 65001, L"65001 (UTF-8)" } }; /* Unicode expanded ligatures */ @@ -1964,24 +1964,28 @@ static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) static UINT get_locale_codepage( const NLS_LOCALE_DATA *locale, ULONG flags ) { UINT ret = locale->idefaultansicodepage; - if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = system_locale->idefaultansicodepage; + if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = nls_info.AnsiTableInfo.CodePage; return ret; } static UINT get_lcid_codepage( LCID lcid, ULONG flags ) { - UINT ret = GetACP(); + UINT ret = nls_info.AnsiTableInfo.CodePage; - if (!(flags & LOCALE_USE_CP_ACP) && lcid != GetSystemDefaultLCID()) - GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&ret, sizeof(ret)/sizeof(WCHAR) ); + if (!(flags & LOCALE_USE_CP_ACP) && lcid != system_lcid) + { + const NLS_LOCALE_DATA *locale = NlsValidateLocale( &lcid, 0 ); + if (locale) ret = locale->idefaultansicodepage; + } return ret; } static const CPTABLEINFO *get_codepage_table( UINT codepage ) { + static const CPTABLEINFO utf7_cpinfo = { CP_UTF7, 5, '?', 0xfffd, '?', '?' }; + static const CPTABLEINFO utf8_cpinfo = { CP_UTF8, 4, '?', 0xfffd, '?', '?' }; unsigned int i; USHORT *ptr; SIZE_T size; @@ -1996,15 +2000,13 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) codepage = mac_cp; break; case CP_THREAD_ACP: - if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return &nls_info.AnsiTableInfo; codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale, 0 ); - if (!codepage) return &nls_info.AnsiTableInfo; - break; - default: - if (codepage == nls_info.AnsiTableInfo.CodePage) return &nls_info.AnsiTableInfo; - if (codepage == nls_info.OemTableInfo.CodePage) return &nls_info.OemTableInfo; break; } + if (codepage == nls_info.AnsiTableInfo.CodePage) return &nls_info.AnsiTableInfo; + if (codepage == nls_info.OemTableInfo.CodePage) return &nls_info.OemTableInfo; + if (codepage == CP_UTF8) return &utf8_cpinfo; + if (codepage == CP_UTF7) return &utf7_cpinfo; RtlEnterCriticalSection( &locale_section ); @@ -4838,27 +4840,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCPInfo( UINT codepage, CPINFO *cpinfo ) { const CPTABLEINFO *table; - if (!cpinfo) + if (!cpinfo || !(table = get_codepage_table( codepage ))) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - switch (codepage) - { - case CP_UTF7: - case CP_UTF8: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - memset( cpinfo->LeadByte, 0, sizeof(cpinfo->LeadByte) ); - cpinfo->MaxCharSize = (codepage == CP_UTF7) ? 5 : 4; - break; - default: - if (!(table = get_codepage_table( codepage ))) return FALSE; - cpinfo->MaxCharSize = table->MaximumCharacterSize; - memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); - memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); - break; - } + cpinfo->MaxCharSize = table->MaximumCharacterSize; + memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); + memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); return TRUE; } @@ -4871,38 +4860,16 @@ BOOL WINAPI GetCPInfoExW( UINT codepage, DWORD flags, CPINFOEXW *cpinfo ) const CPTABLEINFO *table; int min, max, pos; - if (!cpinfo) + if (!cpinfo || !(table = get_codepage_table( codepage ))) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - switch (codepage) - { - case CP_UTF7: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - cpinfo->LeadByte[0] = cpinfo->LeadByte[1] = 0; - cpinfo->MaxCharSize = 5; - cpinfo->CodePage = CP_UTF7; - cpinfo->UnicodeDefaultChar = 0x3f; - break; - case CP_UTF8: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - cpinfo->LeadByte[0] = cpinfo->LeadByte[1] = 0; - cpinfo->MaxCharSize = 4; - cpinfo->CodePage = CP_UTF8; - cpinfo->UnicodeDefaultChar = 0x3f; - break; - default: - if (!(table = get_codepage_table( codepage ))) return FALSE; - cpinfo->MaxCharSize = table->MaximumCharacterSize; - memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); - memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); - cpinfo->CodePage = table->CodePage; - cpinfo->UnicodeDefaultChar = table->UniDefaultChar; - break; - } + cpinfo->MaxCharSize = table->MaximumCharacterSize; + memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); + memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); + cpinfo->CodePage = table->CodePage; + cpinfo->UnicodeDefaultChar = table->UniDefaultChar; min = 0; max = ARRAY_SIZE(codepage_names) - 1; @@ -5775,9 +5742,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidCodePage( UINT codepage ) case CP_MACCP: case CP_THREAD_ACP: return FALSE; - case CP_UTF7: - case CP_UTF8: - return TRUE; default: return get_codepage_table( codepage ) != NULL; }

1 0

Alexandre Julliard : kernelbase: Avoid redundant locale lookups in GetLocaleInfoA().
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: fd2ecee06fe9ab3af09854bb72fe9be3ec40a673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd2ecee06fe9ab3af09854bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:19:52 2022 +0200 kernelbase: Avoid redundant locale lookups in GetLocaleInfoA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 1e477a449e1..67052af7e4f 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5098,6 +5098,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetGeoInfoW( GEOID id, GEOTYPE type, WCHAR *data, i */ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buffer, INT len ) { + const NLS_LOCALE_DATA *locale; WCHAR *bufferW; INT lenW, ret; @@ -5113,19 +5114,26 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buf SetLastError( ERROR_INVALID_FLAGS ); return 0; } - + if (!(locale = NlsValidateLocale( &lcid, 0 ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (LOWORD(lctype) == LOCALE_FONTSIGNATURE || (lctype & LOCALE_RETURN_NUMBER)) - return GetLocaleInfoW( lcid, lctype, (WCHAR *)buffer, len / sizeof(WCHAR) ) * sizeof(WCHAR); + { + ret = get_locale_info( locale, lcid, lctype, (WCHAR *)buffer, len / sizeof(WCHAR) ); + return ret * sizeof(WCHAR); + } - if (!(lenW = GetLocaleInfoW( lcid, lctype, NULL, 0 ))) return 0; + if (!(lenW = get_locale_info( locale, lcid, lctype, NULL, 0 ))) return 0; if (!(bufferW = RtlAllocateHeap( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; } - ret = GetLocaleInfoW( lcid, lctype, bufferW, lenW ); - if (ret) ret = WideCharToMultiByte( get_lcid_codepage( lcid, lctype ), 0, + ret = get_locale_info( locale, lcid, lctype, bufferW, lenW ); + if (ret) ret = WideCharToMultiByte( get_locale_codepage( locale, lctype ), 0, bufferW, ret, buffer, len, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, bufferW ); return ret;

1 0

Alexandre Julliard : ntdll: Support UTF-8 codepage in string conversion functions.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 2aa4673f32d08238b61e5b445d8bf873dccf2556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa4673f32d08238b61e5b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 11:36:24 2022 +0200 ntdll: Support UTF-8 codepage in string conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 189 ++++++++++++++++++++++++++++++++++++++++------------ dlls/ntdll/string.c | 8 +-- 2 files changed, 148 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2aa4673f32d08238b61e…

1 0

Alexandre Julliard : ntdll: Use the standard CPTABLEINFO structure for the Unix codepage.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: deab47be6eabc93b89b76e332db8dab1502daebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=deab47be6eabc93b89b76e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 11:15:03 2022 +0200 ntdll: Use the standard CPTABLEINFO structure for the Unix codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 163 ++++++++++---------------------------------------- 1 file changed, 30 insertions(+), 133 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 9b499239803..47bc0118802 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -83,13 +83,7 @@ static char user_locale[LOCALE_NAME_MAX_LENGTH]; const WCHAR system_dir[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\',0}; -static struct -{ - USHORT *data; - USHORT *dbcs; - USHORT *mbtable; - void *wctable; -} unix_cp; +static CPTABLEINFO unix_cp = { CP_UTF8, 4, '?', 0xfffd, '?', '?' }; static char *get_nls_file_path( ULONG type, ULONG id ) { @@ -276,17 +270,6 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "UTF8", CP_UTF8 } }; -static void init_unix_cptable( USHORT *ptr ) -{ - unix_cp.data = ptr; - ptr += ptr[0]; - unix_cp.wctable = ptr + ptr[0] + 1; - unix_cp.mbtable = ++ptr; - ptr += 256; - if (*ptr++) ptr += 256; /* glyph table */ - if (*ptr) unix_cp.dbcs = ptr + 1; /* dbcs ranges */ -} - static void init_unix_codepage(void) { char charset_name[16]; @@ -315,7 +298,7 @@ static void init_unix_codepage(void) if (charset_names[pos].cp != CP_UTF8) { void *data = read_nls_file( NLS_SECTION_CODEPAGE, charset_names[pos].cp ); - if (data) init_unix_cptable( data ); + if (data) init_codepage_table( data, &unix_cp ); } return; } @@ -378,42 +361,14 @@ static BOOL is_dynamic_env_var( const char *var ) */ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) { - DWORD reslen; + unsigned int reslen; - if (unix_cp.data) - { - DWORD i; + if (unix_cp.CodePage != CP_UTF8) return cp_mbstowcs( &unix_cp, dst, dstlen, src, srclen ); - if (unix_cp.dbcs) - { - for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) - { - USHORT off = unix_cp.dbcs[(unsigned char)*src]; - if (off && srclen > 1) - { - src++; - srclen--; - *dst = unix_cp.dbcs[off + (unsigned char)*src]; - } - else *dst = unix_cp.mbtable[(unsigned char)*src]; - } - reslen = dstlen - i; - } - else - { - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) dst[i] = unix_cp.mbtable[(unsigned char)src[i]]; - } - } - else /* utf-8 */ - { - reslen = 0; - RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - reslen /= sizeof(WCHAR); + utf8_mbstowcs( dst, dstlen, &reslen, src, srclen ); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); #endif - } return reslen; } @@ -423,98 +378,40 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) { - DWORD i, reslen; + unsigned int i, reslen; - if (unix_cp.data) + if (unix_cp.CodePage != CP_UTF8) { - if (unix_cp.dbcs) + if (strict) { - const unsigned short *uni2cp = unix_cp.wctable; - for (i = dstlen; srclen && i; i--, srclen--, src++) + if (unix_cp.DBCSCodePage) { - unsigned short ch = uni2cp[*src]; - if (ch >> 8) - { - if (strict && unix_cp.dbcs[unix_cp.dbcs[ch >> 8] + (ch & 0xff)] != *src) return -1; - if (i == 1) break; /* do not output a partial char */ - i--; - *dst++ = ch >> 8; - } - else + const WCHAR *uni2cp = unix_cp.WideCharTable; + for (i = 0; i < srclen; i++) { - if (unix_cp.mbtable[ch] != *src) return -1; - *dst++ = (char)ch; + WCHAR ch = uni2cp[src[i]]; + if (ch >> 8) + { + if (unix_cp.DBCSOffsets[unix_cp.DBCSOffsets[ch >> 8] + (ch & 0xff)] != src[i]) + return -1; + } + else if (unix_cp.MultiByteTable[(unsigned char)ch] != src[i]) return -1; } } - reslen = dstlen - i; - } - else - { - const unsigned char *uni2cp = unix_cp.wctable; - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) + else { - unsigned char ch = uni2cp[src[i]]; - if (strict && unix_cp.mbtable[ch] != src[i]) return -1; - dst[i] = ch; + const char *uni2cp = unix_cp.WideCharTable; + for (i = 0; i < srclen; i++) + if (unix_cp.MultiByteTable[(unsigned char)uni2cp[src[i]]] != src[i]) + return -1; } } + reslen = cp_wcstombs( &unix_cp, dst, dstlen, src, srclen ); } - else /* utf-8 */ + else { - char *end; - unsigned int val; - - for (end = dst + dstlen; srclen; srclen--, src++) - { - WCHAR ch = *src; - - if (ch < 0x80) /* 0x00-0x7f: 1 byte */ - { - if (dst > end - 1) break; - *dst++ = ch; - continue; - } - if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ - { - if (dst > end - 2) break; - dst[1] = 0x80 | (ch & 0x3f); - ch >>= 6; - dst[0] = 0xc0 | ch; - dst += 2; - continue; - } - if (!get_utf16( src, srclen, &val )) - { - if (strict) return -1; - val = 0xfffd; - } - if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ - { - if (dst > end - 3) break; - dst[2] = 0x80 | (val & 0x3f); - val >>= 6; - dst[1] = 0x80 | (val & 0x3f); - val >>= 6; - dst[0] = 0xe0 | val; - dst += 3; - } - else /* 0x10000-0x10ffff: 4 bytes */ - { - if (dst > end - 4) break; - dst[3] = 0x80 | (val & 0x3f); - val >>= 6; - dst[2] = 0x80 | (val & 0x3f); - val >>= 6; - dst[1] = 0x80 | (val & 0x3f); - val >>= 6; - dst[0] = 0xf0 | val; - dst += 4; - src++; - srclen--; - } - } - reslen = dstlen - (end - dst); + NTSTATUS status = utf8_wcstombs( dst, dstlen, &reslen, src, srclen ); + if (strict && status == STATUS_SOME_NOT_MAPPED) return -1; } return reslen; } @@ -1140,9 +1037,9 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_system_dll_path_var( env, pos, size ); append_envA( env, pos, size, "WINEUSERNAME", user_name ); append_envA( env, pos, size, "WINEDLLOVERRIDES", overrides ); - if (unix_cp.data) + if (unix_cp.CodePage != CP_UTF8) { - sprintf( str, "%u", unix_cp.data[1] ); + sprintf( str, "%u", unix_cp.CodePage ); append_envA( env, pos, size, "WINEUNIXCP", str ); } else append_envW( env, pos, size, "WINEUNIXCP", NULL );

1 0