From: Alex Henrie Subject: [PATCH v2] wine.inf: Add sRGB color profile Message-Id: <20200912074502.30693-1-alexhenrie24@gmail.com> Date: Sat, 12 Sep 2020 01:45:02 -0600 "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 --- v2: Add color directory to TOP_INSTALL_LIB The Microsoft version of this file is tagged "sRGB IEC61966-2.1". Any differences from the standard sRGB IEC61966-2.1 profile available on color.org are not likely to be perceptible. In addition to a couple of ICM files, on Windows the directory C:\Windows\System32\spool\drivers\color also has some CAMP, GMMP, and CDMP files. I have generically named the new source directory "color" so that we have a place for these other files in the future. --- Makefile.in | 1 + color/Makefile.in | 2 ++ color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes configure.ac | 2 ++ loader/wine.inf.in | 14 +++++++++----- tools/makedep.c | 12 ++++++++++++ 6 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 color/Makefile.in create mode 100644 color/sRGB_Color_Space_Profile.icm diff --git a/Makefile.in b/Makefile.in index 3f8196ed854..36bb6521d44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ includedir = @includedir@ +colordir = ${datadir}/wine/color fontdir = ${datadir}/wine/fonts nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine diff --git a/color/Makefile.in b/color/Makefile.in new file mode 100644 index 00000000000..f9f6f62a3b1 --- /dev/null +++ b/color/Makefile.in @@ -0,0 +1,2 @@ +SOURCES = \ + sRGB_Color_Space_Profile.icm diff --git a/color/sRGB_Color_Space_Profile.icm b/color/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/configure.ac b/configure.ac index 0204c8ffd53..0aca5178354 100644 --- a/configure.ac +++ b/configure.ac @@ -2810,6 +2810,7 @@ depend: \$(MAKEDEP) dummy WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(color) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) @@ -4148,6 +4149,7 @@ clean:: else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ +color \ fonts \ loader/wine.inf \ loader/winebus.inf \ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index af4d4e48564..7e8e7a3203d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -2684,7 +2684,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,catroot, 11,mui, 11,tasks, -11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe 10,,hh.exe @@ -3900,6 +3899,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[ColorFiles] +"sRGB Color Space Profile.icm",sRGB_Color_Space_Profile.icm + [InfFiles] winebus.inf winehid.inf @@ -3982,10 +3984,12 @@ normnfkd.nls sortdefault.nls [WineSourceDirs] +ColorFiles = color NlsFiles = nls SortFiles = nls [DestinationDirs] +ColorFiles = 11,spool\drivers\color InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting diff --git a/tools/makedep.c b/tools/makedep.c index e819cbb9499..45d6f1ecb88 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2986,6 +2986,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, } +/******************************************************************* + * output_source_icm + */ +static void output_source_icm( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(colordir)/%s", source->name )); + output_srcdir_symlink( make, strmake( "%s.icm", obj )); +} + + /******************************************************************* * output_source_nls */ @@ -3202,6 +3213,7 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "icm", output_source_icm }, { "nls", output_source_nls }, { "desktop", output_source_desktop }, { "po", output_source_po }, -- 2.28.0