October 2018 - Wine-commits

Nikolay Sivov : d2d1: Fix bind flags used for bitmap resources.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: f2429e3109c4caa92fdc22bed48f2c8b580ba3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2429e3109c4caa92fdc22be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:06 2018 +0300 d2d1: Fix bind flags used for bitmap resources. 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 | 6 +++++- dlls/d2d1/tests/d2d1.c | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 3948c26..6eee1d1 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -338,7 +338,11 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D10_USAGE_DEFAULT; - texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.BindFlags = 0; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_TARGET) + texture_desc.BindFlags |= D3D10_BIND_RENDER_TARGET; + if (!(desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d31c8ad..55d2f56 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -813,9 +813,8 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) bind_flags |= D3D10_BIND_SHADER_RESOURCE; - todo_wine_if (options == D2D1_BITMAP_OPTIONS_TARGET) - ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n", - desc.BindFlags, options); + ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n", + desc.BindFlags, options); ok_(__FILE__, line)(!desc.CPUAccessFlags, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); ok_(__FILE__, line)(!desc.MiscFlags, "Unexpected misc flags %#x.\n", desc.MiscFlags);

1 0

Nikolay Sivov : d2d1: Set GDI compatible resource flag from bitmap options.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 8b3081e30566b3aa5e29857bfa9fcb652341a76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3081e30566b3aa5e29857b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:07 2018 +0300 d2d1: Set GDI compatible resource flag from bitmap options. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6eee1d1..c0aef3c 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -345,6 +345,8 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE) + texture_desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch;

1 0

Nikolay Sivov : d2d1: Simplify target bitmap creation for DC target.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: c96eba60e347e9ce79f8b60e0fac9bf69c165ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96eba60e347e9ce79f8b60e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:08 2018 +0300 d2d1: Simplify target bitmap creation for DC target. 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/dc_render_target.c | 64 +++++++++++++++++--------------------------- dlls/d2d1/tests/d2d1.c | 1 - 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index b4306fb..b095008 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -686,11 +686,13 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget const HDC hdc, const RECT *rect) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - D3D10_TEXTURE2D_DESC texture_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d_bitmap *bitmap_impl; IDXGISurface1 *dxgi_surface; ID2D1DeviceContext *context; - ID3D10Texture2D *texture; - ID2D1Bitmap1 *bitmap; + ID3D10Resource *resource; + D2D1_SIZE_U bitmap_size; + ID2D1Bitmap *bitmap; HRESULT hr; TRACE("iface %p, hdc %p, rect %s.\n", iface, hdc, wine_dbgstr_rect(rect)); @@ -698,49 +700,33 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget if (!hdc) return E_INVALIDARG; - texture_desc.Width = rect->right - rect->left; - texture_desc.Height = rect->bottom - rect->top; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = render_target->pixel_format.format; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D10_USAGE_DEFAULT; - texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE; - texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE; - - if (FAILED(hr = ID3D10Device1_CreateTexture2D(render_target->d3d_device, &texture_desc, NULL, &texture))) - { - WARN("Failed to create texture, hr %#x.\n", hr); - return hr; - } - - hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void **)&dxgi_surface); - ID3D10Texture2D_Release(texture); - if (FAILED(hr)) - { - WARN("Failed to get surface interface from a texture, hr %#x.\n", hr); - return hr; - } - /* Switch dxgi target to new surface. */ ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, &IID_ID2D1DeviceContext, (void **)&context); - hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(context, (IDXGISurface *)dxgi_surface, NULL, &bitmap); - if (SUCCEEDED(hr)) - { - ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); - ID2D1Bitmap1_Release(bitmap); - } - ID2D1DeviceContext_Release(context); - if (FAILED(hr)) + bitmap_size.width = rect->right - rect->left; + bitmap_size.height = rect->bottom - rect->top; + + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat = render_target->pixel_format; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | + D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE; + if (FAILED(hr = ID2D1DeviceContext_CreateBitmap(context, bitmap_size, NULL, 0, &bitmap_desc, + (ID2D1Bitmap1 **)&bitmap))) { - WARN("Failed to create new target bitmap, hr %#x.\n", hr); - IDXGISurface1_Release(dxgi_surface); + WARN("Failed to create target bitmap, hr %#x.\n", hr); + ID2D1DeviceContext_Release(context); return hr; } + bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); + ID3D10ShaderResourceView_GetResource(bitmap_impl->view, &resource); + ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)&dxgi_surface); + ID3D10Resource_Release(resource); + + ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); + ID2D1Bitmap_Release(bitmap); + ID2D1DeviceContext_Release(context); + if (render_target->dxgi_surface) IDXGISurface1_Release(render_target->dxgi_surface); render_target->dxgi_surface = dxgi_surface; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 55d2f56..feebeff 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7489,7 +7489,6 @@ todo_wine ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); options = ID2D1Bitmap1_GetOptions(bitmap); -todo_wine ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface);

