March 2022 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : kernelbase: Trace not supported flags in CopyFileExW.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: aa2851f167aa2089fdbb12ec58d6f6b4801edbab URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2851f167aa2089fdbb12ec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 12 20:01:29 2022 +1100 kernelbase: Trace not supported flags in CopyFileExW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 2d5a6a8ba9a..569d92345b7 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -518,6 +518,13 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); + if (flags & COPY_FILE_RESTARTABLE) + FIXME("COPY_FILE_RESTARTABLE is not supported\n"); + if (flags & COPY_FILE_COPY_SYMLINK) + FIXME("COPY_FILE_COPY_SYMLINK is not supported\n"); + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + FIXME("COPY_FILE_OPEN_SOURCE_FOR_WRITE is not supported\n"); + if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) {

1 0

Huw Davies : winealsa: Move the midi in buffer lock to the unixlib.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 5f5aa248476b8b7c00ef3c5084c2c68799d0a1f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f5aa248476b8b7c00ef3c50… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 22 08:57:01 2022 -0500 winealsa: Move the midi in buffer lock to the unixlib. The syscall itself is temporary. 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/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 19 +++++++++++++++++++ dlls/winealsa.drv/midi.c | 31 ++++++++++++++++--------------- dlls/winealsa.drv/unixlib.h | 2 ++ 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b629cd8317a..eb16203dbf9 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,5 +2449,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_seq_lock, /* temporary */ + midi_in_lock, midi_seq_open, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f12eefdd1a3..a78102745bc 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,7 @@ struct midi_dest }; static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; static struct midi_dest dests[MAX_MIDIOUTDRV]; @@ -86,6 +87,24 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } +static void in_buffer_lock(void) +{ + pthread_mutex_lock(&in_buffer_mutex); +} + +static void in_buffer_unlock(void) +{ + pthread_mutex_unlock(&in_buffer_mutex); +} + +NTSTATUS midi_in_lock(void *args) +{ + if (args) in_buffer_lock(); + else in_buffer_unlock(); + + return STATUS_SUCCESS; +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index bd73c1f5db2..70e6caebfc7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,15 +54,6 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &crit_sect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": crit_sect") } -}; -static CRITICAL_SECTION crit_sect = { &critsect_debug, -1, 0, 0, 0, 0 }; - static int end_thread; static HANDLE hThread; @@ -76,6 +67,16 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); } +static void in_buffer_lock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1); +} + +static void in_buffer_unlock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0); +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -240,7 +241,7 @@ static void handle_midi_event(snd_seq_event_t *ev) LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (len) { if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); @@ -262,7 +263,7 @@ static void handle_midi_event(snd_seq_event_t *ev) break; } } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); } break; case SND_SEQ_EVENT_SENSING: @@ -475,7 +476,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwBytesRecorded = 0; @@ -489,7 +490,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ptr = ptr->lpNext); ptr->lpNext = lpMidiHdr; } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } @@ -506,7 +507,7 @@ static DWORD midReset(WORD wDevID) if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (MidiInDev[wDevID].lpQueueHdr) { LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; @@ -514,7 +515,7 @@ static DWORD midReset(WORD wDevID) lpMidiHdr->dwFlags |= MHDR_DONE; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 7907ad24efa..263e83eda57 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -301,6 +301,7 @@ enum alsa_funcs alsa_midi_in_message, alsa_midi_seq_lock, /* temporary */ + alsa_midi_in_lock, alsa_midi_seq_open, }; @@ -309,6 +310,7 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move MIDM_ADDBUFFER to the unixlib.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: a9fab273a1e63fd1a943d2b797a5a1125183f19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9fab273a1e63fd1a943d2b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 22 08:58:09 2022 -0500 winealsa: Move MIDM_ADDBUFFER to the unixlib. 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/winealsa.drv/alsamidi.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 38 -------------------------------------- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index a78102745bc..80e677b3064 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -852,6 +852,38 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + struct midi_src *src; + MIDIHDR **next; + + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; + if (!(hdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; + + in_buffer_lock(); + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + next = &src->lpQueueHdr; + while (*next) next = &(*next)->lpNext; + *next = hdr; + + in_buffer_unlock(); + + return MMSYSERR_NOERROR; +} + static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); @@ -963,6 +995,9 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_ADDBUFFER: + *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; case MIDM_PREPARE: *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 70e6caebfc7..3665b557d03 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,42 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } - -/************************************************************************** - * midAddBuffer [internal] - */ -static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - if (lpMidiHdr == NULL) return MMSYSERR_INVALPARAM; - if (dwSize < offsetof(MIDIHDR,dwOffset)) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwBufferLength == 0) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - - in_buffer_lock(); - lpMidiHdr->dwFlags &= ~WHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - lpMidiHdr->dwBytesRecorded = 0; - lpMidiHdr->lpNext = 0; - if (MidiInDev[wDevID].lpQueueHdr == 0) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; - } else { - LPMIDIHDR ptr; - - for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; - ptr = ptr->lpNext); - ptr->lpNext = lpMidiHdr; - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midReset [internal] */ @@ -593,8 +557,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_ADDBUFFER: - return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_RESET: return midReset(wDevID); case MIDM_START:

