September 2017 - Wine-commits

Hans Leidekker : webservices: Include a RelatesTo header in reply messages.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 2946dc71aaf1478d97c1427ef9da69ac4c80b4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2946dc71aaf1478d97c1427ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:14 2017 +0200 webservices: Include a RelatesTo header in reply messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 3 + dlls/webservices/msg.c | 161 ++++++++++++++++++++++++++------- dlls/webservices/webservices_private.h | 2 + 3 files changed, 131 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2946dc71aaf1478d97c14…

1 0

Nikolay Sivov : dbgeng: Added DebugCreateEx() stub.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 0d078dbc82208caef06273c51e46faabc5452828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d078dbc82208caef06273c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 6 12:19:30 2017 +0300 dbgeng: Added DebugCreateEx() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 ++++++++++++++---- dlls/dbgeng/dbgeng.spec | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index b08be75..6ac9360 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -58,8 +58,8 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * Creating Debug Engine client object * * PARAMS -* InterfaceId [I] Interface Id of debugger client -* pInterface [O] Pointer to interface as requested via InterfaceId +* riid [I] Interface Id of debugger client +* obj [O] Pointer to interface as requested via riid * * RETURNS * Success: S_OK @@ -68,9 +68,9 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * BUGS * Unimplemented */ -HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) +HRESULT WINAPI DebugCreate(REFIID riid, void **obj) { - FIXME("(%p,%p): stub\n", InterfaceId, pInterface); + FIXME("(%s, %p): stub\n", debugstr_guid(riid), obj); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -78,6 +78,16 @@ HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) } /************************************************************ +* DebugCreateEx (DBGENG.@) +*/ +HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj) +{ + FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj); + + return E_NOTIMPL; +} + +/************************************************************ * DebugConnect (DBGENG.@) * * Creating Debug Engine client object and connecting it to remote host diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index f2f735c..14dbc33 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -2,5 +2,5 @@ @ stdcall DebugConnect(str ptr ptr) @ stub DebugConnectWide @ stdcall DebugCreate(ptr ptr) -@ stub DebugCreateEx +@ stdcall DebugCreateEx(ptr long ptr) @ stdcall DebugExtensionInitialize(ptr ptr)

1 0

Hugh McMaster : reg/tests: Add basic tests for the export operation.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 41236123bbcf0c3065fb528ebe82831357023fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=41236123bbcf0c3065fb528eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 6 12:31:41 2017 +0000 reg/tests: Add basic tests for the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8d103df..9d5eee9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4223,6 +4223,48 @@ static void test_import_31(void) ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } +static void test_export(void) +{ + LONG err; + DWORD r; + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + + run_reg_exe("reg export", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKDD file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4240,4 +4282,5 @@ START_TEST(reg) test_import_with_whitespace(); test_unicode_import_with_whitespace(); test_import_31(); + test_export(); }

1 0

Stefan Dösinger : ntdll: Make RtlDeregisterWaitEx( handle, INVALID_HANDLE_VALUE) thread safe.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: af35aada9b078f8dc71dcc85e505da8eee4571da URL: http://source.winehq.org/git/wine.git/?a=commit;h=af35aada9b078f8dc71dcc85e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 5 17:34:03 2017 +0200 ntdll: Make RtlDeregisterWaitEx(handle, INVALID_HANDLE_VALUE) thread safe. Chromium signals the wait semaphore and calls DeregisterWaitEx with CompletionHandle = INVALID_HANDLE_VALUE in close succession. Sometimes the worker thread decides to run the callback, but before it sets CallbackInProgress RtlDeregisterWaitEx decides that the callback is not running and returns STATUS_SUCCESS. Chromium then releases resources that the callback needs to run, resulting in random crashes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 59 +++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 6063d51..1b0546a 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -541,11 +541,13 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) break; } - completion_event = wait_work_item->CompletionEvent; - if (completion_event) NtSetEvent( completion_event, NULL ); if (interlocked_inc( &wait_work_item->DeleteCount ) == 2 ) + { + completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); + if (completion_event) NtSetEvent( completion_event, NULL ); + } return 0; } @@ -633,44 +635,47 @@ NTSTATUS WINAPI RtlRegisterWait(PHANDLE NewWaitObject, HANDLE Object, NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) { struct wait_work_item *wait_work_item = WaitHandle; - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status; + HANDLE LocalEvent = NULL; + BOOLEAN CallbackInProgress; - TRACE( "(%p)\n", WaitHandle ); + TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; - NtSetEvent( wait_work_item->CancelEvent, NULL ); - if (wait_work_item->CallbackInProgress) + CallbackInProgress = wait_work_item->CallbackInProgress; + if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { - if (CompletionEvent != NULL) - { - if (CompletionEvent == INVALID_HANDLE_VALUE) - { - status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); - if (status != STATUS_SUCCESS) - return status; - interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); - if (wait_work_item->CallbackInProgress) - NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); - NtClose( CompletionEvent ); - } - else - { - interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); - if (wait_work_item->CallbackInProgress) - status = STATUS_PENDING; - } - } - else - status = STATUS_PENDING; + status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); + if (status != STATUS_SUCCESS) + return status; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, LocalEvent ); + } + else if (CompletionEvent != NULL) + { + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); } + NtSetEvent( wait_work_item->CancelEvent, NULL ); + if (interlocked_inc( &wait_work_item->DeleteCount ) == 2 ) { status = STATUS_SUCCESS; delete_wait_work_item( wait_work_item ); } + else if (LocalEvent) + { + NtWaitForSingleObject( LocalEvent, FALSE, NULL ); + status = STATUS_SUCCESS; + } + else + { + status = STATUS_PENDING; + } + + if (LocalEvent) + NtClose( LocalEvent ); return status; }

1 0

Alistair Leslie-Hughes : include: Added IMFMediaEventQueue interface.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 90d4f7f30043ea9802e0367b1de245cad2c27076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d4f7f30043ea9802e0367b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:40 2017 +0000 include: Added IMFMediaEventQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfobjects.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 467535d..67055d3 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -583,3 +583,21 @@ interface IMFPluginControl : IUnknown HRESULT GetDisabledByIndex(DWORD pluginType, DWORD index, CLSID *clsid); HRESULT SetDisabled(DWORD pluginType, REFCLSID clsid, BOOL disabled); } + +[ + object, + uuid(36f846fc-2256-48b6-b58e-e2b638316581), + local +] +interface IMFMediaEventQueue : IUnknown +{ + HRESULT GetEvent([in] DWORD flags, [out] IMFMediaEvent **event); + HRESULT BeginGetEvent([in] IMFAsyncCallback *callback, [in] IUnknown *state); + HRESULT EndGetEvent([in] IMFAsyncResult *result, [out] IMFMediaEvent **event); + HRESULT QueueEvent([in] IMFMediaEvent *event); + HRESULT QueueEventParamVar([in] MediaEventType met, [in] REFGUID type, + [in] HRESULT status, [in, unique] const PROPVARIANT *value); + HRESULT QueueEventParamUnk([in] MediaEventType met, [in] REFGUID type, + [in] HRESULT status, [in, unique] IUnknown *unk); + HRESULT Shutdown(); +}

1 0

Alistair Leslie-Hughes : include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: a0989060190a6e875483b249586a3c0840757c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0989060190a6e875483b2495… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:49 2017 +0000 include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 3c33806..b0fadba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -164,6 +164,54 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +[ + object, + uuid(e93dcf6c-4b07-4e1e-8123-aa16ed6eadf5) +] +interface IMFMediaTypeHandler : IUnknown +{ + [local] + HRESULT IsMediaTypeSupported([in] IMFMediaType *in_type, [out] IMFMediaType **out_type); + + [call_as(IsMediaTypeSupported)] + HRESULT RemoteIsMediaTypeSupported([in, size_is(size)] BYTE *data, [in] DWORD size, + [out, size_is(, *match_count)] BYTE **match, [out] DWORD *match_count); + + HRESULT GetMediaTypeCount([out] DWORD *count); + + [local] + HRESULT GetMediaTypeByIndex([in] DWORD index, [out] IMFMediaType **type); + + [call_as(GetMediaTypeByIndex)] + HRESULT RemoteGetMediaTypeByIndex([in] DWORD index, [out, size_is(, *count)] BYTE **data, + [out] DWORD *count); + + [local] + HRESULT SetCurrentMediaType([in] IMFMediaType *type); + + [call_as(SetCurrentMediaType)] + HRESULT RemoteSetCurrentMediaType([in, size_is(count)] BYTE *data, [in] DWORD count); + + [local] + HRESULT GetCurrentMediaType([out] IMFMediaType **type); + + [call_as(GetCurrentMediaType)] + HRESULT RemoteGetCurrentMediaType([out, size_is(, *count)] BYTE **data, [out] DWORD *count); + + HRESULT GetMajorType([out] GUID *type); +} + +[ + object, + uuid(56c03d9c-9dbb-45f5-ab4b-d80f47c05938) +] +interface IMFStreamDescriptor : IMFAttributes +{ + HRESULT GetStreamIdentifier([out] DWORD *identifier); + + HRESULT GetMediaTypeHandler([out] IMFMediaTypeHandler **handler); +} + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Vincent Povirk : gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawPath.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: ac51280b1f9ab818a136f7b6987a590ea78ea66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac51280b1f9ab818a136f7b69… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:31 2017 -0500 gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4413e75..da70899 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3799,7 +3799,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * points[1].X = pen->width; points[2].Y = pen->width; - stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, + stat = gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, points, 3); if (stat != Ok) @@ -3823,7 +3823,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * stat = GdipCreateMatrix(&transform); if (stat == Ok) - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, transform); } else @@ -3831,7 +3831,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * /* Set flatness based on the final coordinate space */ GpMatrix t; - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &t); if (stat != Ok)

