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

[PATCH] oledlg: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 17, 2018

July 17, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledlg/insobjdlg.c | 2 +- dlls/oledlg/oledlg_main.c | 8 ++++---- dlls/oledlg/pastespl.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 506196ed45..00b991e390 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -350,7 +350,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) RegOpenKeyExW(HKEY_CLASSES_ROOT, szClsid, 0, KEY_READ, &hkclsids); - while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, sizeof(szclsid)/sizeof(szclsid[0])))) + while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, ARRAY_SIZE(szclsid)))) { index++; diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 8ba9f17a7a..ba5b7c8081 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -181,7 +181,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, if (object) IOleObject_EnumVerbs(object, &enumverbs); - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, ARRAY_SIZE(resstrW)); /* no object, or object without enumeration support */ if (!object || !enumverbs) { RemoveMenu(hMenu, uPos, MF_BYPOSITION); @@ -202,7 +202,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, singleverb = get_next_insertable_verb(enumverbs, idmin, idmax, &verb) != S_OK; if (singleverb && !addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)firstverb.lpszVerbName; args[1] = (DWORD_PTR)objecttype; @@ -235,7 +235,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, /* convert verb is at the bottom of a popup, separated from verbs */ if (addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, ARRAY_SIZE(resstrW)); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_SEPARATOR, 0, NULL); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_STRING, idConvert, resstrW); } @@ -244,7 +244,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, *ret_submenu = submenu; /* now submenu is ready, add root entry to original menu, attach submenu */ - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)objecttype; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 530c4eddda..0b8c8c95a1 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -182,14 +182,14 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, ARRAY_SIZE(buf)); ps_struct->source_name = strdupW(buf); } if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, ARRAY_SIZE(buf)); ps_struct->type_name = strdupW(buf); } } @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) } /* The native version grabs only the first 20 fmts and we do the same */ - hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched); + hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); TRACE("got %d formats hr %08x\n", fetched, hr); if(SUCCEEDED(hr)) @@ -431,7 +431,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) res_id = IDS_PS_PASTE_LINK_DATA; } - LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); if((ptr = strstrW(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ -- 2.14.4

1 0

[PATCH] ole32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 17, 2018

July 17, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/classmoniker.c | 6 +++--- dlls/ole32/clipboard.c | 2 +- dlls/ole32/datacache.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/ole2impl.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/storage32.c | 9 ++++----- dlls/ole32/usrmarshal.c | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index ebad7947c6..30a24d23e5 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -536,14 +536,14 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); - StringFromGUID2(&This->clsid, *ppszDisplayName+sizeof(wszClsidPrefix)/sizeof(WCHAR)-2, CHARS_IN_GUID); + StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); /* note: this overwrites the opening curly bracket of the CLSID string generated above */ memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); /* note: this overwrites the closing curly bracket of the CLSID string generated above */ - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-2] = ':'; - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-1] = '\0'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0'; TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); return S_OK; diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 919d9e3604..cb005d384f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1197,7 +1197,7 @@ static HRESULT get_priv_data(ole_priv_data **data) for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { WCHAR buf[256]; - if (GetClipboardFormatNameW(cf, buf, sizeof(buf) / sizeof(WCHAR))) + if (GetClipboardFormatNameW(cf, buf, ARRAY_SIZE(buf))) TRACE("cf %04x %s\n", cf, debugstr_w(buf)); else TRACE("cf %04x\n", cf); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b72b8ff2ef..3eff56908d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2667,7 +2667,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat } else { - for (i = 0; i < sizeof(view_list) / sizeof(view_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(view_list); i++) { fmt.cfFormat = view_list[i]; fmt.tymed = tymed_from_cf( fmt.cfFormat ); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ffbaa61e50..c1312d1e1e 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1152,7 +1152,7 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, *pchEaten = 0; *ppmk = NULL; - if (!strncmpiW(szDisplayName, wszClsidColon, sizeof(wszClsidColon)/sizeof(wszClsidColon[0]))) + if (!strncmpiW(szDisplayName, wszClsidColon, ARRAY_SIZE(wszClsidColon))) { hr = ClassMoniker_CreateFromDisplayName(pbc, szDisplayName, &chEaten, &moniker); if (FAILED(hr) && (hr != MK_E_SYNTAX)) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c7a9b272cb..2de9edbb80 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -967,7 +967,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( LPWSTR pwszOLEVERB; LPWSTR pwszMenuFlags; LPWSTR pwszAttribs; - LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, sizeof(wszSubKey)/sizeof(wszSubKey[0])); + LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, ARRAY_SIZE(wszSubKey)); if (res == ERROR_NO_MORE_ITEMS) { hr = S_FALSE; diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index ccf31fa4f5..fa5777beb0 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -135,7 +135,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL if (other_fmts) { - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt_id); i++) { init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); hr = IDataObject_QueryGetData(data, &fmt); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index a73d23ce68..9aa945b367 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1658,7 +1658,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; HKEY key; HRESULT hres; - WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; + WCHAR command[MAX_PATH+ARRAY_SIZE(embedding)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; @@ -1799,7 +1799,7 @@ static void get_localserver_pipe_name(WCHAR *pipefn, REFCLSID rclsid) { static const WCHAR wszPipeRef[] = {'\\','\\','.','\\','p','i','p','e','\\',0}; strcpyW(pipefn, wszPipeRef); - StringFromGUID2(rclsid, pipefn + sizeof(wszPipeRef)/sizeof(wszPipeRef[0]) - 1, CHARS_IN_GUID); + StringFromGUID2(rclsid, pipefn + ARRAY_SIZE(wszPipeRef) - 1, CHARS_IN_GUID); } /* FIXME: should call to rpcss instead */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 51f178be8e..886d9b95a5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5057,7 +5057,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) if (SUCCEEDED(hr)) { - for (j=0; j<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); j++) + for (j = 0; j < ARRAY_SIZE(This->locked_bytes); j++) { if (This->locked_bytes[j] == 0) { @@ -5200,10 +5200,10 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) BlockChainStream_Destroy(This->rootBlockChain); BlockChainStream_Destroy(This->smallBlockDepotChain); - for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + for (i = 0; i < BLOCKCHAIN_CACHE_SIZE; i++) BlockChainStream_Destroy(This->blockChainCache[i]); - for (i=0; i<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->locked_bytes); i++) { ULARGE_INTEGER offset, cb; cb.QuadPart = 1; @@ -9369,8 +9369,7 @@ HRESULT WINAPI WriteFmtUserTypeStg( /* get the clipboard format name */ if( cf ) { - n = GetClipboardFormatNameW( cf, szwClipName, - sizeof(szwClipName)/sizeof(szwClipName[0]) ); + n = GetClipboardFormatNameW(cf, szwClipName, ARRAY_SIZE(szwClipName)); szwClipName[n]=0; } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8d36e13441..772bff5f5e 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -116,7 +116,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) /* urg! this function is badly designed because it won't tell us how * much space is needed without doing a dummy run of storing the * name into a buffer */ - ret = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + ret = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!ret) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); size += (ret + 1) * sizeof(WCHAR); @@ -161,7 +161,7 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * *(DWORD *)pBuffer = *pCF; pBuffer += 4; - len = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + len = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!len) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); len += 1; -- 2.14.4

