wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Zhiyi Zhang : user32/tests: Add BM_SETIMAGE style check tests.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 7699d8e47ad0026e21213da6065fe0872af36200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7699d8e47ad0026e21213da6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 28 19:46:21 2018 +0800 user32/tests: Add BM_SETIMAGE style check tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 36d1e33..69841d3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6502,6 +6502,121 @@ static void test_button_messages(void) DestroyWindow(parent); } +static void test_button_bm_get_set_image(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP hbmp1x1; + HBITMAP hbmp2x2; + HBITMAP hmask2x2; + ICONINFO icon_info2x2; + HICON hicon2x2; + HBITMAP hbmp; + HICON hicon; + ICONINFO icon_info; + BITMAP bm; + DWORD default_style = BS_PUSHBUTTON | WS_TABSTOP | WS_POPUP | WS_VISIBLE; + LRESULT ret; + + hdc = GetDC(0); + hbmp1x1 = CreateCompatibleBitmap(hdc, 1, 1); + hbmp2x2 = CreateCompatibleBitmap(hdc, 2, 2); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp1x1, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp2x2, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + + hmask2x2 = CreateCompatibleBitmap(hdc, 2, 2); + ZeroMemory(&icon_info2x2, sizeof(icon_info2x2)); + icon_info2x2.fIcon = TRUE; + icon_info2x2.hbmMask = hmask2x2; + icon_info2x2.hbmColor = hbmp2x2; + hicon2x2 = CreateIconIndirect(&icon_info2x2); + + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon2x2, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + + /* Set bitmap with BS_BITMAP */ + hwnd = CreateWindowA("Button", "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp1x1); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_BITMAP, 0); + ok(hbmp != 0, "Expect hbmp not 0\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(hbmp, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 1 && bm.bmHeight == 1, "Expect bitmap size: %d,%d, got: %d,%d\n", 1, 1, + bm.bmWidth, bm.bmHeight); + DestroyWindow(hwnd); + + /* Set bitmap without BS_BITMAP */ + hwnd = CreateWindowA("Button", "test", default_style, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + ret = SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(ret == 0, "Expect ret to be 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_BITMAP, 0); + ok(hbmp == NULL, "Expect hbmp to be NULL\n"); + DestroyWindow(hwnd); + + /* Set icon with BS_ICON */ + hwnd = CreateWindowA("Button", "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon2x2); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_ICON, 0); + ok(hicon != NULL, "Expect hicon not NULL\n"); + ZeroMemory(&icon_info, sizeof(icon_info)); + ok(GetIconInfo(hicon, &icon_info), "Expect GetIconInfo() success\n"); + ZeroMemory(&bm, sizeof(bm)); + ok(GetObjectW(icon_info.hbmColor, sizeof(bm), &bm), "Expect GetObjectW() success\n"); + ok(bm.bmWidth == 2 && bm.bmHeight == 2, "Expect bitmap size: %d,%d, got: %d,%d\n", 2, 2, + bm.bmWidth, bm.bmHeight); + DeleteObject(icon_info.hbmColor); + DeleteObject(icon_info.hbmMask); + DestroyWindow(hwnd); + + /* Set icon without BS_ICON */ + hwnd = CreateWindowA("Button", "test", default_style, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + ret = SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon2x2); + ok(ret == 0, "Expect ret to be 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_ICON, 0); + ok(hicon == NULL, "Expect hicon to be NULL\n"); + DestroyWindow(hwnd); + + /* Set icon with BS_BITMAP */ + hwnd = CreateWindowA("Button", "test", default_style | BS_BITMAP, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + ret = SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon2x2); + ok(ret == 0, "Expect ret to be 0\n"); + hicon = (HICON)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_ICON, 0); + ok(hicon == NULL, "Expect hicon to be NULL\n"); + DestroyWindow(hwnd); + + /* Set bitmap with BS_ICON */ + hwnd = CreateWindowA("Button", "test", default_style | BS_ICON, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Expect hwnd to be not NULL\n"); + ret = SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp1x1); + ok(ret == 0, "Expect ret to be 0\n"); + hbmp = (HBITMAP)SendMessageA(hwnd, BM_GETIMAGE, (WPARAM)IMAGE_BITMAP, 0); + ok(hbmp == NULL, "Expect hbmp to be NULL\n"); + DestroyWindow(hwnd); + + DestroyIcon(hicon2x2); + DeleteObject(hmask2x2); + DeleteObject(hbmp2x2); + DeleteObject(hbmp1x1); + ReleaseDC(0, hdc); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -16721,6 +16836,7 @@ START_TEST(msg) invisible_parent_tests(); test_mdi_messages(); test_button_messages(); + test_button_bm_get_set_image(); test_static_messages(); test_listbox_messages(); test_combobox_messages();

1 0

Zhiyi Zhang : comctl32/button: Implement BCM_{GETNOTE, SETNOTE, GETNOTELENGTH} message.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 06d2ad29aee4b1468b1a3fda47af170951737365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d2ad29aee4b1468b1a3fda… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 28 19:45:19 2018 +0800 comctl32/button: Implement BCM_{GETNOTE,SETNOTE,GETNOTELENGTH} message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 86 +++++++++++++++++++++++ dlls/comctl32/tests/button.c | 158 +++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 8 +++ 3 files changed, 252 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06d2ad29aee4b1468b1a…

1 0

Roderick Colenbrander : vulkan-1: Implement vkGetInstanceProcAddr.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 3a6c724e904e4730adc365df03ab7a096532ed1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a6c724e904e4730adc365df… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:52 2018 -0700 vulkan-1: Implement vkGetInstanceProcAddr. 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/vulkan-1/vulkan.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index fbc3d1c..6f7ab43 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); +PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance, const char *); VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) @@ -52,8 +53,18 @@ VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count, PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p %s\n", instance, debugstr_a(name)); - return NULL; + TRACE("%p %s\n", instance, debugstr_a(name)); + + if (!strcmp(name, "vkEnumerateInstanceExtensionProperties")) + return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties; + + if (!strcmp(name, "vkEnumerateInstanceLayerProperties")) + return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties; + + if (!strcmp(name, "vkGetInstanceProcAddr")) + return (PFN_vkVoidFunction)vkGetInstanceProcAddr; + + return wine_vkGetInstanceProcAddr(instance, name); } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)

