May 2019 - Wine-commits - list.winehq.org

Roman Stingler : kernel32: Added some Numa stubs.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 52065a31d70dd9610388a094c70a6c9e34083ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52065a31d70dd9610388a094… Author: Roman Stingler <roman.stingler(a)gmail.com> Date: Wed May 8 22:34:08 2019 +0200 kernel32: Added some Numa stubs. Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 4 +-- dlls/kernel32/kernel32.spec | 8 ++--- dlls/kernel32/process.c | 37 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +- include/winbase.h | 8 +++++ 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 5531d2d..946e3de 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -29,9 +29,9 @@ @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId -@ stub GetNumaAvailableMemoryNodeEx +@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) @ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask -@ stub GetNumaProcessorNodeEx +@ stdcall GetNumaProcessorNodeEx(ptr ptr) @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA @ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA @ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2e2828e..8346575 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -742,16 +742,16 @@ # @ stub GetNLSVersionEx # @ stub GetNumaAvailableMemory @ stdcall GetNumaAvailableMemoryNode(long ptr) -# @ stub GetNumaAvailableMemoryNodeEx +@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) @ stdcall GetNumaHighestNodeNumber(ptr) # @ stub GetNumaNodeNumberFromHandle @ stdcall GetNumaNodeProcessorMask(long ptr) @ stdcall GetNumaNodeProcessorMaskEx(long ptr) # @ stub GetNumaProcessorMap @ stdcall GetNumaProcessorNode(long ptr) -# @ stub GetNumaProcessorNodeEx -# @ stub GetNumaProximityNode -# @ stub GetNumaProximityNodeEx +@ stdcall GetNumaProcessorNodeEx(ptr ptr) +@ stdcall GetNumaProximityNode(long ptr) +@ stdcall GetNumaProximityNodeEx(long ptr) @ stdcall GetNumberFormatA(long long str ptr ptr long) @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) @ stdcall GetNumberFormatW(long long wstr ptr ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 200ea8b..ccb743b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4459,6 +4459,16 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) return FALSE; } +/********************************************************************** + * GetNumaAvailableMemoryNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT node, PULONGLONG available_bytes) +{ + FIXME("(%hu %p): stub\n", node, available_bytes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * GetNumaProcessorNode (KERNEL32.@) */ @@ -4480,6 +4490,33 @@ BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) return FALSE; } +/*********************************************************************** + * GetNumaProcessorNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaProcessorNodeEx(PPROCESSOR_NUMBER processor, PUSHORT node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * GetNumaProximityNode (KERNEL32.@) + */ +BOOL WINAPI GetNumaProximityNode(ULONG proximity_id, PUCHAR node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * GetNumaProximityNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaProximityNodeEx(ULONG proximity_id, PUSHORT node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /********************************************************************** * GetProcessDEPPolicy (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9bba9ae..7151bba 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -576,7 +576,8 @@ # @ stub GetNextFgPolicyRefreshInfoInternal @ stdcall GetNumaHighestNodeNumber(ptr) kernel32.GetNumaHighestNodeNumber @ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernel32.GetNumaNodeProcessorMaskEx -# @ stub GetNumaProximityNodeEx +@ stdcall GetNumaProximityNode(long ptr) kernel32.GetNumaProximityNode +@ stdcall GetNumaProximityNodeEx(long ptr) kernel32.GetNumaProximityNodeEx @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx @ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW @ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents diff --git a/include/winbase.h b/include/winbase.h index 887e1c1..8b2eb2c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1684,6 +1684,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM ProcThreadAttributeParentProcess = 0, ProcThreadAttributeHandleList = 2, ProcThreadAttributeGroupAffinity = 3, + ProcThreadAttributePreferredNode = 4, ProcThreadAttributeIdealProcessor = 5, ProcThreadAttributeUmsThread = 6, ProcThreadAttributeMitigationPolicy = 7, @@ -1699,6 +1700,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_PARENT_PROCESS (ProcThreadAttributeParentProcess | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_HANDLE_LIST (ProcThreadAttributeHandleList | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_GROUP_AFFINITY (ProcThreadAttributeGroupAffinity | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_PREFERRED_NODE (ProcThreadAttributePreferredNode | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR (ProcThreadAttributeIdealProcessor | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_UMS_THREAD (ProcThreadAttributeUmsThread | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) @@ -2187,7 +2189,13 @@ WINBASEAPI BOOL WINAPI GetNamedPipeServerProcessId(HANDLE,PULONG); WINBASEAPI BOOL WINAPI GetNamedPipeServerSessionId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); +WINBASEAPI BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR,PULONGLONG); +WINBASEAPI BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT,PULONGLONG); +WINBASEAPI BOOL WINAPI GetNumaNodeProcessorMaskEx(USHORT,PGROUP_AFFINITY); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); +WINBASEAPI BOOL WINAPI GetNumaProcessorNodeEx(PPROCESSOR_NUMBER,PUSHORT); +WINBASEAPI BOOL WINAPI GetNumaProximityNode(ULONG,PUCHAR); +WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL);