1 0

[PATCH] ntdll/tests: Avoid temp variables holding ARRAY_SIZE results
by Michael Stefaniuc July 17, 2018

July 17, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 22f3df95e0..07fa1cd3cc 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1239,7 +1239,6 @@ static struct { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, }; -const unsigned int ipv4_testcount = sizeof(ipv4_tests) / sizeof(ipv4_tests[0]); static void init_ip4(IN_ADDR* addr, const int src[4]) { @@ -1284,7 +1283,7 @@ static void test_RtlIpv4StringToAddress(void) */ } - for (i = 0; i < ipv4_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_tests); i++) { /* non-strict */ terminator = &dummy; @@ -1361,7 +1360,6 @@ static void test_RtlIpv4StringToAddressEx(void) { "1.2.3.4: 1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, { "1.2.3.4:\t1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, }; - const unsigned int ipv4_ex_testcount = sizeof(ipv4_ex_tests) / sizeof(ipv4_ex_tests[0]); unsigned int i; BOOLEAN strict; @@ -1395,7 +1393,7 @@ static void test_RtlIpv4StringToAddressEx(void) ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); /* first we run the non-ex testcases on the ex function */ - for (i = 0; i < ipv4_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_tests); i++) { NTSTATUS expect_res = (ipv4_tests[i].flags & ex_fail_4) ? STATUS_INVALID_PARAMETER : ipv4_tests[i].res; @@ -1433,7 +1431,7 @@ static void test_RtlIpv4StringToAddressEx(void) } - for (i = 0; i < ipv4_ex_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_ex_tests); i++) { /* Strict is only relevant for the ip address, so make sure that it does not influence the port */ for (strict = 0; strict < 2; strict++) @@ -1726,7 +1724,6 @@ static const struct { "[::]", STATUS_INVALID_PARAMETER, 0, { -1 }, ex_skip_6 }, }; -const unsigned int ipv6_testcount = sizeof(ipv6_tests) / sizeof(ipv6_tests[0]); static void init_ip6(IN6_ADDR* addr, const int src[8]) { @@ -1824,7 +1821,6 @@ static void test_RtlIpv6AddressToString(void) { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, { "2001::ffd3", { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, }; - const size_t testcount = sizeof(tests) / sizeof(tests[0]); unsigned int i; if (!pRtlIpv6AddressToStringA) @@ -1846,7 +1842,7 @@ static void test_RtlIpv6AddressToString(void) ok(result == (LPCSTR)~0 || broken(result == (LPCSTR)len) /* WinXP / Win2k3 */, "got %p, expected %p\n", result, (LPCSTR)~0); - for (i = 0; i < testcount; i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { init_ip6(&ip, tests[i].ip); memset(buffer, '#', sizeof(buffer)); @@ -1927,7 +1923,6 @@ static void test_RtlIpv6AddressToStringEx(void) { "[2001::ffd3%4294949819]:256", 0xffffbbbb, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, { "[2001::ffd3]:256", 0, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, }; - const size_t testcount = sizeof(tests) / sizeof(tests[0]); unsigned int i; if (!pRtlIpv6AddressToStringExA) @@ -1968,7 +1963,7 @@ static void test_RtlIpv6AddressToStringEx(void) ok(buffer[0] == '#', "got first char %c (expected '#')\n", buffer[0]); ok(len == 3, "got len %d (expected len 3)\n", len); - for (i = 0; i < testcount; i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { init_ip6(&ip, tests[i].ip); len = sizeof(buffer); @@ -2058,7 +2053,7 @@ static void test_RtlIpv6StringToAddress(void) /* sanity check */ ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); - for (i = 0; i < ipv6_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { init_ip6(&ip, NULL); terminator = (void *)0xdeadbeef; @@ -2222,7 +2217,6 @@ static void test_RtlIpv6StringToAddressEx(void) { "[ff01::8:800:200C:417A/16]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, }; - const unsigned int ipv6_ex_testcount = sizeof(ipv6_ex_tests) / sizeof(ipv6_ex_tests[0]); const char *simple_ip = "::"; unsigned int i; @@ -2291,7 +2285,7 @@ static void test_RtlIpv6StringToAddressEx(void) ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ - for (i = 0; i < ipv6_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { ULONG scope = 0xbadf00d; USHORT port = 0xbeef; @@ -2350,7 +2344,7 @@ static void test_RtlIpv6StringToAddressEx(void) } /* now we run scope / port related tests */ - for (i = 0; i < ipv6_ex_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_ex_tests); i++) { scope = 0xbadf00d; port = 0xbeef; -- 2.14.4

1 0

[PATCH] testbot: A minor LogUtils.pm indentation fix.
by Francois Gouget July 17, 2018

July 17, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5e6407b49..cabd18358 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -361,7 +361,7 @@ sub ParseWineTestReport($$$$) } elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); } } elsif ($Rc & 0xc0000000) -- 2.18.0

1 0

[PATCH 1/5] testbot/WineSendlog: Use a lexical file handle for the sendmail pipe.
by Francois Gouget July 17, 2018

July 17, 2018

Lexical file handles are much simpler to pass around (and generally much cleaner). Also standardize on the 3-parameter open() form. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some cleanup patches before the big ones. Having a lexical file handle will come in handy soon. Also, all the other regular file handles will disappear soon so there is no point messing with them. testbot/bin/WineSendLog.pl | 87 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ac14e11dc..9ed83367b 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -221,29 +221,30 @@ sub SendLog($) # Debug("-------------------- Developer email --------------------\n"); + my $Sendmail; if ($Debug) { - open(SENDMAIL, ">>&=", 1); + open($Sendmail, ">>&=", 1); } else { - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } - print SENDMAIL "From: $RobotEMail\n"; - print SENDMAIL "To: $To\n"; + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; my $Description = $Job->GetDescription(); if ($Description) { $Subject .= ": " . $Description; } - print SENDMAIL "Subject: $Subject\n"; + print $Sendmail "Subject: $Subject\n"; if ($Job->Patch and $Job->Patch->MessageId) { - print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="$PART_BOUNDARY" @@ -263,8 +264,8 @@ EOF { $TestFailures = ""; } - printf SENDMAIL "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, - $TestFailures; + printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures; } # Print the job summary @@ -274,7 +275,7 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print SENDMAIL "\n=== ", $StepTask->GetTitle(), " ===\n"; + print $Sendmail "\n=== ", $StepTask->GetTitle(), " ===\n"; my $LogFiles = GetLogFileNames($TaskDir); my $LogName = $LogFiles->[0] || "log"; @@ -298,16 +299,16 @@ EOF { if ($PrintedDll ne $CurrentDll) { - print SENDMAIL "\n$CurrentDll:\n"; + print $Sendmail "\n$CurrentDll:\n"; $PrintedDll = $CurrentDll; } if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) { - print SENDMAIL "$1: The test timed out\n"; + print $Sendmail "$1: The test timed out\n"; } else { - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; } $PrintedSomething = 1; } @@ -321,12 +322,12 @@ EOF { if ($First) { - print SENDMAIL "\n"; + print $Sendmail "\n"; $First = !1; } $HasLogEntries = 1; $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; $PrintedSomething = 1; } close ERRFILE; @@ -336,15 +337,15 @@ EOF { if (! $HasLogEntries) { - print SENDMAIL "Empty test log and no error message\n"; + print $Sendmail "Empty test log and no error message\n"; } elsif ($StepTask->Type eq "build") { - print SENDMAIL "No build failures found\n"; + print $Sendmail "No build failures found\n"; } else { - print SENDMAIL "No test failures found\n"; + print $Sendmail "No test failures found\n"; } } else @@ -360,12 +361,12 @@ EOF { $HasErrEntries = 1; $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; } close ERRFILE; if (! $HasErrEntries) { - print SENDMAIL "No test log and no error message"; + print $Sendmail "No test log and no error message"; } else { @@ -380,15 +381,15 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; --$PART_BOUNDARY Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF - print SENDMAIL "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, ".log\n\n"; - print SENDMAIL "Not dumping logs in debug mode\n" if ($Debug); + print $Sendmail "Content-Disposition: attachment; filename=", + $StepTask->VM->Name, ".log\n\n"; + print $Sendmail "Not dumping logs in debug mode\n" if ($Debug); my $LogFiles = GetLogFileNames($TaskDir); my $LogName = $LogFiles->[0] || "log"; @@ -399,7 +400,7 @@ EOF while (defined($Line = <LOGFILE>)) { $Line =~ s/\s*$//; - print SENDMAIL "$Line\n" if (!$Debug); + print $Sendmail "$Line\n" if (!$Debug); $PrintSeparator = 1; } close LOGFILE; @@ -412,18 +413,18 @@ EOF { if ($PrintSeparator) { - print SENDMAIL "\n" if (!$Debug); + print $Sendmail "\n" if (!$Debug); $PrintSeparator = !1; } $Line =~ s/\s*$//; - print SENDMAIL "$Line\n" if (!$Debug); + print $Sendmail "$Line\n" if (!$Debug); } close ERRFILE; } } - print SENDMAIL "--$PART_BOUNDARY--\n"; - close(SENDMAIL); + print $Sendmail "--$PART_BOUNDARY--\n"; + close($Sendmail); # This is all for jobs submitted from the website if (!defined $Job->Patch) @@ -506,22 +507,22 @@ EOF { if ($Debug) { - open(SENDMAIL, ">>&=", 1); + open($Sendmail, ">>&=", 1); } else { - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } - print SENDMAIL "From: $RobotEMail\n"; - print SENDMAIL "To: $To\n"; - print SENDMAIL "Cc: $WinePatchCc\n"; - print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; + print $Sendmail "Cc: $WinePatchCc\n"; + print $Sendmail "Subject: Re: ", $Job->Patch->Subject, "\n"; if ($Job->Patch->MessageId) { - print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; Hi, @@ -530,12 +531,12 @@ Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at EOF - print SENDMAIL "$WebSite/JobDetails.pl?Key=", + print $Sendmail "$WebSite/JobDetails.pl?Key=", $Job->GetKey(), "\n\n"; - print SENDMAIL "Your paranoid android.\n\n"; + print $Sendmail "Your paranoid android.\n\n"; - print SENDMAIL $Messages; - close SENDMAIL; + print $Sendmail $Messages; + close($Sendmail); } else { -- 2.18.0

1 4

[PATCH] vulkan-1/tests: Enumerate queue families.
by Józef Kucia July 17, 2018

July 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index bf83a2899d93..1d2f66f5f901 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -149,6 +149,28 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) +{ + VkPhysicalDeviceProperties device_properties; + VkQueueFamilyProperties *properties; + uint32_t i, count; + + vkGetPhysicalDeviceProperties(vk_physical_device, &device_properties); + + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); + properties = heap_calloc(count, sizeof(*properties)); + ok(!!properties, "Failed to allocate memory.\n"); + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); + + for (i = 0; i < count; ++i) + { + trace("Device '%s', queue family %u: flags %#x count %u.\n", + device_properties.deviceName, i, properties[i].queueFlags, properties[i].queueCount); + } + + heap_free(properties); +} + static void test_physical_device_groups(void) { PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR; @@ -248,5 +270,6 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + for_each_device(enumerate_device_queues); test_physical_device_groups(); } -- 2.16.4

1 0

[3/3 v5] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng July 17, 2018

July 17, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 45 +++++++++++++++++++++--------------- dlls/riched20/tests/txtsrv.c | 41 +++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..0327d1cf8d 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,8 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; - LOGFONTW lf; - HFONT hf; + CHARFORMATW *host_cf; ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = make_para(editor); ME_DisplayItem *run; @@ -47,31 +46,39 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - hf = GetStockObject(SYSTEM_FONT); - assert(hf); - GetObjectW(hf, sizeof(LOGFONTW), &lf); ZeroMemory(&cf, sizeof(cf)); cf.cbSize = sizeof(cf); + + if (ITextHost_TxGetCharFormat(editor->texthost, (const CHARFORMATW **)&host_cf) == S_OK) + cfany_to_cf2w(&cf, (CHARFORMAT2W *)host_cf); + else + { + HFONT hf; + LOGFONTW lf; + + hf = GetStockObject(SYSTEM_FONT); + assert(hf); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + lstrcpyW(cf.szFaceName, lf.lfFaceName); + /* Convert system font height from logical units to twips for cf.yHeight */ + cf.yHeight = (lf.lfHeight * 72 * 1440) / (c.dpi.cy * c.dpi.cy); + if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; + cf.wWeight = lf.lfWeight; + if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) cf.dwEffects |= CFE_UNDERLINE; + cf.bUnderlineType = CFU_UNDERLINE; + if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; + cf.bPitchAndFamily = lf.lfPitchAndFamily; + cf.bCharSet = lf.lfCharSet; + cf.lcid = GetSystemDefaultLCID(); + } cf.dwMask = CFM_ANIMATION|CFM_BACKCOLOR|CFM_CHARSET|CFM_COLOR|CFM_FACE|CFM_KERNING|CFM_LCID|CFM_OFFSET; cf.dwMask |= CFM_REVAUTHOR|CFM_SIZE|CFM_SPACING|CFM_STYLE|CFM_UNDERLINETYPE|CFM_WEIGHT; cf.dwMask |= CFM_ALLCAPS|CFM_BOLD|CFM_DISABLED|CFM_EMBOSS|CFM_HIDDEN; cf.dwMask |= CFM_IMPRINT|CFM_ITALIC|CFM_LINK|CFM_OUTLINE|CFM_PROTECTED; cf.dwMask |= CFM_REVISED|CFM_SHADOW|CFM_SMALLCAPS|CFM_STRIKEOUT; cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINE; - - cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; - lstrcpyW(cf.szFaceName, lf.lfFaceName); - /* Convert system font height from logical units to twips for cf.yHeight */ - cf.yHeight = (lf.lfHeight * 72 * 1440) / (c.dpi.cy * c.dpi.cy); - if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; - cf.wWeight = lf.lfWeight; - if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; - if (lf.lfUnderline) cf.dwEffects |= CFE_UNDERLINE; - cf.bUnderlineType = CFU_UNDERLINE; - if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; - cf.bPitchAndFamily = lf.lfPitchAndFamily; - cf.bCharSet = lf.lfCharSet; - cf.lcid = GetSystemDefaultLCID(); + cf.dwEffects |= CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; style = ME_MakeStyle(&cf); text->pDefaultStyle = style; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca2cd..9d3fc361d6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, (const CHARFORMATW **)&host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.18.0

3 2

[PATCH 1/2] riched20: Add a helper for merging two CHARFORMAT2W.
by Jactry Zeng July 17, 2018

July 17, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.h | 1 + dlls/riched20/style.c | 69 +++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141c63aca9..35168bcdfb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -61,6 +61,7 @@ void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; +void merge_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc) DECLSPEC_HIDDEN; /* only works with 2W structs */ diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 97e98a7a14..43c12c53e5 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -132,15 +132,15 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) } #define COPY_STYLE_ITEM(mask, member) \ - if (mod->dwMask & mask) { \ - fmt.dwMask |= mask;\ - fmt.member = mod->member;\ + if (from->dwMask & mask) { \ + to->dwMask |= mask; \ + to->member = from->member; \ } #define COPY_STYLE_ITEM_MEMCPY(mask, member) \ - if (mod->dwMask & mask) { \ - fmt.dwMask |= mask;\ - CopyMemory(fmt.member, mod->member, sizeof(mod->member));\ + if (from->dwMask & mask) { \ + to->dwMask |= mask; \ + CopyMemory(to->member, from->member, sizeof(from->member)); \ } void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) @@ -149,12 +149,11 @@ void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) pFmt->cbSize = sizeof(CHARFORMAT2W); } -ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod) +void merge_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) { - CHARFORMAT2W fmt = sSrc->fmt; - ME_Style *s; + assert(to->cbSize == sizeof(CHARFORMAT2W)); + assert(from->cbSize == sizeof(CHARFORMAT2W)); - assert(mod->cbSize == sizeof(CHARFORMAT2W)); COPY_STYLE_ITEM(CFM_ANIMATION, bAnimation); COPY_STYLE_ITEM(CFM_BACKCOLOR, crBackColor); COPY_STYLE_ITEM(CFM_CHARSET, bCharSet); @@ -164,9 +163,9 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod COPY_STYLE_ITEM(CFM_LCID, lcid); COPY_STYLE_ITEM(CFM_OFFSET, yOffset); COPY_STYLE_ITEM(CFM_REVAUTHOR, bRevAuthor); - if (mod->dwMask & CFM_SIZE) { - fmt.dwMask |= CFM_SIZE; - fmt.yHeight = min(mod->yHeight, yHeightCharPtsMost * 20); + if (from->dwMask & CFM_SIZE) { + to->dwMask |= CFM_SIZE; + to->yHeight = min(from->yHeight, yHeightCharPtsMost * 20); } COPY_STYLE_ITEM(CFM_SPACING, sSpacing); COPY_STYLE_ITEM(CFM_STYLE, sStyle); @@ -174,37 +173,45 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod /* FIXME: this is not documented this way, but that's the more logical */ COPY_STYLE_ITEM(CFM_FACE, bPitchAndFamily); - fmt.dwEffects &= ~(mod->dwMask); - fmt.dwEffects |= mod->dwEffects & mod->dwMask; - fmt.dwMask |= mod->dwMask; - if (mod->dwMask & CFM_COLOR) + to->dwEffects &= ~(from->dwMask); + to->dwEffects |= from->dwEffects & from->dwMask; + to->dwMask |= from->dwMask; + if (from->dwMask & CFM_COLOR) { - if (mod->dwEffects & CFE_AUTOCOLOR) - fmt.dwEffects |= CFE_AUTOCOLOR; + if (from->dwEffects & CFE_AUTOCOLOR) + to->dwEffects |= CFE_AUTOCOLOR; else - fmt.dwEffects &= ~CFE_AUTOCOLOR; + to->dwEffects &= ~CFE_AUTOCOLOR; } COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType); /* If the CFM_UNDERLINE effect is not specified, set it appropriately */ - if ((mod->dwMask & CFM_UNDERLINETYPE) && !(mod->dwMask & CFM_UNDERLINE)) + if ((from->dwMask & CFM_UNDERLINETYPE) && !(from->dwMask & CFM_UNDERLINE)) { - fmt.dwMask |= CFM_UNDERLINE; - if (mod->bUnderlineType == CFU_UNDERLINENONE) - fmt.dwEffects &= ~CFE_UNDERLINE; + to->dwMask |= CFM_UNDERLINE; + if (from->bUnderlineType == CFU_UNDERLINENONE) + to->dwEffects &= ~CFE_UNDERLINE; else - fmt.dwEffects |= CFE_UNDERLINE; + to->dwEffects |= CFE_UNDERLINE; } - if (mod->dwMask & CFM_BOLD && !(mod->dwMask & CFM_WEIGHT)) + if (from->dwMask & CFM_BOLD && !(from->dwMask & CFM_WEIGHT)) { - fmt.wWeight = (mod->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; - } else if (mod->dwMask & CFM_WEIGHT && !(mod->dwMask & CFM_BOLD)) { - if (mod->wWeight > FW_NORMAL) - fmt.dwEffects |= CFE_BOLD; + to->wWeight = (from->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; + } else if (from->dwMask & CFM_WEIGHT && !(from->dwMask & CFM_BOLD)) { + if (from->wWeight > FW_NORMAL) + to->dwEffects |= CFE_BOLD; else - fmt.dwEffects &= ~CFE_BOLD; + to->dwEffects &= ~CFE_BOLD; } +} + +ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod) +{ + CHARFORMAT2W fmt = sSrc->fmt; + ME_Style *s; + + merge_cf2w(&fmt, mod); LIST_FOR_EACH_ENTRY(s, &editor->style_list, ME_Style, entry) { -- 2.18.0

