February 2018 - Wine-Commits

Michael Stefaniuc : netprofm: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: ffb80476499123c6c66c25454dc14de0bb755faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb80476499123c6c66c2545… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:54 2018 +0100 netprofm: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index e28be12..f6823f0 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -38,21 +38,12 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - struct network { INetwork INetwork_iface;

1 0

Józef Kucia : libs/vkd3d-shader: Use our own SPIR-V generator ID.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: be8e10e12e3333b493b44f8216ea2c7b2ed1b75a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be8e10e12e3333b493b44f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:22 2018 +0100 libs/vkd3d-shader: Use our own SPIR-V generator ID. 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d92b7b1..6eb1537 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -87,6 +87,10 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #endif /* HAVE_SPIRV_TOOLS */ +#define VKD3D_SPIRV_GENERATOR_ID 18 +#define VKD3D_SPIRV_GENERATOR_VERSION 0 +#define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) + struct vkd3d_spirv_stream { uint32_t *words; @@ -1535,7 +1539,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_word(&stream, SpvMagicNumber); vkd3d_spirv_build_word(&stream, SpvVersion); - vkd3d_spirv_build_word(&stream, 0); /* generator */ + vkd3d_spirv_build_word(&stream, VKD3D_SPIRV_GENERATOR_MAGIC); vkd3d_spirv_build_word(&stream, builder->current_id); /* bound */ vkd3d_spirv_build_word(&stream, 0); /* schema, reserved */

1 0

Józef Kucia : libs/vkd3d: Add support for device parent.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: 372bd56ade17481e6b169154335292fc7e1ce821 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=372bd56ade17481e6b16915… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:21 2018 +0100 libs/vkd3d: Add support for device parent. In order to hold a reference to IDXGIAdapter. 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.h | 2 ++ libs/vkd3d/device.c | 12 +++++++ libs/vkd3d/vkd3d.map | 1 + libs/vkd3d/vkd3d_private.h | 1 + tests/vkd3d_api.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index 8f2c9b5..32e8123 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -69,6 +69,7 @@ struct vkd3d_device_create_info const char * const *device_extensions; uint32_t device_extension_count; + IUnknown *parent; LUID adapter_luid; }; @@ -84,6 +85,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); +IUnknown *vkd3d_get_device_parent(ID3D12Device *device); VkDevice vkd3d_get_vk_device(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8658014..c59ba87 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1216,6 +1216,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); + if (device->parent) + IUnknown_Release(device->parent); vkd3d_instance_decref(device->vkd3d_instance); vkd3d_free(device); @@ -2174,6 +2176,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, d3d12_device_init_pipeline_cache(device); + if ((device->parent = create_info->parent)) + IUnknown_AddRef(device->parent); + return S_OK; } @@ -2199,6 +2204,13 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, return S_OK; } +IUnknown *vkd3d_get_device_parent(ID3D12Device *device) +{ + struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); + + return d3d12_device->parent; +} + VkDevice vkd3d_get_vk_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 246275b..7d0f838 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -6,6 +6,7 @@ global: vkd3d_create_image_resource; vkd3d_create_instance; vkd3d_create_root_signature_deserializer; + vkd3d_get_device_parent; vkd3d_get_vk_device; vkd3d_get_vk_format; vkd3d_get_vk_physical_device; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6913051..acf7824 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -666,6 +666,7 @@ struct d3d12_device vkd3d_create_thread_pfn create_thread; vkd3d_join_thread_pfn join_thread; + IUnknown *parent; LUID adapter_luid; }; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index fc8d985..7135737 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -24,6 +24,13 @@ #include "vkd3d_test.h" #include <vkd3d.h> +static ULONG get_refcount(void *iface) +{ + IUnknown *unk = iface; + IUnknown_AddRef(unk); + return IUnknown_Release(unk); +} + static ULONG resource_get_internal_refcount(ID3D12Resource *resource) { vkd3d_resource_incref(resource); @@ -561,6 +568,87 @@ static void test_adapter_luid(void) ok(!refcount, "Device has %u references left.\n", refcount); } +struct parent +{ + IUnknown IUnknown_iface; + LONG refcount; +}; + +static struct parent *parent_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct parent, IUnknown_iface); +} + +static HRESULT STDMETHODCALLTYPE parent_QueryInterface(IUnknown *iface, + REFIID iid, void **object) +{ + if (IsEqualGUID(iid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + ok(false, "Unexpected QueryInterface() call.\n"); + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE parent_AddRef(IUnknown *iface) +{ + struct parent *parent = parent_from_IUnknown(iface); + + return InterlockedIncrement(&parent->refcount); +} + +static ULONG STDMETHODCALLTYPE parent_Release(IUnknown *iface) +{ + struct parent *parent = parent_from_IUnknown(iface); + + return InterlockedDecrement(&parent->refcount); +} + +static const struct IUnknownVtbl parent_vtbl = +{ + parent_QueryInterface, + parent_AddRef, + parent_Release, +}; + +static void test_device_parent(void) +{ + struct vkd3d_device_create_info create_info; + struct parent parent_impl; + ID3D12Device *device; + IUnknown *unknown; + IUnknown *parent; + ULONG refcount; + HRESULT hr; + + parent_impl.IUnknown_iface.lpVtbl = &parent_vtbl; + parent_impl.refcount = 1; + parent = &parent_impl.IUnknown_iface; + + refcount = get_refcount(parent); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + create_info = device_default_create_info; + create_info.parent = parent; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + + refcount = get_refcount(parent); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + + unknown = vkd3d_get_device_parent(device); + ok(unknown == parent, "Got device parent %p, expected %p.\n", unknown, parent); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + refcount = get_refcount(parent); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); +} + static void test_vkd3d_queue(void) { ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; @@ -666,6 +754,7 @@ START_TEST(vkd3d_api) run_test(test_additional_device_extensions); run_test(test_physical_device); run_test(test_adapter_luid); + run_test(test_device_parent); run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); }