1 0

Huw Davies : winealsa: Pass the time relative to the start time to the callback.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: bce11840bd5f56c70e1290d302556c97ba3b1389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bce11840bd5f56c70e1290d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 22 08:58:31 2022 -0500 winealsa: Pass the time relative to the start time to the callback. This is equivalent to commit 01ad503004cf8ea6b0bd8f544ee131fc86abc580 in the coreaudio driver. 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/winealsa.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3665b557d03..72649eca89c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -477,7 +477,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock();

1 0

Gabriel Ivăncescu : mshtml/tests: Add test for setting a prop with same name as a prototype accessor with no setter.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: fa3095d4d43355725b77ee72b0ef04e5a8f90cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa3095d4d43355725b77ee72… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 22 17:41:19 2022 +0200 mshtml/tests: Add test for setting a prop with same name as a prototype accessor with no setter. 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/mshtml/tests/es5.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6e92fb6a00f..c03a2c2ec88 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -526,6 +526,16 @@ sync_test("defineProperty", function() { obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + ok((delete obj.no_setter) === true, "delete no_setter returned false"); + ok(!("no_setter" in obj), "no_setter still in obj after delete"); + + Object.defineProperty(child.prototype, "no_setter", desc); + test_accessor_prop_desc(child.prototype, "no_setter", desc); + ok(!obj.hasOwnProperty("no_setter"), "no_setter is a property of obj"); + obj.no_setter = false; + ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + ok(!obj.hasOwnProperty("no_setter"), "no_setter is a property of obj"); + /* call prop with getter */ desc = { get: function() {

1 0

Zhiyi Zhang : comctl32/tests: Use correct width and height in create_bitmap() helper.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 24785b4096efd964f4c805d71fb54e317e957c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24785b4096efd964f4c805d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 22 23:12:40 2022 +0800 comctl32/tests: Use correct width and height in create_bitmap() helper. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e7e3582ec35..8033a33e9cd 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -948,8 +948,8 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment memset(&bmi, 0, sizeof(bmi)); bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = cx; - bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biWidth = cx; + bmi.bmiHeader.biHeight = cy; bmi.bmiHeader.biBitCount = 24; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; @@ -1156,7 +1156,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, ILC_COLOR24, "init 0 grow 32"); - hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); + hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, ILC_COLOR24, "add 1 x 9"); @@ -1167,7 +1167,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24, "init 4 grow 4"); - hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); + hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, ILC_COLOR24, "add 9 x 1");

1 0

Rémi Bernon : dinput/tests: Introduce a new Wine Test Bus driver.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 657e07aea5a41ef4787ae9a5073d9cb137173d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=657e07aea5a41ef4787ae9a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 22 11:41:37 2022 +0100 dinput/tests: Introduce a new Wine Test Bus driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 4 + dlls/dinput/tests/dinput_test.h | 2 + dlls/dinput/tests/driver_bus.c | 294 ++++++++++++++++++++++++++++++++++++++ dlls/dinput/tests/driver_bus.spec | 1 + dlls/dinput/tests/hid.c | 90 ++++++++++-- 5 files changed, 382 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=657e07aea5a41ef4787a…

1 0

