mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 1f15ddce9c7d0ee71521d7b98c698488b76d3f01.
This commit is contained in:
Alistair Leslie-Hughes
parent
c7ea1850c7
commit
cd3ee9b25d
@ -1,167 +0,0 @@
|
||||
From b037d19858277d7dde0df6cdf4678a55517366af Mon Sep 17 00:00:00 2001
|
||||
From: Alex Henrie <alexhenrie24@gmail.com>
|
||||
Date: Tue, 22 Sep 2020 22:00:11 -0600
|
||||
Subject: [PATCH] winspool: Add sRGB color profile
|
||||
|
||||
"This profile is made available by the International Color Consortium,
|
||||
and may be copied, distributed, embedded, made, used, and sold without
|
||||
restriction. Altered versions of this profile shall have the original
|
||||
identification and copyright information removed and shall not be
|
||||
misrepresented as the original profile."
|
||||
|
||||
See http://www.color.org/srgbprofiles.xalter
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396
|
||||
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
---
|
||||
.../winspool.drv/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes
|
||||
dlls/winspool.drv/winspool.rc | 3 ++
|
||||
dlls/winspool.drv/wspool.c | 38 ++++++++++++++++++
|
||||
dlls/winspool.drv/wspool.h | 2 +
|
||||
4 files changed, 43 insertions(+)
|
||||
create mode 100644 dlls/winspool.drv/sRGB_Color_Space_Profile.icm
|
||||
|
||||
diff --git a/dlls/winspool.drv/sRGB_Color_Space_Profile.icm b/dlls/winspool.drv/sRGB_Color_Space_Profile.icm
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..49afbfef10f22a1832590b68369d2f248ea553b9
|
||||
GIT binary patch
|
||||
literal 3024
|
||||
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
|
||||
|
||||
literal 0
|
||||
HcmV?d00001
|
||||
|
||||
diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc
|
||||
index 50772ce60bb..1b573be096e 100644
|
||||
--- a/dlls/winspool.drv/winspool.rc
|
||||
+++ b/dlls/winspool.drv/winspool.rc
|
||||
@@ -47,6 +47,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||
/* @makedep: generic.ppd */
|
||||
1 PPDFILE generic.ppd
|
||||
|
||||
+/* @makedep: sRGB_Color_Space_Profile.icm */
|
||||
+IDR_SRGB_ICM RCDATA sRGB_Color_Space_Profile.icm
|
||||
+
|
||||
#define WINE_FILENAME_STR "winspool.drv"
|
||||
#define WINE_FILEDESCRIPTION_STR "Wine core printer driver"
|
||||
|
||||
diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c
|
||||
index bbfb0fb0f42..baa7bfdb455 100644
|
||||
--- a/dlls/winspool.drv/wspool.c
|
||||
+++ b/dlls/winspool.drv/wspool.c
|
||||
@@ -104,6 +104,43 @@ BOOL load_backend(void)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+static void create_color_profiles(void)
|
||||
+{
|
||||
+ static const WCHAR color_dir[] = {'\\','s','p','o','o','l',
|
||||
+ '\\','d','r','i','v','e','r','s',
|
||||
+ '\\','c','o','l','o','r','\\',0};
|
||||
+ static const WCHAR srgb_icm[] = {'s','R','G','B',' ',
|
||||
+ 'C','o','l','o','r',' ',
|
||||
+ 'S','p','a','c','e',' ',
|
||||
+ 'P','r','o','f','i','l','e','.','i','c','m',0};
|
||||
+ WCHAR profile_path[MAX_PATH];
|
||||
+ HANDLE file;
|
||||
+ HRSRC res;
|
||||
+ DWORD size, written;
|
||||
+ char *data;
|
||||
+ BOOL ret;
|
||||
+
|
||||
+ GetSystemDirectoryW(profile_path, ARRAY_SIZE(profile_path));
|
||||
+ lstrcatW(profile_path, color_dir);
|
||||
+ lstrcatW(profile_path, srgb_icm);
|
||||
+
|
||||
+ file = CreateFileW(profile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
+ if (file == INVALID_HANDLE_VALUE)
|
||||
+ return;
|
||||
+
|
||||
+ ret = ((res = FindResourceA(WINSPOOL_hInstance, MAKEINTRESOURCEA(IDR_SRGB_ICM), (const char *)RT_RCDATA)) &&
|
||||
+ (size = SizeofResource(WINSPOOL_hInstance, res)) &&
|
||||
+ (data = LoadResource(WINSPOOL_hInstance, res)) &&
|
||||
+ WriteFile(file, data, size, &written, NULL) &&
|
||||
+ written == size);
|
||||
+ CloseHandle(file);
|
||||
+ if (!ret)
|
||||
+ {
|
||||
+ ERR("Failed to create %s\n", wine_dbgstr_w(profile_path));
|
||||
+ DeleteFileW(profile_path);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/******************************************************************************
|
||||
* DllMain
|
||||
*
|
||||
@@ -118,6 +155,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved)
|
||||
WINSPOOL_hInstance = hInstance;
|
||||
DisableThreadLibraryCalls(hInstance);
|
||||
WINSPOOL_LoadSystemPrinters();
|
||||
+ create_color_profiles();
|
||||
break;
|
||||
}
|
||||
case DLL_PROCESS_DETACH:
|
||||
diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h
|
||||
index 06c28231330..a229b1ffe88 100644
|
||||
--- a/dlls/winspool.drv/wspool.h
|
||||
+++ b/dlls/winspool.drv/wspool.h
|
||||
@@ -33,5 +33,7 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN;
|
||||
#define IDS_FILE_EXISTS 11
|
||||
#define IDS_CANNOT_OPEN 12
|
||||
|
||||
+#define IDR_SRGB_ICM 2
|
||||
+
|
||||
#define FILENAME_DIALOG 100
|
||||
#define EDITBOX 201
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [37396] Add sRGB color profile.
|
||||
@ -1,7 +1,7 @@
|
||||
From d708c949e4c6bdf5beb1fd728bcf12313c7bff42 Mon Sep 17 00:00:00 2001
|
||||
From 651f85c986806d5ae08f9e471fdca3139e57da1e Mon Sep 17 00:00:00 2001
|
||||
From: Derek Lesho <dlesho@codeweavers.com>
|
||||
Date: Thu, 2 Apr 2020 15:42:18 -0500
|
||||
Subject: [PATCH 23/45] mf: Ask for more samples from upstream node when upon
|
||||
Subject: [PATCH] mf: Ask for more samples from upstream node when upon
|
||||
MF_E_TRANSFORM_NEED_MORE_INPUT
|
||||
|
||||
---
|
||||
@ -9,10 +9,10 @@ Subject: [PATCH 23/45] mf: Ask for more samples from upstream node when upon
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
|
||||
index 7c82aa42a4b..2f1b589a1aa 100644
|
||||
index 75bc669f8fd..42f28702ddd 100644
|
||||
--- a/dlls/mf/session.c
|
||||
+++ b/dlls/mf/session.c
|
||||
@@ -2503,6 +2503,8 @@ static HRESULT transform_node_pull_samples(struct topo_node *node)
|
||||
@@ -2534,6 +2534,8 @@ static HRESULT transform_node_pull_samples(const struct media_session *session,
|
||||
return hr;
|
||||
}
|
||||
|
||||
@ -21,12 +21,12 @@ index 7c82aa42a4b..2f1b589a1aa 100644
|
||||
static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *node, unsigned int input,
|
||||
IMFSample *sample)
|
||||
{
|
||||
@@ -2575,7 +2577,14 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
|
||||
@@ -2609,7 +2611,14 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
|
||||
WARN("Drain command failed for transform, hr %#x.\n", hr);
|
||||
}
|
||||
|
||||
- transform_node_pull_samples(topo_node);
|
||||
+ if (transform_node_pull_samples(topo_node) == MF_E_TRANSFORM_NEED_MORE_INPUT && !drain)
|
||||
- transform_node_pull_samples(session, topo_node);
|
||||
+ if (transform_node_pull_samples(session, topo_node) == MF_E_TRANSFORM_NEED_MORE_INPUT && !drain)
|
||||
+ {
|
||||
+ IMFTopologyNode *upstream_node;
|
||||
+ DWORD upstream_output;
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "b940c5e7c91bff963336dd7d2c4defc3a82c75a1"
|
||||
echo "1f15ddce9c7d0ee71521d7b98c698488b76d3f01"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -90,7 +90,6 @@ patch_enable_all ()
|
||||
enable_atl_AtlAxDialogBox="$1"
|
||||
enable_bcrypt_ECDHSecretAgreement="$1"
|
||||
enable_cmd_launch_association="$1"
|
||||
enable_color_sRGB_profile="$1"
|
||||
enable_comctl32_Listview_DrawItem="$1"
|
||||
enable_comctl32_rebar_capture="$1"
|
||||
enable_comctl32_version_6="$1"
|
||||
@ -355,9 +354,6 @@ patch_enable ()
|
||||
cmd-launch-association)
|
||||
enable_cmd_launch_association="$2"
|
||||
;;
|
||||
color-sRGB-profile)
|
||||
enable_color_sRGB_profile="$2"
|
||||
;;
|
||||
comctl32-Listview_DrawItem)
|
||||
enable_comctl32_Listview_DrawItem="$2"
|
||||
;;
|
||||
@ -1804,19 +1800,6 @@ if test "$enable_cmd_launch_association" -eq 1; then
|
||||
patch_apply cmd-launch-association/0002-cmd-ftype-failed-to-clear-file-associations.patch
|
||||
fi
|
||||
|
||||
# Patchset color-sRGB-profile
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37396] Add sRGB color profile.
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winspool.drv/sRGB_Color_Space_Profile.icm, dlls/winspool.drv/winspool.rc, dlls/winspool.drv/wspool.c,
|
||||
# | dlls/winspool.drv/wspool.h
|
||||
# |
|
||||
if test "$enable_color_sRGB_profile" -eq 1; then
|
||||
patch_apply color-sRGB-profile/0001-winspool-Add-sRGB-color-profile.patch
|
||||
fi
|
||||
|
||||
# Patchset comctl32-Listview_DrawItem
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1 +1 @@
|
||||
b940c5e7c91bff963336dd7d2c4defc3a82c75a1
|
||||
1f15ddce9c7d0ee71521d7b98c698488b76d3f01
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user