July 2018 - Wine-Commits - list.winehq.org

Józef Kucia : libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: b9a090769120202c293fba62728e0461afcda0cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9a090769120202c293fba6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:40 2018 +0200 libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE. 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/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fb57d76..5f3161d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1597,6 +1597,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ROOT_SIGNATURE: + { + D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + FIXME("Root signature version 1_1 not supported yet.\n"); + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Józef Kucia : libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView ().
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: 72859f8898945cf5b43dea082968692b6df7df1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=72859f8898945cf5b43dea0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:41 2018 +0200 libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView(). 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/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e1a5adf..fb84e4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1194,6 +1194,15 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_TEXTURE2D: + vk_view_type = VK_IMAGE_VIEW_TYPE_2D; + miplevel_idx = desc->u.Texture2D.MostDetailedMip; + miplevel_count = desc->u.Texture2D.MipLevels; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (desc->u.Texture2D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; miplevel_idx = desc->u.TextureCube.MostDetailedMip;

1 0

Józef Kucia : libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: 9ce53b74df1b6417a9e1dd9bdbf5f422a9172dee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9ce53b74df1b6417a9e1dd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:42 2018 +0200 libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL. 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/vkd3d_main.c | 8 +++++++- tests/d3d12.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 97d642a..0e2d422 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -28,7 +28,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, TRACE("create_info %p, iid %s, device %p.\n", create_info, debugstr_guid(iid), device); - if (!create_info || !device) + if (!create_info) return E_INVALIDARG; if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) { @@ -76,6 +76,12 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (FAILED(hr)) return hr; + if (!device) + { + ID3D12Device_Release(&object->ID3D12Device_iface); + return S_FALSE; + } + return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6128a40..e2337c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1080,6 +1080,9 @@ static void test_create_device(void) ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); ID3D12Device_Release(device); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_2, &IID_ID3D12Device, (void **)&device);

1 0

Daniel Lehman : gdi32/tests: Add test for clipped polygon.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 418514820f03243c192ca5e6dfd0ab00ec740fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=418514820f03243c192ca5e6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 14:41:55 2018 -0700 gdi32/tests: Add test for clipped polygon. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 80145fc..2356b96 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1894,6 +1894,31 @@ static void test_all_functions(void) ReleaseDC( 0, hdc ); } +static void test_clipped_polygon_fill(void) +{ + const POINT pts[3] = {{-10, -10}, {10, -5}, {0, 10}}; + HBRUSH brush, oldbrush; + HBITMAP bmp, oldbmp; + HDC hdc, memdc; + COLORREF col; + + hdc = GetDC( 0 ); + memdc = CreateCompatibleDC( hdc ); + bmp = CreateCompatibleBitmap( hdc, 20, 20 ); + brush = CreateSolidBrush( RGB( 0x11, 0x22, 0x33 ) ); + oldbrush = SelectObject( memdc, brush ); + oldbmp = SelectObject( memdc, bmp ); + Polygon( memdc, pts, ARRAY_SIZE(pts) ); + col = GetPixel( memdc, 1, 1 ); + todo_wine ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); + SelectObject( memdc, oldbrush ); + SelectObject( memdc, oldbmp ); + DeleteObject( brush ); + DeleteObject( bmp ); + DeleteDC( memdc ); + ReleaseDC( 0, hdc ); +} + START_TEST(path) { test_path_state(); @@ -1906,5 +1931,6 @@ START_TEST(path) test_rectangle(); test_roundrect(); test_ellipse(); + test_clipped_polygon_fill(); test_all_functions(); }

1 0

Hans Leidekker : bcrypt: Move GnuTLS support to a new file.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 018b695efaaa347e52e6b63ffcfa66f6551333aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=018b695efaaa347e52e6b63f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:11 2018 +0200 bcrypt: Move GnuTLS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 137 +++++ dlls/bcrypt/bcrypt_main.c | 1189 ++++++++--------------------------------- dlls/bcrypt/gnutls.c | 632 ++++++++++++++++++++++ 4 files changed, 1004 insertions(+), 955 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=018b695efaaa347e52e6…

1 0