1 0

Józef Kucia : libs/vkd3d-shader: Force public enums to 32-bit values.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: 367e55cd597a108ca14761ab54b20275a183fa68 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=367e55cd597a108ca14761a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:23 2018 +0100 libs/vkd3d-shader: Force public enums to 32-bit values. 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_shader.h | 26 +++++++++++++++++++------- libs/vkd3d-shader/spirv.c | 6 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 52b1b9e..48b5189 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -25,21 +25,25 @@ extern "C" { #endif /* __cplusplus */ +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, - VKD3D_SHADER_COMPILER_OPTIONS_FORCE_32_BIT = 0x7fffffff, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILER_OPTION), }; enum vkd3d_shader_visibility { - VKD3D_SHADER_VISIBILITY_ALL, - VKD3D_SHADER_VISIBILITY_VERTEX, - VKD3D_SHADER_VISIBILITY_HULL, - VKD3D_SHADER_VISIBILITY_DOMAIN, - VKD3D_SHADER_VISIBILITY_GEOMETRY, - VKD3D_SHADER_VISIBILITY_PIXEL, + VKD3D_SHADER_VISIBILITY_ALL = 0, + VKD3D_SHADER_VISIBILITY_VERTEX = 1, + VKD3D_SHADER_VISIBILITY_HULL = 2, + VKD3D_SHADER_VISIBILITY_DOMAIN = 3, + VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, + VKD3D_SHADER_VISIBILITY_PIXEL = 5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; struct vkd3d_shader_code @@ -55,6 +59,8 @@ enum vkd3d_shader_descriptor_type VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */ VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */ VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */ + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; struct vkd3d_shader_descriptor_binding @@ -119,6 +125,8 @@ void vkd3d_shader_free_root_signature(D3D12_ROOT_SIGNATURE_DESC *root_signature) enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; HRESULT vkd3d_shader_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature, @@ -143,6 +151,8 @@ enum vkd3d_component_type VKD3D_TYPE_FLOAT = 3, VKD3D_TYPE_BOOL, VKD3D_TYPE_COUNT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPONENT_TYPE), }; enum vkd3d_sysval_semantic @@ -163,6 +173,8 @@ enum vkd3d_sysval_semantic VKD3D_SV_TESS_FACTOR_TRIINT = 14, VKD3D_SV_TESS_FACTOR_LINEDET = 15, VKD3D_SV_TESS_FACTOR_LINEDEN = 16, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SYSVAL_SEMANTIC), }; struct vkd3d_shader_signature_element diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6eb1537..f984e62 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1919,10 +1919,10 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compil return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; case VKD3D_SHADER_VISIBILITY_PIXEL: return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL; + default: + ERR("Invalid shader visibility %#x.\n", visibility); + return false; } - - ERR("Invalid shader visibility %#x.\n", visibility); - return false; } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer(

1 0

Francois Gouget : testbot: Don't rely on the DBI defaults.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: tools Branch: master Commit: b8437d575fde8ad84f48bcabfbc034f7e321e2e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8437d575fde8ad84f48bca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 2 02:43:58 2018 +0100 testbot: Don't rely on the DBI defaults. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 +++ testbot/lib/WineTestBot/Config.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index b5bb485..5567203 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -608,6 +608,9 @@ sub UseDBIBackEnd($$$$$$) { my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; + # The implementation assumes AutoCommit is on. + $DbArgs->{AutoCommit} = 1; + my $BackEnd = $class->new(); $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; AddDBBackEnd($DbSelector, $BackEnd); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b1024b5..9d7e200 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -122,7 +122,7 @@ if (!$::BuildEnv) require ObjectModel::DBIBackEnd; ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource, $DbUsername, $DbPassword, - { RaiseError => 1 }); + { PrintError => 1, RaiseError => 1}); } umask 002;

1 0

Alexandre Julliard : wineandroid: Force non-zero state on ACTION_BUTTON_RELEASE to avoid duplicate events.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 6a4fa30e4cbb714814ae1d1941004730646b1a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4fa30e4cbb714814ae1d19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 16:06:13 2018 +0100 wineandroid: Force non-zero state on ACTION_BUTTON_RELEASE to avoid duplicate events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 7d2049d..aff687b 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -293,6 +293,9 @@ jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, mask == AMOTION_EVENT_ACTION_BUTTON_RELEASE )) return JNI_FALSE; + /* make sure a subsequent AMOTION_EVENT_ACTION_UP is not treated as a touch event */ + if (mask == AMOTION_EVENT_ACTION_BUTTON_RELEASE) state |= 0x80000000; + prev_state = InterlockedExchange( &button_state, state ); data.type = MOTION_EVENT;