Ziqing Hui : ws2_32/tests: Test getaddrinfo() for IPv6 DNS querying.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 6bdf3a6ba7c169e5d2e21f7d79bc798fb6e28c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdf3a6ba7c169e5d2e21f7d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 21 17:05:54 2022 +0800 ws2_32/tests: Test getaddrinfo() for IPv6 DNS querying. The tests show that if we don't have a global IPv6 address, getaddrinfo() will not return IPv6 results. Specifing AF_UNSPEC makes it return IPv4 results. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 5f728a9c4a4..9a6c8610718 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2122,6 +2122,17 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b) ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); } +static BOOL ipv6_found(ADDRINFOA *addr) +{ + ADDRINFOA *p; + for (p = addr; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + return TRUE; + } + return FALSE; +} + static void test_getaddrinfo(void) { int i, ret; @@ -2129,6 +2140,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); @@ -2396,6 +2408,59 @@ static void test_getaddrinfo(void) ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); freeaddrinfo(result); + + /* Check whether we have global IPv6 address */ + result = NULL; + ret = getaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + has_ipv6_addr = FALSE; + for (p = result; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + { + IN6_ADDR *a = &((SOCKADDR_IN6 *)p->ai_addr)->sin6_addr; + if (!IN6_IS_ADDR_LINKLOCAL(a) && !IN6_IS_ADDR_LOOPBACK(a) && !IN6_IS_ADDR_UNSPECIFIED(a)) + { + has_ipv6_addr = TRUE; + break; + } + } + } + freeaddrinfo(result); + + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + for (i = 0; i < ARRAY_SIZE(hinttests); i++) + { + if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue; + winetest_push_context("Test %u", i); + + hint.ai_flags = 0; + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, &hint, &result); + ok(!ret, "Got unexpected ret %d\n", ret); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + hint.ai_family = AF_INET6; + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, &hint, &result); + if (!has_ipv6_addr) + todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret); + freeaddrinfo(result); + + winetest_pop_context(); + } } static void test_dns(void)

1 0