1 0

[v2 PATCH] comctl32/trackbar: Scale thumb size with resolution.
by Nikolay Sivov July 17, 2018

July 17, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/trackbar.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d774823d60..7cb73ca682 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1468,25 +1468,28 @@ TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) return bTemp; } +static int get_scaled_metric(const TRACKBAR_INFO *infoPtr, int value) +{ + return MulDiv(value, GetDpiForWindow(infoPtr->hwndSelf), 96); +} static LRESULT TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) { + int client_size; RECT rect; - int clientWidth, clientMetric; - /* initial thumb length */ - clientMetric = (infoPtr->dwStyle & TBS_ENABLESELRANGE) ? 23 : 21; + infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); + GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) { - clientWidth = rect.right - rect.left; - } else { - clientWidth = rect.bottom - rect.top; - } - if (clientWidth >= clientMetric) - infoPtr->uThumbLen = clientMetric; + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; else - infoPtr->uThumbLen = clientWidth > 9 ? clientWidth - 6 : 4; + client_size = rect.bottom - rect.top; + + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr); -- 2.18.0

1 3

[PATCH] winevulkan: Avoid FIXMEs for unsupported Vulkan functions.
by Józef Kucia July 17, 2018

July 17, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5c156c125c65..0bb68c28cf7d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -935,7 +935,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return func; } - TRACE("Function %s not found.\n", debugstr_a(name)); + WARN("Unsupported device function: %s.\n", debugstr_a(name)); return NULL; } @@ -970,7 +970,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const { void *func; - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); if (!name) return NULL; @@ -985,7 +985,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const } if (!instance) { - FIXME("Global function %s not found.\n", debugstr_a(name)); + WARN("Global function %s not found.\n", debugstr_a(name)); return NULL; } @@ -996,13 +996,13 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const func = wine_vk_get_device_proc_addr(name); if (func) return func; - FIXME("Unsupported device or instance function: %s.\n", debugstr_a(name)); + WARN("Unsupported device or instance function: %s.\n", debugstr_a(name)); return NULL; } void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be * exported. vk_icdGetInstanceProcAddr was added later to separate ICD calls from -- 2.16.4

1 0