July 2015 - Wine-Commits - list.winehq.org

Huw Davies : comctl32: Add helpers to set the button text.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: a29b6958e1315814a69730650528bddc92ff4292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29b6958e1315814a69730650… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:51 2015 +0100 comctl32: Add helpers to set the button text. --- dlls/comctl32/toolbar.c | 52 +++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2c7ed63..bbfc6b7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -328,6 +328,31 @@ TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) return HIWORD(btnPtr->iString) && btnPtr->iString != -1; } +static void set_string_index( TBUTTON_INFO *btn, INT_PTR str, BOOL unicode ) +{ + if (!IS_INTRESOURCE( str ) && str != -1) + { + if (!TOOLBAR_ButtonHasString( btn )) btn->iString = 0; + + if (unicode) + Str_SetPtrW( (WCHAR **)&btn->iString, (WCHAR *)str ); + else + Str_SetPtrAtoW( (WCHAR **)&btn->iString, (char *)str ); + } + else + { + if (TOOLBAR_ButtonHasString( btn )) Free( (WCHAR *)btn->iString ); + + btn->iString = str; + } +} + +static void set_stringT( TBUTTON_INFO *btn, const WCHAR *str, BOOL unicode ) +{ + if (IS_INTRESOURCE( (DWORD_PTR)str ) || (DWORD_PTR)str == -1) return; + set_string_index( btn, (DWORD_PTR)str, unicode ); +} + /*********************************************************************** * TOOLBAR_CheckStyle * @@ -1817,6 +1842,7 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto /* insert new buttons data */ for (iButton = 0; iButton < nAddButtons; iButton++) { TBUTTON_INFO *btnPtr = &infoPtr->buttons[iIndex + iButton]; + INT_PTR str; TOOLBAR_DumpTBButton(lpTbb + iButton, fUnicode); @@ -1827,18 +1853,13 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; btnPtr->dwData = lpTbb[iButton].dwData; + if (btnPtr->fsStyle & BTNS_SEP) - btnPtr->iString = -1; - else if(!IS_INTRESOURCE(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) - { - if (fUnicode) - Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString ); - else - Str_SetPtrAtoW((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[iButton].iString); - fHasString = TRUE; - } + str = -1; else - btnPtr->iString = lpTbb[iButton].iString; + str = lpTbb[iButton].iString; + set_string_index( btnPtr, str, fUnicode ); + fHasString |= TOOLBAR_ButtonHasString( btnPtr ); TOOLBAR_TooltipAddTool(infoPtr, btnPtr); } @@ -4320,15 +4341,8 @@ TOOLBAR_SetButtonInfo (TOOLBAR_INFO *infoPtr, INT Id, if (lptbbi->dwMask & TBIF_STYLE) btnPtr->fsStyle = lptbbi->fsStyle; - if ((lptbbi->dwMask & TBIF_TEXT) && ((INT_PTR)lptbbi->pszText != -1)) { - /* iString is index, zero it to make Str_SetPtr succeed */ - if (!TOOLBAR_ButtonHasString(btnPtr)) btnPtr->iString = 0; - - if (isW) - Str_SetPtrW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); - else - Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, (LPSTR)lptbbi->pszText); - } + if (lptbbi->dwMask & TBIF_TEXT) + set_stringT( btnPtr, lptbbi->pszText, isW ); /* save the button rect to see if we need to redraw the whole toolbar */ oldBtnRect = btnPtr->rect;

1 0

