wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Zebediah Figura : kernel32/tests: Fix permission check.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 43c5fe11cbfe8fb16f542ee17ec82e1b6ec0ccd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c5fe11cbfe8fb16f542ee1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 20:03:30 2018 -0500 kernel32/tests: Fix permission check. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 64ffc17..c5c7702 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -956,6 +956,7 @@ static void test_WritePrivateProfileString(void) LPCSTR data; CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + HANDLE file; SetLastError(0xdeadbeef); ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); @@ -1069,12 +1070,14 @@ static void test_WritePrivateProfileString(void) "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); /* Relative paths are relative to X:\\%WINDIR% */ - GetWindowsDirectoryA(temp, MAX_PATH); - GetTempFileNameA(temp, "win", 1, path); - if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) + GetWindowsDirectoryA(path, MAX_PATH); + strcat(path, "\\win1.tmp"); + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("Not allowed to create a file in the Windows directory\n"); else { + CloseHandle(file); DeleteFileA(path); data = "[App]\r\n"

1 0

Roderick Colenbrander : winex11: Enable surface support for instances.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 43c71d9916422014be558ca0137b71ec3daf6e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c71d9916422014be558ca0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:55 2018 +0100 winex11: Enable surface support for instances. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 68 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index fe50d66..11d9f61 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" /* We only want host compatible structures and don't need alignment. */ @@ -74,6 +75,54 @@ LOAD_FUNCPTR(vkGetInstanceProcAddr) return TRUE; } +/* Helper function for converting between win32 and X11 compatible VkInstanceCreateInfo. + * Caller is responsible for allocation and cleanup of 'dst'. + */ +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, + VkInstanceCreateInfo *dst) +{ + unsigned int i; + const char **enabled_extensions = NULL; + + dst->sType = src->sType; + dst->flags = src->flags; + dst->pApplicationInfo = src->pApplicationInfo; + dst->pNext = src->pNext; + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + dst->enabledExtensionCount = 0; + dst->ppEnabledExtensionNames = NULL; + + if (src->enabledExtensionCount > 0) + { + enabled_extensions = heap_calloc(src->enabledExtensionCount, sizeof(*src->ppEnabledExtensionNames)); + if (!enabled_extensions) + { + ERR("Failed to allocate memory for enabled extensions\n"); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + for (i = 0; i < src->enabledExtensionCount; i++) + { + /* Substitute extension with X11 ones else copy. Long-term, when we + * support more extensions, we should store these in a list. + */ + if (!strcmp(src->ppEnabledExtensionNames[i], "VK_KHR_win32_surface")) + { + enabled_extensions[i] = "VK_KHR_xlib_surface"; + } + else + { + enabled_extensions[i] = src->ppEnabledExtensionNames[i]; + } + } + dst->ppEnabledExtensionNames = enabled_extensions; + dst->enabledExtensionCount = src->enabledExtensionCount; + } + + return VK_SUCCESS; +} + static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) { @@ -87,19 +136,28 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swa static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { + VkInstanceCreateInfo create_info_host; + VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - /* TODO: convert win32 to x11 extensions here. */ - if (create_info->enabledExtensionCount > 0) + /* Perform a second pass on converting VkInstanceCreateInfo. Winevulkan + * performed a first pass in which it handles everything except for WSI + * functionality such as VK_KHR_win32_surface. Handle this now. + */ + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) { - FIXME("Extensions are not supported yet, aborting!\n"); - return VK_ERROR_INCOMPATIBLE_DRIVER; + ERR("Failed to convert instance create info, res=%d\n", res); + return res; } - return pvkCreateInstance(create_info, NULL /* allocator */, instance); + res = pvkCreateInstance(&create_info_host, NULL /* allocator */, instance); + + heap_free((void *)create_info_host.ppEnabledExtensionNames); + return res; } static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device,

1 0