Alexandre Julliard : include: Add some structures for the undocumented locale.nls layout.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: f161195859f1f851f43c709f08838ace4f38b0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f161195859f1f851f43c709f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:29:34 2022 +0100 include: Add some structures for the undocumented locale.nls layout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 3fa5fad9b46..d4f360bd2a7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4739,6 +4739,145 @@ typedef struct WCHAR curdir_buffer[MAX_PATH]; } WIN16_SUBSYSTEM_TIB; +/* Undocumented: layout of the locale data in the locale.nls file */ + +typedef struct +{ + UINT sname; /* 000 LOCALE_SNAME */ + UINT sopentypelanguagetag; /* 004 LOCALE_SOPENTYPELANGUAGETAG */ + USHORT ilanguage; /* 008 LOCALE_ILANGUAGE */ + USHORT unique_lcid; /* 00a unique id if lcid == 0x1000 */ + USHORT idigits; /* 00c LOCALE_IDIGITS */ + USHORT inegnumber; /* 00e LOCALE_INEGNUMBER */ + USHORT icurrdigits; /* 010 LOCALE_ICURRDIGITS*/ + USHORT icurrency; /* 012 LOCALE_ICURRENCY */ + USHORT inegcurr; /* 014 LOCALE_INEGCURR */ + USHORT ilzero; /* 016 LOCALE_ILZERO */ + USHORT inotneutral; /* 018 LOCALE_INEUTRAL (inverted) */ + USHORT ifirstdayofweek; /* 01a LOCALE_IFIRSTDAYOFWEEK (monday=0) */ + USHORT ifirstweekofyear; /* 01c LOCALE_IFIRSTWEEKOFYEAR */ + USHORT icountry; /* 01e LOCALE_ICOUNTRY */ + USHORT imeasure; /* 020 LOCALE_IMEASURE */ + USHORT idigitsubstitution; /* 022 LOCALE_IDIGITSUBSTITUTION */ + UINT sgrouping; /* 024 LOCALE_SGROUPING (as binary string) */ + UINT smongrouping; /* 028 LOCALE_SMONGROUPING (as binary string) */ + UINT slist; /* 02c LOCALE_SLIST */ + UINT sdecimal; /* 030 LOCALE_SDECIMAL */ + UINT sthousand; /* 034 LOCALE_STHOUSAND */ + UINT scurrency; /* 038 LOCALE_SCURRENCY */ + UINT smondecimalsep; /* 03c LOCALE_SMONDECIMALSEP */ + UINT smonthousandsep; /* 040 LOCALE_SMONTHOUSANDSEP */ + UINT spositivesign; /* 044 LOCALE_SPOSITIVESIGN */ + UINT snegativesign; /* 048 LOCALE_SNEGATIVESIGN */ + UINT s1159; /* 04c LOCALE_S1159 */ + UINT s2359; /* 050 LOCALE_S2359 */ + UINT snativedigits; /* 054 LOCALE_SNATIVEDIGITS (array of single digits) */ + UINT stimeformat; /* 058 LOCALE_STIMEFORMAT (array of formats) */ + UINT sshortdate; /* 05c LOCALE_SSHORTDATE (array of formats) */ + UINT slongdate; /* 060 LOCALE_SLONGDATE (array of formats) */ + UINT syearmonth; /* 064 LOCALE_SYEARMONTH (array of formats) */ + UINT sduration; /* 068 LOCALE_SDURATION (array of formats) */ + USHORT idefaultlanguage; /* 06c LOCALE_IDEFAULTLANGUAGE */ + USHORT idefaultansicodepage; /* 06e LOCALE_IDEFAULTANSICODEPAGE */ + USHORT idefaultcodepage; /* 070 LOCALE_IDEFAULTCODEPAGE */ + USHORT idefaultmaccodepage; /* 072 LOCALE_IDEFAULTMACCODEPAGE */ + USHORT idefaultebcdiccodepage; /* 074 LOCALE_IDEFAULTEBCDICCODEPAGE */ + USHORT old_geoid; /* 076 LOCALE_IGEOID (older version?) */ + USHORT ipapersize; /* 078 LOCALE_IPAPERSIZE */ + BYTE islamic_cal[2]; /* 07a calendar id for islamic calendars (?) */ + UINT scalendartype; /* 07c string, first char is LOCALE_ICALENDARTYPE, next chars are LOCALE_IOPTIONALCALENDAR */ + UINT sabbrevlangname; /* 080 LOCALE_SABBREVLANGNAME */ + UINT siso639langname; /* 084 LOCALE_SISO639LANGNAME */ + UINT senglanguage; /* 088 LOCALE_SENGLANGUAGE */ + UINT snativelangname; /* 08c LOCALE_SNATIVELANGNAME */ + UINT sengcountry; /* 090 LOCALE_SENGCOUNTRY */ + UINT snativectryname; /* 094 LOCALE_SNATIVECTRYNAME */ + UINT sabbrevctryname; /* 098 LOCALE_SABBREVCTRYNAME */ + UINT siso3166ctryname; /* 09c LOCALE_SISO3166CTRYNAME */ + UINT sintlsymbol; /* 0a0 LOCALE_SINTLSYMBOL */ + UINT sengcurrname; /* 0a4 LOCALE_SENGCURRNAME */ + UINT snativecurrname; /* 0a8 LOCALE_SNATIVECURRNAME */ + UINT fontsignature; /* 0ac LOCALE_FONTSIGNATURE (binary string) */ + UINT siso639langname2; /* 0b0 LOCALE_SISO639LANGNAME2 */ + UINT siso3166ctryname2; /* 0b4 LOCALE_SISO3166CTRYNAME2 */ + UINT sparent; /* 0b8 LOCALE_SPARENT */ + UINT sdayname; /* 0bc LOCALE_SDAYNAME1 (array of days 1..7) */ + UINT sabbrevdayname; /* 0c0 LOCALE_SABBREVDAYNAME1 (array of days 1..7) */ + UINT smonthname; /* 0c4 LOCALE_SMONTHNAME1 (array of months 1..13) */ + UINT sabbrevmonthname; /* 0c8 LOCALE_SABBREVMONTHNAME1 (array of months 1..13) */ + UINT sgenitivemonth; /* 0cc equivalent of LOCALE_SMONTHNAME1 for genitive months */ + UINT sabbrevgenitivemonth; /* 0d0 equivalent of LOCALE_SABBREVMONTHNAME1 for genitive months */ + UINT calnames; /* 0d4 array of calendar names */ + UINT customsorts; /* 0d8 array of custom sort names */ + USHORT inegativepercent; /* 0dc LOCALE_INEGATIVEPERCENT */ + USHORT ipositivepercent; /* 0de LOCALE_IPOSITIVEPERCENT */ + USHORT unknown1; /* 0e0 */ + USHORT ireadinglayout; /* 0e2 LOCALE_IREADINGLAYOUT */ + USHORT unknown2[2]; /* 0e4 */ + UINT unused1; /* 0e8 unused? */ + UINT sengdisplayname; /* 0ec LOCALE_SENGLISHDISPLAYNAME */ + UINT snativedisplayname; /* 0f0 LOCALE_SNATIVEDISPLAYNAME */ + UINT spercent; /* 0f4 LOCALE_SPERCENT */ + UINT snan; /* 0f8 LOCALE_SNAN */ + UINT sposinfinity; /* 0fc LOCALE_SPOSINFINITY */ + UINT sneginfinity; /* 100 LOCALE_SNEGINFINITY */ + UINT unused2; /* 104 unused? */ + UINT serastring; /* 108 CAL_SERASTRING */ + UINT sabbreverastring; /* 10c CAL_SABBREVERASTRING */ + UINT unused3; /* 110 unused? */ + UINT sconsolefallbackname; /* 114 LOCALE_SCONSOLEFALLBACKNAME */ + UINT sshorttime; /* 118 LOCALE_SSHORTTIME (array of formats) */ + UINT sshortestdayname; /* 11c LOCALE_SSHORTESTDAYNAME1 (array of days 1..7) */ + UINT unused4; /* 120 unused? */ + UINT ssortlocale; /* 124 LOCALE_SSORTLOCALE */ + UINT skeyboardstoinstall; /* 128 LOCALE_SKEYBOARDSTOINSTALL */ + UINT sscripts; /* 12c LOCALE_SSCRIPTS */ + UINT srelativelongdate; /* 130 LOCALE_SRELATIVELONGDATE */ + UINT igeoid; /* 134 LOCALE_IGEOID */ + UINT sshortestam; /* 138 LOCALE_SSHORTESTAM */ + UINT sshortestpm; /* 13c LOCALE_SSHORTESTPM */ + UINT smonthday; /* 140 LOCALE_SMONTHDAY (array of formats) */ + UINT keyboard_layout; /* 144 keyboard layouts */ +} NLS_LOCALE_DATA; + +typedef struct +{ + UINT id; /* 00 lcid */ + USHORT idx; /* 04 index in locales array */ + USHORT name; /* 06 locale name */ +} NLS_LOCALE_LCID_INDEX; + +typedef struct +{ + USHORT name; /* 00 locale name */ + USHORT idx; /* 02 index in locales array */ + UINT id; /* 04 lcid */ +} NLS_LOCALE_LCNAME_INDEX; + +typedef struct +{ + UINT offset; /* 00 offset to version, always 8? */ + UINT unknown1; /* 04 */ + UINT version; /* 08 file format version */ + UINT magic; /* 0c magic 'NSDS' */ + UINT unknown2[3]; /* 10 */ + USHORT header_size; /* 1c size of this header (?) */ + USHORT nb_lcids; /* 1e number of lcids in index */ + USHORT nb_locales; /* 20 number of locales in array */ + USHORT locale_size; /* 22 size of NLS_LOCALE_DATA structure */ + UINT locales_offset; /* 24 offset of locales array */ + USHORT nb_lcnames; /* 28 number of lcnames in index */ + USHORT pad; /* 2a */ + UINT lcids_offset; /* 2c offset of lcids index */ + UINT lcnames_offset; /* 30 offset of lcnames index */ + UINT unknown3; /* 34 */ + USHORT nb_calendars; /* 38 number of calendars in array */ + USHORT calendar_size; /* 3a size of calendar structure */ + UINT calendars_offset; /* 3c offset of calendars array */ + UINT strings_offset; /* 40 offset of strings data */ + USHORT unknown4[4]; /* 44 */ +} NLS_LOCALE_HEADER; + #endif /* __WINESRC__ */ #ifdef __cplusplus

