wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Huw Davies : riched20: Don't emit paragraph props if they' re the same as the previous paragraph's.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 8739f450cea348b4d68f44477c24609e81c34d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8739f450cea348b4d68f44477… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:00 2016 +0100 riched20: Don't emit paragraph props if they're the same as the previous paragraph's. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 0204215..27e07b1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -429,6 +429,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, PARAFORMAT2 *fmt = &para->member.para.fmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; + ME_Paragraph *prev_para = NULL; + + if (para->member.para.prev_para->type == diParagraph) + prev_para = &para->member.para.prev_para->member.para; if (!editor->bEmulateVersion10) { /* v4.1 */ if (para->member.para.nFlags & MEPF_ROWSTART) { @@ -462,7 +466,9 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } - /* TODO: Don't emit anything if the last PARAFORMAT2 is inherited */ + if (prev_para && !memcmp( fmt, &prev_para->fmt, sizeof(*fmt) )) + return TRUE; + if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE;

1 0

Huw Davies : riched20: The new eop style when typing a list is a copy of the existing eop style.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 2019ec38dbee432d56a7648545992d3a34741cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2019ec38dbee432d56a764854… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:03:59 2016 +0100 riched20: The new eop style when typing a list is a copy of the existing eop style. Normally the new eop style is the insert style, however in a list the existing eop style is used. This prevents the list label style from changing when the new eop is inserted. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 162daa8..8b94ccf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2404,7 +2404,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) int from, to; const WCHAR endl = '\r'; const WCHAR endlv10[] = {'\r','\n'}; - ME_Style *style; + ME_Style *style, *eop_style; if (editor->styleFlags & ES_READONLY) { MessageBeep(MB_ICONERROR); @@ -2501,14 +2501,22 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); else if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, style); + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, style); + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL);

1 0

Huw Davies : wordpad: Keep the list indentation aligned when the margins are changed.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 9a1cc45edd8d1db98fbcf78697f4100ddb329b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1cc45edd8d1db98fbcf7869… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:12 2016 +0100 wordpad: Keep the list indentation aligned when the margins are changed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8d07d7b..f0a7d14 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1579,8 +1579,15 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, int index; float num; int ret = 0; - PARAFORMAT pf; + PARAFORMAT2 pf; UNIT unit; + BOOL in_list = FALSE; + + pf.cbSize = sizeof(pf); + pf.dwMask = PFM_NUMBERING; + SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + if ((pf.dwMask & PFM_NUMBERING) && pf.wNumbering) + in_list = TRUE; index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); pf.wAlignment = ALIGNMENT_VALUES[index]; @@ -1630,6 +1637,12 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.cbSize = sizeof(pf); pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | PFM_STARTINDENT; + if (in_list) + { + pf.wNumberingTab = max(pf.dxOffset, 0); + pf.dwMask |= PFM_NUMBERINGTAB; + } + SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }

1 0

