August 2018 - Wine-Devel - list.winehq.org

[PATCH 4/8] mshtml: Use generic value checks for IHTMLStyle::put_backgroundRepeat implementation.
by Jacek Caban Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

1 0

[PATCH 3/8] mshtml: Use generic value checks for IHTMLStyle::put_fontWeight implementation.
by Jacek Caban Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 53 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-)

1 0

[PATCH 2/8] mshtml: Use generic value checks for IHTMLStyle::put_fontVariant implementation.
by Jacek Caban Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[PATCH 1/8] mshtml: Support using array to check for allowed values and use it in IHTMLStyle::put_fontStyle implementation.
by Jacek Caban Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 57 ++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 22 deletions(-)

1 0

[PATCH] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng Aug. 28, 2018

Aug. 28, 2018

For bug 42710: https://bugs.winehq.org/show_bug.cgi?id=42710 . Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 39 ++++++++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..e2ae3f262e 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,44 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + + TRACE("%p,%s,%08x,%p,%p,%p,%p\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt == OLERENDER_FORMAT) + { + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + + if (!fmt) + return E_INVALIDARG; + + if (SUCCEEDED(hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&ole_cache))) + if (SUCCEEDED(hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection))) + if (SUCCEEDED(hr = IDataObject_GetData(data, fmt, &stgmedium))) + if (SUCCEEDED(hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE))) + if (SUCCEEDED(hr = IOleCache2_QueryInterface(ole_cache, &IID_IPersistStorage, + (LPVOID *)&persist))) + if (SUCCEEDED(hr = IPersistStorage_Save(persist, stg, TRUE))) + if (SUCCEEDED(hr = IPersistStorage_SaveCompleted(persist, NULL))) + hr = OleLoad(stg, iid, client_site, obj); + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + return hr; + } + else + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..ceec369dc3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4593,6 +4593,62 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + static FORMATETC bitmap_fmt[] = + { + { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI }, + { 0 } + }; + static const struct expected_method methods_create_from_bitmap[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_bitmap[] = + { + { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, + { NULL } + }; + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_create_from_bitmap; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, bitmap_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_createstatic_from_bitmap; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + if (ole_obj) + IOleObject_Release(ole_obj); + + IStorage_Release(storage); + ILockBytes_Release(ilb); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4699,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

1 0

[PATCH] kerberos: Avoid needless conversions between SYSTEMTIME and FILETIME.
by Dmitry Timoshkov Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 70895c999a..3827e5ccbc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -751,12 +751,11 @@ static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) { - SYSTEMTIME time; FILETIME filetime; ULARGE_INTEGER tmp; - GetLocalTime( &time ); - SystemTimeToFileTime( &time, &filetime ); + GetSystemTimeAsFileTime( &filetime ); + FileTimeToLocalFileTime( &filetime, &filetime ); tmp.QuadPart = ((ULONGLONG)filetime.dwLowDateTime | (ULONGLONG)filetime.dwHighDateTime << 32) + expirytime; timestamp->LowPart = tmp.QuadPart; timestamp->HighPart = tmp.QuadPart >> 32; -- 2.17.1

2 1

[PATCH] winevulkan: Trace properties for created devices.
by Józef Kucia Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a1e970daff85..89df838f0499 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -60,6 +60,9 @@ static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); +void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties *properties); + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -600,6 +603,17 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + if (TRACE_ON(vulkan)) + { + VkPhysicalDeviceProperties properties; + + wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + + TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID); + TRACE("Driver version: %#x.\n", properties.driverVersion); + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; -- 2.16.4

1 0

[PATCH 1/3] comctl32/pager: Support toolbar notification conversion.
by Zhiyi Zhang Aug. 28, 2018

Aug. 28, 2018

