wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Józef Kucia : libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView ().
by Alexandre Julliard 19 Jul '18

19 Jul '18

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: Support D3D12_FEATURE_ROOT_SIGNATURE.
by Alexandre Julliard 19 Jul '18

19 Jul '18

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 : include: Add more definitions for D3D12 features.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: vkd3d Branch: master Commit: 6b4b2a35cc8edc7f78f358810f69e96cb589dbe3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b4b2a35cc8edc7f78f3588… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:39 2018 +0200 include: Add more definitions for D3D12 features. 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> --- include/vkd3d_d3d12.idl | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec7df56..a0c09ef 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1516,14 +1516,38 @@ typedef struct D3D12_FEATURE_DATA_FEATURE_LEVELS D3D_FEATURE_LEVEL MaxSupportedFeatureLevel; } D3D12_FEATURE_DATA_FEATURE_LEVELS; +typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE +{ + D3D_ROOT_SIGNATURE_VERSION HighestVersion; +} D3D12_FEATURE_DATA_ROOT_SIGNATURE; + +typedef enum D3D_SHADER_MODEL +{ + D3D_SHADER_MODEL_5_1 = 0x51, + D3D_SHADER_MODEL_6_0 = 0x60, +} D3D_SHADER_MODEL; + +typedef struct D3D12_FEATURE_DATA_SHADER_MODEL +{ + D3D_SHADER_MODEL HighestShaderModel; +} D3D12_FEATURE_DATA_SHADER_MODEL; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, D3D12_FEATURE_ARCHITECTURE = 1, D3D12_FEATURE_FEATURE_LEVELS = 2, D3D12_FEATURE_FORMAT_SUPPORT = 3, - D3D12_FEATURE_FORMAT_INFO = 4, - D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 5, + D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4, + D3D12_FEATURE_FORMAT_INFO = 5, + D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, + D3D12_FEATURE_SHADER_MODEL = 7, + D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_ROOT_SIGNATURE = 12, + D3D12_FEATURE_ARCHITECTURE1 = 16, + D3D12_FEATURE_D3D12_OPTIONS2 = 18, + D3D12_FEATURE_SHADER_CACHE = 19, + D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Hans Leidekker : bcrypt: Move macOS support to a new file.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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 : bcrypt: Move GnuTLS support to a new file.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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

Hans Leidekker : msi: Use msi_get_package_code in msi_publish_product_properties.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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 : gdi32: Update edgetable limits with top and bottom.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: e976e179ae07d5c6c4d6854a939844d32f6255dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e976e179ae07d5c6c4d6854a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 09:45:39 2018 -0700 gdi32: Update edgetable limits with top and bottom. 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/region.c | 4 ++-- dlls/gdi32/tests/path.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4899d43..cad6428 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2457,8 +2457,8 @@ static unsigned int REGION_CreateEdgeTable(const INT *Count, INT nbpolygons, REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock); - if (PrevPt->y > ET->ymax) ET->ymax = PrevPt->y; - if (PrevPt->y < ET->ymin) ET->ymin = PrevPt->y; + if (top->y < ET->ymin) ET->ymin = top->y; + if (bottom->y > ET->ymax) ET->ymax = bottom->y; pETEs++; } } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 2356b96..f4a9d18 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1910,7 +1910,7 @@ static void test_clipped_polygon_fill(void) 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 ); + ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); SelectObject( memdc, oldbrush ); SelectObject( memdc, oldbmp ); DeleteObject( brush );

1 0

Daniel Lehman : gdi32/tests: Add test for clipped polygon.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _GetNumberOfVirtualProcessors.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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

Daniel Lehman : msvcr110/tests: Add GetNumberOfVirtualProcessors tests.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 8ae5352a72508eddb01a7f0b62503981942a6e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ae5352a72508eddb01a7f0b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 17 16:23:37 2018 -0700 msvcr110/tests: Add GetNumberOfVirtualProcessors tests. 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 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index c0a182f..423b5d2 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,9 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); +static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); + static BOOL init(void) { HMODULE module; @@ -45,9 +48,30 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); + return TRUE; } +static void test_CurrentScheduler(void) +{ + unsigned int ncpus; + unsigned int expect; + SYSTEM_INFO si; + + expect = ~0; + ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); + ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + + GetSystemInfo(&si); + expect = si.dwNumberOfProcessors; + ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + todo_wine 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); +} + static void test_setlocale(void) { int i; @@ -76,5 +100,6 @@ static void test_setlocale(void) START_TEST(msvcr110) { if (!init()) return; + test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018