1 0

Vincent Povirk : gdiplus: Account for gdi32 transforms in text functions.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: 9e1c110585e0b9df28c0d41b47f42ba50a6d23d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1c110585e0b9df28c0d41b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:32 2017 -0500 gdiplus: Account for gdi32 transforms in text functions. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index da70899..3b01505 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -302,13 +302,6 @@ static void round_points(POINT *pti, GpPointF *ptf, INT count) } } -static void transform_and_round_points(GpGraphics *graphics, POINT *pti, - GpPointF *ptf, INT count) -{ - gdip_transform_points(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, count); - round_points(pti, ptf, count); -} - static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { @@ -2226,7 +2219,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GdipTransformMatrixPoints(&xform, pt, 3); } - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -5263,7 +5256,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5292,9 +5285,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; + gdi_transform_acquire(graphics); + stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); + gdi_transform_release(graphics); + SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -5382,7 +5379,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5417,9 +5414,13 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.linesfilled = &lines; lines = glyphs = 0; + gdi_transform_acquire(graphics); + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); + gdi_transform_release(graphics); + if (linesfilled) *linesfilled = lines; if (codepointsfitted) *codepointsfitted = glyphs; @@ -5549,7 +5550,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5559,7 +5560,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; - transform_and_round_points(graphics, corners, rectcpy, 4); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, rectcpy, 4); + round_points(corners, rectcpy, 4); margin_x = (format && format->generic_typographic) ? 0.0 : font->emSize / 6.0; margin_x *= units_scale(font->unit, graphics->unit, graphics->xres); @@ -5598,12 +5600,16 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.rel_width = rel_width; args.rel_height = rel_height; + gdi_transform_acquire(graphics); + GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); + gdi_transform_release(graphics); + DeleteObject(rgn); DeleteObject(gdifont); @@ -6907,7 +6913,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT GpMatrix xform = *matrix; GdipTransformMatrixPoints(&xform, pt, 3); } - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -7001,15 +7007,19 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } pt = positions[0]; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &pt, 1); get_font_hfont(graphics, font, format, &hfont, matrix); SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); + gdi_transform_acquire(graphics); + ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, NULL); + gdi_transform_release(graphics); + RestoreDC(graphics->hdc, save_state); DeleteObject(hfont); @@ -7057,7 +7067,8 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI { real_position = positions[0]; - transform_and_round_points(graphics, pti, &real_position, 1); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &real_position, 1); + round_points(pti, &real_position, 1); } else { @@ -7070,7 +7081,8 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI memcpy(real_positions, positions, sizeof(PointF) * length); - transform_and_round_points(graphics, pti, real_positions, length); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, real_positions, length); + round_points(pti, real_positions, length); heap_free(real_positions); } @@ -7210,10 +7222,14 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI heap_free(text_mask); + gdi_transform_acquire(graphics); + /* draw the result */ stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, pixel_area.Height, pixel_data_stride, PixelFormat32bppARGB); + gdi_transform_release(graphics); + heap_free(pixel_data); return stat;