Fix BibleWorks 10 not displaying toolbar. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 96 ++++++++ dlls/comctl32/tests/pager.c | 431 ++++++++++++++++++++++++++++++++++++ 2 files changed, 527 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index de63cad717..0367108db2 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -91,6 +91,17 @@ typedef struct #define INITIAL_DELAY 500 #define REPEAT_DELAY 50 +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +typedef enum +{ + /* Convert ANSI text from parent back to Unicode for pager */ + FROM_ANSI = 0x01, + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + TO_ANSI = 0x02, + /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ + SET_NULL_EMPTY = 0x04 +} ConversionFlag; + static void PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBottomRight, BOOL bClientCoords) { @@ -1020,6 +1031,89 @@ static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) } } +static UINT PAGER_GetAnsiNtfCode(UINT code) +{ + switch (code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; + case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + } + return code; +} + +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) +{ + WCHAR emptyW[] = {0}; + WCHAR *oldText; + INT oldTextMax; + void *sendBuffer = NULL; + void *receiveBuffer = NULL; + INT bufferSize; + LRESULT ret = 0; + + oldText = *text; + oldTextMax = textMax ? *textMax : 0; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (oldTextMax < 0) goto done; + + if (!*text && flags & SET_NULL_EMPTY) + *text = emptyW; + + if (*text && flags & TO_ANSI) + { + bufferSize = WideCharToMultiByte(CP_ACP, 0, *text, -1, 0, 0, NULL, FALSE); + bufferSize = max(bufferSize, oldTextMax); + sendBuffer = heap_alloc(bufferSize); + if (!sendBuffer) goto done; + WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + *text = sendBuffer; + } + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + if (*text && flags & FROM_ANSI) + { + bufferSize = lstrlenA((CHAR *)*text); + receiveBuffer = heap_alloc(bufferSize + 1); + if (!receiveBuffer) goto done; + memcpy(receiveBuffer, *text, bufferSize + 1); + if (!oldText) goto done; + MultiByteToWideChar(CP_ACP, 0, receiveBuffer, -1, oldText, oldTextMax); + } + +done: + heap_free(sendBuffer); + heap_free(receiveBuffer); + *text = oldText; + return ret; +} + +static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) +{ + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + switch (hdr->code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: + { + NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + SET_NULL_EMPTY | TO_ANSI | FROM_ANSI); + } + case TBN_GETINFOTIPW: + { + NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); + } + } + /* Other notifications or notifications above that don't have text, thus no need to convert */ + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1115,6 +1209,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_NotifyFormat (infoPtr, lParam); case WM_NOTIFY: + return PAGER_Notify (infoPtr, (NMHDR *)lParam); + case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a1f6683a57..46f2eb0acb 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -30,10 +30,91 @@ static HWND parent_wnd, child1_wnd, child2_wnd; static INT notify_format; static BOOL notify_query_received; +static WCHAR test_w[] = {'t', 'e', 's', 't', 0}; +static CHAR test_a[] = {'t', 'e', 's', 't', 0}; +static WCHAR t_w[] = {'t', 0}; +static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR buffer[64]; +static WCHAR buffer2[64]; + +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +typedef enum +{ + /* Convert ANSI text from parent back to Unicode for pager */ + FROM_ANSI = 0x01, + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + TO_ANSI = 0x02, + /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ + SET_NULL_EMPTY = 0x04 +} ConversionFlag; + +static struct notify_test_data +{ + UINT unicode; + UINT ansi; + UINT_PTR id_from; + HWND hwnd_from; + INT text_size; + /* Whether parent receive notification */ + BOOL received; + UINT sub_test_id; + /* Text field conversion behavior flags */ + ConversionFlag flags; +} notify_test_data; #define CHILD1_ID 1 #define CHILD2_ID 2 +#define expect_eq_int(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " 0x%08x, got 0x%08x\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_long(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " 0x%08lx, got 0x%08lx\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_pointer(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " %p, got %p\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_text_a(actual, expected) \ + do \ + { \ + ok(!lstrcmpA((actual), (expected)), "Code:0x%08x Subtest:0x%08x Expect " #actual " %s, got %s\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_text_w(actual, expected) \ + do \ + { \ + ok(!lstrcmpW((actual), (expected)), "Code:0x%08x Subtest:0x%08x Expect " #actual " %s, got %s\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, wine_dbgstr_w((expected)), \ + wine_dbgstr_w((actual))); \ + } while (0) + +#define expect_text_empty(actual) \ + do \ + { \ + ok((actual) && !(actual)[0], "Code:0x%08x Subtest:0x%08x Expect " #actual " empty\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id); \ + } while (0) + +#define expect_null(actual) \ + do \ + { \ + ok(!(actual), "Code:0x%08x Subtest:0x%08x Expect " #actual " NULL, got %p\n", notify_test_data.unicode, \ + notify_test_data.sub_test_id, (actual)); \ + } while (0) + static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -419,6 +500,355 @@ static void test_wm_notifyformat(void) UnregisterClassW(class_w, GetModuleHandleW(NULL)); } +static void wm_notify_text_handler(CHAR **text, INT *textMax) +{ + expect_eq_int(*textMax, notify_test_data.text_size); + switch (notify_test_data.sub_test_id) + { + case 1: + if (notify_test_data.flags & SET_NULL_EMPTY) + expect_text_empty(*text); + else + expect_null(*text); + break; + case 2: + { + INT length = lstrlenA(*text); + ok(length == 0 + || broken(length == 3) /* 2003 */ + || broken(length == 1) /* <= Win7 */, + "Wrong text length\n"); + break; + } + case 3: + if (notify_test_data.flags & TO_ANSI) + { + expect_eq_text_a(*text, test_a); + ok(*text != (CHAR *)buffer, "Expect using a new buffer\n"); + } + else + { + expect_eq_text_w((WCHAR *)*text, test_w); + expect_eq_pointer(*text, (CHAR *)buffer); + } + break; + case 4: + expect_text_empty(*text); + memcpy(*text, test_a, sizeof(test_a)); + break; + case 5: + expect_text_empty(*text); + *textMax = 1; + break; + case 6: + expect_text_empty(*text); + *text = test_a; + break; + case 7: + *text = test_a; + break; + case 8: + expect_text_empty(*text); + *text = large_a; + break; + } +} + +static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static const WCHAR test[] = {'t', 'e', 's', 't', 0}; + switch (message) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lParam; + + /* Not notifications we want to test */ + if (!notify_test_data.unicode) break; + ok(!notify_test_data.received, "Extra notification received\n"); + + expect_eq_long(wParam, notify_test_data.id_from); + expect_eq_int(hdr->code, notify_test_data.ansi); + expect_eq_long(hdr->idFrom, notify_test_data.id_from); + expect_eq_pointer(hdr->hwndFrom, notify_test_data.hwnd_from); + + if (hdr->code != notify_test_data.ansi) + { + skip("Notification code mismatch, skipping lParam check\n"); + return 0; + } + switch (hdr->code) + { + /* Toolbar */ + /* No conversion for TBN_SAVE and TBN_RESTORE */ + case TBN_SAVE: + { + NMTBSAVE *nmtbs = (NMTBSAVE *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_eq_text_w((WCHAR *)nmtbs->tbButton.iString, test_w); + break; + case 1: + nmtbs->tbButton.iString = (INT_PTR)test_a; + break; + } + break; + } + case TBN_RESTORE: + { + NMTBRESTORE *nmtbr = (NMTBRESTORE *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_eq_text_w((WCHAR *)nmtbr->tbButton.iString, test_w); + break; + case 1: + nmtbr->tbButton.iString = (INT_PTR)test_a; + break; + } + break; + } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *nmtb = (NMTOOLBARA *)hdr; + wm_notify_text_handler(&nmtb->pszText, &nmtb->cchText); + break; + } + /* TBN_GETDISPINFOW doesn't get converted to TBN_GETDISPINFOA */ + case TBN_GETDISPINFOW: + { + NMTBDISPINFOW *nmtbdi = (NMTBDISPINFOW *)hdr; + expect_eq_text_w(nmtbdi->pszText, test_w); + expect_eq_int(nmtbdi->cchText, ARRAY_SIZE(buffer)); + memcpy(nmtbdi->pszText, test_a, sizeof(test_a)); + break; + } + case TBN_GETINFOTIPA: + { + NMTBGETINFOTIPA *nmtbgit = (NMTBGETINFOTIPA *)hdr; + wm_notify_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); + break; + } + default: + ok(0, "Unexpected message 0x%08x\n", hdr->code); + } + notify_test_data.received = TRUE; + ok(!lstrcmpA(test_a, "test"), "test_a got modified\n"); + ok(!lstrcmpW(test_w, test), "test_w got modified\n"); + return 0; + } + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) return NFR_ANSI; + break; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static BOOL register_test_notify_class(void) +{ + WNDCLASSA cls = {0}; + + cls.lpfnWndProc = test_notify_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "Pager notify class"; + return RegisterClassA(&cls); +} + +static void send_notify_(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOOL code_change, BOOL received) +{ + NMHDR *hdr = (NMHDR *)lParam; + + notify_test_data.unicode = unicode; + notify_test_data.id_from = 1; + notify_test_data.hwnd_from = child1_wnd; + notify_test_data.ansi = ansi; + notify_test_data.received = FALSE; + + hdr->code = unicode; + hdr->idFrom = 1; + hdr->hwndFrom = child1_wnd; + + SendMessageW(pager, WM_NOTIFY, hdr->idFrom, lParam); + expect_eq_int(notify_test_data.received, received); + expect_eq_int(hdr->code, code_change ? notify_test_data.ansi : notify_test_data.unicode); +} + +#define send_notify(a, b, c, d, e) send_notify_(pager, a, b, c, d, e) + +/* Send notify to test text field conversion. In parent proc wm_notify_text_handler() handles these messages */ +static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHAR **text, INT *textMax, + UINT code_unicode, UINT code_ansi, ConversionFlag flags) +{ + notify_test_data.flags = flags; + + /* NULL text */ + notify_test_data.sub_test_id = 1; + memset(ptr, 0, size); + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_null(*text); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Zero text max size */ + notify_test_data.sub_test_id = 2; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + /* Got *text null on Windows <= Win7 */ + ok(broken(!*text) || (!lstrlenW(*text) && *text == buffer), "Wrong *text\n"); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification */ + notify_test_data.sub_test_id = 3; + memset(ptr, 0, size); + memcpy(buffer, test_w, sizeof(test_w)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + if (!(flags & TO_ANSI) && flags & FROM_ANSI) + expect_eq_text_w(*text, t_w); + else + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent write to buffer */ + notify_test_data.sub_test_id = 4; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent set buffer size to one */ + notify_test_data.sub_test_id = 5; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, 1); + + /* Valid notification. Parent replace buffer */ + notify_test_data.sub_test_id = 6; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* NULL text. Parent replace buffer */ + notify_test_data.sub_test_id = 7; + memset(ptr, 0, size); + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_null(*text); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent replace buffer with a pointer pointing to a string larger than old buffer can store */ + notify_test_data.sub_test_id = 8; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + memset(buffer2, 0, sizeof(buffer2)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + MultiByteToWideChar(CP_ACP, 0, large_a, -1, buffer2, ARRAY_SIZE(buffer2)); + ok(!memcmp(*text, buffer2, sizeof(buffer2)), "Expect memory content to be the same\n"); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); +} + +#define test_wm_notify_text_helper(a, b, c, d, e, f, g) test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g) + +static void test_wm_notify_toolbar(HWND pager) +{ + NMTBRESTORE nmtbr; + NMTBSAVE nmtbs; + NMTOOLBARW nmtb; + NMTBDISPINFOW nmtbdi; + NMTBGETINFOTIPW nmtbgit; + + /* No conversion for TBN_SAVE */ + notify_test_data.sub_test_id = 0; + memset(&nmtbs, 0, sizeof(nmtbs)); + nmtbs.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_SAVE, TBN_SAVE, (LPARAM)&nmtbs, TRUE, TRUE); + expect_eq_text_w((WCHAR *)nmtbs.tbButton.iString, test_w); + + notify_test_data.sub_test_id = 1; + memset(&nmtbs, 0, sizeof(nmtbs)); + nmtbs.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_SAVE, TBN_SAVE, (LPARAM)&nmtbs, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbs.tbButton.iString, test_a); + + /* No conversion for TBN_RESTORE */ + notify_test_data.sub_test_id = 0; + memset(&nmtbr, 0, sizeof(nmtbr)); + nmtbr.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_RESTORE, TBN_RESTORE, (LPARAM)&nmtbr, TRUE, TRUE); + expect_eq_text_w((WCHAR *)nmtbr.tbButton.iString, test_w); + + notify_test_data.sub_test_id = 1; + memset(&nmtbr, 0, sizeof(nmtbr)); + nmtbr.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_RESTORE, TBN_RESTORE, (LPARAM)&nmtbr, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbr.tbButton.iString, test_a); + + /* TBN_GETDISPINFOW doesn't get unconverted */ + memset(&nmtbdi, 0, sizeof(nmtbdi)); + memcpy(buffer, test_w, sizeof(test_w)); + nmtbdi.dwMask = TBNF_TEXT; + nmtbdi.pszText = buffer; + nmtbdi.cchText = ARRAY_SIZE(buffer); + notify_test_data.text_size = nmtbdi.cchText; + send_notify(TBN_GETDISPINFOW, TBN_GETDISPINFOW, (LPARAM)&nmtbdi, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbdi.pszText, test_a); + + test_wm_notify_text_helper(&nmtb, sizeof(nmtb), &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, + TBN_GETBUTTONINFOA, SET_NULL_EMPTY | TO_ANSI); + test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, + TBN_GETINFOTIPA, FROM_ANSI); +} + +static void test_wm_notify(void) +{ + static const CHAR *class = "Pager notify class"; + HWND parent, pager; + + ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowA(WC_PAGESCROLLERA, "pager", WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleA(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child1_wnd = CreateWindowA(class, "child", WS_CHILD, 0, 0, 100, 100, pager, (HMENU)1, GetModuleHandleA(0), 0); + ok(child1_wnd != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + + test_wm_notify_toolbar(pager); + + DestroyWindow(parent); + UnregisterClassA(class, GetModuleHandleA(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -447,6 +877,7 @@ START_TEST(pager) test_pager(); test_wm_notifyformat(); + test_wm_notify(); DestroyWindow(parent_wnd); } -- 2.18.0