Huw Davies : wordpad: Add a dropdown menu to the bullet button.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 6d263cd490bbab08480d4187b92243d6998ffebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d263cd490bbab08480d4187b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:11 2016 +0100 wordpad: Add a dropdown menu to the bullet button. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 65 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a26faab..8d07d7b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -156,7 +156,7 @@ static int MessageBoxWithResStringW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption } -static void AddButton(HWND hwndToolBar, int nImage, int nCommand) +static void AddButtonStyle(HWND hwndToolBar, int nImage, int nCommand, BYTE style) { TBBUTTON button; @@ -164,12 +164,17 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) button.iBitmap = nImage; button.idCommand = nCommand; button.fsState = TBSTATE_ENABLED; - button.fsStyle = BTNS_BUTTON; + button.fsStyle = style; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); } +static void AddButton(HWND hwndToolBar, int nImage, int nCommand) +{ + AddButtonStyle(hwndToolBar, nImage, nCommand, BTNS_BUTTON); +} + static void AddSeparator(HWND hwndToolBar) { TBBUTTON button; @@ -1879,6 +1884,8 @@ static LRESULT OnCreate( HWND hWnd ) CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); + SendMessageW(hFormatBarWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS); + AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC); AddButton(hFormatBarWnd, 2, ID_FORMAT_UNDERLINE); @@ -1888,7 +1895,7 @@ static LRESULT OnCreate( HWND hWnd ) AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER); AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT); AddSeparator(hFormatBarWnd); - AddButton(hFormatBarWnd, 7, ID_BULLETONOFF); + AddButtonStyle(hFormatBarWnd, 7, ID_BULLETONOFF, BTNS_DROPDOWN); SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0); @@ -2007,6 +2014,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) NMHDR *pHdr = (NMHDR *)lParam; HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST); HWND hwndSizeList = GetDlgItem(hwndReBar, IDC_SIZELIST); + HWND hwndFormatBar = GetDlgItem(hwndReBar, IDC_FORMATBAR); if (pHdr->hwndFrom == hwndFontList || pHdr->hwndFrom == hwndSizeList) { @@ -2024,22 +2032,51 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) return 0; } - if (pHdr->hwndFrom != hwndEditor) + if (pHdr->hwndFrom == hwndFormatBar) + { + if (pHdr->code == TBN_DROPDOWN) + { + NMTOOLBARW *tb_notify = (NMTOOLBARW *)lParam; + HMENU menu = GetMenu( hWnd ); + MENUITEMINFOW info; + TPMPARAMS params; + RECT rc; + + if (!menu) return 0; + info.cbSize = sizeof(info); + info.fMask = MIIM_SUBMENU; + GetMenuItemInfoW( menu, ID_LISTMENU, FALSE, &info ); + if (!info.hSubMenu) return 0; + + SendMessageW( tb_notify->hdr.hwndFrom, TB_GETRECT, (WPARAM)tb_notify->iItem, (LPARAM)&rc ); + MapWindowPoints( tb_notify->hdr.hwndFrom, HWND_DESKTOP, (LPPOINT)&rc, 2 ); + + params.cbSize = sizeof(params); + params.rcExclude = rc; + TrackPopupMenuEx( info.hSubMenu, + TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL, + rc.left, rc.bottom, hWnd, &params ); + } + return 0; + } - if (pHdr->code == EN_SELCHANGE) + if (pHdr->hwndFrom == hwndEditor) { - SELCHANGE *pSC = (SELCHANGE *)lParam; - char buf[128]; + if (pHdr->code == EN_SELCHANGE) + { + SELCHANGE *pSC = (SELCHANGE *)lParam; + char buf[128]; - update_font_list(); + update_font_list(); - sprintf( buf,"selection = %d..%d, line count=%ld", - pSC->chrg.cpMin, pSC->chrg.cpMax, - SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); - SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); - SendMessageW(hWnd, WM_USER, 0, 0); - return 1; + sprintf( buf,"selection = %d..%d, line count=%ld", + pSC->chrg.cpMin, pSC->chrg.cpMax, + SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); + SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); + SendMessageW(hWnd, WM_USER, 0, 0); + return 1; + } } return 0; }

1 0

