October 2016 - Wine-commits

Huw Davies : riched20: Add a helper to add a colour to the colour table.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: b8e55779fe26846bebd034744a5a02fa40b98ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e55779fe26846bebd034744… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:03 2016 +0100 riched20: Add a helper to add a colour to the colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 54 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b448f43..e79aacf 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -237,6 +237,21 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) } } +static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) +{ + int i; + + for (i = 1; i < stream->nColorTblLen; i++) + if (stream->colortbl[i] == color) + break; + + if (i == stream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) + { + stream->colortbl[i] = color; + stream->nColorTblLen++; + } +} + static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *pLastRun) @@ -249,30 +264,13 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; - COLORREF crColor; add_font_to_fonttbl( pStream, item->member.run.style ); - if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) { - crColor = fmt->crTextColor; - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == crColor) - break; - if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[i] = crColor; - pStream->nColorTblLen++; - } - } - if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) { - crColor = fmt->crBackColor; - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == crColor) - break; - if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[i] = crColor; - pStream->nColorTblLen++; - } - } + if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) + add_color_to_colortbl( pStream, fmt->crTextColor ); + if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) + add_color_to_colortbl( pStream, fmt->crBackColor ); if (item == pLastRun) break; @@ -287,20 +285,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, &pCell->member.cell.border.bottom, &pCell->member.cell.border.right }; for (i = 0; i < 4; i++) - { if (borders[i]->width > 0) - { - unsigned int j; - COLORREF crColor = borders[i]->colorRef; - for (j = 1; j < pStream->nColorTblLen; j++) - if (pStream->colortbl[j] == crColor) - break; - if (j == pStream->nColorTblLen && j < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[j] = crColor; - pStream->nColorTblLen++; - } - } - } + add_color_to_colortbl( pStream, borders[i]->colorRef ); } if (item == pLastPara) break;

1 0

Huw Davies : riched20: Move the check for cell border colours into the same loop as the other colours.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: a06dcd46bb87bc84552e23ce997c3b8eef969363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06dcd46bb87bc84552e23ce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:04 2016 +0100 riched20: Move the check for cell border colours into the same loop as the other colours. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index e79aacf..fe8c797 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -259,8 +259,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); ME_DisplayItem *pCell = NULL; + ME_Paragraph *prev_para = NULL; do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; @@ -272,14 +272,10 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) add_color_to_colortbl( pStream, fmt->crBackColor ); - if (item == pLastRun) - break; - item = ME_FindItemFwd(item, diRun); - } while (item); - item = ME_GetParagraph(pFirstRun); - do { - if ((pCell = item->member.para.pCell)) + if (item->member.run.para != prev_para) { + if ((pCell = item->member.para.pCell)) + { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, &pCell->member.cell.border.bottom, @@ -287,12 +283,16 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); + } + + prev_para = item->member.run.para; } - if (item == pLastPara) + + if (item == pLastRun) break; - item = item->member.para.next_para; + item = ME_FindItemFwd(item, diRun); } while (item); - + if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) return FALSE;

1 0

