January 2017 - Wine-Commits

Andrew Eikum : quartz: Downgrade FIXME->WARN.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: e2a4974f399df7e3a4c97b3bd1348ea8fb9d5930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a4974f399df7e3a4c97b3bd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 15:13:01 2017 -0600 quartz: Downgrade FIXME->WARN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2bd08f1..92c30c1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2379,7 +2379,7 @@ static HRESULT WINAPI MediaSeeking_IsFormatSupported(IMediaSeeking *iface, const if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { - FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + WARN("Unhandled time format %s\n", debugstr_guid(pFormat)); return S_FALSE; }

1 0

Nikolay Sivov : comdlg32: Always use original Open File dialog template.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 6c4aaf776faf6bf465e3a06bb68a7c7e998b68be URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4aaf776faf6bf465e3a06bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:56:09 2017 +0300 comdlg32: Always use original Open File dialog template. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 50 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 67b3566..d0d00b3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -248,11 +248,8 @@ static BOOL BrowseSelectedFolder(HWND hwnd); */ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { - LRESULT lRes; - LPCVOID origTemplate; - DWORD dwSize; - LPDLGTEMPLATEW template; + void *template; HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr; @@ -271,36 +268,25 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; } - if (!(dwSize = SizeofResource(COMDLG32_hInstance, hRes)) || - !(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes)) || - !(origTemplate = LockResource(hDlgTmpl))) + if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || + !(template = LockResource( hDlgTmpl ))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - if (!(template = HeapAlloc(GetProcessHeap(), 0, dwSize))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - return FALSE; - } - memcpy(template, origTemplate, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or - * custom tmeplate is provided */ + * custom template is provided */ if( (fodInfos->ofnInfos->Flags & OFN_EXPLORER) && !(fodInfos->ofnInfos->Flags & ( OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) fodInfos->ofnInfos->Flags |= OFN_ENABLESIZING; if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - template->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } - else - template->style &= ~WS_SIZEBOX; - /* old style hook messages */ if (IsHooked(fodInfos)) @@ -329,8 +315,6 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (SUCCEEDED(hr)) OleUninitialize(); - HeapFree(GetProcessHeap(), 0, template); - /* Unable to create the dialog */ if( lRes == -1) return FALSE; @@ -1286,7 +1270,31 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - GetWindowRect( hwnd, &rc); + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + DWORD ex_style = GetWindowLongW(hwnd, GWL_EXSTYLE); + RECT client, client_adjusted; + + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + style |= WS_SIZEBOX; + ex_style |= WS_EX_WINDOWEDGE; + } + else + style &= ~WS_SIZEBOX; + SetWindowLongW(hwnd, GWL_STYLE, style); + SetWindowLongW(hwnd, GWL_EXSTYLE, ex_style); + + GetClientRect( hwnd, &client ); + GetClientRect( hwnd, &client_adjusted ); + AdjustWindowRectEx( &client_adjusted, style, FALSE, ex_style ); + + GetWindowRect( hwnd, &rc ); + rc.right += client_adjusted.right - client.right; + rc.bottom += client_adjusted.bottom - client.bottom; + SetWindowPos(hwnd, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_FRAMECHANGED | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOMOVE); + + GetWindowRect( hwnd, &rc ); fodInfos->DlgInfos.hwndGrip = CreateWindowExA( 0, "SCROLLBAR", NULL, WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS |

1 0

Andrey Gusev : ntdll: Move UnregisterTraceGuids from advapi32 to ntdll.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 03d22addd12dfc752448cbae6ee738ad1576bbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d22addd12dfc752448cbae6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 25 17:18:43 2017 +0200 ntdll: Move UnregisterTraceGuids from advapi32 to ntdll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 14 -------------- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8e2911c..3bd6382 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -783,7 +783,7 @@ # @ stub UninstallApplication @ stdcall UnlockServiceDatabase (ptr) # @ stub UnregisterIdleTask -@ stdcall UnregisterTraceGuids(int64) +@ stdcall UnregisterTraceGuids(int64) ntdll.EtwUnregisterTraceGuids @ stub UpdateTraceA @ stub UpdateTraceW # @ stub UsePinForEncryptedFilesA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index c1dbb99..93d814c 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -815,20 +815,6 @@ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTra } /****************************************************************************** - * UnregisterTraceGuids [ADVAPI32.@] - * - * See RegisterTraceGuids - * - * FIXME - * Stub. - */ -ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) -{ - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index ceb82f6..40a8785 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -445,3 +445,15 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; } + +/****************************************************************************** + * EtwUnregisterTraceGuids (NTDLL.@) + */ +ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) +{ + if (!RegistrationHandle) + return ERROR_INVALID_PARAMETER; + + FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fc6074c..28dc60c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -46,6 +46,7 @@ @ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall EtwUnregisterTraceGuids(int64) # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall

1 0

Nikolay Sivov : dwrite: Implement another variant of CreateGlyphRunAnalysis().
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: c32a19f198c7b68ff21c56f1869dc6d4bac689e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32a19f198c7b68ff21c56f18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:46 2017 +0300 dwrite: Implement another variant of CreateGlyphRunAnalysis(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 55 +++++++++++++++++++++++++++++--------------- dlls/dwrite/main.c | 14 +++++++++-- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7d1cfa8..882567c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -143,7 +143,7 @@ struct glyphrunanalysis_desc { const DWRITE_GLYPH_RUN *run; const DWRITE_MATRIX *transform; - DWRITE_RENDERING_MODE rendering_mode; + DWRITE_RENDERING_MODE1 rendering_mode; DWRITE_MEASURING_MODE measuring_mode; DWRITE_GRID_FIT_MODE gridfit_mode; DWRITE_TEXT_ANTIALIAS_MODE aa_mode; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9ddce0..01719a3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -166,7 +166,7 @@ struct dwrite_glyphrunanalysis { IDWriteGlyphRunAnalysis IDWriteGlyphRunAnalysis_iface; LONG ref; - DWRITE_RENDERING_MODE rendering_mode; + DWRITE_RENDERING_MODE1 rendering_mode; DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; FLOAT ppdip; @@ -1167,7 +1167,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac emSize *= max(dpiX, dpiY) / 96.0f; - *rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; + *rendering_mode = DWRITE_RENDERING_MODE1_DEFAULT; *gridfit_mode = DWRITE_GRID_FIT_MODE_DEFAULT; if (params) { IDWriteRenderingParams3 *params3; @@ -4757,6 +4757,19 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) return ref; } +static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) +{ + switch (mode) + { + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: + return TRUE; + default: + return FALSE; + } +} + static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -4787,8 +4800,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface3; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; - glyph_bitmap.nohint = analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL || - analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; + glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -4836,8 +4848,8 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return E_INVALIDARG; } - if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE_ALIASED) || - (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE_ALIASED)) { + if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE1_ALIASED) || + (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)) { memset(bounds, 0, sizeof(*bounds)); return S_OK; } @@ -4889,8 +4901,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface2; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; - glyph_bitmap.nohint = analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL || - analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; + glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); glyph_bitmap.type = type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -5018,14 +5029,15 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi /* validate requested texture type with rendering mode */ switch (This->rendering_mode) { - case DWRITE_RENDERING_MODE_ALIASED: + case DWRITE_RENDERING_MODE1_ALIASED: if (type != DWRITE_TEXTURE_ALIASED_1x1) return DWRITE_E_UNSUPPORTEDOPERATION; break; - case DWRITE_RENDERING_MODE_GDI_CLASSIC: - case DWRITE_RENDERING_MODE_GDI_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_GDI_CLASSIC: + case DWRITE_RENDERING_MODE1_GDI_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: if (type != DWRITE_TEXTURE_CLEARTYPE_3x1) return DWRITE_E_UNSUPPORTEDOPERATION; break; @@ -5071,8 +5083,8 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys switch (This->rendering_mode) { - case DWRITE_RENDERING_MODE_GDI_CLASSIC: - case DWRITE_RENDERING_MODE_GDI_NATURAL: + case DWRITE_RENDERING_MODE1_GDI_CLASSIC: + case DWRITE_RENDERING_MODE1_GDI_NATURAL: { UINT value = 0; SystemParametersInfoW(SPI_GETFONTSMOOTHINGCONTRAST, 0, &value, 0); @@ -5081,9 +5093,12 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys *cleartypelevel = 1.0f; break; } - case DWRITE_RENDERING_MODE_ALIASED: - case DWRITE_RENDERING_MODE_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: + WARN("Downsampled mode is ignored.\n"); + /* fallthrough */ + case DWRITE_RENDERING_MODE1_ALIASED: + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: *gamma = IDWriteRenderingParams_GetGamma(params); *contrast = IDWriteRenderingParams_GetEnhancedContrast(params); *cleartypelevel = IDWriteRenderingParams_GetClearTypeLevel(params); @@ -5133,7 +5148,9 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit *ret = NULL; /* check for valid rendering mode */ - if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE_OUTLINE || desc->rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED || + desc->rendering_mode == DWRITE_RENDERING_MODE1_OUTLINE || + desc->rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) return E_INVALIDARG; analysis = heap_alloc(sizeof(*analysis)); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 50a4c1c..a493578 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1291,11 +1291,21 @@ static HRESULT WINAPI dwritefactory3_CreateGlyphRunAnalysis(IDWriteFactory4 *ifa IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); + struct glyphrunanalysis_desc desc; - FIXME("(%p)->(%p %p %d %d %d %d %.2f %.2f %p): stub\n", This, run, transform, rendering_mode, measuring_mode, + TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - return E_NOTIMPL; + desc.run = run; + desc.ppdip = 1.0f; + desc.transform = transform; + desc.rendering_mode = rendering_mode; + desc.measuring_mode = measuring_mode; + desc.gridfit_mode = gridfit_mode; + desc.aa_mode = aa_mode; + desc.origin_x = originX; + desc.origin_y = originY; + return create_glyphrunanalysis(&desc, analysis); } static HRESULT WINAPI dwritefactory3_CreateCustomRenderingParams(IDWriteFactory4 *iface, FLOAT gamma, FLOAT contrast,

1 0

André Hentschel : winebus.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 1afcfc77d376916466035ab5c085dcb8201ecd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afcfc77d376916466035ab5c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:58 2017 +0100 winebus.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ed95435..978540b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS @@ -303,7 +304,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) EnterCriticalSection(&ext->report_cs); while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_CANCELLED; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -525,7 +526,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } else { - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } LeaveCriticalSection(&ext->report_cs); @@ -613,7 +614,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { IO_STACK_LOCATION *irpsp; TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irpsp = IoGetCurrentIrpStackLocation(irp); irp->IoStatus.u.Status = deliver_last_report(ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

Nikolay Sivov : shell32/shellview: Set subitem callbacks for every column.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 2cce196210b82a94046389fe7f90d25da7d908d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cce196210b82a94046389fe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:51:31 2017 +0300 shell32/shellview: Set subitem callbacks for every column. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c15a32d..92eda55 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -562,22 +562,29 @@ static int LV_FindItemByPidl( return -1; } -/********************************************************** -* LV_AddItem() -*/ -static void shellview_add_item(IShellViewImpl * This, LPCITEMIDLIST pidl) +static void shellview_add_item(IShellViewImpl *shellview, LPCITEMIDLIST pidl) { - LVITEMW lvItem; + LVITEMW item; + UINT i; - TRACE("(%p)(pidl=%p)\n", This, pidl); + TRACE("(%p)(pidl=%p)\n", shellview, pidl); - lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ - lvItem.iItem = 0; - lvItem.iSubItem = 0; - lvItem.lParam = (LPARAM)pidl; - lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ - lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - ListView_InsertItemW(This->hWndList, &lvItem); + item.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = (LPARAM)pidl; + item.pszText = LPSTR_TEXTCALLBACKW; + item.iImage = I_IMAGECALLBACK; + SendMessageW(shellview->hWndList, LVM_INSERTITEMW, 0, (LPARAM)&item); + + for (i = 1; i < shellview->columns; i++) + { + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = LPSTR_TEXTCALLBACKW; + SendMessageW(shellview->hWndList, LVM_SETITEMW, 0, (LPARAM)&item); + } } /**********************************************************

1 0

Nikolay Sivov : shell32/shellview: Get rid of intermediate pointer array when filling ListView.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: a26d6e375e394f7672555c2ae51fd5aaa03d0525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26d6e375e394f7672555c2ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:51:30 2017 +0300 shell32/shellview: Get rid of intermediate pointer array when filling ListView. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 83 ++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 4560162..c15a32d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -110,6 +110,7 @@ typedef struct LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT ptLastMousePos; /* Mouse position at last DragOver call */ + UINT columns; /* Number of shell folder columns */ } IShellViewImpl; static inline IShellViewImpl *impl_from_IShellView3(IShellView3 *iface) @@ -383,7 +384,6 @@ static void ShellView_InitList(IShellViewImpl *This) SHELLDETAILS sd; WCHAR nameW[50]; HRESULT hr; - INT i; TRACE("(%p)\n", This); @@ -405,39 +405,36 @@ static void ShellView_InitList(IShellViewImpl *This) } } - for (i = 0; 1; i++) + for (This->columns = 0;; This->columns++) { if (This->pSF2Parent) - hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, This->columns, &sd); else - hr = IShellDetails_GetDetailsOf(details, NULL, i, &sd); + hr = IShellDetails_GetDetailsOf(details, NULL, This->columns, &sd); if (FAILED(hr)) break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); - SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, This->columns, (LPARAM)&lvColumn); } if (details) IShellDetails_Release(details); } -/********************************************************** -* ShellView_CompareItems() -* -* NOTES -* internal, CALLBACK for DSA_Sort -*/ -static INT CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData) +/* LVM_SORTITEMS callback used when initially inserting items */ +static INT CALLBACK ShellView_CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData) { - int ret; - TRACE("pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData); + LPITEMIDLIST pidl1 = (LPITEMIDLIST)lParam1; + LPITEMIDLIST pidl2 = (LPITEMIDLIST)lParam2; + IShellFolder *folder = (IShellFolder *)lpData; + int ret; - if(!lpData) return 0; + TRACE("pidl1=%p, pidl2=%p, shellfolder=%p\n", pidl1, pidl2, folder); - ret = (SHORT) SCODE_CODE(IShellFolder_CompareIDs((LPSHELLFOLDER)lpData, 0, (LPITEMIDLIST)lParam1, (LPITEMIDLIST)lParam2)); - TRACE("ret=%i\n",ret); - return ret; + ret = (SHORT)HRESULT_CODE(IShellFolder_CompareIDs(folder, 0, pidl1, pidl2)); + TRACE("ret=%i\n", ret); + return ret; } /************************************************************************* @@ -568,19 +565,19 @@ static int LV_FindItemByPidl( /********************************************************** * LV_AddItem() */ -static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) +static void shellview_add_item(IShellViewImpl * This, LPCITEMIDLIST pidl) { LVITEMW lvItem; TRACE("(%p)(pidl=%p)\n", This, pidl); lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ - lvItem.iItem = SendMessageW(This->hWndList, LVM_GETITEMCOUNT, 0, 0); /*add the item to the end of the list*/ + lvItem.iItem = 0; lvItem.iSubItem = 0; - lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ + lvItem.lParam = (LPARAM)pidl; lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - return ListView_InsertItemW(This->hWndList, &lvItem) != -1; + ListView_InsertItemW(This->hWndList, &lvItem); } /********************************************************** @@ -618,16 +615,6 @@ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCIT * - fills the list into the view */ -static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) -{ - LPITEMIDLIST pidl = ptr; - IShellViewImpl *This = arg; - /* in a commdlg This works as a filemask*/ - if ( IncludeObject(This, pidl)==S_OK ) LV_AddItem(This, pidl); - SHFree(pidl); - return TRUE; -} - static HRESULT ShellView_FillList(IShellViewImpl *This) { IFolderView2 *folderview = &This->IFolderView2_iface; @@ -635,40 +622,28 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) LPITEMIDLIST pidl; DWORD fetched; HRESULT hr; - HDPA hdpa; TRACE("(%p)\n", This); /* get the itemlist from the shfolder*/ hr = IShellFolder_EnumObjects(This->pSFParent, This->hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList); - if (hr != S_OK) return hr; + if (hr != S_OK) + return hr; - /* create a pointer array */ - hdpa = DPA_Create(16); - if (!hdpa) - { - IEnumIDList_Release(pEnumIDList); - return E_OUTOFMEMORY; - } + IFolderView2_SetRedraw(folderview, FALSE); - /* copy the items into the array*/ - while((S_OK == IEnumIDList_Next(pEnumIDList, 1, &pidl, &fetched)) && fetched) + /* copy the items into the array */ + while ((S_OK == IEnumIDList_Next(pEnumIDList, 1, &pidl, &fetched)) && fetched) { - if (DPA_InsertPtr(hdpa, DPA_GetPtrCount(hdpa), pidl) == -1) - { - SHFree(pidl); - } + if (IncludeObject(This, pidl) == S_OK) + shellview_add_item(This, pidl); } - /* sort the array */ - DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); + SendMessageW(This->hWndList, LVM_SORTITEMS, (WPARAM)This->pSFParent, (LPARAM)ShellView_CompareItems); - IFolderView2_SetRedraw(folderview, FALSE); - DPA_DestroyCallback(hdpa, fill_list, This); IFolderView2_SetRedraw(folderview, TRUE); IEnumIDList_Release(pEnumIDList); - return S_OK; } @@ -1626,6 +1601,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pidls, LONG event) { + LPCITEMIDLIST pidl; BOOL ret = TRUE; TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pidls[0], pidls[1], event); @@ -1634,7 +1610,8 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pi { case SHCNE_MKDIR: case SHCNE_CREATE: - LV_AddItem(This, pidls[0]); + pidl = ILClone(ILFindLastID(pidls[0])); + shellview_add_item(This, pidl); break; case SHCNE_RMDIR: case SHCNE_DELETE:

1 0

Nikolay Sivov : comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 970029bb9ba33928bb20c5e397d47f023e4a6501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970029bb9ba33928bb20c5e39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:50:54 2017 +0300 comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 13 ++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f2f7924..a8bcd40 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2367,6 +2367,47 @@ static void test_save(void) RegCloseKey( key ); } +static void test_drawtext_flags(void) +{ + HWND hwnd = NULL; + UINT flags; + + rebuild_toolbar(&hwnd); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + + /* zero mask, flags are retained */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + /* set/remove */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags); + ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2411,6 +2452,7 @@ START_TEST(toolbar) test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); + test_drawtext_flags(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0c545a2..784745c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4546,17 +4546,16 @@ TOOLBAR_SetDisabledImageList (TOOLBAR_INFO *infoPtr, WPARAM wParam, HIMAGELIST h static LRESULT -TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) { - DWORD dwTemp; + DWORD old_flags; - TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", infoPtr->hwndSelf, (DWORD)wParam, (DWORD)lParam); + TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); - dwTemp = infoPtr->dwDTFlags; - infoPtr->dwDTFlags = - (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; + old_flags = infoPtr->dwDTFlags; + infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); - return (LRESULT)dwTemp; + return (LRESULT)old_flags; } /* This function differs a bit from what MSDN says it does:

1 0

Aric Stewart : hid/tests: Add HID device enumeration test.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 178400b2bf4840dd1b370dfd8af652ed9f332f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178400b2bf4840dd1b370dfd8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:19:23 2017 -0600 hid/tests: Add HID device enumeration test. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/hid/tests/Makefile.in | 5 +++ dlls/hid/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/configure b/configure index 1a96117..5bfad88 100755 --- a/configure +++ b/configure @@ -17995,6 +17995,7 @@ wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx clean,implib htmlhelp wine_fn_config_dll hid enable_hid implib +wine_fn_config_test dlls/hid/tests hid_test wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test diff --git a/configure.ac b/configure.ac index 353f271..d468bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -3056,6 +3056,7 @@ WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) WINE_CONFIG_DLL(hhctrl.ocx,,[clean,implib],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) +WINE_CONFIG_TEST(dlls/hid/tests) WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) diff --git a/dlls/hid/tests/Makefile.in b/dlls/hid/tests/Makefile.in new file mode 100644 index 0000000..6bf3773 --- /dev/null +++ b/dlls/hid/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = hid.dll +IMPORTS = hid setupapi + +C_SRCS = \ + device.c diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c new file mode 100644 index 0000000..068360a --- /dev/null +++ b/dlls/hid/tests/device.c @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017 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 "ntstatus.h" +#define WIN32_NO_STATUS +#include "windows.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" + +#include "wine/test.h" + +typedef void (device_test)(HANDLE device); + +static void test_device_info(HANDLE device) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + NTSTATUS status; + BOOL rc; + WCHAR device_name[128]; + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + 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); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); +} + +static void run_for_each_device(device_test *test) +{ + GUID hid_guid; + HDEVINFO info_set; + DWORD index = 0; + SP_DEVICE_INTERFACE_DATA interface_data; + DWORD detail_size = MAX_PATH * sizeof(WCHAR); + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + + HidD_GetHidGuid(&hid_guid); + + ZeroMemory(&interface_data, sizeof(interface_data)); + interface_data.cbSize = sizeof(interface_data); + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + detail_size); + data->cbSize = sizeof(*data); + + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) + { + index ++; + + if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) + { + HANDLE file = CreateFileW(data->DevicePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + + test(file); + + CloseHandle(file); + } + } + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); +} + +START_TEST(device) +{ + run_for_each_device(test_device_info); +}

