September 2017 - Wine-commits

Ihsan Akmal : include: Add d3d11_3.idl.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: b4940ebab16903985b64cf7401cfff68ac33fa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4940ebab16903985b64cf740… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 19 13:14:33 2017 +0200 include: Add d3d11_3.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11_3.idl | 384 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 385 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4940ebab16903985b64c…

1 0

Nikolay Sivov : d3d9/tests: Some tests for D3DPRESENTFLAG_LOCKABLE_BACKBUFFER mode.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: a5328e51df65ffd0fead908a6bba921110bb718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5328e51df65ffd0fead908a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 19 09:00:11 2017 +0300 d3d9/tests: Some tests for D3DPRESENTFLAG_LOCKABLE_BACKBUFFER mode. 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/d3d9/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d9cfb02b..fb30636 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11740,6 +11740,96 @@ static void test_destroyed_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_lockable_backbuffer(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lockrect; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + HDC dc; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + dc = (void *)0xdeadbeef; + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(dc == (void *)0xdeadbeef, "Unexpected DC returned.\n"); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + /* Reset with D3DPRESENTFLAG_LOCKABLE_BACKBUFFER. */ + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + hr = IDirect3DDevice9_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); +todo_wine + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + device_desc.width = 640; + device_desc.height = 480; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_LOCKABLE_BACKBUFFER; + + device = create_device(d3d, window, &device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11859,6 +11949,7 @@ START_TEST(device) test_render_target_device_mismatch(); test_format_unknown(); test_destroyed_window(); + test_lockable_backbuffer(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Alistair Leslie-Hughes : qedit/tests: Add test for the IAMTimelineGroup interface.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: d107b91caa47b23d8788c8627f1b181138384689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d107b91caa47b23d8788c8627… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 19 04:10:08 2017 +0000 qedit/tests: Add test for the IAMTimelineGroup interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 40cf774..4801743 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -108,9 +108,38 @@ static void test_timeline(void) ok(!timeline2, "Expected NULL got %p\n", timeline2); } +static void test_timelineobj_interfaces(void) +{ + HRESULT hr; + IAMTimeline *timeline = NULL; + IAMTimelineObj *obj; + + hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "CoCreateInstance failed: %08x\n", hr); + if (!timeline) + return; + + hr = IAMTimeline_CreateEmptyNode(timeline, &obj, TIMELINE_MAJOR_TYPE_GROUP); + ok(hr == S_OK, "CreateEmptyNode failed: %08x\n", hr); + if(hr == S_OK) + { + IAMTimelineGroup *group; + + hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimelineGroup, (void **)&group); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + IAMTimelineGroup_Release(group); + + IAMTimelineObj_Release(obj); + } + + IAMTimeline_Release(timeline); +} + START_TEST(timeline) { CoInitialize(NULL); test_timeline(); + test_timelineobj_interfaces(); CoUninitialize(); }

1 0

Fabian Maurer : mfuuid: Add library.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: 95633f368133bd51fcd777e0487f915e62a3d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95633f368133bd51fcd777e04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Sep 19 01:40:09 2017 +0200 mfuuid: Add library. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfuuid/Makefile.in | 4 ++++ dlls/mfuuid/mfuuid.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index 6643778..644dd4c 100755 --- a/configure +++ b/configure @@ -18444,6 +18444,7 @@ wine_fn_config_dll mf3216 enable_mf3216 wine_fn_config_dll mfplat enable_mfplat implib wine_fn_config_test dlls/mfplat/tests mfplat_test wine_fn_config_dll mfreadwrite enable_mfreadwrite +wine_fn_config_lib mfuuid wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang clean,implib diff --git a/configure.ac b/configure.ac index f5a617c..54ae425 100644 --- a/configure.ac +++ b/configure.ac @@ -3233,6 +3233,7 @@ WINE_CONFIG_DLL(mf3216) WINE_CONFIG_DLL(mfplat,,[implib]) WINE_CONFIG_TEST(dlls/mfplat/tests) WINE_CONFIG_DLL(mfreadwrite) +WINE_CONFIG_LIB(mfuuid) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[clean,implib]) diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in new file mode 100644 index 0000000..5fbb522 --- /dev/null +++ b/dlls/mfuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libmfuuid.a + +C_SRCS = \ + mfuuid.c diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c new file mode 100644 index 0000000..f9b1a8a --- /dev/null +++ b/dlls/mfuuid/mfuuid.c @@ -0,0 +1,30 @@ +/* + * GUID definitions + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "propsys.h" +#include "strmif.h" +#include "mediaobj.h" + +#include "initguid.h" + +#include "mfapi.h" +#include "mfidl.h" +#include "mfreadwrite.h"

1 0

Gijs Vermeulen : msvcrt: Add _vfprintf_l.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: 4a75c37b41a8dabbdd96b6b255a98b6eb814e323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a75c37b41a8dabbdd96b6b25… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 19 01:41:52 2017 +0200 msvcrt: Add _vfprintf_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 20 ++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a8c7862..1c95da9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1433,7 +1433,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5f4c497..86209ac 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1790,7 +1790,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 75f0428..c091bd1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1808,7 +1808,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index cd9c44d..0193282 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1502,7 +1502,7 @@ @ cdecl _utime32(str ptr) msvcr120._utime32 @ cdecl _utime64(str ptr) msvcr120._utime64 @ cdecl _vacopy(ptr ptr) msvcr120._vacopy -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5cc8691..a08748c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1112,7 +1112,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 57a4741..1604d62 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1088,7 +1088,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index eb474c5..8af9bc2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5214,6 +5214,26 @@ int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, MSVCRT_FILE } /********************************************************************* + * _vfprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfprintf_l(MSVCRT_FILE* file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, 0, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * _vfwprintf_l (MSVCRT.@) */ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1e2b043..4e80308 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1044,7 +1044,7 @@ # stub _vcwprintf_p_l(wstr ptr ptr) # stub _vcwprintf_s(wstr ptr) # stub _vcwprintf_s_l(wstr ptr ptr) -# stub _vfprintf_l(ptr str ptr ptr) +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr)