Carlo Bramini : winefile: Use StrFormatByteSizeW.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 0e5eed109dc0e2171d6db16c8a6e307057122b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5eed109dc0e2171d6db16c8… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Oct 9 13:05:19 2016 +0200 winefile: Use StrFormatByteSizeW. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 73 +++++++++++++++++-------------------------- po/bg.po | 73 +++++++++++++++++-------------------------- po/ca.po | 73 +++++++++++++++++-------------------------- po/cs.po | 73 +++++++++++++++++-------------------------- po/da.po | 73 +++++++++++++++++-------------------------- po/de.po | 73 +++++++++++++++++-------------------------- po/el.po | 73 +++++++++++++++++-------------------------- po/en.po | 73 +++++++++++++++++-------------------------- po/en_US.po | 73 +++++++++++++++++-------------------------- po/eo.po | 73 +++++++++++++++++-------------------------- po/es.po | 73 +++++++++++++++++-------------------------- po/fa.po | 73 +++++++++++++++++-------------------------- po/fi.po | 73 +++++++++++++++++-------------------------- po/fr.po | 73 +++++++++++++++++-------------------------- po/he.po | 73 +++++++++++++++++-------------------------- po/hi.po | 73 +++++++++++++++++-------------------------- po/hr.po | 73 +++++++++++++++++-------------------------- po/hu.po | 73 +++++++++++++++++-------------------------- po/it.po | 73 +++++++++++++++++-------------------------- po/ja.po | 73 +++++++++++++++++-------------------------- po/ko.po | 73 +++++++++++++++++-------------------------- po/lt.po | 73 +++++++++++++++++-------------------------- po/ml.po | 73 +++++++++++++++++-------------------------- po/nb_NO.po | 73 +++++++++++++++++-------------------------- po/nl.po | 73 +++++++++++++++++-------------------------- po/or.po | 73 +++++++++++++++++-------------------------- po/pa.po | 73 +++++++++++++++++-------------------------- po/pl.po | 73 +++++++++++++++++-------------------------- po/pt_BR.po | 73 +++++++++++++++++-------------------------- po/pt_PT.po | 73 +++++++++++++++++-------------------------- po/rm.po | 73 +++++++++++++++++-------------------------- po/ro.po | 73 +++++++++++++++++-------------------------- po/ru.po | 73 +++++++++++++++++-------------------------- po/sk.po | 73 +++++++++++++++++-------------------------- po/sl.po | 73 +++++++++++++++++-------------------------- po/sr_RS(a)cyrillic.po | 73 +++++++++++++++++-------------------------- po/sr_RS(a)latin.po | 73 +++++++++++++++++-------------------------- po/sv.po | 73 +++++++++++++++++-------------------------- po/te.po | 73 +++++++++++++++++-------------------------- po/th.po | 73 +++++++++++++++++-------------------------- po/tr.po | 73 +++++++++++++++++-------------------------- po/uk.po | 73 +++++++++++++++++-------------------------- po/wa.po | 73 +++++++++++++++++-------------------------- po/wine.pot | 73 +++++++++++++++++-------------------------- po/zh_CN.po | 73 +++++++++++++++++-------------------------- po/zh_TW.po | 73 +++++++++++++++++-------------------------- programs/winefile/Makefile.in | 2 +- programs/winefile/resource.h | 3 -- programs/winefile/winefile.c | 41 +++--------------------- programs/winefile/winefile.h | 1 + programs/winefile/winefile.rc | 3 -- 51 files changed, 1340 insertions(+), 2068 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e5eed109dc0e2171d6db…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory4.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 988cf549fc80e135fdf70c0a5177074c1cfbfe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988cf549fc80e135fdf70c0a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 11 15:20:26 2016 +0300 dwrite: Update to IDWriteFactory4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/dwrite_private.h | 22 ++-- dlls/dwrite/font.c | 46 ++++---- dlls/dwrite/gdiinterop.c | 12 +- dlls/dwrite/layout.c | 14 +-- dlls/dwrite/main.c | 265 ++++++++++++++++++++++++------------------- 6 files changed, 203 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=988cf549fc80e135fdf70…

1 0

Piotr Caban : msvcp100: Add stdext::threads::_Mtx_* implementation.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: a94184155648f42cb023e5fe2c5ac904664cde56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94184155648f42cb023e5fe2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 11 15:51:23 2016 +0200 msvcp100: Add stdext::threads::_Mtx_* implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 16 ++++++++-------- dlls/msvcp110/msvcp110.spec | 16 ++++++++-------- dlls/msvcp120/msvcp120.spec | 16 ++++++++-------- dlls/msvcp120/tests/msvcp120.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 16 ++++++++-------- dlls/msvcp140/msvcp140.spec | 16 ++++++++-------- dlls/msvcp90/misc.c | 21 ++++++++++++++++++++ 7 files changed, 99 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a94184155648f42cb023e…

1 0

Dmitry Timoshkov : include/d2d1.idl: Remove duplicate typedefs.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 53943a4c31bb290e5793ba0f33cccc35817017e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53943a4c31bb290e5793ba0f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 11 09:30:03 2016 +0800 include/d2d1.idl: Remove duplicate typedefs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index 0e944e1..6d39e88 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -42,12 +42,10 @@ cpp_quote("#ifndef __dwrite_h__") typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; cpp_quote("#endif /* __dwrite_h__ */") -typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; typedef UINT64 D2D1_TAG; -typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; typedef D2D_COLOR_F D2D1_COLOR_F;

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

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

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

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