1 0

Francois Gouget : dxgi: Fix a trailing '\n' in a FIXME().
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 3000ac56edbe6dd945fd69515d69ad009bd2f76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3000ac56edbe6dd945fd6951… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 31 03:41:20 2018 +0100 dxgi: Fix a trailing '\n' in a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 267b11b..832e2cb 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -379,7 +379,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IDXGIFac static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IDXGIFactory4 *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!n", iface, cookie); + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IDXGIFactory4 *iface,

1 0

Paul Graham : kernel32: Fix failure reporting in WritePrivateProfile* and add tests.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 39899fd11a8ff9228a587adf5e9aeaf2ded93c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39899fd11a8ff9228a587adf… Author: Paul Graham <development(a)omega-software.com> Date: Sat Jan 27 21:11:10 2018 +0100 kernel32: Fix failure reporting in WritePrivateProfile* and add tests. Conformance tests based on work by Fabian Maurer, with some adaptations. Signed-off-by: Paul Graham <development(a)omega-software.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 9 ++++----- dlls/kernel32/tests/profile.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index aad3ba3..721808c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1391,7 +1391,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } } @@ -1447,11 +1447,10 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); - PROFILE_FlushFile(); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) { + while(*string && ret) { LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); strcpyW( buf, string ); if((p = strchrW( buf, '='))) { @@ -1461,8 +1460,8 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, HeapFree( GetProcessHeap(), 0, buf ); string += strlenW(string)+1; } - PROFILE_FlushFile(); } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1744,7 +1743,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2eb90a8..17ba124 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "windows.h" +#include "sddl.h" #define KEY "ProfileInt" #define SECTION "Test" @@ -534,6 +535,41 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) return TRUE; } +static void test_profile_directory_readonly(void) +{ + BOOL ret; + CHAR path_folder[MAX_PATH]; + CHAR path_file[MAX_PATH]; + const char *sddl_string_everyone_readonly = "D:PAI(A;;0x1200a9;;;WD)"; + SECURITY_ATTRIBUTES attributes = {0}; + char lpStruct[] = { 's', 't', 'r', 'i', 'n', 'g' }; + + attributes.nLength = sizeof(attributes); + ret = ConvertStringSecurityDescriptorToSecurityDescriptorA(sddl_string_everyone_readonly, SDDL_REVISION_1, &attributes.lpSecurityDescriptor, NULL); + ok(ret == TRUE, "ConvertStringSecurityDescriptorToSecurityDescriptor failed: %d\n", GetLastError()); + + GetTempPathA(MAX_PATH, path_folder); + lstrcatA(path_folder, "wine-test"); + + strcpy(path_file, path_folder); + lstrcatA(path_file, "\\tmp.ini"); + + ret = CreateDirectoryA(path_folder, &attributes); + ok(ret == TRUE, "CreateDirectoryA failed: %d\n", GetLastError()); + + ret = WritePrivateProfileStringA("App", "key", "string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileSectionA("App", "key=string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileStructA("App", "key", lpStruct, sizeof(lpStruct), path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = RemoveDirectoryA(path_folder); + ok(ret == TRUE, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_GetPrivateProfileString(const char *content, const char *descript) { DWORD ret, len; @@ -1132,6 +1168,7 @@ START_TEST(profile) test_profile_existing(); test_profile_delete_on_close(); test_profile_refresh(); + test_profile_directory_readonly(); test_GetPrivateProfileString( "[section1]\r\n" "name1=val1\r\n"

1 0