1 0

Zebediah Figura : msi/tests: Factor out success checks into table building functions.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: b91a27489254150e54835eca24440c0c05e272d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91a27489254150e54835eca2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 10:50:14 2017 -0500 msi/tests: Factor out success checks into table building functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 171 ++-- dlls/msi/tests/package.c | 2221 +++++++++++++++------------------------------- 2 files changed, 766 insertions(+), 1626 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91a27489254150e54835…

1 0

Zebediah Figura : msi/tests: Move a test from format.c to package.c.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: ffef8bd41cd3bcc613270fe17f698bd0e2610c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffef8bd41cd3bcc613270fe17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 10:50:15 2017 -0500 msi/tests: Move a test from format.c to package.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/format.c | 511 ----------------------------------------------- dlls/msi/tests/package.c | 261 ++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 511 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffef8bd41cd3bcc613270…

1 0

Hugh Bellamy : gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: e0601829e1093c6ba6e42004f5270817a6d90a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0601829e1093c6ba6e42004f… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Sun Sep 17 11:46:56 2017 +0100 gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 3 +++ dlls/gdiplus/tests/brush.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 201fadf..6db4ada 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -250,6 +250,9 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR if(!brush) return InvalidParameter; + if(hatchstyle < HatchStyleMin || hatchstyle > HatchStyleMax) + return InvalidParameter; + *brush = heap_alloc_zero(sizeof(GpHatch)); if (!*brush) return OutOfMemory; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 045d5e5..e002a6f 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -45,6 +45,33 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static void test_createHatchBrush(void) +{ + GpStatus status; + GpHatch *brush; + + status = GdipCreateHatchBrush(HatchStyleMin, 1, 2, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected the brush to be initialized."); + + GdipDeleteBrush((GpBrush *)brush); + + status = GdipCreateHatchBrush(HatchStyleMax, 1, 2, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected the brush to be initialized."); + + GdipDeleteBrush((GpBrush *)brush); + + status = GdipCreateHatchBrush(HatchStyle05Percent, 1, 2, NULL); + expect(InvalidParameter, status); + + status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMin - 1), 1, 2, &brush); + expect(InvalidParameter, status); + + status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMax + 1), 1, 2, &brush); + expect(InvalidParameter, status); +} + static void test_type(void) { GpStatus status; @@ -1563,6 +1590,7 @@ START_TEST(brush) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_createHatchBrush(); test_type(); test_gradientblendcount(); test_getblend();

1 0

Hugh Bellamy : gdiplus: Define GpHatchStyle.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: c022c46613c137ab53185b5e7752aff14a085c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c022c46613c137ab53185b5e7… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Fri Sep 15 16:39:59 2017 +0100 gdiplus: Define GpHatchStyle. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/tests/brush.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 4 ++-- include/gdiplusgpstubs.h | 1 + 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 6db4ada..d5cd94a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -230,7 +230,7 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; -GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) +GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { @@ -244,7 +244,7 @@ GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -941,7 +941,7 @@ GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) return Ok; } -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, GpHatchStyle *hatchstyle) { TRACE("(%p, %p)\n", brush, hatchstyle); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6bb7f88..33f6ceb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -139,7 +139,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; +extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; static inline INT gdip_round(REAL x) { @@ -276,7 +276,7 @@ struct GpBrush{ struct GpHatch{ GpBrush brush; - HatchStyle hatchstyle; + GpHatchStyle hatchstyle; ARGB forecol; ARGB backcol; }; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index e002a6f..45b2710 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1556,6 +1556,27 @@ static void test_pathgradientblend(void) expect(Ok, status); } +static void test_getHatchStyle(void) +{ + GpStatus status; + GpHatch *brush; + GpHatchStyle hatchStyle; + + GdipCreateHatchBrush(HatchStyleHorizontal, 11, 12, &brush); + + status = GdipGetHatchStyle(NULL, &hatchStyle); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, &hatchStyle); + expect(Ok, status); + expect(HatchStyleHorizontal, hatchStyle); + + GdipDeleteBrush((GpBrush *)brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1606,6 +1627,7 @@ START_TEST(brush) test_pathgradientcenterpoint(); test_pathgradientpresetblend(); test_pathgradientblend(); + test_getHatchStyle(); GdiplusShutdown(gdiplusToken); DestroyWindow(hwnd); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f2ac91e..8bfe8b8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -387,10 +387,10 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL, GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL); /* HatchBrush */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle,ARGB,ARGB,GpHatch**); GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*); +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,GpHatchStyle*); /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 5a65cd8..67b6ac1 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -95,5 +95,6 @@ typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; typedef PenAlignment GpPenAlignment; typedef PenType GpPenType; +typedef HatchStyle GpHatchStyle; #endif