1 0

Nikolay Sivov : dwrite/layout: Use a helper to update layout metrics.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: a4b3420e675fe92a41ac0b5986ee4a74373e9cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b3420e675fe92a41ac0b59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:42 2019 +0300 dwrite/layout: Use a helper to update layout metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d101a5a..40621ce 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3592,17 +3592,21 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout3 *iface, return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } +static HRESULT layout_update_metrics(struct dwrite_textlayout *layout) +{ + return layout_compute_effective_runs(layout); +} + static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout3 *iface, DWRITE_TEXT_METRICS *metrics) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - DWRITE_TEXT_METRICS1 metrics1; + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); HRESULT hr; - TRACE("(%p)->(%p)\n", This, metrics); + TRACE("%p, %p.\n", iface, metrics); - hr = IDWriteTextLayout3_GetMetrics(iface, &metrics1); + hr = layout_update_metrics(layout); if (hr == S_OK) - memcpy(metrics, &metrics1, sizeof(*metrics)); + memcpy(metrics, &layout->metrics, sizeof(*metrics)); return hr; } @@ -3932,17 +3936,15 @@ static HRESULT WINAPI dwritetextlayout1_GetCharacterSpacing(IDWriteTextLayout3 * static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout3 *iface, DWRITE_TEXT_METRICS1 *metrics) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); HRESULT hr; - TRACE("(%p)->(%p)\n", This, metrics); + TRACE("%p, %p.\n", iface, metrics); - hr = layout_compute_effective_runs(This); - if (FAILED(hr)) - return hr; + if (SUCCEEDED(hr = layout_update_metrics(layout))) + *metrics = layout->metrics; - *metrics = This->metrics; - return S_OK; + return hr; } static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout3 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation)

1 0