Huw Davies : wordpad: Remove BTNS_BUTTON from the toolbar style - it' s a button style.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 6ac0dd03522b644b1dead23379f9b67c920ddd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac0dd03522b644b1dead2337… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:10 2016 +0100 wordpad: Remove BTNS_BUTTON from the toolbar style - it's a button style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index dc3918e..a26faab 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1814,7 +1814,7 @@ static LRESULT OnCreate( HWND hWnd ) if(!SendMessageW(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|BTNS_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS, IDC_TOOLBAR, 1, hInstance, IDB_TOOLBAR, NULL, 0, @@ -1876,7 +1876,7 @@ static LRESULT OnCreate( HWND hWnd ) SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, - CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, + CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);

1 0

Huw Davies : wordpad: Switch the main menu to MENUEX so that the list menu can be given an id.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 2878d1e34107795f736a82a4a53d2b5bb1ede658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2878d1e34107795f736a82a4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:09 2016 +0100 wordpad: Switch the main menu to MENUEX so that the list menu can be given an id. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 250 ++++++++++++++++++++++++-------------------- po/bg.po | 248 +++++++++++++++++++++++-------------------- po/ca.po | 250 ++++++++++++++++++++++++-------------------- po/cs.po | 250 ++++++++++++++++++++++++-------------------- po/da.po | 250 ++++++++++++++++++++++++-------------------- po/de.po | 250 ++++++++++++++++++++++++-------------------- po/el.po | 248 +++++++++++++++++++++++-------------------- po/en.po | 246 +++++++++++++++++++++++-------------------- po/en_US.po | 246 +++++++++++++++++++++++-------------------- po/eo.po | 248 +++++++++++++++++++++++-------------------- po/es.po | 250 ++++++++++++++++++++++++-------------------- po/fa.po | 246 +++++++++++++++++++++++-------------------- po/fi.po | 250 ++++++++++++++++++++++++-------------------- po/fr.po | 250 ++++++++++++++++++++++++-------------------- po/he.po | 248 +++++++++++++++++++++++-------------------- po/hi.po | 246 +++++++++++++++++++++++-------------------- po/hr.po | 250 ++++++++++++++++++++++++-------------------- po/hu.po | 250 ++++++++++++++++++++++++-------------------- po/it.po | 250 ++++++++++++++++++++++++-------------------- po/ja.po | 250 ++++++++++++++++++++++++-------------------- po/ko.po | 250 ++++++++++++++++++++++++-------------------- po/lt.po | 250 ++++++++++++++++++++++++-------------------- po/ml.po | 246 +++++++++++++++++++++++-------------------- po/nb_NO.po | 250 ++++++++++++++++++++++++-------------------- po/nl.po | 250 ++++++++++++++++++++++++-------------------- po/or.po | 246 +++++++++++++++++++++++-------------------- po/pa.po | 246 +++++++++++++++++++++++-------------------- po/pl.po | 250 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 250 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 250 ++++++++++++++++++++++++-------------------- po/rm.po | 246 +++++++++++++++++++++++-------------------- po/ro.po | 250 ++++++++++++++++++++++++-------------------- po/ru.po | 250 ++++++++++++++++++++++++-------------------- po/sk.po | 248 +++++++++++++++++++++++-------------------- po/sl.po | 250 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 248 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 248 +++++++++++++++++++++++-------------------- po/sv.po | 250 ++++++++++++++++++++++++-------------------- po/te.po | 246 +++++++++++++++++++++++-------------------- po/th.po | 248 +++++++++++++++++++++++-------------------- po/tr.po | 250 ++++++++++++++++++++++++-------------------- po/uk.po | 250 ++++++++++++++++++++++++-------------------- po/wa.po | 246 +++++++++++++++++++++++-------------------- po/wine.pot | 246 +++++++++++++++++++++++-------------------- po/zh_CN.po | 250 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 250 ++++++++++++++++++++++++-------------------- programs/wordpad/wordpad.h | 1 + programs/wordpad/wordpad.rc | 22 ++-- 48 files changed, 6346 insertions(+), 5117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2878d1e34107795f736a8…

1 0

Nikolay Sivov : d2d1: Make some of drawing calls a wrappers over DrawGeometry().
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 1f50b75b78d470ccf7f63316cc10a0e5ff00f6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f50b75b78d470ccf7f63316c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 10 17:29:56 2016 +0300 d2d1: Make some of drawing calls a wrappers over DrawGeometry(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 78000af..4417b85 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -466,8 +466,21 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTarget *iface, const D2D1_RECT_F *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - FIXME("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1RectangleGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, rect, brush, stroke_width, stroke_style); + + if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, rect, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1RectangleGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTarget *iface, @@ -492,8 +505,21 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1RenderTarget *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - FIXME("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1RoundedRectangleGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, rect, brush, stroke_width, stroke_style); + + if (FAILED(hr = ID2D1Factory_CreateRoundedRectangleGeometry(render_target->factory, rect, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1RoundedRectangleGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, @@ -518,8 +544,21 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1Re static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarget *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - FIXME("iface %p, ellipse %p, brush %p, stroke_width %.8e, stroke_style %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1EllipseGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, ellipse %p, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, ellipse, brush, stroke_width, stroke_style); + + if (FAILED(hr = ID2D1Factory_CreateEllipseGeometry(render_target->factory, ellipse, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1EllipseGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarget *iface,

1 0

Nikolay Sivov : d2d1: Support shared bitmaps created from dxgi surface.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 31b162b37d9b9338b168270fc37ed83cd23ffa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b162b37d9b9338b168270fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 10 17:12:39 2016 +0300 d2d1: Support shared bitmaps created from dxgi surface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 97 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 44 +++++++++++++++++++++ 4 files changed, 137 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b2f2ad7..43904bb 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -296,22 +296,32 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return *bitmap ? S_OK : E_OUTOFMEMORY; } -HRESULT d2d_bitmap_create_shared(ID2D1Factory *factory, ID3D10Device *target_device, +HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *target_device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) { + D2D1_BITMAP_PROPERTIES d; + ID2D1Factory *factory; + if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - D2D1_BITMAP_PROPERTIES d; ID3D10Device *device; + HRESULT hr = S_OK; + ID2D1RenderTarget_GetFactory(render_target, &factory); if (src_impl->factory != factory) - return D2DERR_WRONG_FACTORY; + { + hr = D2DERR_WRONG_FACTORY; + goto failed; + } ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); ID3D10Device_Release(device); if (device != target_device) - return D2DERR_UNSUPPORTED_OPERATION; + { + hr = D2DERR_UNSUPPORTED_OPERATION; + goto failed; + } if (!desc) { @@ -325,15 +335,90 @@ HRESULT d2d_bitmap_create_shared(ID2D1Factory *factory, ID3D10Device *target_dev { WARN("Tried to create bitmap with unsupported format {%#x / %#x}.\n", desc->pixelFormat.format, desc->pixelFormat.alphaMode); - return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + hr = D2DERR_UNSUPPORTED_PIXEL_FORMAT; + goto failed; } if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto failed; + } d2d_bitmap_init(*bitmap, factory, src_impl->view, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); + failed: + ID2D1Factory_Release(factory); + return hr; + } + + if (IsEqualGUID(iid, &IID_IDXGISurface) || IsEqualGUID(iid, &IID_IDXGISurface1)) + { + ID3D10ShaderResourceView *view; + DXGI_SURFACE_DESC surface_desc; + IDXGISurface *surface = data; + ID3D10Resource *resource; + D2D1_SIZE_U pixel_size; + ID3D10Device *device; + HRESULT hr; + + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + { + WARN("Failed to get d3d resource from dxgi surface.\n"); + return E_FAIL; + } + + ID3D10Resource_GetDevice(resource, &device); + ID3D10Device_Release(device); + if (device != target_device) + { + ID3D10Resource_Release(resource); + return D2DERR_UNSUPPORTED_OPERATION; + } + + hr = ID3D10Device_CreateShaderResourceView(target_device, resource, NULL, &view); + ID3D10Resource_Release(resource); + if (FAILED(hr)) + { + WARN("Failed to create shader resource view, hr %#x.\n", hr); + return hr; + } + + if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + { + ID3D10ShaderResourceView_Release(view); + return E_OUTOFMEMORY; + } + + d = *desc; + if (d.dpiX == 0.0f || d.dpiY == 0.0f) + { + float dpi_x, dpi_y; + + ID2D1RenderTarget_GetDpi(render_target, &dpi_x, &dpi_y); + if (d.dpiX == 0.0f) + d.dpiX = dpi_x; + if (d.dpiY == 0.0f) + d.dpiY = dpi_y; + } + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + ID3D10ShaderResourceView_Release(view); + return hr; + } + + pixel_size.width = surface_desc.Width; + pixel_size.height = surface_desc.Height; + + ID2D1RenderTarget_GetFactory(render_target, &factory); + d2d_bitmap_init(*bitmap, factory, view, pixel_size, &d); + ID3D10ShaderResourceView_Release(view); + ID2D1Factory_Release(factory); + TRACE("Created bitmap %p.\n", *bitmap); + return S_OK; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6cee5ef..c5c3a03 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -236,7 +236,7 @@ struct d2d_bitmap HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_shared(ID2D1Factory *factory, ID3D10Device *device, REFIID iid, void *data, +HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e9a971e..78000af 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -341,7 +341,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1R TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", iface, debugstr_guid(iid), data, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_shared(render_target->factory, render_target->device, iid, data, desc, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object))) *bitmap = &object->ID2D1Bitmap_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ba4be0c..38012ca 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2046,8 +2046,10 @@ static void test_shared_bitmap(void) ID3D10Device1 *device1, *device2; IWICImagingFactory *wic_factory; ID2D1Bitmap *bitmap1, *bitmap2; + DXGI_SURFACE_DESC surface_desc; ID2D1RenderTarget *rt1, *rt2; D2D1_SIZE_U size = {4, 4}; + IDXGISurface1 *surface3; HWND window1, window2; HRESULT hr; @@ -2171,6 +2173,48 @@ static void test_shared_bitmap(void) ID2D1Bitmap_Release(bitmap2); ID2D1RenderTarget_Release(rt2); + /* Shared DXGI surface. */ + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 0.0f; + desc.dpiY = 0.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface2, &desc, &rt2); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 0.0f; + bitmap_desc.dpiY = 0.0f; + + hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); + ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG) /* vista */, "Failed to create bitmap, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + size = ID2D1Bitmap_GetPixelSize(bitmap2); + hr = IDXGISurface_GetDesc(surface2, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); + + ID2D1Bitmap_Release(bitmap2); + + /* IDXGISurface1 is supported too. */ + if (IDXGISurface_QueryInterface(surface2, &IID_IDXGISurface1, (void **)&surface3) == S_OK) + { + hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface1, surface3, &bitmap_desc, &bitmap2); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + ID2D1Bitmap_Release(bitmap2); + IDXGISurface1_Release(surface3); + } + } + + ID2D1RenderTarget_Release(rt2); + ID2D1Bitmap_Release(bitmap1); ID2D1RenderTarget_Release(rt1); ID2D1Factory_Release(factory2);

1 0

Ken Thomases : winemac: Post WINDOW_FRAME_CHANGED with the non-fullscreen frame when exiting of fullscreen mode begins.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: a85f11c2e63078e6572481092dbdc5b96b04d7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85f11c2e63078e6572481092… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 10 22:38:13 2016 -0500 winemac: Post WINDOW_FRAME_CHANGED with the non-fullscreen frame when exiting of fullscreen mode begins. We had been posting it when exiting fullscreen mode ended. However, certain events during exiting could provoke the back-end to assert the window frame as it knows it, which would be the one from full-screen mode. This would be handled by the Cocoa thread after exiting full-screen mode. So, the window would animate to its pre-fullscreen frame and then spontaneously go back to covering the screen. This would be Windows-style fullscreen rather than Cocoa-style and there'd be no obvious way to get out. The problem occurs on macOS 10.12 (Sierra) due to a change in what methods it calls on the window while exiting fullscreen. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 48 ++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8e8ac9f..e638991 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1842,6 +1842,30 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + { + macdrv_event* event; + NSUInteger style = self.styleMask; + + if (isFullscreen) + style |= NSFullScreenWindowMask; + else + style &= ~NSFullScreenWindowMask; + frame = [[self class] contentRectForFrameRect:frame styleMask:style]; + [[WineApplicationController sharedController] flipRect:&frame]; + + /* Coalesce events by discarding any previous ones still in the queue. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) + forWindow:self]; + + event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); + event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); + event->window_frame_changed.fullscreen = isFullscreen; + event->window_frame_changed.in_resize = resizing; + [queue postEvent:event]; + macdrv_release_event(event); + } + - (void) updateForCursorClipping { [self adjustFeaturesForState]; @@ -2589,7 +2613,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void)windowDidResize:(NSNotification *)notification { - macdrv_event* event; NSRect frame = self.wine_fractionalFrame; if ([self inLiveResize]) @@ -2600,28 +2623,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi resizingFromTop = TRUE; } - frame = [self contentRectForFrameRect:frame]; - if (ignore_windowResize || exitingFullScreen) return; if ([self preventResizing]) { - [self setContentMinSize:frame.size]; - [self setContentMaxSize:frame.size]; + NSRect contentRect = [self contentRectForFrameRect:frame]; + [self setContentMinSize:contentRect.size]; + [self setContentMaxSize:contentRect.size]; } - [[WineApplicationController sharedController] flipRect:&frame]; - - /* Coalesce events by discarding any previous ones still in the queue. */ - [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) - forWindow:self]; - - event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); - event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); - event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0; - event->window_frame_changed.in_resize = [self inLiveResize]; - [queue postEvent:event]; - macdrv_release_event(event); + [self postWindowFrameChanged:frame + fullscreen:([self styleMask] & NSFullScreenWindowMask) != 0 + resizing:[self inLiveResize]]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; @@ -2683,6 +2696,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification

1 0

Sebastian Lackner : ntoskrnl.exe: Use completion routine to transfer result of IRP back to server.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 54002103763188b5c5b1fd1210ad4cf09ef80bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54002103763188b5c5b1fd121… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 10 17:15:39 2016 +0200 ntoskrnl.exe: Use completion routine to transfer result of IRP back to server. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 83 +++++++++++++++++++++----------------------- include/ddk/wdm.h | 12 +++++++ 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf87f7a..909bf6f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -172,16 +172,40 @@ static HANDLE get_device_manager(void) return ret; } -static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp ) +/* transfer result of IRP back to wineserver */ +static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; + void *out_buff = irp->UserBuffer; + HANDLE handle = context; + + SERVER_START_REQ( set_irp_result ) + { + req->handle = wine_server_obj_handle( handle ); + req->status = irp->IoStatus.u.Status; + req->file_ptr = wine_server_client_ptr( file ); + if (irp->IoStatus.u.Status >= 0) + { + req->size = irp->IoStatus.Information; + if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + } + wine_server_call( req ); + } + SERVER_END_REQ; + + HeapFree( GetProcessHeap(), 0, out_buff ); + return STATUS_SUCCESS; +} + +static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, HANDLE irp_handle ) { LARGE_INTEGER count; + IoSetCompletionRoutine( irp, dispatch_irp_completion, irp_handle, TRUE, TRUE, TRUE ); KeQueryTickCount( &count ); /* update the global KeTickCount */ device->CurrentIrp = irp; - IoCallDriver( device, irp ); - device->CurrentIrp = NULL; } @@ -211,7 +235,6 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; irpsp->DeviceObject = device; - irpsp->CompletionRoutine = NULL; irpsp->Parameters.Create.SecurityContext = NULL; /* FIXME */ irpsp->Parameters.Create.Options = params->create.options; irpsp->Parameters.Create.ShareAccess = params->create.sharing; @@ -222,10 +245,10 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = NULL; irp->UserBuffer = NULL; - irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ + irp->UserIosb = NULL; irp->UserEvent = NULL; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; } @@ -254,16 +277,15 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CLOSE; irpsp->DeviceObject = device; - irpsp->CompletionRoutine = NULL; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = NULL; irp->UserBuffer = NULL; - irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ + irp->UserIosb = NULL; irp->UserEvent = NULL; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ return STATUS_SUCCESS; @@ -290,9 +312,8 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG offset.QuadPart = params->read.pos; - /* note: we abuse UserIosb to store the server irp handle */ if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_READ, device, out_buff, out_size, - &offset, NULL, irp_handle ))) + &offset, NULL, NULL ))) { HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_NO_MEMORY; @@ -304,7 +325,7 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Read.Key = params->read.key; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; } @@ -327,9 +348,8 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG offset.QuadPart = params->write.pos; - /* note: we abuse UserIosb to store the server irp handle */ if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_WRITE, device, in_buff, in_size, - &offset, NULL, irp_handle ))) + &offset, NULL, NULL ))) return STATUS_NO_MEMORY; irp->Tail.Overlay.OriginalFileObject = file; @@ -338,7 +358,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Write.Key = params->write.key; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; } @@ -357,15 +377,14 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG TRACE( "device %p file %p\n", device, file ); - /* note: we abuse UserIosb to store the server irp handle */ if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, - NULL, NULL, irp_handle ))) + NULL, NULL, NULL ))) return STATUS_NO_MEMORY; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; } @@ -398,9 +417,8 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG } } - /* note: we abuse UserIosb to store the server handle to the ioctl */ irp = IoBuildDeviceIoControlRequest( params->ioctl.code, device, in_buff, in_size, out_buff, out_size, - FALSE, NULL, irp_handle ); + FALSE, NULL, NULL ); if (!irp) { HeapFree( GetProcessHeap(), 0, out_buff ); @@ -410,7 +428,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - dispatch_irp( device, irp ); + dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; } @@ -1390,7 +1408,6 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; NTSTATUS status, stat; - HANDLE handle; int call_flag = 0; TRACE( "%p %u\n", irp, priority_boost ); @@ -1422,28 +1439,6 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) } } - handle = (HANDLE)irp->UserIosb; - if (handle) - { - void *out_buff = irp->UserBuffer; - FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; - - SERVER_START_REQ( set_irp_result ) - { - req->handle = wine_server_obj_handle( handle ); - req->status = irp->IoStatus.u.Status; - req->file_ptr = wine_server_client_ptr( file ); - if (irp->IoStatus.u.Status >= 0) - { - req->size = irp->IoStatus.Information; - if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); - } - wine_server_call( req ); - } - SERVER_END_REQ; - HeapFree( GetProcessHeap(), 0, out_buff ); - } - IoFreeIrp( irp ); } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 918797e..5602f7d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1189,6 +1189,18 @@ NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); # endif #endif +static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routine, void *context, + BOOLEAN on_success, BOOLEAN on_error, BOOLEAN on_cancel) +{ + IO_STACK_LOCATION *irpsp = IoGetNextIrpStackLocation(irp); + irpsp->CompletionRoutine = routine; + irpsp->Context = context; + irpsp->Control = 0; + if (on_success) irpsp->Control |= SL_INVOKE_ON_SUCCESS; + if (on_error) irpsp->Control |= SL_INVOKE_ON_ERROR; + if (on_cancel) irpsp->Control |= SL_INVOKE_ON_CANCEL; +} + #define KernelMode 0 #define UserMode 1

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016