March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : winebus.sys: Use public HID_USAGE_* constants.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 602f20826d3e2f04d5f46778edfe0c178565af5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=602f20826d3e2f04d5f46778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 16 21:19:38 2020 -0500 winebus.sys: Use public HID_USAGE_* constants. Fix a typo in the process (HID_USAGE_DIGITIZER_Y_TILT is 0x3E, not 0x3F). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 +++++++++--------- include/hidusage.h | 33 ++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 24d7961b06..51940ba088 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,8 +139,8 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -149,15 +149,15 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {0,0}, /*ABS_HAT2Y*/ {0,0}, /*ABS_HAT3X*/ {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ {0, 0}, /*ABS_TOOL_WIDTH*/ {0, 0}, {0, 0}, {0, 0}, - {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ + {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) @@ -245,9 +245,9 @@ static const BYTE* what_am_I(struct udev_device *dev) static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; - static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; - static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; - static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_PEN}; + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_PAD}; struct udev_device *parent = dev; diff --git a/include/hidusage.h b/include/hidusage.h index 67d698ed34..c45e2712fc 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -24,6 +24,21 @@ extern "C" { typedef USHORT USAGE, *PUSAGE; +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_CONSUMER_VOLUME ((USAGE) 0xE0) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) +#define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) +#define HID_USAGE_DIGITIZER_Y_TILT ((USAGE) 0x3E) +#define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_JOYSTICK ((USAGE) 0x04) @@ -183,16 +198,11 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) -#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) -#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) -#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) -#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) -#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) -#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) -#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) - #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) #define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) @@ -214,13 +224,6 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) - -#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) -#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) -#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) -#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) - #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : mfplat: Get rid of unsupported interface trace for 1D buffers.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: f056355071dea0549bee41399bcea5a9136ea54a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f056355071dea0549bee4139… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:34 2020 +0300 mfplat: Get rid of unsupported interface trace for 1D buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 323603cf21..05e1ce5fd6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -97,16 +97,13 @@ static HRESULT WINAPI memory_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID IsEqualIID(riid, &IID_IUnknown)) { *out = &buffer->IMFMediaBuffer_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; + IMFMediaBuffer_AddRef(iface); + return S_OK; } - IUnknown_AddRef((IUnknown*)*out); - return S_OK; + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI memory_buffer_AddRef(IMFMediaBuffer *iface)

1 0

