April 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Try to load libpng only once.
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: b1631d69da38a2820db6b500e1c0cb9a9b7d0263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1631d69da38a2820db6b500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 20:41:37 2018 +0200 user32: Try to load libpng only once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 65 ++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6304192..7730736 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -144,42 +144,42 @@ MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); #undef MAKE_FUNCPTR -static BOOL load_libpng(void) -{ - USER_Lock(); +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - if (!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) +static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) +{ + if (!(libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0))) { + WARN( "failed to load %s\n", SONAME_LIBPNG ); + return TRUE; + } #define LOAD_FUNCPTR(f) \ if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ { \ + WARN( "%s not found in %s\n", #f, SONAME_LIBPNG ); \ libpng_handle = NULL; \ - USER_Unlock(); \ - return FALSE; \ - } - LOAD_FUNCPTR(png_create_read_struct); - LOAD_FUNCPTR(png_create_info_struct); - LOAD_FUNCPTR(png_destroy_read_struct); - LOAD_FUNCPTR(png_error); - LOAD_FUNCPTR(png_get_bit_depth); - LOAD_FUNCPTR(png_get_color_type); - LOAD_FUNCPTR(png_get_error_ptr); - LOAD_FUNCPTR(png_get_image_height); - LOAD_FUNCPTR(png_get_image_width); - LOAD_FUNCPTR(png_get_io_ptr); - LOAD_FUNCPTR(png_read_image); - LOAD_FUNCPTR(png_read_info); - LOAD_FUNCPTR(png_read_update_info); - LOAD_FUNCPTR(png_set_bgr); - LOAD_FUNCPTR(png_set_crc_action); - LOAD_FUNCPTR(png_set_error_fn); - LOAD_FUNCPTR(png_set_expand); - LOAD_FUNCPTR(png_set_gray_to_rgb); - LOAD_FUNCPTR(png_set_read_fn); + return TRUE; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_expand); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - } - - USER_Unlock(); return TRUE; } @@ -233,6 +233,11 @@ static unsigned be_uint(unsigned val) return (u.c[0] << 24) | (u.c[1] << 16) | (u.c[2] << 8) | u.c[3]; } +static BOOL have_libpng(void) +{ + return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && libpng_handle; +} + static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) { static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; @@ -271,7 +276,7 @@ static BITMAPINFO *load_png(const char *png_data, DWORD *size) if (!get_png_info(png_data, *size, &width, &height, &bpp)) return NULL; - if (!load_libpng()) return NULL; + if (!have_libpng()) return NULL; png.buffer = png_data; png.size = *size;

1 0

Alexandre Julliard : user32: Ignore PNG icons instead of failing if we don 't have libpng.
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: 9dc886244bcc21468c88f4951bb875155c0df242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc886244bcc21468c88f495… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 20:41:58 2018 +0200 user32: Ignore PNG icons instead of failing if we don't have libpng. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7730736..a6daa48 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -409,6 +409,13 @@ static BITMAPINFO *load_png(const char *png_data, DWORD *size) #else /* SONAME_LIBPNG */ +static BOOL have_libpng(void) +{ + static int warned; + if (!warned++) WARN( "PNG support not compiled in\n" ); + return FALSE; +} + static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) { return FALSE; @@ -997,7 +1004,11 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); if (info->biSize == PNG_SIGN) - return get_png_info(info, size, width, height, bits); + { + if (have_libpng()) return get_png_info(info, size, width, height, bits); + *width = *height = *bits = 0; + return TRUE; + } if (info->biSize != sizeof(BITMAPCOREHEADER)) {

1 0

Alexandre Julliard : user32: Add support for loading 256x256 icons.
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: b53d84b947f93ab6848c8614c37e76b5dfb37f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b53d84b947f93ab6848c8614… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 20:45:44 2018 +0200 user32: Add support for loading 256x256 icons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a6daa48..0adb73b 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -873,6 +873,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, *width = icon->bWidth; *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; + if (!*width && !*height && have_libpng()) *width = *height = 256; return TRUE; }

1 0