1 0

Aric Stewart : hid: Implement HidP_GetUsagesEx.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: cc00075a65e0a3c1e93418daeb2a22dd6fede377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc00075a65e0a3c1e93418dae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:07:04 2017 -0600 hid: Implement HidP_GetUsagesEx. 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 | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 6 ++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b1b6a35..205b626 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -29,7 +29,7 @@ @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetUsageValueArray @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) -@ stub HidP_GetUsagesEx +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9dcdeb6..d031b67 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -676,3 +676,90 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, return HIDP_STATUS_SUCCESS; } + +NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, + ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) +{ + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT b_count = 0, r_count = 0; + int i,uCount = 0; + NTSTATUS rc; + + TRACE("(%i, %i, %p, %p(%i), %p, %p, %i)\n", ReportType, LinkCollection, ButtonList, + UsageLength, *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; + + for (i = 0; i < report->elementCount; i++) + { + if (report->Elements[i].ElementType == ButtonElement) + { + 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; + if (v) + { + if (uCount < *UsageLength) + { + ButtonList[uCount].Usage = element->caps.button.u.Range.UsageMin + k; + ButtonList[uCount].UsagePage = element->caps.button.UsagePage; + } + uCount++; + } + } + } + } + + TRACE("Returning %i usages\n", uCount); + + if (*UsageLength < uCount) + rc = HIDP_STATUS_BUFFER_TOO_SMALL; + else + rc = HIDP_STATUS_SUCCESS; + + *UsageLength = uCount; + + return rc; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 9f0fd8f..2b0eebd 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -161,6 +161,11 @@ typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { } DUMMYUNIONNAME; } HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; +typedef struct _USAGE_AND_PAGE { + USAGE Usage; + USAGE UsagePage; +} USAGE_AND_PAGE, *PUSAGE_AND_PAGE; + typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); @@ -175,6 +180,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); +NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0