February 2020 - Wine-commits

Andrew Eikum : winealsa.drv: Clean up midiOpenSeq.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 983354c3f6744028548905c6b75ebfa222220e1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=983354c3f6744028548905c6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 12 12:52:53 2020 -0600 winealsa.drv: Clean up midiOpenSeq. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 58b10bf666..7be7bc58f3 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -243,33 +243,26 @@ static int midiOpenSeq(BOOL create_client) return -1; } - if (create_client) { - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + if (create_client) { + /* Setting the client name is the only init to do */ + snd_seq_set_client_name(midiSeq, "WINE midi driver"); -#if 0 /* FIXME: Is it possible to use a port for READ & WRITE ops */ - port_in = port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input/Output", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", + SND_SEQ_PORT_CAP_READ, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) - TRACE("Unable to create output port\n"); + TRACE("Unable to create output port\n"); else - TRACE("Outport port %d created successfully\n", port_out); -#else - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); - - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + TRACE("Outport port %d created successfully\n", port_out); + + port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port %d created successfully\n", port_in); -#endif - } + TRACE("Input port %d created successfully\n", port_in); + } } numOpenMidiSeq++; LeaveCriticalSection(&midiSeqLock);

1 0

Jacek Konieczny : winealsa.drv: Allow external MIDI port connection changes.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 1875887000b368cc57f2953cf8d2c043369674c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1875887000b368cc57f2953c… Author: Jacek Konieczny <jajcus(a)jajcus.net> Date: Wed Feb 12 12:53:25 2020 -0600 winealsa.drv: Allow external MIDI port connection changes. That is generally the expected behaviour of any ALSA sequencer client. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7be7bc58f3..879d48d824 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -248,16 +248,16 @@ static int midiOpenSeq(BOOL create_client) snd_seq_set_client_name(midiSeq, "WINE midi driver"); port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else

1 0

Jacek Konieczny : winealsa.drv: Send MIDI events to port subscribers.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 3d57cc2863f2f9a5ace40d29317b3ff4357fd119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d57cc2863f2f9a5ace40d29… Author: Jacek Konieczny <jajcus(a)jajcus.net> Date: Wed Feb 12 12:53:54 2020 -0600 winealsa.drv: Send MIDI events to port subscribers. This way changes to the port connections made by other applications will be honoured. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 879d48d824..f2fe6307bb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -871,7 +871,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { case MIDI_CMD_NOTE_OFF: @@ -1040,8 +1040,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event);

1 0

Alistair Leslie-Hughes : oledb32: Add All page to data Link dialog.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: fd82f1228fc9e6d988c1ffc05b64c3cb9d74d59f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd82f1228fc9e6d988c1ffc0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 12 04:52:54 2020 +0000 oledb32: Add All page to data Link dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 53 +++++++++++++++++++++++++++- dlls/oledb32/resource.h | 6 ++++ dlls/oledb32/version.rc | 12 +++++++ po/ar.po | 89 +++++++++++++++++++++++++++++------------------- po/ast.po | 87 +++++++++++++++++++++++++++------------------- po/bg.po | 89 +++++++++++++++++++++++++++++------------------- po/ca.po | 89 +++++++++++++++++++++++++++++------------------- po/cs.po | 89 +++++++++++++++++++++++++++++------------------- po/da.po | 89 +++++++++++++++++++++++++++++------------------- po/de.po | 89 +++++++++++++++++++++++++++++------------------- po/el.po | 88 ++++++++++++++++++++++++++++------------------- po/en.po | 87 +++++++++++++++++++++++++++------------------- po/en_US.po | 87 +++++++++++++++++++++++++++------------------- po/eo.po | 89 +++++++++++++++++++++++++++++------------------- po/es.po | 89 +++++++++++++++++++++++++++++------------------- po/fa.po | 86 +++++++++++++++++++++++++++------------------- po/fi.po | 89 +++++++++++++++++++++++++++++------------------- po/fr.po | 89 +++++++++++++++++++++++++++++------------------- po/he.po | 88 ++++++++++++++++++++++++++++------------------- po/hi.po | 86 +++++++++++++++++++++++++++------------------- po/hr.po | 89 +++++++++++++++++++++++++++++------------------- po/hu.po | 89 +++++++++++++++++++++++++++++------------------- po/it.po | 89 +++++++++++++++++++++++++++++------------------- po/ja.po | 89 +++++++++++++++++++++++++++++------------------- po/ko.po | 89 +++++++++++++++++++++++++++++------------------- po/lt.po | 89 +++++++++++++++++++++++++++++------------------- po/ml.po | 86 +++++++++++++++++++++++++++------------------- po/nb_NO.po | 89 +++++++++++++++++++++++++++++------------------- po/nl.po | 89 +++++++++++++++++++++++++++++------------------- po/or.po | 86 +++++++++++++++++++++++++++------------------- po/pa.po | 86 +++++++++++++++++++++++++++------------------- po/pl.po | 89 +++++++++++++++++++++++++++++------------------- po/pt_BR.po | 89 +++++++++++++++++++++++++++++------------------- po/pt_PT.po | 89 +++++++++++++++++++++++++++++------------------- po/rm.po | 86 +++++++++++++++++++++++++++------------------- po/ro.po | 89 +++++++++++++++++++++++++++++------------------- po/ru.po | 89 +++++++++++++++++++++++++++++------------------- po/si.po | 89 +++++++++++++++++++++++++++++------------------- po/sk.po | 89 +++++++++++++++++++++++++++++------------------- po/sl.po | 89 +++++++++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 88 ++++++++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 87 +++++++++++++++++++++++++++------------------- po/sv.po | 89 +++++++++++++++++++++++++++++------------------- po/ta.po | 85 ++++++++++++++++++++++++++------------------- po/te.po | 86 +++++++++++++++++++++++++++------------------- po/th.po | 88 ++++++++++++++++++++++++++++------------------- po/tr.po | 89 +++++++++++++++++++++++++++++------------------- po/uk.po | 89 +++++++++++++++++++++++++++++------------------- po/wa.po | 88 ++++++++++++++++++++++++++++------------------- po/wine.pot | 85 ++++++++++++++++++++++++++------------------- po/zh_CN.po | 89 +++++++++++++++++++++++++++++------------------- po/zh_TW.po | 89 +++++++++++++++++++++++++++++------------------- 52 files changed, 2674 insertions(+), 1716 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd82f1228fc9e6d988c1…

1 0

Dmitry Timoshkov : kerberos: Add support for SECQOP_WRAP_NO_ENCRYPT to SpSealMessage.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 92d77920fd4a0168f011c145e5bdf7d9e9cecc05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d77920fd4a0168f011c145… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 12 18:18:21 2020 +0800 kerberos: Add support for SECQOP_WRAP_NO_ENCRYPT to SpSealMessage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 3827e5ccbc..f426290673 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1413,11 +1413,21 @@ static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBuf } #ifdef SONAME_LIBGSSAPI_KRB5 -static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) +static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; + int token_idx, data_idx, conf_flag, conf_state; + + if (!quality_of_protection) + conf_flag = 1; /* confidentiality + integrity */ + else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } /* FIXME: multiple data buffers, read-only buffers */ if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; @@ -1439,7 +1449,7 @@ static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *messa iov[3].buffer.length = 0; iov[3].buffer.value = NULL; - ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + ret = pgss_wrap_iov( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) @@ -1452,11 +1462,21 @@ static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *messa return status_gss_to_sspi( ret ); } -static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) +static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; + int token_idx, data_idx, conf_flag, conf_state; + + if (!quality_of_protection) + conf_flag = 1; /* confidentiality + integrity */ + else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } /* FIXME: multiple data buffers, read-only buffers */ if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; @@ -1465,7 +1485,7 @@ static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) input.length = message->pBuffers[data_idx].cbBuffer; input.value = message->pBuffers[data_idx].pvBuffer; - ret = pgss_wrap( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); + ret = pgss_wrap( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); TRACE( "gss_wrap returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) @@ -1494,18 +1514,13 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual gss_ctx_id_t ctxt_handle; TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - if (quality_of_protection) - { - FIXME( "flags %08x not supported\n", quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (is_dce_style_context( ctxt_handle )) return seal_message_iov( ctxt_handle, message ); - return seal_message( ctxt_handle, message ); + if (is_dce_style_context( ctxt_handle )) return seal_message_iov( ctxt_handle, message, quality_of_protection ); + return seal_message( ctxt_handle, message, quality_of_protection ); #else FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); return SEC_E_UNSUPPORTED_FUNCTION;

1 0

Rémi Bernon : hid/tests: Call CancelIo before closing device.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: d63c7afc2043a0b3eb44feb370a8a974239a3c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63c7afc2043a0b3eb44feb3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:13:43 2020 +0100 hid/tests: Call CancelIo before closing device. This was causing some leak to be reported on wineserver shutdown when no data can be read from a device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index bb819cc83f..19f450045f 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -316,6 +316,7 @@ static void test_read_device(void) CloseHandle(overlapped.hEvent); rc = HidD_FreePreparsedData(ppd); ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CancelIo(device); CloseHandle(device); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, report);

