March 2018 - Wine-Commits - list.winehq.org

Roderick Colenbrander : vulkan-1: Implement vkGetInstanceProcAddr.
by Alexandre Julliard March 28, 2018

March 28, 2018

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

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

March 28, 2018

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

Zhiyi Zhang : user32/tests: Add BM_SETIMAGE style check tests.
by Alexandre Julliard March 28, 2018

March 28, 2018

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

Roderick Colenbrander : vulkan-1: Implement vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard March 28, 2018

March 28, 2018

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

Alexandre Julliard : winex11: Use more common names for resizing cursors.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 9b2b9d9cb3929b17236cbedac5bb4ad4333e264f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2b9d9cb3929b17236cbeda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 28 19:37:33 2018 +0200 winex11: Use more common names for resizing cursors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..c3ec916 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -832,10 +832,10 @@ static const struct system_cursors user32_cursors[] = { OCR_SIZE, "fleur" }, { OCR_SIZEALL, "fleur" }, { OCR_ICON, "icon" }, - { OCR_SIZENWSE, "nwse-resize" }, - { OCR_SIZENESW, "nesw-resize" }, - { OCR_SIZEWE, "ew-resize" }, - { OCR_SIZENS, "ns-resize" }, + { OCR_SIZENWSE, "top_left_corner" }, + { OCR_SIZENESW, "top_right_corner" }, + { OCR_SIZEWE, "left_side" }, + { OCR_SIZENS, "top_side" }, { OCR_NO, "not-allowed" }, { OCR_HAND, "hand2" }, { OCR_APPSTARTING, "left_ptr_watch" },

1 0