1 0

Vincent Povirk : gdiplus: Account for gdi32 transform in GdipSetClipHrgn.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: b32c3243782477f7cc6dc5a189a3e4a5dacce1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32c3243782477f7cc6dc5a18… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:33 2017 -0500 gdiplus: Account for gdi32 transform in GdipSetClipHrgn. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 ++++++++++++----- dlls/gdiplus/tests/graphics.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3b01505..ea02c6b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6209,6 +6209,7 @@ GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode { GpRegion *region; GpStatus status; + GpMatrix transform; TRACE("(%p, %p, %d)\n", graphics, hrgn, mode); @@ -6218,14 +6219,21 @@ GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode if(graphics->busy) return ObjectBusy; - /* hrgn is already in device units */ + /* hrgn is in gdi32 device units */ status = GdipCreateRegionHrgn(hrgn, &region); - if(status != Ok) - return status; - status = GdipCombineRegionRegion(graphics->clip, region, mode); + if (status == Ok) + { + status = get_graphics_transform(graphics, CoordinateSpaceDevice, WineCoordinateSpaceGdiDevice, &transform); + + if (status == Ok) + status = GdipTransformRegion(region, &transform); + + if (status == Ok) + status = GdipCombineRegionRegion(graphics->clip, region, mode); - GdipDeleteRegion(region); + GdipDeleteRegion(region); + } return status; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5416ebc..651ba53 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6529,6 +6529,51 @@ static void test_GdipDrawImagePointsRectOnMemoryDC(void) ReleaseDC(hwnd, dc); } +static void test_cliphrgn_transform(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + HRGN rgn; + RectF rectf; + BOOL res; + + hdc = GetDC(hwnd); + + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + rgn = CreateRectRgn(0, 0, 100, 100); + + status = GdipSetClipHrgn(graphics, rgn, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + expectf(-10.0, rectf.X); + expectf(-10.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipIsVisiblePoint(graphics, 95, 95, &res); + expect(Ok, status); + expect(FALSE, res); + + status = GdipIsVisiblePoint(graphics, -5, -5, &res); + expect(Ok, status); + expect(TRUE, res); + + DeleteObject(rgn); + + GdipDeleteGraphics(graphics); + + SetViewportOrgEx(hdc, 0, 0, NULL); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6618,6 +6663,7 @@ START_TEST(graphics) test_GdipDrawImagePointsRectOnMemoryDC(); test_container_rects(); test_GdipGraphicsSetAbort(); + test_cliphrgn_transform(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Fabian Maurer : shell32: Draw text on message boxes without background.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: 755f49d7c4765c792da2c0b776300b4616f7bef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755f49d7c4765c792da2c0b77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 4 19:42:53 2017 +0200 shell32: Draw text on message boxes without background. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3c18066..8d4160d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -122,6 +122,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) BeginPaint(hDlg, &ps); hdc = ps.hdc; + SetBkMode(hdc, TRANSPARENT); GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r); /* this will remap the rect to dialog coords */

1 0