1 0

Roderick Colenbrander : vulkan-1: Implement vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 6ba422b3dc8908b7bb08cedd314c89b2649be2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba422b3dc8908b7bb08cedd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:51 2018 -0700 vulkan-1: Implement vkEnumerateInstanceExtensionProperties. 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/vulkan-1/vulkan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index 5f974ee..fbc3d1c 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -27,11 +27,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); + VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - FIXME("stub: %p %p %p\n", layer_name, count, properties); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("%p %p %p\n", layer_name, count, properties); + + if (layer_name) + return VK_ERROR_LAYER_NOT_PRESENT; + + return wine_vkEnumerateInstanceExtensionProperties(NULL, count, properties); } VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count,

1 0

Roderick Colenbrander : vulkan-1: Add initial implementation.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: f0f232ebd1628b638b84c78331136a2e6917699a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f232ebd1628b638b84c783… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:50 2018 -0700 vulkan-1: Add initial implementation. 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> --- configure | 2 + configure.ac | 1 + dlls/vulkan-1/Makefile.in | 7 ++ dlls/vulkan-1/version.rc | 27 ++++++++ dlls/vulkan-1/vulkan-1.spec | 159 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vulkan-1/vulkan.c | 68 +++++++++++++++++++ dlls/winevulkan/make_vulkan | 38 ++++++++++- 7 files changed, 299 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0f232ebd1628b638b84…

1 0

Roderick Colenbrander : winevulkan: Export symbols for Core Vulkan functions.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: dea298413ea2d136b3a354c8619e0cb0ab54441c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea298413ea2d136b3a354c8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:49 2018 -0700 winevulkan: Export symbols for Core Vulkan functions. 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/Makefile.in | 1 + dlls/winevulkan/make_vulkan | 107 ++++++++++++++-- dlls/winevulkan/vulkan.c | 6 +- dlls/winevulkan/vulkan_thunks.c | 268 ++++++++++++++++++++-------------------- dlls/winevulkan/vulkan_thunks.h | 22 ++-- dlls/winevulkan/winevulkan.spec | 158 +++++++++++++++++++++++ 6 files changed, 404 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dea298413ea2d136b3a3…

1 0

André Hentschel : dwrite/tests: Use fabs for floating point numbers (clang).
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 383fbf04cfc52a57869ef94adc307711d1021081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=383fbf04cfc52a57869ef94a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 18:54:47 2018 +0200 dwrite/tests: Use fabs for floating point numbers (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 347d750..b54748a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -635,7 +635,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface);

1 0

Jacek Caban : msxml3/tests: Added invalid host XHR tests.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 35bd57ec5e62a984dd4223551eaa0714c06f7722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35bd57ec5e62a984dd422355… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 18:20:19 2018 +0200 msxml3/tests: Added invalid host XHR tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5149222..f20f18f 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1787,6 +1787,18 @@ static void test_XMLHTTP(void) SysFreeString(str); IXMLHttpRequest_Release(xhr); + + /* invalid host */ + xhr = create_xhr(); + + test_open(xhr, "GET", "http://invalid.host.test.winehq.org/test/path", S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + todo_wine + ok(hr == INET_E_RESOURCE_NOT_FOUND, "send to invalid host returned %#x.\n", hr); + + IXMLHttpRequest_Release(xhr); free_bstrs(); } @@ -1819,6 +1831,18 @@ static void test_server_xhr(void) SysFreeString(response); IServerXMLHTTPRequest_Release(xhr); + + /* invalid host */ + xhr = create_server_xhr(); + + test_server_open(xhr, "GET", "http://invalid.host.test.winehq.org/test/path", S_OK); + + V_VT(&body) = VT_EMPTY; + hr = IServerXMLHTTPRequest_send(xhr, body); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "send to invalid host returned %#x.\n", hr); + + IServerXMLHTTPRequest_Release(xhr); free_bstrs(); }

