January 2017 - Wine-commits

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

26 Jan '17

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: Fix return value of GetDetailsOf() for unixfs folder.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 8f21b352c25b0078c4cb8a7c554dd8503a9d136f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f21b352c25b0078c4cb8a7c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:51:32 2017 +0300 shell32: Fix return value of GetDetailsOf() for unixfs folder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9df761f..3feef74 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1475,10 +1475,10 @@ static HRESULT WINAPI ShellFolder2_GetDetailsOf(IShellFolder2* iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) { UnixFolder *This = impl_from_IShellFolder2(iface); - HRESULT hr = E_FAIL; struct passwd *pPasswd; struct group *pGroup; struct stat statItem; + HRESULT hr = S_OK; static const shvheader unixfs_header[SHELLVIEWCOLUMNS] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},

1 0

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

26 Jan '17

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

Andrew Eikum : quartz: Clean up another trace for consistency.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: c6a4811edfa97331939e3b71f34970fcd263b41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a4811edfa97331939e3b71f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 15:12:55 2017 -0600 quartz: Clean up another trace for consistency. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 97c049d..2bd08f1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -730,6 +730,9 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_QueryDirection(ppin, &pindir); hr = IPin_ConnectedTo(ppin, &pConnectedTo); + + TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + if (FAILED(hr)) { TRACE("Querying connected to failed: %x\n", hr); return hr; @@ -743,7 +746,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_Release(pConnectedTo); if (FAILED(hr)) WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); + TRACE("-> %08x\n", hr); return hr; }

1 0

Andrew Eikum : quartz: Downgrade FIXME->WARN.
by Alexandre Julliard 26 Jan '17

26 Jan '17

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

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

26 Jan '17

Module: wine Branch: master Commit: 902b8a2b6d3393c5af52af5b84166634153436a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902b8a2b6d3393c5af52af5b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:54 2017 +0100 hidclass.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/hidclass.sys/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b241016..fe79212 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "hid.h" #include "wine/unicode.h" #include "winreg.h" @@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device entry = RemoveHeadList(&ext->irp_queue); while(entry != &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_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); entry = RemoveHeadList(&ext->irp_queue); @@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) while(entry != &ext->irp_queue) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) else { TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; } HeapFree(GetProcessHeap(), 0, packet);

1 0

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

26 Jan '17

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 : dwrite: Implement another variant of CreateGlyphRunAnalysis().
by Alexandre Julliard 26 Jan '17

26 Jan '17

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

Nikolay Sivov : dwrite: Remove existing effective runs before evaluating them again.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: e9ff71f62beb4841700b1d35185783df9d776354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ff71f62beb4841700b1d351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:47 2017 +0300 dwrite: Remove existing effective runs before evaluating them again. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 706ed4e..7ef050e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1740,6 +1740,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; + free_layout_eruns(layout); + hr = layout_compute(layout); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : dwrite: Invalidate layout on box changes.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 3871981e3abf0d494e9c3811e2ff1d405535f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871981e3abf0d494e9c3811e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:48 2017 +0300 dwrite: Invalidate layout on box changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7ef050e..a80c49e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2833,26 +2833,36 @@ static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout3 *iface, static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FLOAT maxWidth) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxWidth); if (maxWidth < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutWidth != maxWidth; This->metrics.layoutWidth = maxWidth; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout3 *iface, FLOAT maxHeight) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxHeight); if (maxHeight < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutHeight != maxHeight; This->metrics.layoutHeight = maxHeight; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0