Józef Kucia : d3d11: Validate resource access flags for buffers and 2D textures.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: a2fe3ff066e50e8f173544ad689ec342e127f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fe3ff066e50e8f173544ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:31 2018 +0100 d3d11: Validate resource access flags for buffers and 2D textures. 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/d3d11/buffer.c | 8 +++-- dlls/d3d11/d3d11_private.h | 4 +++ dlls/d3d11/texture.c | 8 +++-- dlls/d3d11/utils.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 3ccccc8..ffa95a1 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -387,8 +387,12 @@ static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops = d3d_buffer_wined3d_object_released, }; -static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc) +static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc, D3D_FEATURE_LEVEL feature_level) { + if (!validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION_BUFFER, + desc->Usage, desc->BindFlags, desc->CPUAccessFlags, feature_level)) + return FALSE; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) { if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) @@ -442,7 +446,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev buffer->refcount = 1; buffer->desc = *desc; - if (!validate_buffer_desc(&buffer->desc)) + if (!validate_buffer_desc(&buffer->desc, device->feature_level)) return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c286e76..6702248 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -83,6 +83,10 @@ UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags) D UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; +BOOL validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION resource_dimension, + D3D11_USAGE usage, UINT bind_flags, UINT cpu_access_flags, + D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; + HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT d3d_set_private_data(struct wined3d_private_store *store, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 2644b52..a35a9ac 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -456,8 +456,12 @@ static BOOL is_gdi_compatible_texture(const D3D11_TEXTURE2D_DESC *desc) return TRUE; } -static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) +static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc, D3D_FEATURE_LEVEL feature_level) { + if (!validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION_TEXTURE2D, + desc->Usage, desc->BindFlags, desc->CPUAccessFlags, feature_level)) + return FALSE; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE && desc->ArraySize < 6) { @@ -492,7 +496,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE DWORD flags = 0; HRESULT hr; - if (!validate_texture2d_desc(desc)) + if (!validate_texture2d_desc(desc, device->feature_level)) { WARN("Failed to validate texture desc.\n"); return E_INVALIDARG; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index ae761f4..b3894bb 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -610,6 +610,94 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc return d3d10_resource_misc_flags; } +static BOOL d3d11_bind_flags_are_gpu_read_only(UINT bind_flags) +{ + static const BOOL read_only_bind_flags = D3D11_BIND_VERTEX_BUFFER + | D3D11_BIND_INDEX_BUFFER | D3D11_BIND_CONSTANT_BUFFER + | D3D11_BIND_SHADER_RESOURCE; + + return !(bind_flags & ~read_only_bind_flags); +} + +BOOL validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION resource_dimension, + D3D11_USAGE usage, UINT bind_flags, UINT cpu_access_flags, D3D_FEATURE_LEVEL feature_level) +{ + const BOOL is_texture = resource_dimension != D3D11_RESOURCE_DIMENSION_BUFFER; + + switch (usage) + { + case D3D11_USAGE_DEFAULT: + if ((bind_flags == D3D11_BIND_SHADER_RESOURCE && feature_level >= D3D_FEATURE_LEVEL_11_0) + || (is_texture && bind_flags == D3D11_BIND_RENDER_TARGET) + || bind_flags == D3D11_BIND_UNORDERED_ACCESS) + break; + if (cpu_access_flags) + { + WARN("Default resources are not CPU accessible.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_IMMUTABLE: + if (!bind_flags) + { + WARN("Bind flags must be non-zero for immutable resources.\n"); + return FALSE; + } + if (!d3d11_bind_flags_are_gpu_read_only(bind_flags)) + { + WARN("Immutable resources cannot be writable by GPU.\n"); + return FALSE; + } + + if (cpu_access_flags) + { + WARN("Immutable resources are not CPU accessible.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_DYNAMIC: + if (!bind_flags) + { + WARN("Bind flags must be non-zero for dynamic resources.\n"); + return FALSE; + } + if (!d3d11_bind_flags_are_gpu_read_only(bind_flags)) + { + WARN("Dynamic resources cannot be writable by GPU.\n"); + return FALSE; + } + + if (cpu_access_flags != D3D11_CPU_ACCESS_WRITE) + { + WARN("CPU access must be D3D11_CPU_ACCESS_WRITE for dynamic resources.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_STAGING: + if (bind_flags) + { + WARN("Invalid bind flags %#x for staging resources.\n", bind_flags); + return FALSE; + } + + if (!cpu_access_flags) + { + WARN("CPU access must be non-zero for staging resources.\n"); + return FALSE; + } + break; + + default: + WARN("Invalid usage %#x.\n", usage); + return FALSE; + } + + return TRUE; +} + struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension;

1 0

Józef Kucia : d3d11/tests: Add test for resource access flags.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 34edee9039ab48b044bc20a5e55a415762cddd57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34edee9039ab48b044bc20a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:32 2018 +0100 d3d11/tests: Add test for resource access flags. 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/d3d11/tests/d3d11.c | 357 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 356 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34edee9039ab48b044bc…

1 0