Nikolay Sivov : mf: Forward sink invalidation events to application.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 43a88a7317bc989624bf97dfc199943544f8e9da URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a88a7317bc989624bf97df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:33 2020 +0300 mf: Forward sink invalidation events to application. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 07cfc4ee8c..69d1fdf569 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2492,6 +2492,38 @@ static void session_deliver_sample(struct media_session *session, IMFMediaStream IMFTopologyNode_Release(downstream_node); } +static void session_sink_invalidated(struct media_session *session, IMFMediaEvent *event, IMFStreamSink *sink) +{ + struct topo_node *node, *sink_node = NULL; + HRESULT hr; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_OUTPUT_NODE && node->object.sink_stream == sink) + { + sink_node = node; + break; + } + } + + if (!sink_node) + return; + + if (!event) + { + if (FAILED(hr = MFCreateMediaEvent(MESinkInvalidated, &GUID_NULL, S_OK, NULL, &event))) + WARN("Failed to create event, hr %#x.\n", hr); + } + + if (!event) + return; + + IMFMediaEvent_SetUINT64(event, &MF_EVENT_OUTPUT_NODE, sink_node->node_id); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + + session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED); +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2573,13 +2605,31 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM EnterCriticalSection(&session->cs); session_request_sample(session, (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); - break; + break; case MEMediaSample: EnterCriticalSection(&session->cs); session_deliver_sample(session, (IMFMediaStream *)event_source, &value); LeaveCriticalSection(&session->cs); + + break; + case MEAudioSessionDeviceRemoved: + case MEAudioSessionDisconnected: + case MEAudioSessionExclusiveModeOverride: + case MEAudioSessionFormatChanged: + case MEAudioSessionServerShutdown: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + /* fallthrough */ + case MESinkInvalidated: + + EnterCriticalSection(&session->cs); + session_sink_invalidated(session, event_type == MESinkInvalidated ? event : NULL, + (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + + break; default: ; }

1 0

Nikolay Sivov : mfplat: Implement ConvertToContiguousBuffer() for multiple buffers.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 6601fb3ead59fc05f1b57da97a68b683d93b44f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6601fb3ead59fc05f1b57da9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:29 2020 +0300 mfplat: Implement ConvertToContiguousBuffer() for multiple buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 110 ++++++++++++++++++++++++++++++++++++--------- dlls/mfplat/tests/mfplat.c | 23 +++++++--- 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 69633134f5..1727ff1e90 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1136,9 +1136,78 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF return hr; } +static unsigned int sample_get_total_length(struct sample *sample) +{ + DWORD total_length = 0, length; + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + { + length = 0; + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) + total_length += length; + } + + return total_length; +} + +static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buffer) +{ + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + return hr; +} + static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { struct sample *sample = impl_from_IMFSample(iface); + unsigned int total_length, i; + IMFMediaBuffer *dest_buffer; HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, buffer); @@ -1147,15 +1216,29 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi if (sample->buffer_count == 0) hr = E_UNEXPECTED; - else if (sample->buffer_count == 1) + else if (sample->buffer_count > 1) { - *buffer = sample->buffers[0]; - IMFMediaBuffer_AddRef(*buffer); + total_length = sample_get_total_length(sample); + if (SUCCEEDED(hr = MFCreateMemoryBuffer(total_length, &dest_buffer))) + { + if (SUCCEEDED(hr = sample_copy_to_buffer(sample, dest_buffer))) + { + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + + sample->buffers[0] = dest_buffer; + IMFMediaBuffer_AddRef(sample->buffers[0]); + + sample->buffer_count = 1; + } + IMFMediaBuffer_Release(dest_buffer); + } } - else + + if (SUCCEEDED(hr)) { - FIXME("Samples with multiple buffers are not supported.\n"); - hr = E_NOTIMPL; + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); } LeaveCriticalSection(&sample->attributes.cs); @@ -1225,21 +1308,6 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) return S_OK; } -static DWORD sample_get_total_length(struct sample *sample) -{ - DWORD total_length = 0, length; - size_t i; - - for (i = 0; i < sample->buffer_count; ++i) - { - length = 0; - if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - total_length += length; - } - - return total_length; -} - static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) { struct sample *sample = impl_from_IMFSample(iface); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 008aa05c30..21105f5ce5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1778,7 +1778,7 @@ static void test_system_memory_buffer(void) static void test_sample(void) { static const DWORD test_pattern = 0x22222222; - IMFMediaBuffer *buffer, *buffer2; + IMFMediaBuffer *buffer, *buffer2, *buffer3; DWORD count, flags, length; IMFAttributes *attributes; IMFSample *sample; @@ -1998,9 +1998,15 @@ static void test_sample(void) ok(buffer2 == buffer, "Unexpected buffer instance.\n"); IMFMediaBuffer_Release(buffer2); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMemoryBuffer(16, &buffer2); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(sample, buffer2); ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); IMFMediaBuffer_Release(buffer2); @@ -2009,15 +2015,22 @@ static void test_sample(void) ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); ok(count == 2, "Unexpected buffer count %u.\n", count); - hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); -todo_wine + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer3); ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + if (SUCCEEDED(hr)) - IMFMediaBuffer_Release(buffer2); + IMFMediaBuffer_Release(buffer3); hr = IMFSample_GetBufferCount(sample, &count); ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected buffer count %u.\n", count); IMFMediaBuffer_Release(buffer);

1 0

Alexandre Julliard : kernelbase: Use the ctype table from the sortkey file.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: c567af732b01231a0e4a653b994a89087b1642fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c567af732b01231a0e4a653b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:27:28 2020 +0100 kernelbase: Use the ctype table from the sortkey file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/locale.c | 114 +++--- dlls/kernelbase/wctype.c | 822 -------------------------------------------- tools/make_unicode | 27 -- 4 files changed, 43 insertions(+), 923 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c567af732b01231a0e4a…

1 0