Alexandre Julliard : user32: Define a few more window messages.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: bb99d51dc4c9e6c620b92287a1cfa46e5a46f002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb99d51dc4c9e6c620b92287… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 28 20:10:49 2018 +0200 user32: Define a few more window messages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 35 +++++++++++++++++++++++++++++------ include/winuser.rh | 30 ++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 9fb7307..80bd0a3 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -490,13 +490,30 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_ENTERSIZEMOVE", /* 0x0231 */ "WM_EXITSIZEMOVE", /* 0x0232 */ "WM_DROPFILES", /* 0x0233 */ - "WM_MDIREFRESHMENU", NULL, NULL, NULL, - /* 0x0238*/ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_MDIREFRESHMENU", /* 0x0234 */ + NULL, NULL, NULL, + "WM_POINTERDEVICECHANGE", /* 0x0238 */ + "WM_POINTERDEVICEINRANGE", /* 0x0239 */ + "WM_POINTERDEVICEOUTOFRANGE", /* 0x023a */ + NULL, NULL, NULL, NULL, NULL, /* 0x0240 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_TOUCH", /* 0x0240 */ + "WM_NCPOINTERUPDATE", /* 0x0241 */ + "WM_NCPOINTERDOWN", /* 0x0242 */ + "WM_NCPOINTERUP", /* 0x0243 */ + NULL, + "WM_POINTERUPDATE", /* 0x0245 */ + "WM_POINTERDOWN", /* 0x0246 */ + "WM_POINTERUP", /* 0x0247 */ + NULL, + "WM_POINTERENTER", /* 0x0249 */ + "WM_POINTERLEAVE", /* 0x024a */ + "WM_POINTERACTIVATE", /* 0x024b */ + "WM_POINTERCAPTURECHANGED", /* 0x024c */ + "WM_TOUCHHITTESTING", /* 0x024d */ + "WM_POINTERWHEEL", /* 0x024e */ + "WM_POINTERHWHEEL", /* 0x024f */ /* 0x0250 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -569,7 +586,13 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_TABLET_FIRST+31", /* 0x02de */ "WM_TABLET_LAST", /* 0x02df */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_DPICHANGED", /* 0x02e0 */ + NULL, + "WM_DPICHANGED_BEFOREPARENT",/* 0x02e2 */ + "WM_DPICHANGED_AFTERPARENT",/* 0x02e3 */ + "WM_GETDPISCALEDSIZE", /* 0x02e4 */ + NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/include/winuser.rh b/include/winuser.rh index 350d427..bcc7160 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -530,8 +530,6 @@ #define WM_MDICASCADE 0x0227 #define WM_MDIICONARRANGE 0x0228 #define WM_MDIGETACTIVE 0x0229 -#define WM_MDISETMENU 0x0230 -#define WM_MDIREFRESHMENU 0x0234 /* D&D messages */ #define WM_DROPOBJECT 0x022A /* DDK / Win16 */ @@ -541,11 +539,34 @@ #define WM_DRAGSELECT 0x022E /* DDK / Win16 */ #define WM_DRAGMOVE 0x022F /* DDK / Win16 */ +#define WM_MDISETMENU 0x0230 #define WM_ENTERSIZEMOVE 0x0231 #define WM_EXITSIZEMOVE 0x0232 #define WM_DROPFILES 0x0233 +#define WM_MDIREFRESHMENU 0x0234 + +#define WM_POINTERDEVICECHANGE 0x0238 +#define WM_POINTERDEVICEINRANGE 0x0239 +#define WM_POINTERDEVICEOUTOFRANGE 0x023a #define WM_TOUCH 0x0240 +#define WM_NCPOINTERUPDATE 0x0241 +#define WM_NCPOINTERDOWN 0x0242 +#define WM_NCPOINTERUP 0x0243 +#define WM_POINTERUPDATE 0x0245 +#define WM_POINTERDOWN 0x0246 +#define WM_POINTERUP 0x0247 +#define WM_POINTERENTER 0x0249 +#define WM_POINTERLEAVE 0x024a +#define WM_POINTERACTIVATE 0x024b +#define WM_POINTERCAPTURECHANGED 0x024c +#define WM_TOUCHHITTESTING 0x024d +#define WM_POINTERWHEEL 0x024e +#define WM_POINTERHWHEEL 0x024f + +#define WM_POINTERROUTEDTO 0x0251 +#define WM_POINTERROUTEDAWAY 0x0252 +#define WM_POINTERROUTEDRELEASED 0x0253 /* Win32 4.0 messages for IME */ #define WM_IME_SETCONTEXT 0x0281 @@ -571,6 +592,11 @@ #define WM_TABLET_FIRST 0x02c0 #define WM_TABLET_LAST 0x02df +#define WM_DPICHANGED 0x02e0 +#define WM_DPICHANGED_BEFOREPARENT 0x02e2 +#define WM_DPICHANGED_AFTERPARENT 0x02e3 +#define WM_GETDPISCALEDSIZE 0x02e4 + /* Clipboard command messages */ #define WM_CUT 0x0300 #define WM_COPY 0x0301

1 0

Michael Müller : ieframe: Return S_OK in IViewObject: :Draw stub.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 6545037efba8f3ee48f2a48747c1528f9afeb914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6545037efba8f3ee48f2a487… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 28 10:41:07 2018 -0500 ieframe: Return S_OK in IViewObject::Draw stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 3e44991..546e251 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -60,7 +60,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect,

1 0