1 0

Alex Henrie : msvcrt: Set the correct error number in pow(f).
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 3864851feb1a8a76a8665dea0484512f1fc13c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3864851feb1a8a76a8665dea0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 14 09:16:57 2017 -0600 msvcrt: Set the correct error number in pow(f). Old versions of MSVC set EDOM on pow(-1, INFINITY) and pow(-1, -INFINITY) but new versions do not. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++++---- dlls/ucrtbase/tests/misc.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05a2b72..60ce4e6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -318,9 +318,11 @@ float CDECL MSVCRT_log10f( float x ) */ float CDECL MSVCRT_powf( float x, float y ) { - /* FIXME: If x < 0 and y is not integral, set EDOM */ float z = powf(x,y); - if (!finitef(z)) math_error(_DOMAIN, "powf", x, 0, z); + if (x < 0 && y != floorf(y)) math_error(_DOMAIN, "powf", x, y, z); + else if (!x && finitef(y) && y < 0) math_error(_SING, "powf", x, y, z); + else if (finitef(x) && finitef(y) && !finitef(z)) math_error(_OVERFLOW, "powf", x, y, z); + else if (x && finitef(x) && finitef(y) && !z) math_error(_UNDERFLOW, "powf", x, y, z); return z; } @@ -530,9 +532,11 @@ double CDECL MSVCRT_log10( double x ) */ double CDECL MSVCRT_pow( double x, double y ) { - /* FIXME: If x < 0 and y is not integral, set EDOM */ double z = pow(x,y); - if (!isfinite(z)) math_error(_DOMAIN, "pow", x, y, z); + if (x < 0 && y != floor(y)) math_error(_DOMAIN, "pow", x, y, z); + else if (!x && isfinite(y) && y < 0) math_error(_SING, "pow", x, y, z); + else if (isfinite(x) && isfinite(y) && !isfinite(z)) math_error(_OVERFLOW, "pow", x, y, z); + else if (x && isfinite(x) && isfinite(y) && !z) math_error(_UNDERFLOW, "pow", x, y, z); return z; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 04718c9..d17f2d0 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -647,6 +647,29 @@ static void test_math_errors(void) {"atan2", INFINITY, 0, -1, -1}, {"atan2", 0, -INFINITY, -1, -1}, {"atan2", 0, INFINITY, -1, -1}, + {"pow", -INFINITY, -2, -1, -1}, + {"pow", -INFINITY, -1, -1, -1}, + {"pow", -INFINITY, 0, -1, -1}, + {"pow", -INFINITY, 1, -1, -1}, + {"pow", -INFINITY, 2, -1, -1}, + {"pow", -1e100, -10, -1, _UNDERFLOW}, + {"pow", -1e100, 10, ERANGE, _OVERFLOW}, + {"pow", -1, 1.5, EDOM, _DOMAIN}, + {"pow", 0, -2, ERANGE, _SING}, + {"pow", 0, -1, ERANGE, _SING}, + {"pow", 0.5, -INFINITY, -1, -1}, + {"pow", 0.5, INFINITY, -1, -1}, + {"pow", 2, -INFINITY, -1, -1}, + {"pow", 2, -1e100, -1, _UNDERFLOW}, + {"pow", 2, 1e100, ERANGE, _OVERFLOW}, + {"pow", 2, INFINITY, -1, -1}, + {"pow", 1e100, -10, -1, _UNDERFLOW}, + {"pow", 1e100, 10, ERANGE, _OVERFLOW}, + {"pow", INFINITY, -2, -1, -1}, + {"pow", INFINITY, -1, -1, -1}, + {"pow", INFINITY, 0, -1, -1}, + {"pow", INFINITY, 1, -1, -1}, + {"pow", INFINITY, 2, -1, -1}, }; const struct { char func[16];

1 0