Roderick Colenbrander : winevulkan: Sanitize VkInstanceCreateInfo before passing to driver.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 8238e73b49007f71fa398cddc14741dc134e79e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8238e73b49007f71fa398cdd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:54 2018 +0100 winevulkan: Sanitize VkInstanceCreateInfo before passing to driver. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 61af8df..fe1f851 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 +/* All Vulkan structures use this structure for the first elements. */ +struct wine_vk_structure_header +{ + VkStructureType sType; + const void *pNext; +}; + static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs = NULL; @@ -74,6 +81,58 @@ static BOOL wine_vk_init(void) return TRUE; } +/* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. + * This function takes care of extensions handled at winevulkan layer, a Wine graphics + * driver is responsible for handling e.g. surface extensions. + */ +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, + VkInstanceCreateInfo *dst) +{ + dst->sType = src->sType; + dst->flags = src->flags; + dst->pApplicationInfo = src->pApplicationInfo; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindy pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: + /* Can be used to register new dispatchable object types + * to the loader. We should ignore it as it will confuse the + * host its loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %d\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader + * filter this data out as well. + */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + /* TODO: convert non-WSI win32 extensions here to host specific ones. */ + dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; + dst->enabledExtensionCount = src->enabledExtensionCount; + + return VK_SUCCESS; +} + /* Helper function which stores wrapped physical devices in the instance object. */ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) { @@ -229,6 +288,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ const VkAllocationCallbacks *allocator, VkInstance *instance) { struct VkInstance_T *object = NULL; + VkInstanceCreateInfo create_info_host; VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); @@ -245,7 +305,14 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = vk_funcs->p_vkCreateInstance(create_info, NULL /* allocator */, &object->instance); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert instance create info, res=%d\n", res); + goto err; + } + + res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); if (res != VK_SUCCESS) { ERR("Failed to create instance, res=%d\n", res);

1 0

Roderick Colenbrander : winevulkan/winex11: Add Vulkan WSI stubs ( VK_KHR_surface / VK_KHR_swapchain).
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 0cb665423798e796e816f5d94d7d135448f396b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cb665423798e796e816f5d9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:53 2018 +0100 winevulkan/winex11: Add Vulkan WSI stubs (VK_KHR_surface / VK_KHR_swapchain). The WSI APIs are meant for window system integration, so essentially the WGL of Vulkan. Implementation belongs in the graphics drivers as we need to hook into surface and swapchains. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 114 +++++++++++++++++++++++++++++- dlls/winevulkan/vulkan.c | 153 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 12 ++++ dlls/winevulkan/vulkan_thunks.h | 34 +++++++++ dlls/winex11.drv/vulkan.c | 151 ++++++++++++++++++++++++++++++++++++--- include/wine/vulkan.h | 130 ++++++++++++++++++++++++++++++++++ include/wine/vulkan_driver.h | 14 +++- 7 files changed, 597 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0cb665423798e796e816…

1 0

Nikolay Sivov : wincodecs/tests: Test headers written by BMP encoder.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: c30bf0b6e9818dd7338e45907636b88aba153391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30bf0b6e9818dd7338e4590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 12 17:57:51 2018 +0300 wincodecs/tests: Test headers written by BMP encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 65 ++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 690e787..472bee5 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -632,9 +632,60 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const struct bitmap_data *data) { - /* FIXME */ + BITMAPFILEHEADER bfh; + BITMAPINFOHEADER bih; + HRESULT hr; + ULONG len; + + hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); + ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + + hr = IStream_Read(stream, &bih, sizeof(bih), &len); + ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + + ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); + ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); + ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); + ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + + if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) + || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + { + /* TODO: test with actual palette size */ + ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", + bfh.bfOffBits, wine_dbgstr_guid(data->format)); + } + else + ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", + bfh.bfOffBits, wine_dbgstr_guid(data->format)); + + ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); + ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); +todo_wine + ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); + ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); + + if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) + ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) + ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + + ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); +todo_wine + ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); + ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", + bih.biXPelsPerMeter); + ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", + bih.biYPelsPerMeter); + + /* FIXME: test actual data */ } static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) @@ -722,7 +773,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) { HRESULT hr; LARGE_INTEGER pos; @@ -732,11 +783,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, format); + check_png_format(stream, dst->format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, format); + check_bmp_format(stream, dst); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, format); + check_tiff_format(stream, dst->format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -972,7 +1023,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]->format); + check_bitmap_format(stream, clsid_encoder, dsts[0]); } if (SUCCEEDED(hr))

