wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

winex11-Clipboard_HTML: On invalid HTML, interpret the whole tag as content.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-11-01 00:06:05 +01:00
parent 9414a2da0a
commit 514e29e7dc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/winex11-Clipboard_HTML/0001-winex11.drv-Import-X11-s-text-html-as-HTML-Format.patch
View File

@ -1,4 +1,4 @@
From d819c8a4fb3b754fa9f39eebbb7d28eb49d0dcf3 Mon Sep 17 00:00:00 2001
From 58d6b57b0fb8ba53e8daef409dc345aa12cbb64b Mon Sep 17 00:00:00 2001
From: Damjan Jovanovic <damjan.jov@gmail.com>
Date: Fri, 8 Aug 2014 20:05:54 +0200
Subject: winex11.drv: Import X11's "text/html" as "HTML Format".
@ -11,11 +11,11 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
* Fix incorrect detection of startOfMarkup
* Some small formatting fixes
---
dlls/winex11.drv/clipboard.c | 203 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 202 insertions(+), 1 deletion(-)
dlls/winex11.drv/clipboard.c | 204 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 203 insertions(+), 1 deletion(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index b2705b4..3825c8c 100644
index b2705b4..a2a5889 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -148,6 +148,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportImageBmp(Display *d, Window w, Atom prop);
@ -39,7 +39,7 @@ index b2705b4..3825c8c 100644
}
@@ -1568,6 +1570,205 @@ static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Ato
@@ -1568,6 +1570,206 @@ static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Ato
}
@ -104,7 +104,8 @@ index b2705b4..3825c8c 100644
+ textHtml[startOfMarkup + 1] == '/'))
+ {
+ char *pos = memchr(&textHtml[startOfMarkup + 1], '>', textHtmlLen - startOfMarkup - 1);
+ if (pos) startOfMarkup = pos - textHtml;
+ if (!pos) break;
+ startOfMarkup = pos - textHtml;
+ continue;
+ }
+ else