Michael Müller : ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: b7f3e26e897838055644fa897e98dcb35a16b8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f3e26e897838055644fa89… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 20:18:15 2018 -0600 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a259883..0213f31 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1063,6 +1063,10 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; + case VT_BOOL: + StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal); + TRACE("Read bool %d\n", prop->u.boolVal); + break; case VT_I2: StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal); TRACE("Read short %d\n", prop->u.iVal); @@ -1081,6 +1085,18 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, StorageUtl_ReadDWord(data, 0, &prop->u.ulVal); TRACE("Read ulong %d\n", prop->u.ulVal); break; + case VT_I8: + StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal); + TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart)); + break; + case VT_UI8: + StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal); + TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart)); + break; + case VT_R8: + memcpy(&prop->u.dblVal, data, sizeof(double)); + TRACE("Read double %f\n", prop->u.dblVal); + break; case VT_LPSTR: { DWORD count;

1 0

Michael Stefaniuc : dswave: Reimplement ParseDescriptor() for DirectSoundWave.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 27dc1d05d79ccb51330225bae2351c39f83ff174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27dc1d05d79ccb51330225ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 23:55:33 2018 +0200 dswave: Reimplement ParseDescriptor() for DirectSoundWave. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 167 +++++++-------------------------------------- dlls/dswave/tests/dswave.c | 28 +++++--- 2 files changed, 42 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27dc1d05d79ccb513302…

1 0

Hans Leidekker : bcrypt: Move macOS support to a new file.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: d265dd88cd93ce6ffe56c9cfd640b064d7c14e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d265dd88cd93ce6ffe56c9cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:12 2018 +0200 bcrypt: Move macOS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 180 -------------------------------------- dlls/bcrypt/macos.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d265dd88cd93ce6ffe56…

1 0

Hans Leidekker : msi: Use msi_get_package_code in msi_publish_product_properties.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: ddf762a82f2c578cd3b0d4ff0c13c8a08641a666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf762a82f2c578cd3b0d4ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:19:54 2018 +0200 msi: Use msi_get_package_code in msi_publish_product_properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..29c6827 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4281,10 +4281,8 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) static const WCHAR szClients[] = {'C','l','i','e','n','t','s',0}; static const WCHAR szColon[] = {':',0}; - MSIHANDLE hdb, suminfo; - WCHAR *buffer, *ptr, guids[MAX_PATH], packcode[SQUASHED_GUID_SIZE]; - DWORD langid, size; - UINT r; + WCHAR *buffer, *ptr, *guids, packcode[SQUASHED_GUID_SIZE]; + DWORD langid; buffer = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer); @@ -4318,28 +4316,12 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); msi_reg_set_val_str(hkey, szClients, szColon); - hdb = alloc_msihandle(&package->db->hdr); - if (!hdb) - return ERROR_NOT_ENOUGH_MEMORY; - - r = MsiGetSummaryInformationW(hdb, NULL, 0, &suminfo); - MsiCloseHandle(hdb); - if (r != ERROR_SUCCESS) - goto done; - - size = MAX_PATH; - r = MsiSummaryInfoGetPropertyW(suminfo, PID_REVNUMBER, NULL, NULL, - NULL, guids, &size); - if (r != ERROR_SUCCESS) - goto done; - - ptr = strchrW(guids, ';'); - if (ptr) *ptr = 0; + if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; + if ((ptr = strchrW(guids, ';'))) *ptr = 0; squash_guid(guids, packcode); + msi_free( guids); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, packcode); -done: - MsiCloseHandle(suminfo); return ERROR_SUCCESS; }

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _GetNumberOfVirtualProcessors.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 16f9a9e1224988172c055cd2e276286c62492e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=16f9a9e1224988172c055cd2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 17 15:49:10 2018 -0700 msvcr110: Create current scheduler in _CurrentScheduler::_GetNumberOfVirtualProcessors. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 4 ++-- dlls/msvcrt/scheduler.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 423b5d2..4b0043b 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -67,9 +67,9 @@ static void test_CurrentScheduler(void) GetSystemInfo(&si); expect = si.dwNumberOfProcessors; ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index e4c1861..6269c98 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1063,6 +1063,7 @@ _Scheduler* __cdecl _CurrentScheduler__Get(_Scheduler *ret) unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_GetNumberOfVirtualProcessors(); }

1 0