1 0

Rémi Bernon : hid: Add HidP_GetLinkCollectionNodes stub.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 5c145acd4bd9555e873ca6d48cc15b5d596fa86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c145acd4bd9555e873ca6d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:13:44 2020 +0100 hid: Add HidP_GetLinkCollectionNodes stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 10 ++++++++++ include/ddk/hidpi.h | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b50e04d197..b8e29fef16 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -22,7 +22,7 @@ @ stdcall HidP_GetCaps(ptr ptr) @ stdcall HidP_GetData(long ptr ptr ptr ptr long) @ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) @ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9d631912c8..e0513af7fb 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -927,3 +927,13 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U return rc; } + +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, + ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + FIXME("stub (%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + + *LinkCollectionNodeLength = 0; + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 042c84dd1c..51d61ea854 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -175,6 +175,19 @@ typedef struct _HIDP_DATA { } DUMMYUNIONNAME; } HIDP_DATA, *PHIDP_DATA; +typedef struct _HIDP_LINK_COLLECTION_NODE { + USAGE LinkUsage; + USAGE LinkUsagePage; + USHORT Parent; + USHORT NumberOfChildren; + USHORT NextSibling; + USHORT FirstChild; + ULONG CollectionType : 8; + ULONG IsAlias : 1; + ULONG Reserved : 23; + PVOID UserContext; +} HIDP_LINK_COLLECTION_NODE, *PHIDP_LINK_COLLECTION_NODE; + typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); @@ -196,6 +209,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE Usa NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Rémi Bernon : hid/tests: Add tests for HidP_GetLinkCollectionNodes.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 9a9af8b39a564b08436ca1e3d2ec663d083fbf96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9af8b39a564b08436ca1e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:13:45 2020 +0100 hid/tests: Add tests for HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 19f450045f..b3e959d259 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -35,9 +35,12 @@ static void test_device_info(HANDLE device) PHIDP_PREPARSED_DATA ppd; HIDP_CAPS Caps; HIDD_ATTRIBUTES attributes; + HIDP_LINK_COLLECTION_NODE nodes[16]; + ULONG nodes_count; NTSTATUS status; BOOL rc; WCHAR device_name[128]; + int i; rc = HidD_GetPreparsedData(device, &ppd); ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); @@ -46,6 +49,40 @@ static void test_device_info(HANDLE device) rc = HidD_GetProductString(device, device_name, sizeof(device_name)); ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); trace("Found device %s (%02x, %02x)\n", wine_dbgstr_w(device_name), Caps.UsagePage, Caps.Usage); + + trace("LinkCollectionNodes: (%d)\n", Caps.NumberLinkCollectionNodes); + todo_wine + ok(Caps.NumberLinkCollectionNodes > 0, "Expected at least one link collection\n"); + + nodes_count = 0; + status = HidP_GetLinkCollectionNodes(nodes, &nodes_count, ppd); + todo_wine + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes succeeded:%x\n", status); + + nodes_count = ARRAY_SIZE(nodes); + status = HidP_GetLinkCollectionNodes(nodes, &nodes_count, ppd); + todo_wine + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes failed:%x\n", status); + + for (i = 0; i < nodes_count; ++i) + { + trace(" [%d] LinkUsage: %x LinkUsagePage: %x Parent: %x " + "NumberOfChildren: %x NextSibling: %x FirstChild: %x " + "CollectionType: %x IsAlias: %x UserContext: %p\n", + i, nodes[i].LinkUsage, nodes[i].LinkUsagePage, nodes[i].Parent, + nodes[i].NumberOfChildren, nodes[i].NextSibling, nodes[i].FirstChild, + nodes[i].CollectionType, nodes[i].IsAlias, nodes[i].UserContext); + } + + todo_wine + ok(nodes_count > 0, "Unexpected number of link collection nodes:%u.\n", nodes_count); + todo_wine + ok(nodes[0].LinkUsagePage == Caps.UsagePage, "Unexpected top collection usage page:%x\n", nodes[0].LinkUsagePage); + todo_wine + ok(nodes[0].LinkUsage == Caps.Usage, "Unexpected top collection usage:%x\n", nodes[0].LinkUsage); + todo_wine + ok(nodes[0].CollectionType == 1, "Unexpected top collection type:%x\n", nodes[0].CollectionType); + rc = HidD_FreePreparsedData(ppd); ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); rc = HidD_GetAttributes(device, &attributes);