Michael Stefaniuc : dmime: Pass objects instead of ifaces to helpers.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: a2a2ea03115a9962d8e53e50d58b6d09a19ef3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a2ea03115a9962d8e53e50d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:30:36 2015 +0200 dmime: Pass objects instead of ifaces to helpers. --- dlls/dmime/segtriggertrack.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 277c26f..882ada2 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -256,8 +256,9 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_IsDirty (LPPERS return S_FALSE; } -static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface); +static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -312,7 +313,8 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS switch (Chunk.fccID) { case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -346,8 +348,9 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS return S_OK; } -static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegmentsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - /*ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -374,7 +377,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegmentsList (LPP switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_LIST: { TRACE_(dmfile)(": SEGMENT list\n"); - hr = IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (iface, &Chunk, pStm); + hr = parse_segment(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -400,8 +403,9 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegmentsList (LPP return S_OK; } -static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - /*ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_seqtrack_list(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -434,7 +438,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (LPP switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENTS_LIST: { TRACE_(dmfile)(": SEGMENTS list\n"); - hr = IDirectMusicSegTriggerTrack_IPersistStream_ParseSegmentsList (iface, &Chunk, pStm); + hr = parse_segments_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -478,7 +482,7 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST switch (Chunk.fccID) { case DMUS_FOURCC_SEGTRACK_LIST: { TRACE_(dmfile)(": segment trigger track list\n"); - hr = IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (iface, &Chunk, pStm); + hr = parse_seqtrack_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmstyle: Mark IPersistStream_Save() as stub.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 40769b4fadae605ee5656bab53205aad92c8b355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40769b4fadae605ee5656bab5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:29:59 2015 +0200 dmstyle: Mark IPersistStream_Save() as stub. --- dlls/dmstyle/auditiontrack.c | 14 +++++++++++++- dlls/dmstyle/chordtrack.c | 11 ++++++++--- dlls/dmstyle/commandtrack.c | 9 ++++++++- dlls/dmstyle/mutetrack.c | 14 +++++++++++++- dlls/dmstyle/tests/dmstyle.c | 2 +- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3239ed7..3c304ca 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -242,6 +242,11 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; +static inline IDirectMusicAuditionTrack * impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicAuditionTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); @@ -251,7 +256,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *st static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, BOOL cleardirty) { - return E_NOTIMPL; + IDirectMusicAuditionTrack *This = impl_from_IPersistStream(iface); + + FIXME("(%p, %p, %d): stub\n", This, stream, cleardirty); + + if (!stream) + return E_POINTER; + + return E_NOTIMPL; } static const IPersistStreamVtbl persiststream_vtbl = { diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index db4befc..fd290bf 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -376,9 +376,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, BOOL cleardirty) { - IDirectMusicChordTrack *This = impl_from_IPersistStream(iface); - FIXME("(%p): Saving not implemented yet\n", This); - return E_NOTIMPL; + IDirectMusicChordTrack *This = impl_from_IPersistStream(iface); + + FIXME("(%p, %p, %d): stub\n", This, stream, cleardirty); + + if (!stream) + return E_POINTER; + + return E_NOTIMPL; } static const IPersistStreamVtbl persiststream_vtbl = { diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 9f798e7..e326241 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -319,7 +319,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, BOOL cleardirty) { - return E_NOTIMPL; + IDirectMusicCommandTrack *This = impl_from_IPersistStream(iface); + + FIXME("(%p, %p, %d): stub\n", This, stream, cleardirty); + + if (!stream) + return E_POINTER; + + return E_NOTIMPL; } static const IPersistStreamVtbl persiststream_vtbl = { diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index c912ee0..67bfbc3 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -247,6 +247,11 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; +static inline IDirectMusicMuteTrack * impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicMuteTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); @@ -256,7 +261,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *st static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, BOOL cleardirty) { - return E_NOTIMPL; + IDirectMusicMuteTrack *This = impl_from_IPersistStream(iface); + + FIXME("(%p, %p, %d): stub\n", This, stream, cleardirty); + + if (!stream) + return E_POINTER; + + return E_NOTIMPL; } static const IPersistStreamVtbl persiststream_vtbl = { diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 9468c39..2677daa 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -339,7 +339,7 @@ static void test_track(void) hr = IPersistStream_Save(ps, NULL, TRUE); if (class[i].has_save) - todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); else ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmstyle: Pass objects instead of ifaces to helpers.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 040b3989976ca390351108d129029eecf0eeeb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040b3989976ca390351108d12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:12:22 2015 +0200 dmstyle: Pass objects instead of ifaces to helpers. --- dlls/dmstyle/chordtrack.c | 8 ++++---- dlls/dmstyle/styletrack.c | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 40f9018..1c7cb97 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -277,9 +277,9 @@ static HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicChordTrack_IPersistStream_ParseChordTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicChordTrack, PersistStreamVtbl, iface); +static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -371,7 +371,7 @@ static HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_CHORDTRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); - hr = IDirectMusicChordTrack_IPersistStream_ParseChordTrackList (iface, &Chunk, pStm); + hr = parse_chordtrack_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 4678552..8e02783 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -279,8 +279,9 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicStyleTrack, PersistStreamVtbl, iface); +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -325,7 +326,8 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR */ case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list, not yet handled\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -361,9 +363,9 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicStyleTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -390,7 +392,7 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (LPPERS switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_REF_LIST: { TRACE_(dmfile)(": STYLE_REF list\n"); - hr = IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (iface, &Chunk, pStm); + hr = parse_style_ref(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -434,7 +436,7 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_TRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); - hr = IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (iface, &Chunk, pStm); + hr = parse_styletrack_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Aric Stewart : hid: Implement HidD_GetInputReport.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: eac15cae713df14e4c379e306fc2aec99c8c3259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac15cae713df14e4c379e306… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:22 2015 -0500 hid: Implement HidD_GetInputReport. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index c72b0b8..9cb6440 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -5,7 +5,7 @@ @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) @ stub HidD_GetIndexedString -@ stub HidD_GetInputReport +@ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4c1c1fd..d880a5e 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -57,6 +57,12 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) *guid = GUID_DEVINTERFACE_HID; } +BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) +{ + TRACE("(%p %p %u) \n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); +} + BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u) \n", HidDeviceObject, Buffer, BufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index c8aae28..beac073 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -29,6 +29,7 @@ typedef LONG NTSTATUS; BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Aric Stewart : hid: Implement HidD_GetPreparsedData and HidD_FreePreparsedData.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 5b790bde5e2045aaa6678da6ca5903fec46ddc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b790bde5e2045aaa6678da6c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:13 2015 -0500 hid: Implement HidD_GetPreparsedData and HidD_FreePreparsedData. --- dlls/hid/hid.spec | 4 ++-- dlls/hid/hidd.c | 32 ++++++++++++++++++++++++++++++++ include/ddk/hidclass.h | 9 +++++++++ include/ddk/hidsdi.h | 2 ++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5659a88..c72b0b8 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,5 +1,5 @@ @ stub HidD_FlushQueue -@ stub HidD_FreePreparsedData +@ stdcall HidD_FreePreparsedData(ptr) @ stub HidD_GetAttributes @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @@ -10,7 +10,7 @@ @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers @ stub HidD_GetPhysicalDescriptor -@ stub HidD_GetPreparsedData +@ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stub HidD_GetSerialNumberString @ stub HidD_Hello diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 144e804..4c1c1fd 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -32,10 +32,19 @@ #include "winioctl.h" #include "ddk/wdm.h" +#include "hidusage.h" #include "ddk/hidclass.h" +#include "ddk/hidpi.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) +{ + TRACE("(%p)\n", PreparsedData); + HeapFree(GetProcessHeap(), 0, PreparsedData); + return TRUE; +} + BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); @@ -65,3 +74,26 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } + +BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) +{ + HID_COLLECTION_INFORMATION info; + PHIDP_PREPARSED_DATA data; + + TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); + + if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + return FALSE; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; + + if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL, NULL)) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } + *PreparsedData = data; + return TRUE; +} diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h index 81f892d..09dc467 100644 --- a/include/ddk/hidclass.h +++ b/include/ddk/hidclass.h @@ -56,6 +56,15 @@ DEFINE_GUID (GUID_DEVINTERFACE_HID, \ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) +typedef struct _HID_COLLECTION_INFORMATION { + ULONG DescriptorSize; + BOOLEAN Polled; + UCHAR Reserved1[1]; + USHORT VendorID; + USHORT ProductID; + USHORT VersionNumber; +} HID_COLLECTION_INFORMATION, *PHID_COLLECTION_INFORMATION; + #ifdef __cplusplus } #endif diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 5eb68ff..c8aae28 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -32,5 +32,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); +BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); +BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData); #endif /* __WINE_HIDSDI_H */

1 0

Aric Stewart : hid: Implement HidP_GetUsages.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 8bb231c4ae88f041e6d11e7929c850e3d55c04a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb231c4ae88f041e6d11e792… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:00 2015 -0500 hid: Implement HidP_GetUsages. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 128 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 214fa9e..5b63267 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -28,7 +28,7 @@ @ stub HidP_GetSpecificValueCaps @ stub HidP_GetUsageValue @ stub HidP_GetUsageValueArray -@ stub HidP_GetUsages +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stub HidP_InitializeReportForID diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 5823cfb..0cdad0c 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -37,6 +37,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); +static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) +{ + + if ((startBit + valueSize) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valueSize == 1) + { + ULONG byte_index = startBit / 8; + ULONG bit_index = startBit - (byte_index * 8); + INT mask = (1 << bit_index); + *value = (report[byte_index] & mask); + } + else + { + ULONG byte_index = (startBit + valueSize - 1) / 8; + ULONG data = 0; + ULONG remainingBits = valueSize; + while (remainingBits) + { + data <<= 8; + + if (remainingBits >= 8) + { + data |= report[byte_index]; + byte_index --; + remainingBits -= 8; + } + else if (remainingBits > 0) + { + BYTE mask = ~(0xff << (8-remainingBits)); + data |= report[byte_index] & mask; + remainingBits = 0; + } + } + *value = data; + } + return HIDP_STATUS_SUCCESS; +} + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { @@ -111,6 +151,92 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, } +NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + BOOL found = FALSE; + USHORT b_count = 0, r_count = 0; + int i,uCount; + + TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, + UsageLength, PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + b_count = data->caps.NumberInputButtonCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + b_count = data->caps.NumberOutputButtonCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + b_count = data->caps.NumberFeatureButtonCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !b_count || !report) + return HIDP_STATUS_USAGE_NOT_FOUND; + + for (i = 0; i < r_count; i++) + { + if (!report->reportID || report->reportID == Report[0]) + break; + report = HID_NEXT_REPORT(data, report); + } + + if (i == r_count) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + uCount = 0; + for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) + { + if (report->Elements[i].ElementType == ButtonElement && + report->Elements[i].caps.button.UsagePage == UsagePage) + { + int k; + WINE_HID_ELEMENT *element = &report->Elements[i]; + for (k=0; k < element->bitCount; k++) + { + UINT v = 0; + NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit + k, 1, &v); + if (rc != HIDP_STATUS_SUCCESS) + return rc; + found = TRUE; + if (v) + { + if (uCount == *UsageLength) + return HIDP_STATUS_BUFFER_TOO_SMALL; + UsageList[uCount] = element->caps.button.u.Range.UsageMin + k; + uCount++; + } + } + } + } + + if (!found) + return HIDP_STATUS_USAGE_NOT_FOUND; + + *UsageLength = uCount; + + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index c63d3e3..fddfa02 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -138,6 +138,7 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); +NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Aric Stewart : hid: Implement HidP_GetCaps.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 1e1599d961de93ba2d5bae2669a668a6553a030c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1599d961de93ba2d5bae266… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:39:40 2015 -0500 hid: Implement HidP_GetCaps. --- dlls/hid/Makefile.in | 1 + dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 53 ++++++++++++++++++++++++++++++++++++++ dlls/hid/parse.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index 3a115ca..97ae959 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = hid C_SRCS = \ hidd.c \ + hidp.c \ main.c RC_SRCS = version.rc diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index f58953a..9d7899f 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -19,7 +19,7 @@ @ stub HidD_SetNumInputBuffers @ stub HidD_SetOutputReport @ stub HidP_GetButtonCaps -@ stub HidP_GetCaps +@ stdcall HidP_GetCaps(ptr ptr) @ stub HidP_GetData @ stub HidP_GetExtendedAttributes @ stub HidP_GetLinkCollectionNodes diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c new file mode 100644 index 0000000..a6f462c --- /dev/null +++ b/dlls/hid/hidp.c @@ -0,0 +1,53 @@ +/* + * Human Input Devices + * + * Copyright (C) 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" + +#include "hidusage.h" +#include "ddk/hidpi.h" +#include "parse.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hidp); + +NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, + PHIDP_CAPS Capabilities) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + + TRACE("(%p, %p)\n",PreparsedData, Capabilities); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + *Capabilities = data->caps; + + return HIDP_STATUS_SUCCESS; +} diff --git a/dlls/hid/parse.h b/dlls/hid/parse.h new file mode 100644 index 0000000..1d902f8 --- /dev/null +++ b/dlls/hid/parse.h @@ -0,0 +1,72 @@ +/* + * Internal HID structures + * + * Copyright 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __HID_PARSE_H +#define __HID_PARSE_H + +#define HID_MAGIC 0x8491759 + +typedef enum { + UnknownElement = 0, + ButtonElement, + ValueElement, +} WINE_ELEMENT_TYPE; + +typedef struct +{ + WINE_ELEMENT_TYPE ElementType; + UINT valueStartBit; + UINT bitCount; + union { + HIDP_VALUE_CAPS value; + HIDP_BUTTON_CAPS button; + } caps; +} WINE_HID_ELEMENT; + +typedef struct +{ + UCHAR reportID; + DWORD dwSize; + DWORD elementCount; + WINE_HID_ELEMENT Elements[1]; +} WINE_HID_REPORT; + +typedef struct +{ + DWORD magic; + DWORD dwSize; + HIDP_CAPS caps; + + DWORD dwInputReportCount; + DWORD dwOutputReportCount; + DWORD dwFeatureReportCount; + + DWORD dwOutputReportOffset; + DWORD dwFeatureReportOffset; + + WINE_HID_REPORT InputReports[1]; +} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; + +#define HID_NEXT_REPORT(d,r) ((r)?(WINE_HID_REPORT*)(((BYTE*)(r))+(r)->dwSize):(d)->InputReports) +#define HID_INPUT_REPORTS(d) ((d)->InputReports) +#define HID_OUTPUT_REPORTS(d) ((WINE_HID_REPORT*)(((BYTE*)(d)->InputReports)+(d)->dwOutputReportOffset)) +#define HID_FEATURE_REPORTS(d) ((WINE_HID_REPORT*)(((BYTE*)(d)->InputReports)+(d)->dwFeatureReportOffset)) + +#endif /* __HID_PARSE_H */

