November 2021 - Wine-Commits

Floris Renaud : Remove links to www.linuxforums.org.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: website Branch: master Commit: 7b1d39725a121de12d090372b940f7af26e6f307 URL: https://source.winehq.org/git/website.git/?a=commit;h=7b1d39725a121de12d090… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Nov 23 00:59:44 2021 +0100 Remove links to www.linuxforums.org. Since May 2020, the website has been offline. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/en/forums.template | 2 -- templates/fr/forums.template | 2 -- templates/ko/forums.template | 2 -- templates/pl/forums.template | 2 -- templates/pt/forums.template | 2 -- templates/tr/forums.template | 2 -- templates/zh-cn/forums.template | 2 -- 7 files changed, 14 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 61b4531e..85d7a1e2 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -10,8 +10,6 @@ Here are the most useful ones for users:</p> <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> - <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> - <li>If you want to be notified about new releases, subscribe to the <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> </ul> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index a1ffa884..8786ee78 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -11,8 +11,6 @@ Voici les plus utiles pour les utilisateurs : <li>Les utilisateurs Ubuntu peuvent également visiter l'<a href="http://ubuntuforums.org/forumdisplay.php?f=313">espace Wine des forums Ubuntu</a> - <li>Les utilisateurs peuvent également visiter l'<a href="http://www.linuxforums.org/forum/wine/">espace Wine sur Linux Forums</a> - <li>Si vous voulez être prévenu(e) des nouvelles versions, inscrivez-vous à la <a href="//www.winehq.org/mailman/listinfo/wine-announce">liste de diffusion Wine-Announce</a></li> </ul> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index e932580b..c67f1c1a 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -10,8 +10,6 @@ <li>우분투 사용자라면 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">우분투 포럼의 Wine 게시판</a>을 확인해 보는 것도 추천합니다. - <li><a href="http://www.linuxforums.org/forum/wine/">리눅스 포럼의 Wine 게시판</a>을 확인해 볼 수도 있습니다. - <li>새 릴리스 알림을 받으려면 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 메일링 리스트</a>를 구독하십시오.</li> </ul> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 142b90c7..20f073c0 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -11,8 +11,6 @@ Tutaj wymieniono najbardziej użyteczne dla użytkowników:</p> <li>Użytkownicy Ubuntu mogą takżę odwiedzić <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Dział Wine na forum Ubuntu</a> - <li>Użytkownicy mogą także odwiedzić <a href="http://www.linuxforums.org/forum/wine/">Dział Wine na forum Linuksa</a> - <li>Jeżeli chcesz być powiadamiany o nowych wydaniach, zapisz się do <a href="//www.winehq.org/mailman/listinfo/wine-announce">Zawiadamiająca lista mailingowa Wine</a></li> </ul> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index bd618868..2f9f3c6e 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -12,8 +12,6 @@ Aqui estão as mais úteis para os usuários:</p> <li>Usuários do Ubuntu talvez queiram visitar a <a href="http://ubuntuforums.org/forumdisplay.php?f=313">sessão do Wine nos Fóruns do Ubuntu</a> - <li>Usuários talvez também queiram visitar a <a href="http://www.linuxforums.org/forum/wine/">sessão do Wine nos Fóruns de Linux</a> - <li>Caso você queira ser notificado dos novos lançamentos, inscreva-se na <a href="//www.winehq.org/mailman/listinfo/wine-announce">Lista de anúncios do Wine</a></li> </ul> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index ee8bf648..bf4bbd40 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -10,8 +10,6 @@ <li>Ubuntu kullanıcıları ayrıca <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Kullanıcılar ayrıca <a href="http://www.linuxforums.org/forum/wine/">Linux Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Eğer yeni sürümlerden haberdar olmak isterseniz <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine Haber posta listesi</a>ne abone olun.</li> </ul> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 66c56778..8aeab902 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -9,8 +9,6 @@ <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> - <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul>

1 0

Floris Renaud : Add wwn link and intro text to the Dutch website.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: website Branch: master Commit: 67ba0452f1d1cc1732f6b9090452dbd2aaf695d5 URL: https://source.winehq.org/git/website.git/?a=commit;h=67ba0452f1d1cc1732f6b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Nov 23 00:39:30 2021 +0100 Add wwn link and intro text to the Dutch website. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/news.template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/nl/news.template b/templates/nl/news.template index ae3ab525..c14ad173 100644 --- a/templates/nl/news.template +++ b/templates/nl/news.template @@ -1,7 +1,17 @@  -<h1 class="title">Nieuws</h1> +<h1 class="title"><i class="far fa-newspaper"></i> Nieuws</h1> + +<p class="margin-bottom-lg"> + Het laatste nieuws van Wine.<br> + Meer nieuwsberichten staan in het + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine Nieuwsarchief</a> +</p>  <hr> + +<div class="link-container"> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ Nieuws RSS Feed</a> +</div>