1 0

Alexandre Julliard : ntdll: Load the locale.nls file at startup.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 4b0f1163fae90e0852e97c07043c85b975f2cede URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0f1163fae90e0852e97c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:30:01 2022 +0100 ntdll: Load the locale.nls file at startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/locale.c | 35 ++++++++++++++++++++++++++++++++++- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d3b63dc7ada..f84746b7f1b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4129,6 +4129,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR RtlInitAnsiString( &func_name, "CtrlRoutine" ); LdrGetProcedureAddress( kernel32_handle, &func_name, 0, (void **)&pCtrlRoutine ); + locale_init(); actctx_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 360496dd7e1..c60e6f2cf3e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -100,9 +100,12 @@ struct norm_table /* WORD[] composition character sequences */ }; +static const WCHAR *locale_strings; static NLSTABLEINFO nls_info; static struct norm_table *norm_tables[16]; - +static const NLS_LOCALE_LCID_INDEX *lcids_index; +static const NLS_LOCALE_LCNAME_INDEX *lcnames_index; +static const NLS_LOCALE_HEADER *locale_table; static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) { @@ -235,6 +238,36 @@ invalid: } +void locale_init(void) +{ + LARGE_INTEGER unused; + LCID system_lcid; + NTSTATUS status; + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header; + + status = RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &unused ); + if (status) + { + ERR( "locale init failed %x\n", status ); + return; + } + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset); + lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); +} + + static BYTE rol( BYTE val, BYTE count ) { return (val << count) | (val >> (8 - count)); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index d7c5ade5bc1..571b49e844c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -66,6 +66,7 @@ extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; +extern void locale_init(void) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN;

1 0