Alexandre Julliard : ntdll: Support the sortkey file in NtGetNlsSectionPtr().
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: b408b07eae99ad94e3f12ee77d96090f94513fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b408b07eae99ad94e3f12ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:27:14 2020 +0100 ntdll: Support the sortkey file in NtGetNlsSectionPtr(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 8334de172d..afd65f3c02 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); enum nls_section_type { + NLS_SECTION_SORTKEYS = 9, NLS_SECTION_CASEMAP = 10, NLS_SECTION_CODEPAGE = 11, NLS_SECTION_NORMALIZE = 12 @@ -548,6 +549,9 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\','%','s',0}; + static const WCHAR sortdirW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', + 's','o','r','t','i','n','g','\\',0}; static const WCHAR cpW[] = {'C','o','d','e','p','a','g','e',0}; static const WCHAR normW[] = {'N','o','r','m','a','l','i','z','a','t','i','o','n',0}; static const WCHAR langW[] = {'L','a','n','g','u','a','g','e',0}; @@ -564,21 +568,26 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; static const WCHAR normidnaW[] = {'n','o','r','m','i','d','n','a','.','n','l','s',0}; + static const WCHAR sortkeysW[] = {'s','o','r','t','d','e','f','a','u','l','t','.','n','l','s',0}; DWORD size; HANDLE handle; - NTSTATUS status; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW, valueW; WCHAR buffer[MAX_PATH], value[10]; - const WCHAR *name = NULL; + const WCHAR *name = NULL, *dir = system_dir; KEY_VALUE_PARTIAL_INFORMATION *info; /* get filename from registry */ switch (type) { + case NLS_SECTION_SORTKEYS: + if (id) return STATUS_INVALID_PARAMETER_1; + buffer[0] = 0; + break; case NLS_SECTION_CASEMAP: if (id) return STATUS_UNSUCCESSFUL; sprintfW( buffer, keyfmtW, langW ); @@ -595,25 +604,33 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) default: return STATUS_INVALID_PARAMETER_1; } - RtlInitUnicodeString( &nameW, buffer ); - RtlInitUnicodeString( &valueW, value ); - InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) + + if (buffer[0]) { - info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - size = sizeof(buffer) - sizeof(WCHAR); - if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + RtlInitUnicodeString( &nameW, buffer ); + RtlInitUnicodeString( &valueW, value ); + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) { - ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; - name = (WCHAR *)info->Data; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + NtClose( handle ); } - NtClose( handle ); } if (!name || !*name) /* otherwise some hardcoded defaults */ { switch (type) { + case NLS_SECTION_SORTKEYS: + name = sortkeysW; + dir = sortdirW; + break; case NLS_SECTION_CASEMAP: name = intlW; break; @@ -637,10 +654,10 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) /* try to open file in system dir */ - valueW.MaximumLength = (strlenW(name) + strlenW(system_dir) + 5) * sizeof(WCHAR); + valueW.MaximumLength = (strlenW(name) + strlenW(dir) + 5) * sizeof(WCHAR); if (!(valueW.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, valueW.MaximumLength ))) return STATUS_NO_MEMORY; - valueW.Length = sprintfW( valueW.Buffer, pathfmtW, system_dir, name ) * sizeof(WCHAR); + valueW.Length = sprintfW( valueW.Buffer, pathfmtW, dir, name ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer ));

1 0

Alexandre Julliard : unicode: Store data for CT_CTYPE3 types.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: d87d4a4a045653aa03543c2ac122402bb6339def URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87d4a4a045653aa03543c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:47 2020 +0100 unicode: Store data for CT_CTYPE3 types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/wctype.c | 4 +- libs/port/wctype.c | 4 +- tools/make_unicode | 105 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 78 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87d4a4a045653aa0354…

1 0

Francois Gouget : shell32/tests: Fix some wording issues in shlexec comments.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 1ac9bf9e45beccbfa8ca3ce7a081aa5ef82f969e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac9bf9e45beccbfa8ca3ce7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 15 14:30:32 2020 +0100 shell32/tests: Fix some wording issues in shlexec comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525..0bc7eab0cd 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1105,12 +1105,12 @@ static void test_lpFile_parsed(void) return; } - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* if quoted, existing "drawback_file.noassoc" does not prevent finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, @@ -1127,7 +1127,7 @@ static void test_lpFile_parsed(void) todo_wine okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, "failed: rc=%lu\n", rc); - /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + /* nonexistent "drawback_nonexist.noassoc" does not prevent finding "drawback_nonexist.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc);

1 0

Francois Gouget : gameux/tests: Avoid an ever changing value in a gamestatistics failure message.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 142c8df4041c5ea2329a6328f1b1acaf495ce9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=142c8df4041c5ea2329a6328… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 23:56:34 2020 +0100 gameux/tests: Avoid an ever changing value in a gamestatistics failure message. The whole point of printing the IGameStatisticsMgr::GetGameStatistics() return value was to check whether the pointer had been modified. So provide this information without including an ever changing value in the failure message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index d823af1aab..8d4da4a0f4 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -181,7 +181,8 @@ static void test_gamestatisticsmgr( void ) gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); - ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); + ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", + (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); /* now, allow them to be created */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);

1 0

Alistair Leslie-Hughes : dmime: IDirectMusicGraph GetTool isn't a stub.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 04fe670aa6d58d44dbb760f6aafd86b9aa02117a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04fe670aa6d58d44dbb760f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 16 05:33:43 2020 +0000 dmime: IDirectMusicGraph GetTool isn't a stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index eebebef4d1..85eef9c091 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -149,8 +149,8 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - - FIXME("(%p, %d, %p): stub\n", This, dwIndex, ppTool); + + TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) {

1 0