1 0

Jinoh Kang : winedbg: Cache GDB qXfer command result for chunked fetching.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: f18c0db314d8fe3f724a7bd3642b718fbefb6439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18c0db314d8fe3f724a7bd3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:11:08 2021 +0900 winedbg: Cache GDB qXfer command result for chunked fetching. GDB does not retrieve the result of a qXfer command at once; instead, it issues a series of requests to obtain the result one "chunk" at a time, and concatenates those chunks internally. Each request contains offset and length variables that specify which portion of the result shall be retrieved. Today, Winedbg handles this by generating the entire result data each time a request is received and slicing out the requested range for the response. This is not only inefficient due to repeated computation, but also prone to race condition since the result may change between successive chunk requests due to the dynamic nature of some commands such as "libraries" and "threads." Fix this by cacheing the result into a buffer at the first request, and use the buffer to serve successive chunk requests. The cache is invalidated when the remote requests a different object, or the debugger reaches the end of the result cache buffer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0f5d9df35b8..c21fed43b48 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -931,15 +931,17 @@ static inline void packet_reply_register_hex_to(struct gdb_context* gdbctx, dbg_ packet_reply_hex_to(gdbctx, cpu_register_ptr(gdbctx, ctx, idx), cpu_register_map[idx].length); } -static void packet_reply_xfer(struct gdb_context* gdbctx, size_t off, size_t len) +static void packet_reply_xfer(struct gdb_context* gdbctx, size_t off, size_t len, BOOL* more_p) { + BOOL more; size_t data_len, trunc_len; packet_reply_open(gdbctx); data_len = gdbctx->qxfer_buffer.len; /* check if off + len would overflow */ - if (off < data_len && off + len < data_len) + more = off < data_len && off + len < data_len; + if (more) packet_reply_add(gdbctx, "m"); else packet_reply_add(gdbctx, "l"); @@ -951,6 +953,8 @@ static void packet_reply_xfer(struct gdb_context* gdbctx, size_t off, size_t len } packet_reply_close(gdbctx); + + *more_p = more; } /* =============================================== * @@ -2071,6 +2075,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) { enum packet_return result; int i; + BOOL more; for (i = 0; i < ARRAY_SIZE(qxfer_handlers); i++) { @@ -2086,21 +2091,38 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) TRACE("qXfer %s read %s %u,%u\n", debugstr_a(object_name), debugstr_a(annex), off, len); - gdbctx->qxfer_object_idx = i; - strcpy(gdbctx->qxfer_object_annex, annex); + if (off > 0 && + gdbctx->qxfer_buffer.len > 0 && + gdbctx->qxfer_object_idx == i && + strcmp(gdbctx->qxfer_object_annex, annex) == 0) + { + result = packet_send_buffer; + TRACE("qXfer read result = %d (cached)\n", result); + } + else + { + reply_buffer_clear(&gdbctx->qxfer_buffer); + + gdbctx->qxfer_object_idx = i; + strcpy(gdbctx->qxfer_object_annex, annex); - result = (*qxfer_handlers[i].handler)(gdbctx); - TRACE("qXfer read result = %d\n", result); + result = (*qxfer_handlers[i].handler)(gdbctx); + TRACE("qXfer read result = %d\n", result); + } + more = FALSE; if ((result & ~packet_last_f) == packet_send_buffer) { - packet_reply_xfer(gdbctx, off, len); + packet_reply_xfer(gdbctx, off, len, &more); result = (result & packet_last_f) | packet_done; } - gdbctx->qxfer_object_idx = -1; - gdbctx->qxfer_object_annex[0] = '\0'; - reply_buffer_clear(&gdbctx->qxfer_buffer); + if (!more) + { + gdbctx->qxfer_object_idx = -1; + gdbctx->qxfer_object_annex[0] = '\0'; + reply_buffer_clear(&gdbctx->qxfer_buffer); + } return result; }

1 0

Jinoh Kang : winedbg: Define table for GDB qXfer command handlers.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 595bfdee717af9ba4806f6298afdcd0af38a2089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595bfdee717af9ba4806f629… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:11:00 2021 +0900 winedbg: Define table for GDB qXfer command handlers. Define a handler lookup table for qXfer commands and use it. This facilitates implementing more qXfer commands and cacheing reply data. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 127 +++++++++++++++++++++++++++++++++----------- 1 file changed, 96 insertions(+), 31 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3d6aa02824e..0f5d9df35b8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -61,6 +61,9 @@ struct reply_buffer size_t alloc; }; +#define QX_NAME_SIZE 32 +#define QX_ANNEX_SIZE MAX_PATH + struct gdb_context { /* gdb information */ @@ -87,6 +90,8 @@ struct gdb_context /* Unix environment */ ULONG_PTR wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ BOOL no_ack_mode; + int qxfer_object_idx; + char qxfer_object_annex[QX_ANNEX_SIZE]; struct reply_buffer qxfer_buffer; }; @@ -813,7 +818,7 @@ static int addr_width(struct gdb_context* gdbctx) } enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, - packet_last_f = 0x80}; + packet_send_buffer = 0x03, packet_last_f = 0x80}; static void packet_reply_hex_to(struct gdb_context* gdbctx, const void* src, int len) { @@ -1736,11 +1741,16 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO return TRUE; } -static void packet_query_libraries(struct gdb_context* gdbctx) +static enum packet_return packet_query_libraries(struct gdb_context* gdbctx) { struct reply_buffer* reply = &gdbctx->qxfer_buffer; BOOL opt; + if (!gdbctx->process) return packet_error; + + if (gdbctx->qxfer_object_annex[0]) + return packet_reply_error(gdbctx, 0); + /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(gdbctx->process->handle, 0, 0, 0, 0, 0); @@ -1749,14 +1759,21 @@ static void packet_query_libraries(struct gdb_context* gdbctx) SymEnumerateModules64(gdbctx->process->handle, packet_query_libraries_cb, gdbctx); SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); reply_buffer_append_str(reply, "</library-list>"); + + return packet_send_buffer; } -static void packet_query_threads(struct gdb_context* gdbctx) +static enum packet_return packet_query_threads(struct gdb_context* gdbctx) { struct reply_buffer* reply = &gdbctx->qxfer_buffer; struct dbg_process* process = gdbctx->process; struct dbg_thread* thread; + if (!process) return packet_error; + + if (gdbctx->qxfer_object_annex[0]) + return packet_reply_error(gdbctx, 0); + reply_buffer_append_str(reply, "<threads>"); LIST_FOR_EACH_ENTRY(thread, &process->threads, struct dbg_thread, entry) { @@ -1768,11 +1785,12 @@ static void packet_query_threads(struct gdb_context* gdbctx) reply_buffer_append_str(reply, "\"/>"); } reply_buffer_append_str(reply, "</threads>"); + + return packet_send_buffer; } -static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_cpu* cpu) +static void packet_query_target_xml(struct gdb_context* gdbctx, struct reply_buffer* reply, struct backend_cpu* cpu) { - struct reply_buffer* reply = &gdbctx->qxfer_buffer; const char* feature_prefix = NULL; const char* feature = NULL; char buffer[256]; @@ -1886,10 +1904,41 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c reply_buffer_append_str(reply, "</target>"); } +static enum packet_return packet_query_features(struct gdb_context* gdbctx) +{ + struct reply_buffer* reply = &gdbctx->qxfer_buffer; + struct dbg_process* process = gdbctx->process; + + if (!process) return packet_error; + + if (strncmp(gdbctx->qxfer_object_annex, "target.xml", QX_ANNEX_SIZE) == 0) + { + struct backend_cpu *cpu = process->be_cpu; + if (!cpu) return packet_error; + + packet_query_target_xml(gdbctx, reply, cpu); + + return packet_send_buffer; + } + + return packet_reply_error(gdbctx, 0); +} + +struct qxfer +{ + const char* name; + enum packet_return (*handler)(struct gdb_context* gdbctx); +} qxfer_handlers[] = +{ + {"libraries", packet_query_libraries}, + {"threads" , packet_query_threads }, + {"features" , packet_query_features }, +}; + static enum packet_return packet_query(struct gdb_context* gdbctx) { + char object_name[QX_NAME_SIZE], annex[QX_ANNEX_SIZE]; unsigned int off, len; - struct backend_cpu *cpu; switch (gdbctx->in_packet[0]) { @@ -1976,11 +2025,16 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { + size_t i; + packet_reply_open(gdbctx); packet_reply_add(gdbctx, "QStartNoAckMode+;"); - packet_reply_add(gdbctx, "qXfer:libraries:read+;"); - packet_reply_add(gdbctx, "qXfer:threads:read+;"); - packet_reply_add(gdbctx, "qXfer:features:read+;"); + for (i = 0; i < ARRAY_SIZE(qxfer_handlers); i++) + { + packet_reply_add(gdbctx, "qXfer:"); + packet_reply_add(gdbctx, qxfer_handlers[i].name); + packet_reply_add(gdbctx, ":read+;"); + } packet_reply_close(gdbctx); return packet_done; } @@ -2011,35 +2065,44 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) } break; case 'X': - if (sscanf(gdbctx->in_packet, "Xfer:libraries:read::%x,%x", &off, &len) == 2) + annex[0] = '\0'; + if (sscanf(gdbctx->in_packet, "Xfer:%31[^:]:read::%x,%x", object_name, &off, &len) == 3 || + sscanf(gdbctx->in_packet, "Xfer:%31[^:]:read:%255[^:]:%x,%x", object_name, annex, &off, &len) == 4) { - if (!gdbctx->process) return packet_error; + enum packet_return result; + int i; - packet_query_libraries(gdbctx); - packet_reply_xfer(gdbctx, off, len); - reply_buffer_clear(&gdbctx->qxfer_buffer); - return packet_done; - } + for (i = 0; i < ARRAY_SIZE(qxfer_handlers); i++) + { + if (strcmp(qxfer_handlers[i].name, object_name) == 0) + break; + } - if (sscanf(gdbctx->in_packet, "Xfer:threads:read::%x,%x", &off, &len) == 2) - { - if (!gdbctx->process) return packet_error; + if (i >= ARRAY_SIZE(qxfer_handlers)) + { + ERR("unhandled qXfer %s read %s %u,%u\n", debugstr_a(object_name), debugstr_a(annex), off, len); + return packet_error; + } - packet_query_threads(gdbctx); - packet_reply_xfer(gdbctx, off, len); - reply_buffer_clear(&gdbctx->qxfer_buffer); - return packet_done; - } + TRACE("qXfer %s read %s %u,%u\n", debugstr_a(object_name), debugstr_a(annex), off, len); - if (sscanf(gdbctx->in_packet, "Xfer:features:read:target.xml:%x,%x", &off, &len) == 2) - { - if (!gdbctx->process) return packet_error; - if (!(cpu = gdbctx->process->be_cpu)) return packet_error; + gdbctx->qxfer_object_idx = i; + strcpy(gdbctx->qxfer_object_annex, annex); - packet_query_target_xml(gdbctx, cpu); - packet_reply_xfer(gdbctx, off, len); + result = (*qxfer_handlers[i].handler)(gdbctx); + TRACE("qXfer read result = %d\n", result); + + if ((result & ~packet_last_f) == packet_send_buffer) + { + packet_reply_xfer(gdbctx, off, len); + result = (result & packet_last_f) | packet_done; + } + + gdbctx->qxfer_object_idx = -1; + gdbctx->qxfer_object_annex[0] = '\0'; reply_buffer_clear(&gdbctx->qxfer_buffer); - return packet_done; + + return result; } break; } @@ -2356,6 +2419,8 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne for (i = 0; i < ARRAY_SIZE(gdbctx->wine_segs); i++) gdbctx->wine_segs[i] = 0; + gdbctx->qxfer_object_idx = -1; + memset(gdbctx->qxfer_object_annex, 0, sizeof(gdbctx->qxfer_object_annex)); memset(&gdbctx->qxfer_buffer, 0, sizeof(gdbctx->qxfer_buffer)); /* wait for first trap */