1 0

Józef Kucia : vkd3d-shader: Bump SPIR-V generator version.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: vkd3d Branch: master Commit: 406824327940644568754c37172fc8c699993877 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=406824327940644568754c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 2 12:02:40 2018 +0200 vkd3d-shader: Bump SPIR-V generator version. In preparation for the next release. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7fe3528..98d7a93 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -96,7 +96,7 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 0 +#define VKD3D_SPIRV_GENERATOR_VERSION 1 #define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) struct vkd3d_spirv_stream

1 0

Józef Kucia : build: Bump libtool version numbers for shared libraries.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: vkd3d Branch: master Commit: 44fb80f84c8bb2d8857b7268d4e3a16b8648c8e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44fb80f84c8bb2d8857b726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 2 12:02:41 2018 +0200 build: Bump libtool version numbers for shared libraries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1fdc916..8d47439 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_la_LDFLAGS = -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -106,7 +106,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map

1 0

Hans Leidekker : msi: Add support for control event DirectoryListNew.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 97a7a4ff0c8895c3ef1979eeee988c4c121d9839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a7a4ff0c8895c3ef1979ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 1 17:01:49 2018 +0200 msi: Add support for control event DirectoryListNew. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25687 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 164 +++++++++++++++++++++++++++----------- dlls/msi/msi.rc | 1 + dlls/msi/resource.h | 2 + po/ar.po | 218 +++++++++++++++++++++++++-------------------------- po/bg.po | 218 +++++++++++++++++++++++++-------------------------- po/ca.po | 218 +++++++++++++++++++++++++-------------------------- po/cs.po | 218 +++++++++++++++++++++++++-------------------------- po/da.po | 218 +++++++++++++++++++++++++-------------------------- po/de.po | 218 +++++++++++++++++++++++++-------------------------- po/el.po | 218 +++++++++++++++++++++++++-------------------------- po/en.po | 218 +++++++++++++++++++++++++-------------------------- po/en_US.po | 218 +++++++++++++++++++++++++-------------------------- po/eo.po | 218 +++++++++++++++++++++++++-------------------------- po/es.po | 218 +++++++++++++++++++++++++-------------------------- po/fa.po | 218 +++++++++++++++++++++++++-------------------------- po/fi.po | 218 +++++++++++++++++++++++++-------------------------- po/fr.po | 218 +++++++++++++++++++++++++-------------------------- po/he.po | 218 +++++++++++++++++++++++++-------------------------- po/hi.po | 218 +++++++++++++++++++++++++-------------------------- po/hr.po | 218 +++++++++++++++++++++++++-------------------------- po/hu.po | 218 +++++++++++++++++++++++++-------------------------- po/it.po | 218 +++++++++++++++++++++++++-------------------------- po/ja.po | 218 +++++++++++++++++++++++++-------------------------- po/ko.po | 218 +++++++++++++++++++++++++-------------------------- po/lt.po | 218 +++++++++++++++++++++++++-------------------------- po/ml.po | 218 +++++++++++++++++++++++++-------------------------- po/nb_NO.po | 218 +++++++++++++++++++++++++-------------------------- po/nl.po | 218 +++++++++++++++++++++++++-------------------------- po/or.po | 218 +++++++++++++++++++++++++-------------------------- po/pa.po | 218 +++++++++++++++++++++++++-------------------------- po/pl.po | 218 +++++++++++++++++++++++++-------------------------- po/pt_BR.po | 218 +++++++++++++++++++++++++-------------------------- po/pt_PT.po | 218 +++++++++++++++++++++++++-------------------------- po/rm.po | 218 +++++++++++++++++++++++++-------------------------- po/ro.po | 218 +++++++++++++++++++++++++-------------------------- po/ru.po | 218 +++++++++++++++++++++++++-------------------------- po/sk.po | 218 +++++++++++++++++++++++++-------------------------- po/sl.po | 218 +++++++++++++++++++++++++-------------------------- po/sr_RS(a)cyrillic.po | 218 +++++++++++++++++++++++++-------------------------- po/sr_RS(a)latin.po | 218 +++++++++++++++++++++++++-------------------------- po/sv.po | 218 +++++++++++++++++++++++++-------------------------- po/te.po | 218 +++++++++++++++++++++++++-------------------------- po/th.po | 218 +++++++++++++++++++++++++-------------------------- po/tr.po | 218 +++++++++++++++++++++++++-------------------------- po/uk.po | 218 +++++++++++++++++++++++++-------------------------- po/wa.po | 218 +++++++++++++++++++++++++-------------------------- po/wine.pot | 218 +++++++++++++++++++++++++-------------------------- po/zh_CN.po | 218 +++++++++++++++++++++++++-------------------------- po/zh_TW.po | 218 +++++++++++++++++++++++++-------------------------- 49 files changed, 5137 insertions(+), 5058 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97a7a4ff0c8895c3ef19…