1 0

Rémi Bernon : hid: Implement HidP_GetLinkCollectionNodes.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 56d529694be78e0b4e99055c332169494e4f5f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d529694be78e0b4e99055c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:13:46 2020 +0100 hid: Implement HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 24 +++++++++++++++++++++--- dlls/hid/tests/device.c | 7 ------- dlls/hidclass.sys/descriptor.c | 36 +++++++++++++++++++++++++++++++----- include/wine/hid.h | 13 +++++++++++++ 4 files changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index e0513af7fb..817e021fe4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -931,9 +931,27 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData) { - FIXME("stub (%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; + WINE_HID_LINK_COLLECTION_NODE *nodes = HID_NODES(data); + ULONG i; - *LinkCollectionNodeLength = 0; + TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); - return STATUS_NOT_IMPLEMENTED; + if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) + return HIDP_STATUS_BUFFER_TOO_SMALL; + + for (i = 0; i < data->caps.NumberLinkCollectionNodes; ++i) + { + LinkCollectionNode[i].LinkUsage = nodes[i].LinkUsage; + LinkCollectionNode[i].LinkUsagePage = nodes[i].LinkUsagePage; + LinkCollectionNode[i].Parent = nodes[i].Parent; + LinkCollectionNode[i].NumberOfChildren = nodes[i].NumberOfChildren; + LinkCollectionNode[i].NextSibling = nodes[i].NextSibling; + LinkCollectionNode[i].FirstChild = nodes[i].FirstChild; + LinkCollectionNode[i].CollectionType = nodes[i].CollectionType; + LinkCollectionNode[i].IsAlias = nodes[i].IsAlias; + } + *LinkCollectionNodeLength = data->caps.NumberLinkCollectionNodes; + + return HIDP_STATUS_SUCCESS; } diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index b3e959d259..24c307704f 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -51,17 +51,14 @@ static void test_device_info(HANDLE device) trace("Found device %s (%02x, %02x)\n", wine_dbgstr_w(device_name), Caps.UsagePage, Caps.Usage); trace("LinkCollectionNodes: (%d)\n", Caps.NumberLinkCollectionNodes); - todo_wine ok(Caps.NumberLinkCollectionNodes > 0, "Expected at least one link collection\n"); nodes_count = 0; status = HidP_GetLinkCollectionNodes(nodes, &nodes_count, ppd); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes succeeded:%x\n", status); nodes_count = ARRAY_SIZE(nodes); status = HidP_GetLinkCollectionNodes(nodes, &nodes_count, ppd); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes failed:%x\n", status); for (i = 0; i < nodes_count; ++i) @@ -74,13 +71,9 @@ static void test_device_info(HANDLE device) nodes[i].CollectionType, nodes[i].IsAlias, nodes[i].UserContext); } - todo_wine ok(nodes_count > 0, "Unexpected number of link collection nodes:%u.\n", nodes_count); - todo_wine ok(nodes[0].LinkUsagePage == Caps.UsagePage, "Unexpected top collection usage page:%x\n", nodes[0].LinkUsagePage); - todo_wine ok(nodes[0].LinkUsage == Caps.Usage, "Unexpected top collection usage:%x\n", nodes[0].LinkUsage); - todo_wine ok(nodes[0].CollectionType == 1, "Unexpected top collection type:%x\n", nodes[0].CollectionType); rc = HidD_FreePreparsedData(ppd); diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index af1679d23b..876369ad70 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -835,12 +835,14 @@ static void create_preparse_ctx(const struct collection *base, struct preparse_c create_preparse_ctx(c, ctx); } -static void preparse_collection(const struct collection *base, +static void preparse_collection(const struct collection *root, const struct collection *base, WINE_HIDP_PREPARSED_DATA *data, struct preparse_ctx *ctx) { WINE_HID_ELEMENT *elem = HID_ELEMS(data); + WINE_HID_LINK_COLLECTION_NODE *nodes = HID_NODES(data); struct feature *f; struct collection *c; + struct list *entry; LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { @@ -885,11 +887,29 @@ static void preparse_collection(const struct collection *base, } } + if (root != base) + { + nodes[base->index].LinkUsagePage = base->caps.UsagePage; + nodes[base->index].LinkUsage = base->caps.u.NotRange.Usage; + nodes[base->index].Parent = base->parent == root ? 0 : base->parent->index; + nodes[base->index].CollectionType = base->type; + nodes[base->index].IsAlias = 0; + + if ((entry = list_head(&base->collections))) + nodes[base->index].FirstChild = LIST_ENTRY(entry, struct collection, entry)->index; + } + LIST_FOR_EACH_ENTRY(c, &base->collections, struct collection, entry) - preparse_collection(c, data, ctx); + { + preparse_collection(root, c, data, ctx); + + if ((entry = list_next(&base->collections, &c->entry))) + nodes[c->index].NextSibling = LIST_ENTRY(entry, struct collection, entry)->index; + if (root != base) nodes[base->index].NumberOfChildren++; + } } -static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_collection) +static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_collection, unsigned int node_count) { WINE_HIDP_PREPARSED_DATA *data; unsigned int report_count; @@ -897,6 +917,7 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll struct preparse_ctx ctx; unsigned int element_off; + unsigned int nodes_offset; memset(&ctx, 0, sizeof(ctx)); create_preparse_ctx(base_collection, &ctx); @@ -906,14 +927,19 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll element_off = FIELD_OFFSET(WINE_HIDP_PREPARSED_DATA, reports[report_count]); size = element_off + (ctx.elem_count * sizeof(WINE_HID_ELEMENT)); + nodes_offset = size; + size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); data->magic = HID_MAGIC; data->dwSize = size; data->caps.Usage = base_collection->caps.u.NotRange.Usage; data->caps.UsagePage = base_collection->caps.UsagePage; + data->caps.NumberLinkCollectionNodes = node_count; data->elementOffset = element_off; + data->nodesOffset = nodes_offset; - preparse_collection(base_collection, data, &ctx); + preparse_collection(base_collection, base_collection, data, &ctx); return data; } @@ -981,7 +1007,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } } - data = build_PreparseData(base); + data = build_PreparseData(base, cidx); debug_print_preparsed(data); free_collection(base); diff --git a/include/wine/hid.h b/include/wine/hid.h index 319105d286..857dcae18f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -48,6 +48,17 @@ typedef struct __WINE_HID_REPORT DWORD elementIdx; } WINE_HID_REPORT; +typedef struct __WINE_HID_LINK_COLLECTION_NODE { + USAGE LinkUsage; + USAGE LinkUsagePage; + USHORT Parent; + USHORT NumberOfChildren; + USHORT NextSibling; + USHORT FirstChild; + BYTE CollectionType; + BYTE IsAlias; +} WINE_HID_LINK_COLLECTION_NODE; + typedef struct __WINE_HIDP_PREPARSED_DATA { DWORD magic; @@ -55,6 +66,7 @@ typedef struct __WINE_HIDP_PREPARSED_DATA HIDP_CAPS caps; DWORD elementOffset; + DWORD nodesOffset; DWORD reportCount[3]; BYTE reportIdx[3][256]; @@ -65,5 +77,6 @@ typedef struct __WINE_HIDP_PREPARSED_DATA #define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) #define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) #define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) +#define HID_NODES(d) ((WINE_HID_LINK_COLLECTION_NODE*)((BYTE*)(d) + (d)->nodesOffset)) #endif /* __WINE_PARSE_H */

1 0

Zebediah Figura : quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 6c8f52c4fbc100b0a38a34193f4e10a07b10f69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8f52c4fbc100b0a38a3419… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 12 09:34:15 2020 -0600 quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width. Spotted by Henri Verbeet. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 928e98f605..bc2a905650 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -627,7 +627,10 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; + unsigned int row_size; BITMAPINFOHEADER bih; + LONG i, size_left; + char *dst; HRESULT hr; TRACE("filter %p, size %d, image %p.\n", filter, *size, image); @@ -661,10 +664,19 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L if (FAILED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_READONLY))) goto out; - memcpy(image, &bih, min(*size, sizeof(BITMAPINFOHEADER))); - if (*size > sizeof(BITMAPINFOHEADER)) - memcpy((char *)image + sizeof(BITMAPINFOHEADER), locked_rect.pBits, - min(*size - sizeof(BITMAPINFOHEADER), bih.biSizeImage)); + size_left = *size; + memcpy(image, &bih, min(size_left, sizeof(BITMAPINFOHEADER))); + size_left -= sizeof(BITMAPINFOHEADER); + + dst = (char *)image + sizeof(BITMAPINFOHEADER); + row_size = bih.biWidth * bih.biBitCount / 8; + + for (i = 0; i < bih.biHeight && size_left > 0; ++i) + { + memcpy(dst, (char *)locked_rect.pBits + (i * locked_rect.Pitch), min(row_size, size_left)); + dst += row_size; + size_left -= row_size; + } IDirect3DSurface9_UnlockRect(surface);

1 0