1 0

Jinoh Kang : winedbg: Escape XML special characters in qXfer reply.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 4c01e00dbdc370176b2c692e00ac7b75d72f8e7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c01e00dbdc370176b2c692e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:10:49 2021 +0900 winedbg: Escape XML special characters in qXfer reply. Some dynamic strings (e.g. loaded image paths) may contain XML special characters which breaks parsing. Fix this by escaping all dynamic strings (i.e. character data and attribute values) that go into the XML replies. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 63 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index a1ecdea770f..3d6aa02824e 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -284,6 +284,55 @@ static inline void reply_buffer_append_uinthex(struct reply_buffer* reply, ULONG reply_buffer_append(reply, ptr, len * 2); } +static const unsigned char xml_special_chars_lookup_table[16] = { + /* The characters should be sorted by its value modulo table length. */ + + 0x00, /* NUL */ + 0, + 0x22, /* ": 0010|0010 */ + 0, 0, 0, + 0x26, /* &: 0010|0110 */ + 0x27, /* ': 0010|0111 */ + 0, 0, 0, 0, + 0x3C, /* <: 0011|1100 */ + 0, + 0x3E, /* >: 0011|1110 */ + 0 +}; + +static inline BOOL is_nul_or_xml_special_char(unsigned char val) +{ + const size_t length = ARRAY_SIZE(xml_special_chars_lookup_table); + return xml_special_chars_lookup_table[val % length] == val; +} + +static void reply_buffer_append_xmlstr(struct reply_buffer* reply, const char* str) +{ + const char *ptr = str, *curr; + + for (;;) + { + curr = ptr; + + while (!is_nul_or_xml_special_char((unsigned char)*ptr)) + ptr++; + + reply_buffer_append(reply, curr, ptr - curr); + + switch (*ptr++) + { + case '"': reply_buffer_append_str(reply, """); break; + case '&': reply_buffer_append_str(reply, "&"); break; + case '\'': reply_buffer_append_str(reply, "'"); break; + case '<': reply_buffer_append_str(reply, "<"); break; + case '>': reply_buffer_append_str(reply, ">"); break; + case '\0': + default: + return; + } + } +} + static unsigned char checksum(const void* data, int len) { unsigned cksum = 0; @@ -1621,9 +1670,9 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO reply_buffer_append_str(reply, "<library name=\""); if (strcmp(mod.LoadedImageName, "[vdso].so") == 0) - reply_buffer_append_str(reply, "linux-vdso.so.1"); + reply_buffer_append_xmlstr(reply, "linux-vdso.so.1"); else if (mod.LoadedImageName[0] == '/') - reply_buffer_append_str(reply, mod.LoadedImageName); + reply_buffer_append_xmlstr(reply, mod.LoadedImageName); else { UNICODE_STRING nt_name; @@ -1638,10 +1687,10 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO if (IsWow64Process(gdbctx->process->handle, &is_wow64) && is_wow64 && (tmp = strstr(unix_path, "system32"))) memcpy(tmp, "syswow64", 8); - reply_buffer_append_str(reply, unix_path); + reply_buffer_append_xmlstr(reply, unix_path); } else - reply_buffer_append_str(reply, mod.LoadedImageName); + reply_buffer_append_xmlstr(reply, mod.LoadedImageName); HeapFree(GetProcessHeap(), 0, unix_path); RtlFreeUnicodeString(&nt_name); @@ -1758,8 +1807,8 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c feature = cpu->gdb_register_map[i].feature; reply_buffer_append_str(reply, "<feature name=\""); - if (feature_prefix) reply_buffer_append_str(reply, feature_prefix); - reply_buffer_append_str(reply, feature); + if (feature_prefix) reply_buffer_append_xmlstr(reply, feature_prefix); + reply_buffer_append_xmlstr(reply, feature); reply_buffer_append_str(reply, "\">"); if (strcmp(feature_prefix, "org.gnu.gdb.i386.") == 0 && @@ -1826,7 +1875,7 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c if (cpu->gdb_register_map[i].type) { reply_buffer_append_str(reply, " type=\""); - reply_buffer_append_str(reply, cpu->gdb_register_map[i].type); + reply_buffer_append_xmlstr(reply, cpu->gdb_register_map[i].type); reply_buffer_append_str(reply, "\""); }

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.200.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 17b09409ed5548c0b0db0a6d3761b3b5229702f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17b09409ed5548c0b0db0a6d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Nov 23 20:13:57 2021 +0100 winevulkan: Update to VK spec version 1.2.200. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 17 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1564 ++++++++++++++++++++------------------- 4 files changed, 819 insertions(+), 769 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17b09409ed5548c0b0db…

1 0

Jinoh Kang : winedbg: Buffer output of GDB qXfer commands for proper slicing.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 26aee726fb3dcf7615824cb51231964c04648eaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=26aee726fb3dcf7615824cb5… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:10:01 2021 +0900 winedbg: Buffer output of GDB qXfer commands for proper slicing. Today, gdbproxy reuses the same buffer for both the qXfer reply and the actual GDB packet reply. This worked well, since each byte in the qXfer reply buffer matched 1:1 to each byte in the actual GDB reply packet. Since we escape special characters now, this property no longer holds and a single byte in qXfer reply will take up to two bytes in the GDB reply packet. This causes offsets to shift, preventing the offset/length response slicing (part of GDB protocol) from working correctly. Fix this by writing the qXfer reply data in a separate buffer, and performing slicing out of it. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 264 +++++++++++++++++++++++--------------------- 1 file changed, 137 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26aee726fb3dcf761582…

1 0

Esme Povirk : gdiplus: Mark a Windows behavior as broken.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 28c35689d2d9193cbf7ce5f523fecbaf377ae273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c35689d2d9193cbf7ce5f5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 23 13:24:47 2021 -0600 gdiplus: Mark a Windows behavior as broken. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51989 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 4 ++-- dlls/gdiplus/tests/graphicspath.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 572aa88cb79..d0454edb4a4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4140,7 +4140,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + ok(size == td[i].cx || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cx, size); min = -1; max = -2; @@ -4165,7 +4165,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + ok(size == td[i].cy || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cy, size); status = GdipBitmapUnlockBits(u.bitmap, &bd); expect(Ok, status); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a987cd165dc..07e6dd166ad 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1447,7 +1447,7 @@ static void test_widen(void) status = GdipGetPointCount(path, &count); expect(Ok, status); - expect(0, count); + ok(count == 0 || broken(count == 4), "expected 0, got %i\n", count); /* pen width = 0 pixels, UnitWorld - result is a path 1 unit wide */ GdipDeletePen(pen); @@ -1711,6 +1711,21 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); + + if (i == 9) + { + INT size; + status = GdipGetPointCount(path, &size); + expect(Ok, status); + ok(size == caps[i].expected_size || broken(size == 12), "unexpected path size %i\n", size); + + if (size == 12) + { + GdipDeletePen(pen); + continue; + } + } + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); GdipDeletePen(pen);

1 0

Jinoh Kang : winedbg: Use exponential growth in gdbproxy reply_buffer_grow.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 16df7786279ca081558fabee962c1cc950656a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16df7786279ca081558fabee… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:09:53 2021 +0900 winedbg: Use exponential growth in gdbproxy reply_buffer_grow. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 07a45cd1b15..120cc84e008 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -236,9 +236,14 @@ static void reply_buffer_clear(struct reply_buffer* reply) static void reply_buffer_grow(struct reply_buffer* reply, size_t size) { - if (reply->alloc < reply->len + size) + size_t required_alloc = reply->len + size; + + if (reply->alloc < required_alloc) { - reply->alloc = ((reply->len + size) / 32 + 1) * 32; + reply->alloc = reply->alloc * 3 / 2; + if (reply->alloc < required_alloc) + reply->alloc = required_alloc; + reply->base = realloc(reply->base, reply->alloc); } }

1 0

Daniel Lehman : kernelbase: Handle UNC path in UrlApplySchemeW.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 2a5682d98b2d06642333eef288f4d82ecda4ca9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a5682d98b2d06642333eef2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 23 07:42:22 2021 -0800 kernelbase: Handle UNC path in UrlApplySchemeW. Fixes loading XML from a UNC path. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/url.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index a9105341fad..b4b31410a3a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4020,7 +4020,7 @@ HRESULT WINAPI UrlApplySchemeW(const WCHAR *url, WCHAR *out, DWORD *length, DWOR if (flags & URL_APPLY_GUESSFILE) { - if (*length > 1 && ':' == url[1]) + if ((*length > 1 && ':' == url[1]) || PathIsUNCW(url)) { res1 = *length; hr = url_create_from_path(url, out, &res1); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 9e04c6d7b6f..0cc14dc65bf 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -97,6 +97,11 @@ static const TEST_URL_APPLY TEST_APPLY[] = { {"u:\\windows", URL_APPLY_DEFAULT, S_OK, 17, "http://u:\\windows"}, {"file:///c:/windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, {"aa:\\windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"\\\\server\\share", URL_APPLY_DEFAULT, S_OK, 21, "http://\\\\server\\share"}, + {"\\\\server\\share", URL_APPLY_GUESSFILE, S_OK, 19, "file://server/share"}, + {"\\\\server\\share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"file://server/share", URL_APPLY_GUESSFILE, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"file://server/share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, }; /* ################ */

1 0