1 0

Sebastian Lackner : ntdll/tests: Add threadpool scheduler tests for work items.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: b75d7f064c1e6af1a70119d3ce7b6e6250cf29d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75d7f064c1e6af1a70119d3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:59:01 2015 +0200 ntdll/tests: Add threadpool scheduler tests for work items. --- dlls/ntdll/tests/threadpool.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 46857b7..b261cd1 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -29,6 +29,7 @@ static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); +static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); static VOID (WINAPI *pTpWaitForWork)(TP_WORK *,BOOL); @@ -57,6 +58,7 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); NTDLL_GET_PROC(TpReleaseWork); + NTDLL_GET_PROC(TpSetPoolMaxThreads); NTDLL_GET_PROC(TpSimpleTryPost); NTDLL_GET_PROC(TpWaitForWork); @@ -182,6 +184,13 @@ static void CALLBACK work_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_ InterlockedIncrement((LONG *)userdata); } +static void CALLBACK work2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + trace("Running work2 callback\n"); + Sleep(10); + InterlockedExchangeAdd((LONG *)userdata, 0x10000); +} + static void test_tp_work(void) { TP_CALLBACK_ENVIRON environment; @@ -225,6 +234,79 @@ static void test_tp_work(void) pTpReleasePool(pool); } +static void test_tp_work_scheduler(void) +{ + TP_CALLBACK_ENVIRON environment; + TP_CLEANUP_GROUP *group; + TP_WORK *work, *work2; + TP_POOL *pool; + NTSTATUS status; + LONG userdata; + int i; + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* we limit the pool to a single thread */ + pTpSetPoolMaxThreads(pool, 1); + + /* create a cleanup group */ + group = NULL; + status = pTpAllocCleanupGroup(&group); + ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(group != NULL, "expected pool != NULL\n"); + + /* the first work item has no cleanup group associated */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + status = pTpAllocWork(&work, work_cb, &userdata, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + + /* allocate a second work item with a cleanup group */ + work2 = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpAllocWork(&work2, work2_cb, &userdata, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work2 != NULL, "expected work2 != NULL\n"); + + /* the 'work' callbacks are not blocking execution of 'work2' callbacks */ + userdata = 0; + for (i = 0; i < 10; i++) + pTpPostWork(work); + for (i = 0; i < 10; i++) + pTpPostWork(work2); + Sleep(30); + pTpWaitForWork(work, TRUE); + pTpWaitForWork(work2, TRUE); + ok(userdata & 0xffff, "expected userdata & 0xffff != 0, got %u\n", userdata & 0xffff); + ok(userdata >> 16, "expected userdata >> 16 != 0, got %u\n", userdata >> 16); + + /* test TpReleaseCleanupGroupMembers on a work item */ + userdata = 0; + for (i = 0; i < 100; i++) + pTpPostWork(work); + for (i = 0; i < 10; i++) + pTpPostWork(work2); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + pTpWaitForWork(work, TRUE); + ok((userdata & 0xffff) < 100, "expected userdata & 0xffff < 100, got %u\n", userdata & 0xffff); + ok((userdata >> 16) == 10, "expected userdata >> 16 == 10, got %u\n", userdata >> 16); + + /* cleanup */ + pTpReleaseWork(work); + pTpReleaseCleanupGroup(group); + pTpReleasePool(pool); +} + START_TEST(threadpool) { if (!init_threadpool()) @@ -232,4 +314,5 @@ START_TEST(threadpool) test_tp_simple(); test_tp_work(); + test_tp_work_scheduler(); }

1 0

Aric Stewart : hid: Implement HidP_GetScaledUsageValue.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 098efa1edc254916b7bda0fcd9a38162e5a7ad0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=098efa1edc254916b7bda0fcd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:41 2015 -0500 hid: Implement HidP_GetScaledUsageValue. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--------- include/ddk/hidpi.h | 1 + 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 8772a35..c7b056d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -23,7 +23,7 @@ @ stub HidP_GetData @ stub HidP_GetExtendedAttributes @ stub HidP_GetLinkCollectionNodes -@ stub HidP_GetScaledUsageValue +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetSpecificButtonCaps @ stub HidP_GetSpecificValueCaps @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d263880..3d7a12e 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -150,22 +150,20 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } - -NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, + WINE_HID_ELEMENT **element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_REPORT *report = NULL; USHORT v_count = 0, r_count = 0; int i; - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + TRACE("(%i, %x, %i, %i, %p, %p)\n", ReportType, UsagePage, LinkCollection, Usage, + PreparsedData, Report); if (data->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; - switch(ReportType) { case HidP_Input: @@ -206,15 +204,62 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, report->Elements[i].caps.value.UsagePage == UsagePage && report->Elements[i].caps.value.u.NotRange.Usage == Usage) { - return get_report_data((BYTE*)Report, ReportLength, - report->Elements[i].valueStartBit, - report->Elements[i].bitCount, UsageValue); + *element = &report->Elements[i]; + return HIDP_STATUS_SUCCESS; } } return HIDP_STATUS_USAGE_NOT_FOUND; } +NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, + USHORT LinkCollection, USAGE Usage, PLONG UsageValue, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +{ + NTSTATUS rc; + WINE_HID_ELEMENT *element; + TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + ULONG rawValue; + rc = get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, &rawValue); + if (rc != HIDP_STATUS_SUCCESS) + return rc; + if (element->caps.value.BitSize == 16) + rawValue = (short)rawValue; + *UsageValue = rawValue; + } + + return rc; +} + + +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + return get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, UsageValue); + } + + return rc; +} + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 40821de..527a966 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -143,6 +143,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); +NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0