You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against 1513c706341a6c04ddfa8b1998a346d343fc4983.
[ntdll-RtlSetCurrentDirectory_U] Removed patch to open current working directory with FILE_TRAVERSE access (accepted upstream). [server-Win32_Prefix] Removed patch to allow to create win23 prefix when directory already exists (accepted upstream).
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
From 80a3e2c7b41b6504805e91065058072bc83c4ac4 Mon Sep 17 00:00:00 2001
|
||||
From e5cdbbf9fdf7c927f66bc4c3f7be4bcca0694791 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". (try 3)
|
||||
@ -15,7 +15,7 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
1 file changed, 201 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
|
||||
index dcb1403..058ee53 100644
|
||||
index 0850448..08dd885 100644
|
||||
--- a/dlls/winex11.drv/clipboard.c
|
||||
+++ b/dlls/winex11.drv/clipboard.c
|
||||
@@ -134,6 +134,7 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size );
|
||||
@ -24,18 +24,18 @@ index dcb1403..058ee53 100644
|
||||
static HANDLE import_compound_text( Atom type, const void *data, size_t size );
|
||||
+static HANDLE import_text_html( Atom type, const void *data, size_t size );
|
||||
static HANDLE import_text_uri_list( Atom type, const void *data, size_t size );
|
||||
static HANDLE import_targets( Atom type, const void *data, size_t size );
|
||||
|
||||
static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle );
|
||||
@@ -205,7 +206,7 @@ static const struct
|
||||
@@ -206,7 +207,7 @@ static const struct
|
||||
{ JFIFW, 0, XATOM_image_jpeg, import_data, export_data },
|
||||
{ PNGW, 0, XATOM_image_png, import_data, export_data },
|
||||
{ HTMLFormatW, 0, XATOM_HTML_Format, import_data, export_data },
|
||||
- { HTMLFormatW, 0, XATOM_text_html, import_data, export_text_html },
|
||||
+ { HTMLFormatW, 0, XATOM_text_html, import_text_html, export_text_html },
|
||||
{ 0, 0, XATOM_TARGETS, NULL, export_targets },
|
||||
{ 0, 0, XATOM_TARGETS, import_targets, export_targets },
|
||||
{ 0, 0, XATOM_MULTIPLE, NULL, export_multiple },
|
||||
};
|
||||
@@ -1136,6 +1137,205 @@ static HANDLE import_enhmetafile( Atom type, const void *data, size_t size )
|
||||
@@ -1178,6 +1179,205 @@ static HANDLE import_enhmetafile( Atom type, const void *data, size_t size )
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user