André Hentschel : msvcrt: Accept Czechia as locale name.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 4e5e56c822b6048226fc6a3358f0209e790802bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5e56c822b6048226fc6a33… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 19:24:14 2018 +0200 msvcrt: Accept Czechia as locale name. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..ea42385 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -158,12 +158,14 @@ todo_wine ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "czech"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "dan"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Owen Rudge : wsdapi: Add support for writing XML attributes.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: feee5ad96d0a08e096d46ee5316e875dc49c43a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feee5ad96d0a08e096d46ee5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:17 2018 +0100 wsdapi: Add support for writing XML attributes. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 40edd15..2bfb160 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -130,18 +130,71 @@ static inline void free_xml_string(WS_XML_STRING *value) heap_free(value); } -static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) +static HRESULT write_xml_attribute(WSDXML_ATTRIBUTE *attribute, WS_XML_WRITER *writer) { WS_XML_STRING *local_name = NULL, *element_ns = NULL, *ns_prefix = NULL; WS_XML_UTF16_TEXT utf16_text; + HRESULT ret = E_OUTOFMEMORY; + int text_len; + + if (attribute == NULL) + return S_OK; + + /* Start the attribute */ + local_name = populate_xml_string(attribute->Name->LocalName); + if (local_name == NULL) goto cleanup; + + if (attribute->Name->Space == NULL) + { + element_ns = populate_xml_string(emptyString); + if (element_ns == NULL) goto cleanup; + + ns_prefix = NULL; + } + else + { + element_ns = populate_xml_string(attribute->Name->Space->Uri); + if (element_ns == NULL) goto cleanup; + + ns_prefix = populate_xml_string(attribute->Name->Space->PreferredPrefix); + if (ns_prefix == NULL) goto cleanup; + } + + ret = WsWriteStartAttribute(writer, ns_prefix, local_name, element_ns, FALSE, NULL); + if (FAILED(ret)) goto cleanup; + + text_len = lstrlenW(attribute->Value); + + utf16_text.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16_text.bytes = (BYTE *)attribute->Value; + utf16_text.byteCount = min(WSD_MAX_TEXT_LENGTH, text_len) * sizeof(WCHAR); + + ret = WsWriteText(writer, (WS_XML_TEXT *)&utf16_text, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsWriteEndAttribute(writer, NULL); + if (FAILED(ret)) goto cleanup; + +cleanup: + free_xml_string(local_name); + free_xml_string(element_ns); + free_xml_string(ns_prefix); + + return ret; +} + +static HRESULT write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) +{ + WS_XML_STRING *local_name = NULL, *element_ns = NULL, *ns_prefix = NULL; + WSDXML_ATTRIBUTE *current_attribute; + WS_XML_UTF16_TEXT utf16_text; WSDXML_NODE *current_child; WSDXML_TEXT *node_as_text; - BOOL retVal = FALSE; int text_len; - HRESULT ret; + HRESULT ret = E_OUTOFMEMORY; if (element == NULL) - return TRUE; + return S_OK; /* Start the element */ local_name = populate_xml_string(element->Name->LocalName); @@ -156,7 +209,15 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) ret = WsWriteStartElement(writer, ns_prefix, local_name, element_ns, NULL); if (FAILED(ret)) goto cleanup; - /* TODO: Write attributes */ + /* Write attributes */ + current_attribute = element->FirstAttribute; + + while (current_attribute != NULL) + { + ret = write_xml_attribute(current_attribute, writer); + if (FAILED(ret)) goto cleanup; + current_attribute = current_attribute->Next; + } /* Write child elements */ current_child = element->FirstChild; @@ -165,7 +226,8 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) { if (current_child->Type == ElementType) { - if (!write_xml_element((WSDXML_ELEMENT *)current_child, writer)) goto cleanup; + ret = write_xml_element((WSDXML_ELEMENT *)current_child, writer); + if (FAILED(ret)) goto cleanup; } else if (current_child->Type == TextType) { @@ -185,16 +247,13 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) /* End the element */ ret = WsWriteEndElement(writer, NULL); - if (FAILED(ret)) goto cleanup; - - retVal = TRUE; cleanup: free_xml_string(local_name); free_xml_string(element_ns); free_xml_string(ns_prefix); - return retVal; + return ret; } static WSDXML_ELEMENT *add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, @@ -410,7 +469,8 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER tmp_uri = NULL; /* Write the header */ - if (!write_xml_element(header_element, writer)) goto cleanup; + ret = write_xml_element(header_element, writer); + if (FAILED(ret)) goto cleanup; ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup;

1 0