Nikolay Sivov : dwrite/layout: Use array allocation helper for typography features.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: cbd83b4e8089ba7779d48225eedce0129b3c7bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd83b4e8089ba7779d48225… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:43 2019 +0300 dwrite/layout: Use array allocation helper for typography features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 63 ++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 40621ce..3e316c2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -304,11 +304,11 @@ struct dwrite_trimmingsign { struct dwrite_typography { IDWriteTypography IDWriteTypography_iface; - LONG ref; + LONG refcount; DWRITE_FONT_FEATURE *features; - UINT32 allocated; - UINT32 count; + size_t capacity; + size_t count; }; static const IDWriteTextFormat2Vtbl dwritetextformatvtbl; @@ -5689,9 +5689,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle static HRESULT WINAPI dwritetypography_QueryInterface(IDWriteTypography *iface, REFIID riid, void **obj) { - struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - - TRACE("(%p)->(%s %p)\n", typography, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteTypography) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -5709,57 +5707,61 @@ static HRESULT WINAPI dwritetypography_QueryInterface(IDWriteTypography *iface, static ULONG WINAPI dwritetypography_AddRef(IDWriteTypography *iface) { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - ULONG ref = InterlockedIncrement(&typography->ref); - TRACE("(%p)->(%d)\n", typography, ref); - return ref; + ULONG refcount = InterlockedIncrement(&typography->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI dwritetypography_Release(IDWriteTypography *iface) { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - ULONG ref = InterlockedDecrement(&typography->ref); + ULONG refcount = InterlockedDecrement(&typography->refcount); - TRACE("(%p)->(%d)\n", typography, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { + if (!refcount) + { heap_free(typography->features); heap_free(typography); } - return ref; + return refcount; } static HRESULT WINAPI dwritetypography_AddFontFeature(IDWriteTypography *iface, DWRITE_FONT_FEATURE feature) { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - TRACE("(%p)->(%x %u)\n", typography, feature.nameTag, feature.parameter); - - if (typography->count == typography->allocated) { - DWRITE_FONT_FEATURE *ptr = heap_realloc(typography->features, 2*typography->allocated*sizeof(DWRITE_FONT_FEATURE)); - if (!ptr) - return E_OUTOFMEMORY; + TRACE("%p, %s, %u.\n", iface, debugstr_tag(feature.nameTag), feature.parameter); - typography->features = ptr; - typography->allocated *= 2; + if (!dwrite_array_reserve((void **)&typography->features, &typography->capacity, typography->count + 1, + sizeof(*typography->features))) + { + return E_OUTOFMEMORY; } typography->features[typography->count++] = feature; + return S_OK; } static UINT32 WINAPI dwritetypography_GetFontFeatureCount(IDWriteTypography *iface) { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - TRACE("(%p)\n", typography); + + TRACE("%p.\n", iface); + return typography->count; } -static HRESULT WINAPI dwritetypography_GetFontFeature(IDWriteTypography *iface, UINT32 index, DWRITE_FONT_FEATURE *feature) +static HRESULT WINAPI dwritetypography_GetFontFeature(IDWriteTypography *iface, UINT32 index, + DWRITE_FONT_FEATURE *feature) { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - TRACE("(%p)->(%u %p)\n", typography, index, feature); + TRACE("%p, %u, %p.\n", iface, index, feature); if (index >= typography->count) return E_INVALIDARG; @@ -5783,21 +5785,14 @@ HRESULT create_typography(IDWriteTypography **ret) *ret = NULL; - typography = heap_alloc(sizeof(*typography)); + typography = heap_alloc_zero(sizeof(*typography)); if (!typography) return E_OUTOFMEMORY; typography->IDWriteTypography_iface.lpVtbl = &dwritetypographyvtbl; - typography->ref = 1; - typography->allocated = 2; - typography->count = 0; - - typography->features = heap_calloc(typography->allocated, sizeof(*typography->features)); - if (!typography->features) { - heap_free(typography); - return E_OUTOFMEMORY; - } + typography->refcount = 1; *ret = &typography->IDWriteTypography_iface; + return S_OK; }

1 0

Nikolay Sivov : dwrite/font: Use existing helper for CreateFontFace().
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 6dc35e2d17eb5f4780613e5d75ef1dfdbe40b3e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc35e2d17eb5f4780613e5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:44 2019 +0300 dwrite/font: Use existing helper for CreateFontFace(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3742366..732ca37 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1670,7 +1670,7 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFont { struct dwrite_font *This = impl_from_IDWriteFont3(iface); TRACE("(%p)->(%p)\n", This, fontface); - return IDWriteFont3_CreateFontFace(iface, (IDWriteFontFace3**)fontface); + return get_fontface_from_font(This, (IDWriteFontFace4 **)fontface); } static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics)

1 0

Nikolay Sivov : dwrite/layout: Fix layout metrics width for whitespace-only lines.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 93a852e26227ef6ca7c52ada9d274c9acb6da3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a852e26227ef6ca7c52ada… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:45 2019 +0300 dwrite/layout: Fix layout metrics width for whitespace-only lines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 +++-- dlls/dwrite/tests/layout.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3e316c2..2b62758 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1831,7 +1831,7 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust FLOAT descent, trailingspacewidth; BOOL append_trimming_run = FALSE; const struct layout_run *run; - FLOAT width, origin_x; + float width = 0.0f, origin_x; HRESULT hr; /* Take a look at clusters we got for this line in reverse order to set trailing properties for current line */ @@ -1871,7 +1871,8 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust } /* Does not include trailing space width */ - width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); + if (!layout->clustermetrics[last_cluster].isWhitespace) + width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); /* Append trimming run if necessary */ if (width > layout->metrics.layoutWidth && layout->format.trimmingsign != NULL && diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 14b287c..8337ce7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3205,6 +3205,7 @@ static void test_GetMetrics(void) static const WCHAR str2W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str3W[] = {'a',0}; + static const WCHAR str4W[] = {' ',0}; DWRITE_CLUSTER_METRICS clusters[4]; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; @@ -3290,6 +3291,25 @@ todo_wine ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + /* Whitespace only. */ + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 1, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); + ok(metrics.left == 0.0f, "Unexpected value for left %f.\n", metrics.left); + ok(metrics.top == 0.0f, "Unexpected value for top %f.\n", metrics.top); + ok(metrics.width == 0.0f, "Unexpected width %f.\n", metrics.width); + ok(metrics.widthIncludingTrailingWhitespace > 0.0f, "Unexpected full width %f.\n", + metrics.widthIncludingTrailingWhitespace); + ok(metrics.height > 0.0, "Unexpected height %f.\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "Unexpected box width %f.\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "Unexpected box height %f.\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "Unexpected reordering depth %u.\n", metrics.maxBidiReorderingDepth); + ok(metrics.lineCount == 1, "Unexpected line coun %u.\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/layout: Use interface pointer in text format method traces.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 45361bb65e584fdf35b61cc2d3935302b1ee7a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45361bb65e584fdf35b61cc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:46 2019 +0300 dwrite/layout: Use interface pointer in text format method traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 307 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 181 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45361bb65e584fdf35b6…

1 0

Nikolay Sivov : dwrite: Improve returned design glyph metrics.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 421c83cd7b15a42617fd942888eca0c81f6d2278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421c83cd7b15a42617fd9428… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:47 2019 +0300 dwrite: Improve returned design glyph metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 71 ++++++++++++++++++++++++++++++++++++++------ dlls/dwrite/font.c | 51 +++++-------------------------- dlls/dwrite/freetype.c | 25 ++++++++-------- dlls/dwrite/opentype.c | 21 +++++++++++++ 4 files changed, 103 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421c83cd7b15a42617fd…

1 0

Piotr Caban : hid: Change format of preparsed data.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 395d268565893c10875cbe903d2e1b77d6d7e3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=395d268565893c10875cbe90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:33:56 2019 +0200 hid: Change format of preparsed data. Advantages of this format: - all table elements have constant size, that makes iterating table easier - allow report lookup by report ID in O(1) time - doesn't sort reports, it makes it possible to preserve original order of elements making output of functions more similar to native - preparsed data is created from collection, this will allow to add support for multiple top-most collections Signed-off-by: Piotr Caban <piotr(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 | 239 ++++++++-------------- dlls/hid/parse.h | 39 ++-- dlls/hidclass.sys/descriptor.c | 437 +++++++++++++---------------------------- dlls/hidclass.sys/device.c | 4 +- dlls/hidclass.sys/parse.h | 25 ++- 5 files changed, 250 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=395d268565893c10875c…

1 0

Piotr Caban : hidclass.sys: Remove no longer used features list.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 84a248c1ddd06ef3e1e740cc0702640381ef1c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a248c1ddd06ef3e1e740cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:04 2019 +0200 hidclass.sys: Remove no longer used features list. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index b409ea1..50c53f5 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -134,7 +134,6 @@ struct caps { struct feature { struct list entry; - struct list col_entry; struct caps caps; HIDP_REPORT_TYPE type; @@ -264,7 +263,7 @@ static void debug_collection(struct collection *collection) collection->index, collection_string[collection->type], collection->parent, list_count(&collection->features), list_count(&collection->collections)); debugstr_caps("Collection", &collection->caps); - LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, entry) debug_feature(fentry); LIST_FOR_EACH_ENTRY(centry, &collection->collections, struct collection, entry) debug_collection(centry); @@ -476,7 +475,7 @@ static void new_caps(struct caps *caps) static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *feature_index, unsigned int *collection_index, struct collection *collection, struct caps *caps, - struct list *features, struct list *stack) + struct list *stack) { unsigned int i; for (i = index; i < length;) @@ -516,8 +515,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { case TAG_MAIN_INPUT: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Input; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -526,8 +524,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_OUTPUT: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Output; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -536,8 +533,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_FEATURE: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Feature; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -562,7 +558,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l parse_collection(bSize, itemVal, subcollection); - i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features, stack); + i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack); continue; } case TAG_MAIN_END_COLLECTION: @@ -854,7 +850,7 @@ static void create_preparse_ctx(const struct collection *base, struct preparse_c struct feature *f; struct collection *c; - LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { ctx->elem_count += f->caps.usage_count; ctx->report_elem_count[f->type][f->caps.ReportID] += f->caps.usage_count; @@ -874,7 +870,7 @@ static void preparse_collection(const struct collection *base, struct feature *f; struct collection *c; - LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { WINE_HID_REPORT *report; @@ -958,9 +954,9 @@ static void free_collection(struct collection *collection) list_remove(&centry->entry); free_collection(centry); } - LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, entry) { - list_remove(&fentry->col_entry); + list_remove(&fentry->entry); HeapFree(GetProcessHeap(), 0, fentry); } HeapFree(GetProcessHeap(), 0, collection); @@ -972,7 +968,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct collection *base; struct caps caps; - struct list features; struct list caps_stack; unsigned int feature_count = 0; @@ -990,7 +985,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) TRACE("\n"); } - list_init(&features); list_init(&caps_stack); base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); @@ -1000,7 +994,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) memset(&caps, 0, sizeof(caps)); cidx = 0; - parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features, &caps_stack); + parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &caps_stack); debug_collection(base); @@ -1018,7 +1012,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) data = build_PreparseData(base); debug_print_preparsed(data); free_collection(base); - /* We do not have to free the list as free_collection does all the work */ return data; }

1 0

Piotr Caban : hidclass.sys: Support descriptors with over 10 individual usages in feature.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: f57b86912487a4be41de914c013b2fd40266a47b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57b86912487a4be41de914c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:12 2019 +0200 hidclass.sys: Support descriptors with over 10 individual usages in feature. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 300 +++++++++++++++++++---------------------- 1 file changed, 137 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f57b86912487a4be41de…

1 0