1 0

Jacek Caban : msxml3/tests: Added IServerXMLHTTPRequest tests.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: f6b5b31083ce52936837047bcd85bccbe216cac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b5b31083ce52936837047b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 18:20:11 2018 +0200 msxml3/tests: Added IServerXMLHTTPRequest tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 4f51ef9..5149222 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -50,6 +50,9 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } +static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; +static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, 0x4f, 0xa0, 0xfb, 0xa3); @@ -91,6 +94,13 @@ DEFINE_EXPECT(collection_get_length); static int g_unexpectedcall, g_expectedcall; +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static BSTR alloc_str_from_narrow(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -1431,14 +1441,26 @@ static void _test_open(unsigned line, IXMLHttpRequest *xhr, const char *method, ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); } +#define test_server_open(a,b,c,d) _test_server_open(__LINE__,a,b,c,d) +static void _test_server_open(unsigned line, IServerXMLHTTPRequest *xhr, const char *method, const char *url, HRESULT exhres) +{ + VARIANT empty, vfalse; + HRESULT hr; + + V_VT(&empty) = VT_EMPTY; + V_VT(&vfalse) = VT_BOOL; + V_BOOL(&vfalse) = VARIANT_FALSE; + + hr = IServerXMLHTTPRequest_open(xhr, _bstr_(method), _bstr_(url), vfalse, empty, empty); + ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); +} + static void test_XMLHTTP(void) { static const char bodyA[] = "mode=Test"; static const char urlA[] = "http://test.winehq.org/tests/post.php"; - static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; - static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; static const WCHAR norefererW[] = {'n','o',' ','r','e','f','e','r','e','r',' ','s','e','t',0}; IXMLHttpRequest *xhr; @@ -1768,6 +1790,38 @@ static void test_XMLHTTP(void) free_bstrs(); } +static void test_server_xhr(void) +{ + IServerXMLHTTPRequest *xhr; + BSTR response; + VARIANT body; + HRESULT hr; + + /* GET request */ + xhr = create_server_xhr(); + + test_server_open(xhr, "GET", xmltestA, S_OK); + + V_VT(&body) = VT_EMPTY; + + hr = IServerXMLHTTPRequest_send(xhr, body); + if (hr == INET_E_RESOURCE_NOT_FOUND) + { + skip("No connection could be made with test.winehq.org\n"); + IServerXMLHTTPRequest_Release(xhr); + return; + } + ok(hr == S_OK, "send failed: %08x\n", hr); + + hr = IServerXMLHTTPRequest_get_responseText(xhr, &response); + ok(hr == S_OK, "get_responseText failed: %08x\n", hr); + ok(!strcmp_wa(response, xmltestbodyA), "got %s\n", wine_dbgstr_w(response)); + SysFreeString(response); + + IServerXMLHTTPRequest_Release(xhr); + free_bstrs(); +} + static void test_safe_httpreq(void) { IXMLHttpRequest *xhr; @@ -1847,6 +1901,7 @@ START_TEST(httpreq) IXMLHttpRequest_Release(xhr); test_XMLHTTP(); + test_server_xhr(); test_safe_httpreq(); test_supporterrorinfo();

1 0

Józef Kucia : demos: Do not force sRGB formats for Vulkan swapchains.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: fd36cefbe29c883decba583795191a0a7079c1a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd36cefbe29c883decba583… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:22 2018 +0200 demos: Do not force sRGB formats for Vulkan swapchains. Fixes the following validation error: IMAGE(ERROR): object: 0x0 type: 0 location: 3302 msgCode: 180357110: vkCreateImageView() format VK_FORMAT_B8G8R8A8_UNORM differs from image 6 format VK_FORMAT_B8G8R8A8_SRGB. Formats MUST be IDENTICAL unless VK_IMAGE_CREATE_MUTABLE_FORMAT BIT was set on image creation. The spec valid usage text states 'If image was not created with the VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT flag, format must be identical to the format used to create image' 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 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 4de1149..9980b50 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -304,17 +304,6 @@ static inline void demo_set_idle_func(struct demo *demo, demo->idle_func = idle_func; } -static inline DXGI_FORMAT demo_get_srgb_format(DXGI_FORMAT format) -{ - switch (format) - { - case DXGI_FORMAT_B8G8R8A8_UNORM: - return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - default: - return DXGI_FORMAT_UNKNOWN; - } -} - static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue, struct demo_window *window, const struct demo_swapchain_desc *desc) { @@ -338,7 +327,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; - if ((format = vkd3d_get_vk_format(demo_get_srgb_format(desc->format))) == VK_FORMAT_UNDEFINED) + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL; if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device)))

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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