1 0

Piotr Caban : msvcr120: Added _Cbuild implementation.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 84f5d8a619c599dbacff499989500e653abec0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f5d8a619c599dbacff4999… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:39 2018 +0200 msvcr120: Added _Cbuild implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 7 +++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 7bae4ff..ec85a53 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() ucrtbase._CIsqrt @ cdecl -arch=i386 _CItan() ucrtbase._CItan @ cdecl -arch=i386 _CItanh() ucrtbase._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) ucrtbase._Cbuild @ stub _Cmulcc @ stub _Cmulcr @ stub _FCbuild diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 44f728b..f3ab39a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -824,7 +824,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 85e83a6..37957d5 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -163,6 +163,12 @@ typedef struct unsigned int status; } fenv_t; +typedef struct +{ + double r; + double i; +} _Dcomplex; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -184,6 +190,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); +static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); /* make sure we use the correct errno */ #undef errno @@ -242,6 +249,7 @@ static BOOL init(void) SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); + SET(p__Cbuild, "_Cbuild"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -935,6 +943,20 @@ static void test_vsscanf(void) ok(v == 10, "got %d.\n", v); } +static void test__Cbuild(void) +{ + _Dcomplex c; + + memset(&c, 0, sizeof(c)); + p__Cbuild(&c, 1.0, 2.0); + ok(c.r == 1.0, "c.r = %lf\n", c.r); + ok(c.i == 2.0, "c.i = %lf\n", c.i); + + p__Cbuild(&c, 3.0, NAN); + ok(c.r == 3.0, "c.r = %lf\n", c.r); + ok(_isnan(c.i), "c.i = %lf\n", c.i); +} + START_TEST(msvcr120) { if (!init()) return; @@ -953,4 +975,5 @@ START_TEST(msvcr120) test__Condition_variable(); test_wctype(); test_vsscanf(); + test__Cbuild(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 935de2b..1076ddf 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -818,7 +818,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt @ cdecl -arch=i386 _CItan() msvcr120._CItan @ cdecl -arch=i386 _CItanh() msvcr120._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) msvcr120._Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dbfaa24..b920251 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3383,4 +3383,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } +_Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) +{ + ret->x = r; + ret->y = i; + return ret; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4e24ec0..37e820a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -458,6 +458,7 @@ struct MSVCRT__complex { double x; /* Real part */ double y; /* Imaginary part */ }; +typedef struct MSVCRT__complex _Dcomplex; typedef struct MSVCRT__div_t { int quot; /* quotient */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ced9ca..3d0de47 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr)