2 2

[PATCH 3/3] comctl32/pager: Support comboboxex notification conversion.
by Zhiyi Zhang Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 59 +++++++++++++- dlls/comctl32/tests/pager.c | 148 +++++++++++++++++++++++++++++++++--- 2 files changed, 192 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 9ab492e333..37b2e52325 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -101,7 +101,11 @@ typedef enum /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ TO_ANSI = 0x02, /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ - SET_NULL_EMPTY = 0x04 + SET_NULL_EMPTY = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + NO_MASK_SET_NULL = 0x08, + /* Zero the text buffer before sending */ + ZERO_BUFFER = 0x10 } ConversionFlag; static void @@ -1038,6 +1042,10 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) { switch (code) { + /* ComboxBoxEx */ + case CBEN_DRAGBEGINW: return CBEN_DRAGBEGINA; + case CBEN_ENDEDITW: return CBEN_ENDEDITA; + case CBEN_GETDISPINFOW: return CBEN_GETDISPINFOA; /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; @@ -1060,7 +1068,8 @@ static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) return TRUE; } -static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, ConversionFlag flags) { WCHAR emptyW[] = {0}; WCHAR *oldText; @@ -1075,8 +1084,17 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + if (mask && !(*mask & requiredMask)) + { + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (flags & NO_MASK_SET_NULL) oldText = NULL; + goto done; + } + if (oldTextMax < 0) goto done; + if (*text && flags & ZERO_BUFFER) memset(*text, 0, oldTextMax * sizeof(WCHAR)); + if (!*text && flags & SET_NULL_EMPTY) *text = emptyW; @@ -1117,17 +1135,50 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmcbe->ceItem.mask, CBEIF_TEXT, &nmcbe->ceItem.pszText, + &nmcbe->ceItem.cchTextMax, NO_MASK_SET_NULL | ZERO_BUFFER | FROM_ANSI); + } + case CBEN_DRAGBEGINW: + { + NMCBEDRAGBEGINW *nmdbW = (NMCBEDRAGBEGINW *)hdr; + NMCBEDRAGBEGINA nmdbA = {0}; + nmdbA.hdr.code = PAGER_GetAnsiNtfCode(nmdbW->hdr.code); + nmdbA.hdr.hwndFrom = nmdbW->hdr.hwndFrom; + nmdbA.hdr.idFrom = nmdbW->hdr.idFrom; + nmdbA.iItemid = nmdbW->iItemid; + WideCharToMultiByte(CP_ACP, 0, nmdbW->szText, ARRAY_SIZE(nmdbW->szText), nmdbA.szText, ARRAY_SIZE(nmdbA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmdbA); + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *nmedW = (NMCBEENDEDITW *)hdr; + NMCBEENDEDITA nmedA = {0}; + nmedA.hdr.code = PAGER_GetAnsiNtfCode(nmedW->hdr.code); + nmedA.hdr.hwndFrom = nmedW->hdr.hwndFrom; + nmedA.hdr.idFrom = nmedW->hdr.idFrom; + nmedA.fChanged = nmedW->fChanged; + nmedA.iNewSelection = nmedW->iNewSelection; + nmedA.iWhy = nmedW->iWhy; + WideCharToMultiByte(CP_ACP, 0, nmedW->szText, ARRAY_SIZE(nmedW->szText), nmedA.szText, ARRAY_SIZE(nmedA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmedA); + } /* Toolbar */ case TBN_GETBUTTONINFOW: { NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtb->pszText, &nmtb->cchText, SET_NULL_EMPTY | TO_ANSI | FROM_ANSI); } case TBN_GETINFOTIPW: { NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); } /* Tooltip */ case TTN_GETDISPINFOW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index bf79f34c5b..ee8d36d040 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -45,7 +45,11 @@ typedef enum /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ TO_ANSI = 0x02, /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ - SET_NULL_EMPTY = 0x04 + SET_NULL_EMPTY = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + NO_MASK_SET_NULL = 0x08, + /* Zero the text buffer before sending */ + ZERO_BUFFER = 0x10 } ConversionFlag; static struct notify_test_data @@ -505,12 +509,15 @@ static void wm_notify_text_handler(CHAR **text, INT *textMax) expect_eq_int(*textMax, notify_test_data.text_size); switch (notify_test_data.sub_test_id) { - case 1: + case 0: if (notify_test_data.flags & SET_NULL_EMPTY) expect_text_empty(*text); else expect_null(*text); break; + case 1: + expect_text_empty(*text); + break; case 2: { INT length = lstrlenA(*text); @@ -521,7 +528,9 @@ static void wm_notify_text_handler(CHAR **text, INT *textMax) break; } case 3: - if (notify_test_data.flags & TO_ANSI) + if (notify_test_data.flags & ZERO_BUFFER) + expect_text_empty(*text); + else if (notify_test_data.flags & TO_ANSI) { expect_eq_text_a(*text, test_a); ok(*text != (CHAR *)buffer, "Expect using a new buffer\n"); @@ -579,6 +588,49 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L } switch (hdr->code) { + /* ComboBoxEx */ + /* No conversion for CBEN_INSERTITEM and CBEN_DELETEITEM */ + case CBEN_INSERTITEM: + case CBEN_DELETEITEM: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + expect_eq_text_w(nmcbe->ceItem.pszText, test_w); + break; + } + case CBEN_DRAGBEGINA: + { + NMCBEDRAGBEGINA *nmcbedb = (NMCBEDRAGBEGINA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_text_empty(nmcbedb->szText); + break; + case 1: + expect_eq_text_a(nmcbedb->szText, test_a); + break; + } + break; + } + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *nmcbeed = (NMCBEENDEDITA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_text_empty(nmcbeed->szText); + break; + case 1: + expect_eq_text_a(nmcbeed->szText, test_a); + break; + } + break; + } + case CBEN_GETDISPINFOA: + { + NMCOMBOBOXEXA *nmcbe = (NMCOMBOBOXEXA *)hdr; + wm_notify_text_handler(&nmcbe->ceItem.pszText, &nmcbe->ceItem.cchTextMax); + break; + } /* Toolbar */ /* No conversion for TBN_SAVE and TBN_RESTORE */ case TBN_SAVE: @@ -724,24 +776,46 @@ static void send_notify_(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOO #define send_notify(a, b, c, d, e) send_notify_(pager, a, b, c, d, e) /* Send notify to test text field conversion. In parent proc wm_notify_text_handler() handles these messages */ -static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHAR **text, INT *textMax, - UINT code_unicode, UINT code_ansi, ConversionFlag flags) +static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, UINT code_unicode, UINT code_ansi, ConversionFlag flags) { notify_test_data.flags = flags; /* NULL text */ - notify_test_data.sub_test_id = 1; + notify_test_data.sub_test_id = 0; memset(ptr, 0, size); + if (mask) *mask = requiredMask; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); expect_null(*text); expect_eq_int(*textMax, notify_test_data.text_size); + if (mask) + { + /* No required mask */ + notify_test_data.sub_test_id = 1; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + if (flags & NO_MASK_SET_NULL) + expect_null(*text); + else + { + expect_text_empty(*text); + expect_eq_pointer(*text, buffer); + } + expect_eq_int(*textMax, notify_test_data.text_size); + } + /* Zero text max size */ notify_test_data.sub_test_id = 2; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); @@ -753,11 +827,14 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 3; memset(ptr, 0, size); memcpy(buffer, test_w, sizeof(test_w)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); - if (!(flags & TO_ANSI) && flags & FROM_ANSI) + if (flags & ZERO_BUFFER) + expect_text_empty(*text); + else if (!(flags & TO_ANSI) && flags & FROM_ANSI) expect_eq_text_w(*text, t_w); else expect_eq_text_w(*text, test_w); @@ -768,6 +845,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 4; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -780,6 +858,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 5; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -791,6 +870,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 6; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -802,6 +882,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA /* NULL text. Parent replace buffer */ notify_test_data.sub_test_id = 7; memset(ptr, 0, size); + if (mask) *mask = requiredMask; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); @@ -813,6 +894,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); memset(buffer2, 0, sizeof(buffer2)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -823,7 +905,50 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA expect_eq_int(*textMax, notify_test_data.text_size); } -#define test_wm_notify_text_helper(a, b, c, d, e, f, g) test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g) +#define test_wm_notify_text_helper(a, b, c, d, e, f, g, h, i) \ + test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g, h, i) + +static void test_wm_notify_comboboxex(HWND pager) +{ + NMCOMBOBOXEXW nmcbe; + NMCBEDRAGBEGINW nmcbedb; + NMCBEENDEDITW nmcbeed; + + /* CBEN_INSERTITEM and CBEN_DELETEITEM will be forwarded unchanged */ + memset(&nmcbe, 0, sizeof(nmcbe)); + nmcbe.ceItem.mask = CBEIF_TEXT; + nmcbe.ceItem.pszText = test_w; + nmcbe.ceItem.cchTextMax = ARRAY_SIZE(test_w); + send_notify(CBEN_INSERTITEM, CBEN_INSERTITEM, (LPARAM)&nmcbe, TRUE, TRUE); + send_notify(CBEN_DELETEITEM, CBEN_DELETEITEM, (LPARAM)&nmcbe, TRUE, TRUE); + + /* CBEN_DRAGBEGIN */ + notify_test_data.sub_test_id = 0; + memset(&nmcbedb, 0, sizeof(nmcbedb)); + send_notify(CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE, TRUE); + + notify_test_data.sub_test_id = 1; + memset(&nmcbedb, 0, sizeof(nmcbedb)); + memcpy(nmcbedb.szText, test_w, sizeof(test_w)); + send_notify(CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE, TRUE); + expect_eq_text_w(nmcbedb.szText, test_w); + + /* CBEN_ENDEDIT */ + notify_test_data.sub_test_id = 0; + memset(&nmcbeed, 0, sizeof(nmcbeed)); + send_notify(CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE, TRUE); + + notify_test_data.sub_test_id = 1; + memset(&nmcbeed, 0, sizeof(nmcbeed)); + memcpy(nmcbeed.szText, test_w, sizeof(test_w)); + send_notify(CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE, TRUE); + expect_eq_text_w(nmcbeed.szText, test_w); + + /* CBEN_GETDISPINFO */ + test_wm_notify_text_helper(&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, + &nmcbe.ceItem.cchTextMax, CBEN_GETDISPINFOW, CBEN_GETDISPINFOA, + NO_MASK_SET_NULL | ZERO_BUFFER | FROM_ANSI); +} static void test_wm_notify_toolbar(HWND pager) { @@ -869,10 +994,10 @@ static void test_wm_notify_toolbar(HWND pager) send_notify(TBN_GETDISPINFOW, TBN_GETDISPINFOW, (LPARAM)&nmtbdi, TRUE, TRUE); expect_eq_text_a((CHAR *)nmtbdi.pszText, test_a); - test_wm_notify_text_helper(&nmtb, sizeof(nmtb), &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, + test_wm_notify_text_helper(&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, SET_NULL_EMPTY | TO_ANSI); - test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, - TBN_GETINFOTIPA, FROM_ANSI); + test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), NULL, 0, &nmtbgit.pszText, &nmtbgit.cchTextMax, + TBN_GETINFOTIPW, TBN_GETINFOTIPA, FROM_ANSI); } static void test_wm_notify_tooltip(HWND pager) @@ -979,6 +1104,7 @@ static void test_wm_notify(void) ok(child1_wnd != NULL, "CreateWindow failed\n"); SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + test_wm_notify_comboboxex(pager); test_wm_notify_toolbar(pager); test_wm_notify_tooltip(pager); -- 2.18.0

1 0

[PATCH 2/3] comctl32/pager: Support tooltip notification conversion.
by Zhiyi Zhang Aug. 28, 2018

Aug. 28, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 72 +++++++++++++++++++ dlls/comctl32/tests/pager.c | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 0367108db2..9ab492e333 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -84,6 +84,8 @@ typedef struct INT TLbtnState; /* state of top or left btn */ INT BRbtnState; /* state of bottom or right btn */ INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ + WCHAR *pwszBuffer;/* text buffer for converted notifications */ + INT nBufferSize;/* size of the above buffer */ } PAGER_INFO; #define TIMERID1 1 @@ -605,6 +607,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + heap_free (infoPtr->pwszBuffer); heap_free (infoPtr); return 0; } @@ -1038,10 +1041,25 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + /* Tooltip */ + case TTN_GETDISPINFOW: return TTN_GETDISPINFOA; } return code; } +static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) +{ + if (!infoPtr->pwszBuffer) + infoPtr->pwszBuffer = heap_alloc(size); + else if (infoPtr->nBufferSize < size) + infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + + if (!infoPtr->pwszBuffer) return FALSE; + if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; + + return TRUE; +} + static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) { WCHAR emptyW[] = {0}; @@ -1093,6 +1111,8 @@ done: static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) { + LRESULT ret; + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); switch (hdr->code) @@ -1109,6 +1129,58 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); } + /* Tooltip */ + case TTN_GETDISPINFOW: + { + NMTTDISPINFOW *nmttdiW = (NMTTDISPINFOW *)hdr; + NMTTDISPINFOA nmttdiA = {0}; + INT size; + + nmttdiA.hdr.code = PAGER_GetAnsiNtfCode(nmttdiW->hdr.code); + nmttdiA.hdr.hwndFrom = nmttdiW->hdr.hwndFrom; + nmttdiA.hdr.idFrom = nmttdiW->hdr.idFrom; + nmttdiA.hinst = nmttdiW->hinst; + nmttdiA.uFlags = nmttdiW->uFlags; + nmttdiA.lParam = nmttdiW->lParam; + nmttdiA.lpszText = nmttdiA.szText; + WideCharToMultiByte(CP_ACP, 0, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText), nmttdiA.szText, + ARRAY_SIZE(nmttdiA.szText), NULL, FALSE); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmttdiA); + + nmttdiW->hinst = nmttdiA.hinst; + nmttdiW->uFlags = nmttdiA.uFlags; + nmttdiW->lParam = nmttdiA.lParam; + + MultiByteToWideChar(CP_ACP, 0, nmttdiA.szText, ARRAY_SIZE(nmttdiA.szText), nmttdiW->szText, + ARRAY_SIZE(nmttdiW->szText)); + if (!nmttdiA.lpszText) + nmttdiW->lpszText = nmttdiW->szText; + else if (!IS_INTRESOURCE(nmttdiA.lpszText)) + { + size = MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, 0, 0); + if (size > ARRAY_SIZE(nmttdiW->szText)) + { + if (!PAGER_AdjustBuffer(infoPtr, size * sizeof(WCHAR))) return ret; + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, infoPtr->pwszBuffer, size); + nmttdiW->lpszText = infoPtr->pwszBuffer; + /* Override content in szText */ + memcpy(nmttdiW->szText, nmttdiW->lpszText, min(sizeof(nmttdiW->szText), size * sizeof(WCHAR))); + } + else + { + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText)); + nmttdiW->lpszText = nmttdiW->szText; + } + } + else + { + nmttdiW->szText[0] = 0; + nmttdiW->lpszText = (WCHAR *)nmttdiA.lpszText; + } + + return ret; + } } /* Other notifications or notifications above that don't have text, thus no need to convert */ return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 46f2eb0acb..bf79f34c5b 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -630,6 +630,53 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L wm_notify_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); break; } + /* Tooltip */ + case TTN_GETDISPINFOA: + { + NMTTDISPINFOA *nmttdi = (NMTTDISPINFOA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + break; + case 1: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + break; + case 2: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = test_a; + break; + case 3: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = (CHAR *)1; + nmttdi->hinst = GetModuleHandleA(0); + break; + case 4: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = test_a; + nmttdi->hinst = GetModuleHandleA(0); + break; + case 5: + nmttdi->lpszText = test_a; + break; + case 6: + memcpy(nmttdi->szText, test_a, 2); + nmttdi->szText[2] = 0; + nmttdi->lpszText = test_a; + break; + case 7: + expect_eq_text_a(nmttdi->szText, test_a); + expect_eq_pointer(nmttdi->lpszText, nmttdi->szText); + break; + case 8: + expect_text_empty(nmttdi->szText); + expect_eq_pointer(nmttdi->lpszText, nmttdi->szText); + break; + case 9: + nmttdi->lpszText = large_a; + break; + } + break; + } default: ok(0, "Unexpected message 0x%08x\n", hdr->code); } @@ -828,6 +875,95 @@ static void test_wm_notify_toolbar(HWND pager) TBN_GETINFOTIPA, FROM_ANSI); } +static void test_wm_notify_tooltip(HWND pager) +{ + NMTTDISPINFOW nmttdi; + WCHAR *buffer_w; + INT size; + + /* if lpszText is not set by parent, will be set to the address of szText, even if szText is empty */ + notify_test_data.sub_test_id = 0; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. If lpszText is not set by parent, will be set to the address of szText */ + notify_test_data.sub_test_id = 1; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. Parent replace nmttdi.lpszText with pointer */ + notify_test_data.sub_test_id = 2; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. Parent set int resource. szText end up empty */ + notify_test_data.sub_test_id = 3; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + ok(IS_INTRESOURCE(nmttdi.lpszText), "Expect int resource\n"); + ok(nmttdi.hinst != NULL, "Expect instance gets set\n"); + + /* Parent set szText, lpszText and instance */ + notify_test_data.sub_test_id = 4; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + ok(nmttdi.hinst != NULL, "Expect instance gets set\n"); + + /* Empty szText will be filled with lpszText if lpszText is set */ + notify_test_data.sub_test_id = 5; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Not empty szText will be overwritten with lpszText if lpszText is set after conversion */ + notify_test_data.sub_test_id = 6; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Set szText before send_notify. szText got converted for parent */ + notify_test_data.sub_test_id = 7; + memset(&nmttdi, 0, sizeof(nmttdi)); + memcpy(nmttdi.szText, test_w, sizeof(test_w)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Set lpszText before send_notify. lpszText doesn't get converted for parent */ + notify_test_data.sub_test_id = 8; + memset(&nmttdi, 0, sizeof(nmttdi)); + nmttdi.lpszText = test_w; + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent set lpszText to a string larger than the size of szText array */ + notify_test_data.sub_test_id = 9; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + size = MultiByteToWideChar(CP_ACP, 0, large_a, -1, 0, 0); + buffer_w = heap_alloc(size * sizeof(WCHAR)); + if (!buffer_w) return; + MultiByteToWideChar(CP_ACP, 0, large_a, -1, buffer_w, size); + expect_eq_text_w(nmttdi.lpszText, buffer_w); + buffer_w[ARRAY_SIZE(nmttdi.szText)] = 0; + expect_eq_text_w(nmttdi.szText, buffer_w); + /* nmttdi.szText is not null terminated */ + expect_eq_int(lstrlenW(nmttdi.szText), ARRAY_SIZE(nmttdi.szText)); + heap_free(buffer_w); +} + static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; @@ -844,6 +980,7 @@ static void test_wm_notify(void) SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); test_wm_notify_toolbar(pager); + test_wm_notify_tooltip(pager); DestroyWindow(parent); UnregisterClassA(class, GetModuleHandleA(NULL)); -- 2.18.0

1 0