v3.1.0

CursedHardware · Dec 1, 2023 · e565f7c · e565f7c
1 parent 8e6eb9b
commit e565f7c
Show file tree

Hide file tree

Showing 210 changed files with 5,196 additions and 11,475 deletions.
diff --git a/Jambase b/Jambase
@@ -72,6 +72,8 @@
 # CatToFile dest : strings ;			save the arguments to the file
 # GuiBin image ;						Mark executable as GUI applications
 #                                       (Needs to go before other declarations of image) 
+# UACBin image ;						Mark executable as MSWindows UAC applications
+#                                       (Needs to go before other declarations of image) 
 # HardLink target : source ;			make link from source to target
 # HdrRule source : headers ;			handle #includes
 # InstallInto dir : sources ;			install any files
@@ -379,9 +381,10 @@ JAMBASEDATE = 2008.03.26 ;
 
 if $(NT)
 {
+	WIN_MT_AVAIL = true ;
 	if ! [ GLOB $(PATH) : mt.exe ] {
     	Echo "mt is NOT available!" ;
-    	WIN_UTF8 = false ;
+    	WIN_MT_AVAIL = false ;
 	}
 
 	MV				?= move /y ;
@@ -608,6 +611,7 @@ if $(NT)
 		if [ MATCH 17\\.(.*) : $(VisualStudioVersion) ] {
 			if $(VSCMD_ARG_TGT_ARCH) = "x64" {
 				ECHO "Compiler is VC++17 64 bit" ;
+				TARGET64 = true ;
 			} else {
 				ECHO "Compiler is VC++17 32 bit" ;
 			}
@@ -997,7 +1001,7 @@ else if $(UNIX)
 
 	# UNIX defaults
 
-	CCFLAGS			?= -DUNIX -D_THREAD_SAFE -pipe ;	# -fwrapv ??
+	CCFLAGS			?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe -fPIC ;	# -fwrapv ??
 	CCOPTFLAG		?= -O2 ;		
 	CCDEBUGFLAG		?= -g ;		
 	CCPROFFLAG		?= ;		
@@ -1007,7 +1011,7 @@ else if $(UNIX)
 	CHGRP			?= chgrp ;
 	CHOWN			?= chown ;
 	LEX				?= lex ;
-	LINKFLAGS		?= ;
+	LINKFLAGS		?= $(LDFLAGS) ;
 	LINKOPTFLAG		?= -O ;				# Affects creating .so's
 	LINKSTRIPFLAG	?= -s ;
 	LINKDEBUGFLAG	?= ;
@@ -1043,6 +1047,7 @@ else if $(UNIX)
 	 || $(HOSTTYPE) = amd64 {
 		ECHO "We're on a 64 bit host" ;
 		HOST64     = true ;
+		TARGET64   = true ;			# We're not allowing for cross-compiling here...
 		CCFLAGS	   += -m64 ;
 		C++FLAGS   += -m64 ;
 	}
@@ -2782,11 +2787,15 @@ rule GuiBin
 	GUIAPP on $(_t) = "true" ;
 }
 
-rule GUIAPP
+# Mark MSWindows executable as needing UAC
+# GuiImages images ;
+rule UACBin
 {
+	local _t = [ NormDstTargets $(<:S=$(SUFEXE)) ] ;
+	WIN_UAC on $(_t) = "true" ;
 }
 
-rule UTF8APP
+rule GUIAPP
 {
 }
 
@@ -3454,8 +3463,17 @@ rule MainFromObjects
 	}
 
 	# On MSWin10 we may want to use UTF-8 for text
-	if $(WIN_UTF8) = true {
-		UTF8APP $(_t) ;
+	if $(WIN_MT_AVAIL) && $(WIN_UTF8) = true {
+		WIN_UTF8_MANIFEST $(_t) ;
+	}
+
+	# On MSWin we may want to trigger UAC
+	if $(WIN_MT_AVAIL) && [ geton $(_t) : WIN_UAC ] = true {
+		WIN_UAC_COMBINE on $(_t) = "outputresource" ;
+		if $(WIN_UTF8) {
+			WIN_UAC_COMBINE on $(_t) = "updateresource" ;
+		}
+		WIN_UAC_MANIFEST $(_t) ;
 	}
 
 #Echo "MainFromObjects done" ;
@@ -4471,8 +4489,7 @@ if $(NT)
 	}
 
 	# Allow MSWin10 apps to use UTF-8