Owen Rudge : wsdapi: Add InstanceId and MessageNumber to SOAP header.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 5df08c9de48b7c2158c0095da3fbd1731b5d140d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df08c9de48b7c2158c0095d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:29 2018 +0100 wsdapi: Add InstanceId and MessageNumber to SOAP header. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 126 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 2bfb160..06d0129 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -69,6 +69,8 @@ static const WCHAR messageIdString[] = { 'M','e','s','s','a','g','e','I','D', 0 static const WCHAR toString[] = { 'T','o', 0 }; static const WCHAR relatesToString[] = { 'R','e','l','a','t','e','s','T','o', 0 }; static const WCHAR appSequenceString[] = { 'A','p','p','S','e','q','u','e','n','c','e', 0 }; +static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d', 0 }; +static const WCHAR messageNumberString[] = { 'M','e','s','s','a','g','e','N','u','m','b','e','r', 0 }; static const WCHAR emptyString[] = { 0 }; struct discovered_namespace @@ -318,6 +320,123 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +#define MAX_ULONGLONG_STRING_SIZE 25 + +static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) +{ + WCHAR formatString[] = { '%','I','6','4','u', 0 }; + LPWSTR ret; + + ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); + + if (ret == NULL) + return NULL; + + wsprintfW(ret, formatString, value); + return ret; +} + +static WSDXML_ATTRIBUTE *add_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name) +{ + WSDXML_ATTRIBUTE *attribute, *cur_attrib; + WSDXML_NAME *name_obj = NULL; + + if (ns_uri == NULL) + { + name_obj = WSDAllocateLinkedMemory(NULL, sizeof(WSDXML_NAME)); + name_obj->LocalName = duplicate_string(name_obj, name); + name_obj->Space = NULL; + } + else + { + if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, ns_uri, name, &name_obj))) + return NULL; + } + + attribute = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_ATTRIBUTE)); + + if (attribute == NULL) + { + WSDFreeLinkedMemory(name_obj); + return NULL; + } + + attribute->Element = parent; + attribute->Name = name_obj; + attribute->Next = NULL; + attribute->Value = NULL; + + if (name_obj != NULL) + WSDAttachLinkedMemory(attribute, name_obj); + + if (parent->FirstAttribute == NULL) + { + /* Make this the first attribute of the parent */ + parent->FirstAttribute = attribute; + } + else + { + /* Find the last attribute and add this as the next one */ + cur_attrib = parent->FirstAttribute; + + while (cur_attrib->Next != NULL) + { + cur_attrib = cur_attrib->Next; + } + + cur_attrib->Next = attribute; + } + + return attribute; +} + +static void remove_attribute(WSDXML_ELEMENT *parent, WSDXML_ATTRIBUTE *attribute) +{ + WSDXML_ATTRIBUTE *cur_attrib; + + /* Find the last attribute and add this as the next one */ + cur_attrib = parent->FirstAttribute; + + if (cur_attrib == attribute) + parent->FirstAttribute = cur_attrib->Next; + else + { + while (cur_attrib != NULL) + { + /* Is our attribute the next attribute? */ + if (cur_attrib->Next == attribute) + { + /* Remove it from the list */ + cur_attrib->Next = attribute->Next; + break; + } + + cur_attrib = cur_attrib->Next; + } + } + + WSDFreeLinkedMemory(attribute); +} + +static BOOL add_ulonglong_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, + ULONGLONG value) +{ + WSDXML_ATTRIBUTE *attribute = add_attribute(xml_context, parent, ns_uri, name); + + if (attribute == NULL) + return FALSE; + + attribute->Value = ulonglong_to_string(attribute, value); + + if (attribute->Value == NULL) + { + remove_attribute(parent, attribute); + return FALSE; + } + + return TRUE; +} + static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE *discovered_ns) { struct discovered_namespace *ns; @@ -376,9 +495,13 @@ static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_conte app_sequence_element = add_child_element(xml_context, header_element, discoveryNsUri, appSequenceString, emptyString); if (app_sequence_element == NULL) goto cleanup; - /* TODO: InstanceId attribute */ + /* InstanceId attribute */ + if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, instanceIdString, min(UINT_MAX, + header->AppSequence->InstanceId))) goto cleanup; - /* TODO: MessageNumber attribute */ + /* MessageNumber attribute */ + if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, messageNumberString, min(UINT_MAX, + header->AppSequence->MessageNumber))) goto cleanup; /* TODO: SequenceID attribute */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 30f90a5..1fa96b7 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -614,7 +614,7 @@ static void Publish_tests(void) ok(hello_message_seen == TRUE, "Hello message not received\n"); todo_wine ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); - todo_wine ok(app_sequence_seen == TRUE, "AppSequence not received\n"); + ok(app_sequence_seen == TRUE, "AppSequence not received\n"); todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n");

1 0