1 0

Piotr Caban : msvcr120: Added creal implementation.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 83a0c2085f55bbe789f7aabf1d494c24c8d6ab37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a0c2085f55bbe789f7aabf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:45 2018 +0200 msvcr120: Added creal implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 3 ++- dlls/msvcr120/msvcr120.spec | 3 ++- dlls/msvcr120/tests/msvcr120.c | 7 +++++++ dlls/msvcr120_app/msvcr120_app.spec | 3 ++- dlls/msvcrt/math.c | 5 +++++ dlls/ucrtbase/ucrtbase.spec | 3 ++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index ec85a53..e7f3c98 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -202,7 +202,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) ucrtbase.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) ucrtbase.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f3ab39a..fe4e2bd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2103,7 +2103,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 37957d5..79b667e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -191,6 +191,7 @@ static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); +static double (__cdecl *p_creal)(_Dcomplex); /* make sure we use the correct errno */ #undef errno @@ -250,6 +251,7 @@ static BOOL init(void) SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); + SET(p_creal, "creal"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -946,15 +948,20 @@ static void test_vsscanf(void) static void test__Cbuild(void) { _Dcomplex c; + double d; memset(&c, 0, sizeof(c)); p__Cbuild(&c, 1.0, 2.0); ok(c.r == 1.0, "c.r = %lf\n", c.r); ok(c.i == 2.0, "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 1.0, "creal returned %lf\n", d); p__Cbuild(&c, 3.0, NAN); ok(c.r == 3.0, "c.r = %lf\n", c.r); ok(_isnan(c.i), "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 3.0, "creal returned %lf\n", d); } START_TEST(msvcr120) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1076ddf..4429a0c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1769,7 +1769,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) msvcr120.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) msvcr120.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b920251..d4785d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3390,4 +3390,9 @@ _Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) return ret; } +double CDECL MSVCR120_creal(_Dcomplex z) +{ + return z.x; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3d0de47..084bea8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2246,7 +2246,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin

1 0

Marcus Meissner : dxgi: Fixed typo in width/height (Coverity).
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 442fd828ffa800c1510c932e79223bb073146bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=442fd828ffa800c1510c932e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 29 20:22:49 2018 +0200 dxgi: Fixed typo in width/height (Coverity). CID 1439782 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d1908ac..f2bc9ed 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4392,7 +4392,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 800; - mode_desc.Width = 600; + mode_desc.Height = 600; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); @@ -4401,7 +4401,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 400; - mode_desc.Width = 200; + mode_desc.Height = 200; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events();

1 0

Józef Kucia : wined3d: Expose viewport array index capability in wined3d_caps.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: dcc608168ae25f9754c504fe4f7ecccba33c346a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcc608168ae25f9754c504fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 18:01:12 2018 +0200 wined3d: Expose viewport array index capability in wined3d_caps. For viewport array indices in shader stages other than geometry. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 4 files changed, 5 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b794415..2f2d09d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3676,6 +3676,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a618486..fb67fe4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2406,6 +2406,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } caps->shader_double_precision = d3d_info->shader_double_precision; + caps->viewport_array_index_any_shader = d3d_info->viewport_array_index_any_shader; caps->max_feature_level = d3d_info->feature_level; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8cfa4c3..9135189 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -197,6 +197,7 @@ struct wined3d_d3d_info unsigned int vs_clipping : 1; unsigned int shader_color_key : 1; unsigned int shader_double_precision : 1; + unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; enum wined3d_feature_level feature_level; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e2e6a72..cf44ca6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1980,6 +1980,7 @@ struct wined3d_caps struct wined3d_ddraw_caps ddraw_caps; BOOL shader_double_precision; + BOOL viewport_array_index_any_shader; enum wined3d_feature_level max_feature_level; };

1 0