-
-	actions UTF8APP
+	actions WIN_UTF8_MANIFEST
 	{
 		(echo ^<?xml version="1.0" encoding="UTF-8" standalone="yes"?^>
 		echo ^<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"^>
@@ -4486,6 +4503,23 @@ if $(NT)
 		mt.exe -nologo -manifest $(<).tmp -outputresource:$(<);#1
 		del $(<).tmp
 	}
+
+	# Make MSWin10 app trigger UAC
+	actions WIN_UAC_MANIFEST
+	{
+		(echo ^<?xml version="1.0" encoding="UTF-8" standalone="yes"?^>
+		echo ^<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"^>
+		echo ^<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"^>
+		echo ^<security^>
+		echo ^<requestedPrivileges^>
+		echo ^<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/^>
+		echo ^</requestedPrivileges^>
+		echo ^</security^>
+		echo ^</trustInfo^>
+		echo ^</assembly^>)>$(<).tmp
+		mt.exe -nologo -manifest $(<).tmp -$(WIN_UAC_COMBINE):$(<);#1
+		del $(<).tmp
+	}
 }
 
 if $(NT) && $(MSVCNT)

diff --git a/Jamfile b/Jamfile
@@ -59,8 +59,7 @@ if ! $(HAVE_PNG) {
 	SubInclude png ;
 }
 
-if $(NT) && $(USE_USBDK) != true {
-echo "#### subincluding usb ####"
+if $(NT) {
 	SubInclude usb ;
 }
 

diff --git a/Jamtop b/Jamtop
@@ -56,7 +56,7 @@ USE_PRINTER = false ;
 
 # enable CMF Measurement device and accessory support (if present)
 # (Not part of ArgyllCMS)
-USE_CMFM = true ;	
+USE_CMFM = false ;	
 
 # Compile in graph plotting code
 USE_PLOT = true ;		# [true] 
@@ -65,8 +65,11 @@ USE_PLOT = true ;		# [true]
 # to make executable language handling consistent across MSWin/OS X/Linux
 WIN_UTF8 = true ;		# [true]
 
-# Use UsbDk rather than libusb0.sys	
-# (Not released yet)
+# Use libusb_win32 libusb0.sys on MSWindows 
+USE_LIBUSB0 = true ;	# [true]
+
+# Use UsbDk on MSWindows 
+# (Can use along side USE_LIBUSB0)
 USE_USBDK = false ;	# [false]
 
 # For testing CCast
@@ -153,17 +156,88 @@ rule CheckForLibrary {
 	}
 
 	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
-		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
-	     || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
+	    if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
 		 || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
-	     || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
-			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
-			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
-			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
+		 || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/alpha-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/aarch64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/arm-linux-gnueabi$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/arm-linux-gnueabihf$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/hppa-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/i386-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/x86_64-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/i386-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+         || [ GLOB /usr/include/loongarch64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/m68k-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/mips-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/mipsel-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/mips64el-linux-gnuabi64$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/powerpc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/powerpc-linux-gnuspe$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/powerpc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/powerpc64le-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+         || [ GLOB /usr/include/riscv64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/s390x-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/sh4-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/sparc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/sparc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+		 || [ GLOB /usr/include/x86_64-linux-gnux32$(subd) : $(lcase).h $(lcase)lib.h ] {
+		    if  [ GLOB /usr/lib : lib$(lcase).so ]  || [ GLOB /usr/lib : lib$(lcase).a ]
+			 || [ GLOB /usr/local/lib : lib$(lcase).so ]
+			 || [ GLOB /usr/local/lib : lib$(lcase).a ]
+			 || [ GLOB /usr/lib64 : lib$(lcase).so ]
+			 || [ GLOB /usr/lib64 : lib$(lcase).a ]
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
-	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
-	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ] {
+			 || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/i386-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/i386-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).a ]
+             || [ GLOB /usr/lib/loongarch64-linux-gnu : lib$(lcase).so ]
+             || [ GLOB /usr/lib/loongarch64-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).a ]
+             || [ GLOB /usr/lib/riscv64-linux-gnu : lib$(lcase).so ]
+             || [ GLOB /usr/lib/riscv64-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).a ]
+			 || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).so ]
+			 || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).a ] {
 				echo "Using system $(UCASE) library" ;
 				$(UCASE)LIB = ;
 				$(UCASE)INC = ;

diff --git a/Readme.txt b/Readme.txt
@@ -1,8 +1,8 @@
 
-Argyll CMS README file - Version 3.0.2
+Argyll CMS README file - Version 3.1.0
 --------------------------------------
 
-Date: 23rd October 2023
+Date: 1st december 2023
 Author: Graeme Gill
 
 Introduction
@@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for
 typical color management tasks is also available. A mailing list provides
 support for more advanced usage.
 
-This is Version 3.0.2, a bug fix update to the release V3.0.0.
+This is Version 3.1.9, a bug fix and feature update to the release V3.0.2.
 The first public release of icclib was in November 1998,
 and of Argyll was in October 2000. Code development commenced in 1995. See
 Changes Summary for an overview of changes since the last release. Changes

diff --git a/ccast/ccast.c b/ccast/ccast.c
@@ -569,7 +569,7 @@ static int start_ccast(ccast *p) {
 
 		// Hmm. Should we wait for a RECEIVER_STATUS message with id 0 here ?
 
-		/* If we get here, we assume that we've suceeded */
+		/* If we get here, we assume that we've succeeded */
 		break;
 
       retry:;
@@ -983,7 +983,7 @@ static int load_ccast(
 				} else {
 					DBG((g_log,0,"MEDIA_STATUS failed to return mediaSessionId\n"))
 				}
-				/* Suceeded */
+				/* Succeeded */
 
 			} else {
 				rv = 3;

diff --git a/ccast/ccmdns.c b/ccast/ccmdns.c
@@ -354,7 +354,7 @@ static int init_socket_mDNS(SOCKET *psock) {
 		DWORD tv;
 		tv = 100;
 		if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d\n",ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d\n",ERRNO))
 			closesocket(sock);
 			return 1;
 		}