1 0

Nikolay Sivov : wincodecs/tests: Move gif decoder test to appropriate file.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: e21b74c2efff9654409824d27b6008db2975c568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e21b74c2efff9654409824d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 12 17:57:50 2018 +0300 wincodecs/tests: Move gif decoder test to appropriate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bmpformat.c | 75 ------------------------------------ dlls/windowscodecs/tests/gifformat.c | 75 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 48985b9..8bac7a3 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1058,80 +1058,6 @@ static void test_createfromstream(void) IWICImagingFactory_Release(factory); } -/* 1x1 pixel gif, missing trailer */ -static unsigned char gifimage_notrailer[] = { -0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x71,0xff,0xff,0xff, -0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, -0x01,0x00 -}; - -static void test_gif_notrailer(void) -{ - IWICBitmapDecoder *decoder; - IWICImagingFactory *factory; - HRESULT hr; - IWICStream *gifstream; - IWICBitmapFrameDecode *framedecode; - double dpiX = 0.0, dpiY = 0.0; - UINT framecount; - - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - - hr = IWICImagingFactory_CreateStream(factory, &gifstream); - ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, - sizeof(gifimage_notrailer)); - ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)&decoder); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - } - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, - WICDecodeMetadataCacheOnDemand); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); - ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); - ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); - ok(dpiX == 48.0, "expected dpiX=48.0, got %f\n", dpiX); - ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); - - IWICBitmapFrameDecode_Release(framedecode); - } - } - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); - ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); - ok(framecount == 1, "framecount=%u\n", framecount); - } - - IWICBitmapDecoder_Release(decoder); - } - - IWICStream_Release(gifstream); - } - - IWICImagingFactory_Release(factory); -} - static void test_create_decoder(void) { IWICBitmapDecoder *decoder; @@ -1170,7 +1096,6 @@ START_TEST(bmpformat) test_decode_rle4(); test_componentinfo(); test_createfromstream(); - test_gif_notrailer(); test_create_decoder(); CoUninitialize(); diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 53b4e47..05affad 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -490,6 +490,80 @@ static void test_truncated_gif(void) IStream_Release(stream); } +/* 1x1 pixel gif, missing trailer */ +static unsigned char gifimage_notrailer[] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x71,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00 +}; + +static void test_gif_notrailer(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *gifstream; + IWICBitmapFrameDecode *framedecode; + double dpiX = 0.0, dpiY = 0.0; + UINT framecount; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &gifstream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, + sizeof(gifimage_notrailer)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(dpiX == 48.0, "expected dpiX=48.0, got %f\n", dpiX); + ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + + IWICBitmapFrameDecode_Release(framedecode); + } + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); + ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok(framecount == 1, "framecount=%u\n", framecount); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(gifstream); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(gifformat) { HRESULT hr; @@ -504,6 +578,7 @@ START_TEST(gifformat) test_global_gif_palette_2frames(); test_local_gif_palette(); test_gif_frame_sizes(); + test_gif_notrailer(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Józef Kucia : d3d9/tests: Add test for presentation intervals.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 6429187307ffc9834e69616650f6c31d80f86e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6429187307ffc9834e696166… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:52 2018 +0100 d3d9/tests: Add test for presentation intervals. 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/d3d9/tests/device.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9fa6a7e..547e0d0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11424,9 +11424,10 @@ static void test_resource_priority(void) static void test_swapchain_parameters(void) { IDirect3DDevice9 *device; + HRESULT hr, expected_hr; IDirect3D9 *d3d; + D3DCAPS9 caps; HWND window; - HRESULT hr; unsigned int i; D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}, present_parameters2; IDirect3DSwapChain9 *swapchain; @@ -11490,6 +11491,9 @@ static void test_swapchain_parameters(void) DestroyWindow(window); return; } + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); IDirect3DDevice9_Release(device); present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; @@ -11560,6 +11564,54 @@ static void test_swapchain_parameters(void) IDirect3DDevice9_Release(device); } + for (i = 0; i < 10; ++i) + { + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = FALSE; + present_parameters.BackBufferCount = 2; + + present_parameters.PresentationInterval = i; + switch (present_parameters.PresentationInterval) + { + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + if (!(caps.PresentationIntervals & present_parameters.PresentationInterval)) + continue; + /* Fall through */ + case D3DPRESENT_INTERVAL_DEFAULT: + expected_hr = D3D_OK; + break; + default: + expected_hr = D3DERR_INVALIDCALL; + break; + } + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + if (FAILED(hr)) + continue; + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x, test %u.\n", hr, i); + + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); + ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x, test %u.\n", hr, i); + ok(present_parameters2.PresentationInterval == i, + "Got presentation interval %#x, expected %#x.\n", + present_parameters2.PresentationInterval, i); + + IDirect3DSwapChain9_Release(swapchain); + IDirect3DDevice9_Release(device); + } + IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Józef Kucia : d3d8/tests: Add test for presentation intervals.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 643d2b06d709789312fb9bad1300da71d9dbfcbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=643d2b06d709789312fb9bad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:51 2018 +0100 d3d8/tests: Add test for presentation intervals. 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/d3d8/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6ae1782..851de3f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7865,11 +7865,12 @@ static void test_resource_priority(void) static void test_swapchain_parameters(void) { + IDirect3DSurface8 *backbuffer; IDirect3DDevice8 *device; + HRESULT hr, expected_hr; IDirect3D8 *d3d; - IDirect3DSurface8 *backbuffer; + D3DCAPS8 caps; HWND window; - HRESULT hr; unsigned int i, j; D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}; static const struct @@ -7933,6 +7934,8 @@ static void test_swapchain_parameters(void) DestroyWindow(window); return; } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); IDirect3DDevice8_Release(device); present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; @@ -8012,6 +8015,42 @@ static void test_swapchain_parameters(void) IDirect3DDevice8_Release(device); } + for (i = 0; i < 10; ++i) + { + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = FALSE; + present_parameters.BackBufferCount = 2; + + present_parameters.FullScreen_PresentationInterval = i; + switch (present_parameters.FullScreen_PresentationInterval) + { + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + if (!(caps.PresentationIntervals & present_parameters.FullScreen_PresentationInterval)) + continue; + /* Fall through */ + case D3DPRESENT_INTERVAL_DEFAULT: + expected_hr = D3D_OK; + break; + default: + expected_hr = D3DERR_INVALIDCALL; + break; + } + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + if (SUCCEEDED(hr)) + IDirect3DDevice8_Release(device); + } + IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Józef Kucia : d3d9: Validate presentation interval.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 9d62b50cafc845dfa06b911ac745b8569a3ba46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d62b50cafc845dfa06b911a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:50 2018 +0100 d3d9: Validate presentation interval. 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/d3d9/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 28c96c4..8c74494 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -331,6 +331,19 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); return FALSE; } + switch (present_parameters->PresentationInterval) + { + case D3DPRESENT_INTERVAL_DEFAULT: + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + case D3DPRESENT_INTERVAL_IMMEDIATE: + break; + default: + WARN("Invalid presentation interval %#x.\n", present_parameters->PresentationInterval); + return FALSE; + } swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;

1 0

Józef Kucia : d3d8: Validate presentation interval.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 93e7878cb41a29530ee49246f7c5332b4a8d93a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e7878cb41a29530ee49246… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:49 2018 +0100 d3d8: Validate presentation interval. 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/d3d8/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5624d76..17e02a3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -304,6 +304,20 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); return FALSE; } + switch (present_parameters->FullScreen_PresentationInterval) + { + case D3DPRESENT_INTERVAL_DEFAULT: + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + case D3DPRESENT_INTERVAL_IMMEDIATE: + break; + default: + WARN("Invalid presentation interval %#x.\n", + present_parameters->FullScreen_PresentationInterval); + return FALSE; + } swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
79
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 March 2018