Zebediah Figura : dmime: Call interface methods properly.
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: 54e27c17ef6db5aa6af39267074967ea977d6af5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e27c17ef6db5aa6af39267… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 3 13:18:04 2018 -0500 dmime: Call interface methods properly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..bdd9201 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface(This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface(This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n");

1 0

Sven Hesse : d3d11: Implement d3d11_device_CreateTexture1D().
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: f3840daf258b2aa668209c3633f032000edc331a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3840daf258b2aa668209c36… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:21 2018 +0430 d3d11: Implement d3d11_device_CreateTexture1D(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 15 +++ dlls/d3d11/device.c | 13 +- dlls/d3d11/tests/d3d11.c | 92 +++++++++++++ dlls/d3d11/texture.c | 316 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3840daf258b2aa66820…

1 0

Sven Hesse : d3d11: Implement d3d10_device_CreateTexture1D().
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: wine Branch: master Commit: 63aae387125570962ad1fbdd49ff20293a386033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63aae387125570962ad1fbdd… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:22 2018 +0430 d3d11: Implement d3d10_device_CreateTexture1D(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d11/device.c | 23 ++++++++++-- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7b28e01..c434939 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1310,6 +1310,87 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_texture1d(void) +{ + ULONG refcount, expected_refcount; + ID3D10Device *device, *tmp; + D3D10_TEXTURE1D_DESC desc; + ID3D10Texture1D *texture; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.Width = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + expected_refcount = get_refcount(device) + 1; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + + ID3D10Texture1D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount(device) + 1; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture1D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D10Texture1D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 1d texture, hr %#x.\n", hr); + + check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + ID3D10Texture1D_Release(texture); + + for (i = 0; i < 4; ++i) + { + desc.ArraySize = i; + desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; + desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, (ID3D10Texture1D **)&texture); + todo_wine_if(!i) + ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (SUCCEEDED(hr)) + ID3D10Texture1D_Release(texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -14935,6 +15016,7 @@ START_TEST(device) test_feature_level(); test_device_interfaces(); + test_create_texture1d(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9799d73..8316105 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4995,9 +4995,28 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device1 *iface, const D3D10_TEXTURE1D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture1D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D10Device(iface); + D3D11_TEXTURE1D_DESC d3d11_desc; + struct d3d_texture1d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + d3d11_desc.Width = desc->Width; + d3d11_desc.MipLevels = desc->MipLevels; + d3d11_desc.ArraySize = desc->ArraySize; + d3d11_desc.Format = desc->Format; + d3d11_desc.Usage = d3d11_usage_from_d3d10_usage(desc->Usage); + d3d11_desc.BindFlags = d3d11_bind_flags_from_d3d10_bind_flags(desc->BindFlags); + d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); + d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); + + if (FAILED(hr = d3d_texture1d_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) + return hr; + + *texture = &object->ID3D10Texture1D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *iface,

1 0

Józef Kucia : libs/vkd3d: Add structure type fields to public API structures.
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: vkd3d Branch: master Commit: f5b532921a74dad336bbddcdbd158a2ae2eaea1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5b532921a74dad336bbddc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 3 11:49:13 2018 +0200 libs/vkd3d: Add structure type fields to public API structures. Adds flexibility for future API extensions. 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> --- demos/demo_xcb.h | 2 ++ include/vkd3d.h | 20 ++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 4 ++++ libs/vkd3d/device.c | 12 +++++++++++- libs/vkd3d/resource.c | 10 ++++++++++ libs/vkd3d/vkd3d_main.c | 7 +++++++ tests/vkd3d_api.c | 4 ++++ 7 files changed, 58 insertions(+), 1 deletion(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 053db0d..3871556 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -446,6 +446,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); vkResetFences(vk_device, 1, &vk_fence); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0; resource_create_info.desc.Width = desc->width; diff --git a/include/vkd3d.h b/include/vkd3d.h index 692b58d..7c5f644 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,6 +34,17 @@ extern "C" { #endif /* __cplusplus */ +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_structure_type +{ + VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), +}; + typedef bool (*PFN_vkd3d_signal_event)(HANDLE event); typedef void * (*PFN_vkd3d_thread)(void *data); @@ -45,6 +56,9 @@ struct vkd3d_instance; struct vkd3d_instance_create_info { + enum vkd3d_structure_type type; + const void *next; + PFN_vkd3d_signal_event pfn_signal_event; PFN_vkd3d_create_thread pfn_create_thread; PFN_vkd3d_join_thread pfn_join_thread; @@ -59,6 +73,9 @@ struct vkd3d_instance_create_info struct vkd3d_device_create_info { + enum vkd3d_structure_type type; + const void *next; + D3D_FEATURE_LEVEL minimum_feature_level; struct vkd3d_instance *instance; @@ -79,6 +96,9 @@ struct vkd3d_device_create_info struct vkd3d_image_resource_create_info { + enum vkd3d_structure_type type; + const void *next; + VkImage vk_image; D3D12_RESOURCE_DESC desc; unsigned int flags; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ba64d40..adafb00 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -48,12 +48,16 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, FIXME("Ignoring adapter %p.\n", adapter); memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = NULL; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d61c331..57b94b6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -342,7 +342,17 @@ HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_in struct vkd3d_instance *object; HRESULT hr; - TRACE("create_info %p.\n", create_info); + TRACE("create_info %p, instance %p.\n", create_info, instance); + + if (!create_info || !instance) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4746ee2..e37b03b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -805,6 +805,16 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); + if (!create_info || !resource) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index b58e6e5..97d642a 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -30,6 +30,13 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (!create_info || !device) return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!create_info->instance && !create_info->instance_create_info) { ERR("Instance or instance create info is required.\n"); diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 4b3466e..439cb63 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -62,12 +62,14 @@ static bool signal_event(HANDLE event) static const struct vkd3d_instance_create_info instance_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .wchar_size = sizeof(WCHAR), .pfn_signal_event = signal_event, }; static const struct vkd3d_device_create_info device_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, .instance_create_info = &instance_default_create_info, }; @@ -849,6 +851,8 @@ static void test_vulkan_resource_present_state(void) vk_memory = allocate_vulkan_image_memory(device, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.vk_image = vk_image; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0;

1 0

Józef Kucia : include: Add emulation of __uuidof().
by Alexandre Julliard 03 Apr '18

03 Apr '18

Module: vkd3d Branch: master Commit: 3ebe7d5b9b4a102bd3f6595f155087ce5eab8c4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ebe7d5b9b4a102bd3f6595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 3 11:49:14 2018 +0200 include: Add emulation of __uuidof(). 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_windows.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 3b1f92a..425d139 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -122,6 +122,33 @@ typedef GUID IID; EXTERN_C const GUID name DECLSPEC_HIDDEN; # endif /* INITGUID */ +/* __uuidof emulation */ +#if defined(__cplusplus) && !defined(_MSC_VER) + +extern "C++" +{ + template<typename T> const GUID &__vkd3d_uuidof(); +} + +# define __CRT_UUID_DECL(type, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + extern "C++" \ + { \ + template<> inline const GUID &__vkd3d_uuidof<type>() \ + { \ + static const IID __uuid_inst = {l, w1, w2, {b1, b2, b3, b4, b5, b6, b7, b8}}; \ + return __uuid_inst; \ + } \ + template<> inline const GUID &__vkd3d_uuidof<type *>() \ + { \ + return __vkd3d_uuidof<type>(); \ + } \ + } + +# define __uuidof(type) __vkd3d_uuidof<typeof(type)>() +#else +# define __CRT_UUID_DECL(type, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) +#endif /* defined(__cplusplus) && !defined(_MSC_VER) */ + typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* !defined(_WIN32) || defined(__WIDL__) */

1 0

Alexandre Julliard : winegcc: Set page alignment to 4096 in all cases.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 395a94d308d77786809eee9eb77b4e35c78fbf9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=395a94d308d77786809eee9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 14:20:10 2018 +0200 winegcc: Set page alignment to 4096 in all cases. This avoids leaving holes in builtin dll mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 80dba4c..4be35d5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1136,13 +1136,13 @@ static void build(struct options* opts) default: if (opts->image_base) { - if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) - strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); else prelink = PRELINK; } + if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) + strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); break; }

1 0

Alexandre Julliard : ntdll: Add support for loading IL-only dlls.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 52e09e823e2a2b65f1f993145c0a65ab1d84713d URL: https://source.winehq.org/git/wine.git/?a=commit;h=52e09e823e2a2b65f1f99314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 18:11:51 2018 +0200 ntdll: Add support for loading IL-only dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fe5ce9d..1a3dd80 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -956,7 +956,10 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * if ((exports = RtlImageDirectoryEntryToData( imp->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, "_CorExeMain", -1, load_path ); + { + const char *name = (wm->ldr.Flags & LDR_IMAGE_IS_DLL) ? "_CorDllMain" : "_CorExeMain"; + proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, name, -1, load_path ); + } if (!proc) return STATUS_PROCEDURE_NOT_FOUND; *entry = proc; return STATUS_SUCCESS; @@ -1929,7 +1932,11 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE)) { - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) + if (wm->ldr.Flags & LDR_COR_ILONLY) + status = fixup_imports_ilonly( wm, load_path, &wm->ldr.EntryPoint ); + else + status = fixup_imports( wm, load_path ); + if (status != STATUS_SUCCESS) { /* the module has only be inserted in the load & memory order lists */ RemoveEntryList(&wm->ldr.InLoadOrderModuleList);

1 0