@@ -365,7 +365,7 @@ static int init_socket_mDNS(SOCKET *psock) {
 		tv.tv_sec = 0;
 		tv.tv_usec = 100 * 1000;
 		if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d\n",ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d\n",ERRNO))
 			closesocket(sock);
 			return 1;
 		}

diff --git a/ccast/ccmes.c b/ccast/ccmes.c
@@ -85,7 +85,7 @@ char *ccmessv_emes(ccmessv_err rv) {
 			return "ccmes: connection has been closed";
 	}
 
-	return "Uknown ccmessv error";
+	return "Unknown ccmessv error";
 }
 
 #if defined(LOWVERBTRACE) || defined(DEBUG)

diff --git a/ccast/ccpacket.c b/ccast/ccpacket.c
@@ -133,7 +133,7 @@ char *ccpacket_emes(ccpacket_err rv) {
 			return "Packet: failed to read message";
 	}
 
-	return "Uknown ccpacket error";
+	return "Unknown ccpacket error";
 }
 
 /* Establish an ccpacket connection - implementation */
@@ -196,13 +196,13 @@ static ccpacket_err connect_ccpacket_imp(
 #endif
 		if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv,
 			                                                   sizeof(tv))) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
 			return ccpacket_connect;
 		}
 		tv = 2000;
 		if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv,
 			                                                    sizeof(tv))) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
 			return ccpacket_connect;
 		}
 #else
@@ -216,14 +216,14 @@ static ccpacket_err connect_ccpacket_imp(
 #endif
 		if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv,
 			                                                    sizeof(tv))) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
 			return ccpacket_connect;
 		}
 		tv.tv_sec = 2;
 		tv.tv_usec = 0;
 		if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv,
 			                                                    sizeof(tv))) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
 			return ccpacket_connect;
 		}
 #endif
@@ -233,7 +233,7 @@ static ccpacket_err connect_ccpacket_imp(
 		ling.l_linger = 2;	/* Two seconds */
 		if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_LINGER, (const char*)&ling,
 			                                                    sizeof(ling))) < 0) {
-			DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
+			DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
 			return ccpacket_connect;
 		}
 #endif /* NEVER */

diff --git a/ccast/dpat.c b/ccast/dpat.c
@@ -394,7 +394,7 @@ double get_ccast_dith(double ipat[DISIZE][DISIZE][3], double val[3]) {
 	/* generates number between 1 and 4294967295 */
 #define PSRAND32F(S) (((S) & 0x80000000) ? (((S) << 1) ^ 0xa398655d) : ((S) << 1))
 
-	/* Locate the 8 surrounding RGB verticies */
+	/* Locate the 8 surrounding RGB vertices */
 	for (n = 0; n < 8; n++) {
 		for (k = 0; k < 3; k++) {
 			if (n & (1 << k))