wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Piotr Caban : crypt32: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 57a8c4dbe8e2f48edf0f2d03aef826d542622964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a8c4dbe8e2f48edf0f2d03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:30 2019 +0200 crypt32: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/oid.c | 5 +++-- dlls/crypt32/store.c | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 02693b9..48eaac0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2151,7 +2151,7 @@ static BOOL find_matching_rdn_attr(DWORD dwFlags, const CERT_NAME_INFO *name, name->rgRDN[i].rgRDNAttr[j].Value.cbData) match = FALSE; else if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) - match = !strncasecmp(nameStr, attrStr, + match = !_strnicmp(nameStr, attrStr, attr->Value.cbData); else match = !strncmp(nameStr, attrStr, attr->Value.cbData); diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index bf0ad32..94270c5 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -29,6 +29,7 @@ #define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wine/debug.h" #include "wine/list.h" @@ -118,7 +119,7 @@ HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, EnterCriticalSection(&funcSetCS); LIST_FOR_EACH_ENTRY(cursor, &funcSets, struct OIDFunctionSet, next) { - if (!strcasecmp(pszFuncName, cursor->name)) + if (!_strnicmp(pszFuncName, cursor->name, -1)) { ret = cursor; break; @@ -403,7 +404,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, if (!IS_INTOID(pszOID)) { if (!IS_INTOID(function->entry.pszOID) && - !strcasecmp(function->entry.pszOID, pszOID)) + !_strnicmp(function->entry.pszOID, pszOID, -1)) { *ppvFuncAddr = function->entry.pvFuncAddr; *phFuncAddr = NULL; /* FIXME: what should it be? */ diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 2b8ea1d..1c9ed91 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h" @@ -873,19 +874,19 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, FIXME("unimplemented type %d\n", LOWORD(lpszStoreProvider)); } } - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY, -1)) openFunc = CRYPT_MemOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_FILENAME_W)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_FILENAME_W, -1)) openFunc = CRYPT_FileOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM, -1)) openFunc = CRYPT_SysOpenStoreW; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7, -1)) openFunc = CRYPT_PKCSOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED, -1)) openFunc = CRYPT_SerializedOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION, -1)) openFunc = CRYPT_CollectionOpenStore; - else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY)) + else if (!_strnicmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY, -1)) openFunc = CRYPT_SysRegOpenStoreW; else {

1 0

Piotr Caban : hhctrl.ocx: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 96c6d45759a3bdd296e214e8f3f1318e0ea0bd0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c6d45759a3bdd296e214e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:14 2019 +0200 hhctrl.ocx: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/content.c | 18 +++++++++--------- dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/index.c | 22 +++++++++++----------- dlls/hhctrl.ocx/search.c | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 0140336..48500ca 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -595,7 +595,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "title")) { + if(!_strnicmp(node_name.buf, "title", -1)) { if(next_content(&stream, &content) && content.len > 1) { document_title = strdupnAtoW(&content.buf[1], content.len-1); diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 6a7c8f8..a20d486 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -62,11 +62,11 @@ static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const return; } - if(!strncasecmp("name", ptr, len)) { + if(!_strnicmp("name", ptr, len)) { param = &item->name; - }else if(!strncasecmp("merge", ptr, len)) { + }else if(!_strnicmp("merge", ptr, len)) { param = &merge; - }else if(!strncasecmp("local", ptr, len)) { + }else if(!_strnicmp("local", ptr, len)) { param = &item->local; }else { WARN("unhandled param %s\n", debugstr_an(ptr, len)); @@ -148,9 +148,9 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "/object")) + if(!_strnicmp(node_name.buf, "/object", -1)) break; - if(!strcasecmp(node_name.buf, "param")) + if(!_strnicmp(node_name.buf, "param", -1)) parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage); strbuf_zero(&node); @@ -195,7 +195,7 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "object")) { + if(!_strnicmp(node_name.buf, "object", -1)) { const char *ptr; int len; @@ -210,10 +210,10 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro if(!ret) ret = prev; } - }else if(!strcasecmp(node_name.buf, "ul")) { + }else if(!_strnicmp(node_name.buf, "ul", -1)) { new_item = parse_ul(info, stream, hhc_root); insert_item(prev, new_item, INSERT_CHILD); - }else if(!strcasecmp(node_name.buf, "/ul")) { + }else if(!_strnicmp(node_name.buf, "/ul", -1)) { break; } @@ -245,7 +245,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root, TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "ul")) { + if(!_strnicmp(node_name.buf, "ul", -1)) { ContentItem *item = parse_ul(info, &stream, hhc_root); prev = insert_item(prev, item, INSERT_CHILD); if(!ret) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index b358f54..ae525cf 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winuser.h" #include "winnls.h" #include "htmlhelp.h" diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 8b80ce2..375f3e4 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -83,20 +83,20 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text, UINT c /* Allocate a new sub-item, either on the first run or whenever a * sub-topic has filled out both the "name" and "local" params. */ - if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len))) + if(item->itemFlags == 0x11 && (!_strnicmp("name", ptr, len) || !_strnicmp("local", ptr, len))) item_realloc(item, item->nItems+1); - if(!strncasecmp("keyword", ptr, len)) { + if(!_strnicmp("keyword", ptr, len)) { param = &item->keyword; - }else if(!item->keyword && !strncasecmp("name", ptr, len)) { + }else if(!item->keyword && !_strnicmp("name", ptr, len)) { /* Some HTML Help index files use an additional "name" parameter * rather than the "keyword" parameter. In this case, the first * occurrence of the "name" parameter is the keyword. */ param = &item->keyword; - }else if(!strncasecmp("name", ptr, len)) { + }else if(!_strnicmp("name", ptr, len)) { item->itemFlags |= 0x01; param = &item->items[item->nItems-1].name; - }else if(!strncasecmp("local", ptr, len)) { + }else if(!_strnicmp("local", ptr, len)) { item->itemFlags |= 0x10; param = &item->items[item->nItems-1].local; }else { @@ -137,9 +137,9 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "param")) { + if(!_strnicmp(node_name.buf, "param", -1)) { parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage); - }else if(!strcasecmp(node_name.buf, "/object")) { + }else if(!_strnicmp(node_name.buf, "/object", -1)) { break; }else { WARN("Unhandled tag! %s\n", node_name.buf); @@ -173,7 +173,7 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "object")) { + if(!_strnicmp(node_name.buf, "object", -1)) { const char *ptr; int len; @@ -228,7 +228,7 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) TRACE("%s\n", node.buf); - if(!strcasecmp(node_name.buf, "li")) { + if(!_strnicmp(node_name.buf, "li", -1)) { IndexItem *new_item; new_item = parse_li(info, &stream); @@ -246,9 +246,9 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) item = item->next; item->indentLevel = indent_level; } - }else if(!strcasecmp(node_name.buf, "ul")) { + }else if(!_strnicmp(node_name.buf, "ul", -1)) { indent_level++; - }else if(!strcasecmp(node_name.buf, "/ul")) { + }else if(!_strnicmp(node_name.buf, "/ul", -1)) { indent_level--; }else { WARN("Unhandled tag! %s\n", node_name.buf); diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 0e198b8..0c38f1d 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -102,7 +102,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * char *text = &content.buf[1]; int textlen = content.len-1; - if(!strcasecmp(node_name.buf, "title")) + if(!_strnicmp(node_name.buf, "title", -1)) { int wlen = MultiByteToWideChar(CP_ACP, 0, text, textlen, NULL, 0); title = heap_alloc((wlen+1)*sizeof(WCHAR));

1 0

Piotr Caban : iphlpapi: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 95510d5b1b541c0f9e6dd508adc050d057f63ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95510d5b1b541c0f9e6dd508… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:05 2019 +0200 iphlpapi: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index be1cc52..b4ed542 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -302,7 +302,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) while ((ptr = fgets(buf, sizeof(buf), fp))) { while (*ptr && isspace(*ptr)) ptr++; - if (strncasecmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') + if (_strnicmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') { ptr += nameLen + 1; sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u", @@ -433,10 +433,10 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -657,13 +657,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) if ((ptr = strchr(value, '\n'))) *ptr='\0'; - if (!strcasecmp(buf, "Icmp6InMsgs")) + if (!_strnicmp(buf, "Icmp6InMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6InErrors")) + if (!_strnicmp(buf, "Icmp6InErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwErrors = res; continue; @@ -671,7 +671,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) { - if (!strcasecmp(buf, icmpinstatlist[i].name)) + if (!_strnicmp(buf, icmpinstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.rgdwTypeCount[icmpinstatlist[i].pos] = res; @@ -679,13 +679,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } } - if (!strcasecmp(buf, "Icmp6OutMsgs")) + if (!_strnicmp(buf, "Icmp6OutMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6OutErrors")) + if (!_strnicmp(buf, "Icmp6OutErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwErrors = res; continue; @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) { - if (!strcasecmp(buf, icmpoutstatlist[i].name)) + if (!_strnicmp(buf, icmpoutstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.rgdwTypeCount[icmpoutstatlist[i].pos] = res; @@ -823,7 +823,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, ipstatlist[i].name, -1) && sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; } fclose(fp); @@ -847,10 +847,10 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1029,10 +1029,10 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1210,7 +1210,7 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, udpstatlist[i].name, -1) && sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; } fclose(fp); @@ -1234,10 +1234,10 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u",

1 0

Józef Kucia : wined3d: Pass application info to Vulkan.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 46a451f32738668738c980635ff813f209b6434e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a451f32738668738c98063… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:34 2019 +0200 wined3d: Pass application info to Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 42 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cea6e69..ca3a0f9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -110,11 +110,28 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, }; +static unsigned int wined3d_get_wine_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; + VkApplicationInfo app_info; + char app_name[MAX_PATH]; VkResult vr; if (!wined3d_load_vulkan(vk_info)) @@ -126,8 +143,17 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + memset(&app_info, 0, sizeof(app_info)); + app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) + app_info.pApplicationName = app_name; + app_info.pEngineName = "Damavand"; + app_info.engineVersion = wined3d_get_wine_vk_version(); + app_info.apiVersion = VK_API_VERSION_1_0; + memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app_info; if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index d2e4978..0a0121d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -142,6 +142,30 @@ success: return 0; } +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) +{ + char buffer[MAX_PATH]; + unsigned int len; + char *p, *name; + + len = GetModuleFileNameA(0, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return FALSE; + + name = buffer; + if ((p = strrchr(name, '/' ))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + if (app_name_size < len) + return FALSE; + + memcpy(app_name, name, len); + return TRUE; +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -149,7 +173,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len, tmpvalue; + DWORD tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc(); @@ -191,20 +215,16 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) + if (wined3d_get_app_name(buffer, ARRAY_SIZE(buffer))) { HKEY tmpkey; /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Direct3D */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s]\n", appname); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + strcat(buffer, "\\Direct3D"); + TRACE("Application name %s.\n", buffer); + if (RegOpenKeyA(tmpkey, buffer, &appkey)) appkey = 0; + RegCloseKey(tmpkey); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 012c90f..c2fbf1d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; + struct wined3d_blend_state { LONG refcount;

1 0

Józef Kucia : wined3d: Add support for USE_WIN32_VULKAN.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f9cf21512e2a114e7f76db1834d309cb2f072734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9cf21512e2a114e7f76db18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:33 2019 +0200 wined3d: Add support for USE_WIN32_VULKAN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 87 ++++++++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_vk.h | 6 ++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 337c6f7..cea6e69 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,12 +24,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#ifdef USE_WIN32_VULKAN +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + + if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + { + WARN("Failed to load vulkan-1.dll.\n"); + return FALSE; + } + + vk_ops->vkGetInstanceProcAddr = (void *)GetProcAddress(vk_info->vulkan_lib, "vkGetInstanceProcAddr"); + if (!vk_ops->vkGetInstanceProcAddr) + { + FreeLibrary(vk_info->vulkan_lib); + return FALSE; + } + + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) +{ + if (vk_info->vulkan_lib) + { + FreeLibrary(vk_info->vulkan_lib); + vk_info->vulkan_lib = NULL; + } +} +#else +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + const struct vulkan_funcs *vk_funcs; + HDC dc; + + dc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, dc); + + if (!vk_funcs) + return FALSE; + + vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} +#endif + static void adapter_vk_destroy(struct wined3d_adapter *adapter) { struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(adapter); - const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); heap_free(adapter_vk); } @@ -62,25 +113,17 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - const struct vulkan_funcs *vk_funcs; + VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; - VkInstance instance; VkResult vr; - HDC dc; - - dc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, dc); - if (!vk_funcs) + if (!wined3d_load_vulkan(vk_info)) return FALSE; - vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; - if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { ERR("Could not get 'vkCreateInstance'.\n"); - return FALSE; + goto fail; } memset(&instance_info, 0, sizeof(instance_info)); @@ -88,7 +131,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); - return FALSE; + goto fail; } TRACE("Created Vulkan instance %p.\n", instance); @@ -97,8 +140,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)))) \ { \ WARN("Could not get instance proc addr for '" #name "'.\n"); \ - vk_funcs->p_vkDestroyInstance(instance, NULL); \ - return FALSE; \ + goto fail; \ } #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN @@ -110,6 +152,12 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) vk_info->instance = instance; return TRUE; + +fail: + if (vk_ops->vkDestroyInstance) + VK_CALL(vkDestroyInstance(instance, NULL)); + wined3d_unload_vulkan(vk_info); + return FALSE; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, @@ -134,12 +182,12 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) { ERR("Failed to get GPU description.\n"); - goto fail; + goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); if (!wined3d_adapter_vk_init_format_info(adapter)) - goto fail; + goto fail_vulkan; adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; @@ -150,9 +198,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, return TRUE; +fail_vulkan: + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); fail: - if (vk_info->vk_ops.vkDestroyInstance) - VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_adapter_cleanup(adapter); return FALSE; } diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index ac59a2d..784dd0c 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,7 +20,9 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -179,6 +181,10 @@ struct wined3d_vk_info { VkInstance instance; struct vulkan_ops vk_ops; + +#ifdef USE_WIN32_VULKAN + HMODULE vulkan_lib; +#endif }; #define VK_CALL(f) (vk_info->vk_ops.f)

1 0

Józef Kucia : wined3d: Initialise Vulkan for adapters.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3dd8cab4f33fd7391f3f80ada0d024ed97afc603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd8cab4f33fd7391f3f80ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:32 2019 +0200 wined3d: Initialise Vulkan for adapters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 80 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 + dlls/wined3d/wined3d_vk.h | 186 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd8cab4f33fd7391f3f…

1 0

Sergio Gómez Del Real : riched20: Handle efficiently caret creation/destruction.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 5868c664c1ac56bc6e3a6a531172d6bdae51b9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5868c664c1ac56bc6e3a6a53… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 3 08:23:04 2019 -0500 riched20: Handle efficiently caret creation/destruction. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 55 ++++++++++++++++++++++++++++--------------------- dlls/riched20/editor.c | 18 +++++++++------- dlls/riched20/editor.h | 7 ++++--- dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 1 - dlls/riched20/table.c | 3 +-- 6 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ad72511..0951bb9 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -266,36 +266,47 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, return; } - -void -ME_MoveCaret(ME_TextEditor *editor) +void create_caret(ME_TextEditor *editor) { int x, y, height; ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); - if(editor->bHaveFocus && !ME_IsSelection(editor)) - { - x = min(x, editor->rcFormat.right-1); - ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); - ITextHost_TxSetCaretPos(editor->texthost, x, y); - } + ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); + editor->caret_height = height; + editor->caret_hidden = TRUE; } +void show_caret(ME_TextEditor *editor) +{ + ITextHost_TxShowCaret(editor->texthost, TRUE); + editor->caret_hidden = FALSE; +} -void ME_ShowCaret(ME_TextEditor *ed) +void hide_caret(ME_TextEditor *editor) { - ME_MoveCaret(ed); - if(ed->bHaveFocus && !ME_IsSelection(ed)) - ITextHost_TxShowCaret(ed->texthost, TRUE); + /* calls to HideCaret are cumulative; do so only once */ + if (!editor->caret_hidden) + { + ITextHost_TxShowCaret(editor->texthost, FALSE); + editor->caret_hidden = TRUE; + } } -void ME_HideCaret(ME_TextEditor *ed) +void update_caret(ME_TextEditor *editor) { - if(!ed->bHaveFocus || ME_IsSelection(ed)) + int x, y, height; + + if (!editor->bHaveFocus) return; + if (!ME_IsSelection(editor)) { - ITextHost_TxShowCaret(ed->texthost, FALSE); - DestroyCaret(); + ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + if (height != editor->caret_height) create_caret(editor); + x = min(x, editor->rcFormat.right-1); + ITextHost_TxSetCaretPos(editor->texthost, x, y); + show_caret(editor); } + else + hide_caret(editor); } BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, @@ -1200,8 +1211,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) } } ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); } @@ -1233,8 +1243,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) } ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); } @@ -1627,9 +1636,9 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_InvalidateSelection(editor); ME_Repaint(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); + hide_caret(editor); ME_EnsureVisible(editor, &tmp_curs); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); return success; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b7254d2..b826a2c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1802,9 +1802,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_MoveCaret(editor); - ITextHost_TxShowCaret(editor->texthost, TRUE); + update_caret(editor); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); @@ -2158,8 +2156,7 @@ static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) ME_InvalidateSelection( editor ); end = ME_SetSelection( editor, to, from ); ME_InvalidateSelection( editor ); - ITextHost_TxShowCaret( editor->texthost, FALSE ); - ME_ShowCaret( editor ); + update_caret( editor ); ME_SendSelChange( editor ); return end; @@ -3118,6 +3115,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bHaveFocus = FALSE; ed->bDialogMode = FALSE; ed->bMouseCaptured = FALSE; + ed->caret_hidden = FALSE; + ed->caret_height = 0; for (i=0; i<HFONT_CACHE_SIZE; i++) { ed->pFontCache[i].nRefs = 0; @@ -3529,7 +3528,7 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); - ME_MoveCaret(editor); + update_caret(editor); return 0; } @@ -4511,7 +4510,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, break; case WM_SETFOCUS: editor->bHaveFocus = TRUE; - ME_ShowCaret(editor); + create_caret(editor); + update_caret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) ME_InvalidateSelection( editor ); @@ -4520,7 +4520,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); /* End coalesced undos for typed characters */ editor->bHaveFocus = FALSE; editor->wheel_remain = 0; - ME_HideCaret(editor); + hide_caret(editor); + DestroyCaret(); ME_SendOldNotify(editor, EN_KILLFOCUS); if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) ME_InvalidateSelection( editor ); @@ -4978,6 +4979,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, RECT rc; PAINTSTRUCT ps; + update_caret(editor); hDC = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2633fa8..2e08eee 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -152,9 +152,10 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; -void ME_HideCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void ME_ShowCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void ME_MoveCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void update_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void create_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, ME_Cursor *cursor, BOOL *isExact) DECLSPEC_HIDDEN; void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) DECLSPEC_HIDDEN; void ME_MouseMove(ME_TextEditor *editor, int x, int y) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 28be524..87cd71c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -442,6 +442,8 @@ typedef struct tagME_TextEditor /* Cache previously set scrollbar info */ SCROLLINFO vert_si, horz_si; + int caret_height; + BOOL caret_hidden; BOOL bMouseCaptured; int wheel_remain; struct list style_list; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e2ccef4..675e0f7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,7 +43,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - ME_MoveCaret(editor); item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 7e8d7ff..1b4b914 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -613,8 +613,7 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) } ME_InvalidateSelection(editor); ME_Repaint(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); }

1 0

Nikolay Sivov : dbgeng: Add IDebugControl2 stub.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 406ac1bc746574aaa9432a958c6de5e1ddf2dade URL: https://source.winehq.org/git/wine.git/?a=commit;h=406ac1bc746574aaa9432a95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:48 2019 +0300 dbgeng: Add IDebugControl2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 905 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 905 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=406ac1bc746574aaa943…

1 0

Nikolay Sivov : include: Add IDebugControl2 definition.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 08f3c7d5114cfaeb7bb352433517fd6256a9106b URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f3c7d5114cfaeb7bb35243… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:47 2019 +0300 include: Add IDebugControl2 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08f3c7d5114cfaeb7bb3…

1 0

Nikolay Sivov : dbgeng: Add IDebugSymbols stub.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 9c0ed2a999e5b860ed73b4e97da09808a3e9bde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0ed2a999e5b860ed73b4e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:46 2019 +0300 dbgeng: Add IDebugSymbols stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 469 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 118 +++++++++++++ 2 files changed, 587 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c0ed2a999e5b860ed73…

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019