1.1.2.1439 Update

YuZhouRen86 · YuZhouRen86 · commit 079483d2b5e1 · 2025-02-02T19:31:59.000+08:00
diff --git a/00-Common Headers/KexGui.h b/00-Common Headers/KexGui.h
@@ -208,7 +208,8 @@ KEXGDECLSPEC EXTERN_C HWND KEXGAPI ToolTip(
 
 KEXGDECLSPEC BOOLEAN KEXGAPI ShowPropertiesDialog(
 	IN	PCWSTR	FilePath,
-	IN	INT		ShowControl);
+	IN	INT		ShowControl,
+	IN	BOOL	NoErrorBox);
 
 KEXGDECLSPEC HRESULT KEXGAPI OpenFileLocation(
 	IN	PCWSTR	FilePath,
diff --git a/00-Common Headers/vautogen.h b/00-Common Headers/vautogen.h
diff --git a/00-Documentation/Changelog.txt b/00-Documentation/Changelog.txt
diff --git a/01-Development Utilities/vautogen/vautogen.ini b/01-Development Utilities/vautogen/vautogen.ini
@@ -3,4 +3,4 @@ HeaderFile=..\..\00-Common Headers\vautogen.h
 MajorVersion=1
 MinorVersion=1
 PatchLevel=2
-BuildNumber=1436
+BuildNumber=1439
diff --git a/01-Extended DLLs/KxCom/firefoxpatch.c b/01-Extended DLLs/KxCom/firefoxpatch.c
@@ -11,7 +11,10 @@ HRESULT WINAPI Ext_CoCreateInstance(
 	OUT	LPVOID		*ppv)
 {
 	unless (KexData->IfeoParameters.DisableAppSpecific){
-		if (AshExeBaseNameIs(L"firefox.exe")) {
+		if (AshExeBaseNameIs(L"firefox.exe")
+			|| AshExeBaseNameIs(L"thunderbird.exe")
+			|| AshExeBaseNameIs(L"betterbird.exe")
+			|| AshExeBaseNameIs(L"librewolf.exe")) {
 			if ((IsEqualCLSID(rclsid, &CLSID_DestinationList) && pUnkOuter == NULL && dwClsContext == CLSCTX_INPROC_SERVER && IsEqualIID(riid, &IID_ICustomDestinationList)) || (pUnkOuter == NULL && dwClsContext == CLSCTX_INPROC_SERVER && IsEqualIID(riid, &IID_IObjectCollection))) return E_NOTIMPL;
 		}
 	}
diff --git a/01-Extended DLLs/KxUia/KxUia.sdf b/01-Extended DLLs/KxUia/KxUia.sdf
diff --git a/01-Extended DLLs/KxUser/sysmetrc.c b/01-Extended DLLs/KxUser/sysmetrc.c
@@ -42,7 +42,7 @@ INT WINAPI GetSystemMetricsForDpi(
 	case SM_CYMENUCHECK:
 		// These are pixel values that have to be scaled according to DPI.
 		Value *= Dpi;
-		Value /= GetDpiForSystem();
+		Value /= (INT) GetDpiForSystem();
 		break;
 	}
 
@@ -56,9 +56,27 @@ BOOL WINAPI SystemParametersInfoForDpi(
 	IN		UINT	WinIni,
 	IN		UINT	Dpi)
 {
+	INT SystemDpi = GetDpiForSystem();
+
 	switch (Action) {
 	case SPI_GETICONTITLELOGFONT:
-		return SystemParametersInfo(Action, Parameter, Data, 0);
+		{
+			BOOL Success;
+			PLOGFONT LogFont;
+
+			Success = SystemParametersInfo(Action, Parameter, Data, 0);
+
+			if (Success) {
+				LogFont = (PLOGFONT) Data;
+
+				LogFont->lfWidth *= Dpi;
+				LogFont->lfHeight *= Dpi;
+				LogFont->lfWidth /= SystemDpi;
+				LogFont->lfHeight /= SystemDpi;
+			}
+
+			return Success;
+		}
 	case SPI_GETICONMETRICS:
 		{
 			BOOL Success;
@@ -71,8 +89,8 @@ BOOL WINAPI SystemParametersInfoForDpi(
 
 				IconMetrics->iHorzSpacing *= Dpi;
 				IconMetrics->iVertSpacing *= Dpi;
-				IconMetrics->iHorzSpacing /= USER_DEFAULT_SCREEN_DPI;
-				IconMetrics->iVertSpacing /= USER_DEFAULT_SCREEN_DPI;
+				IconMetrics->iHorzSpacing /= SystemDpi;
+				IconMetrics->iVertSpacing /= SystemDpi;
 			}
 
 			return Success;
@@ -98,16 +116,38 @@ BOOL WINAPI SystemParametersInfoForDpi(
 				NonClientMetrics->iMenuHeight			*= Dpi;
 				NonClientMetrics->iPaddedBorderWidth	*= Dpi;
 
-				NonClientMetrics->iBorderWidth			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iScrollWidth			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iScrollHeight			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iCaptionWidth			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iCaptionHeight		/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iSmCaptionWidth		/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iSmCaptionHeight		/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iMenuWidth			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iMenuHeight			/= USER_DEFAULT_SCREEN_DPI;
-				NonClientMetrics->iPaddedBorderWidth	/= USER_DEFAULT_SCREEN_DPI;
+				NonClientMetrics->lfCaptionFont.lfWidth		*= Dpi;
+				NonClientMetrics->lfCaptionFont.lfHeight	*= Dpi;
+				NonClientMetrics->lfMenuFont.lfWidth		*= Dpi;
+				NonClientMetrics->lfMenuFont.lfHeight		*= Dpi;
+				NonClientMetrics->lfMessageFont.lfWidth		*= Dpi;
+				NonClientMetrics->lfMessageFont.lfHeight	*= Dpi;
+				NonClientMetrics->lfSmCaptionFont.lfWidth	*= Dpi;
+				NonClientMetrics->lfSmCaptionFont.lfHeight	*= Dpi;
+				NonClientMetrics->lfStatusFont.lfWidth		*= Dpi;
+				NonClientMetrics->lfStatusFont.lfHeight		*= Dpi;
+
+				NonClientMetrics->iBorderWidth			/= SystemDpi;
+				NonClientMetrics->iScrollWidth			/= SystemDpi;
+				NonClientMetrics->iScrollHeight			/= SystemDpi;
+				NonClientMetrics->iCaptionWidth			/= SystemDpi;
+				NonClientMetrics->iCaptionHeight		/= SystemDpi;
+				NonClientMetrics->iSmCaptionWidth		/= SystemDpi;
+				NonClientMetrics->iSmCaptionHeight		/= SystemDpi;
+				NonClientMetrics->iMenuWidth			/= SystemDpi;
+				NonClientMetrics->iMenuHeight			/= SystemDpi;
+				NonClientMetrics->iPaddedBorderWidth	/= SystemDpi;
+				
+				NonClientMetrics->lfCaptionFont.lfWidth		/= SystemDpi;
+				NonClientMetrics->lfCaptionFont.lfHeight	/= SystemDpi;
+				NonClientMetrics->lfMenuFont.lfWidth		/= SystemDpi;
+				NonClientMetrics->lfMenuFont.lfHeight		/= SystemDpi;
+				NonClientMetrics->lfMessageFont.lfWidth		/= SystemDpi;
+				NonClientMetrics->lfMessageFont.lfHeight	/= SystemDpi;
+				NonClientMetrics->lfSmCaptionFont.lfWidth	/= SystemDpi;
+				NonClientMetrics->lfSmCaptionFont.lfHeight	/= SystemDpi;
+				NonClientMetrics->lfStatusFont.lfWidth		/= SystemDpi;
+				NonClientMetrics->lfStatusFont.lfHeight		/= SystemDpi;
 			}
 
 			return Success;
diff --git a/Clean_VxKex_NEXT.bat b/Clean_VxKex_NEXT.bat
@@ -0,0 +1,20 @@
+@echo off
+cd /D %~dp0
+rmdir /S /Q ipch
+del /A /F /S /Q *.user *.sdf *.suo *.aps
+
+for /R /D %%f in (x64) do (
+    if not "%%f"=="%cd%\02-Prebuilt DLLs\x64" (
+        rmdir /S /Q "%%f"
+    )
+)
+
+for /R /D %%f in (Debug) do (
+    rmdir /S /Q "%%f"
+)
+
+for /R /D %%f in (Release) do (
+    rmdir /S /Q "%%f"
+)
+
+pause
diff --git a/KexCfg/gui.c b/KexCfg/gui.c
@@ -515,7 +515,7 @@ STATIC VOID OpenSelectedItemProperties(
 	ItemIndex = ListView_GetNextItem(ListViewWindow, -1, LVIS_SELECTED);
 	ProgramFullPath = GetProgramFullPathFromListViewIndex(ItemIndex);
 
-	Success = ShowPropertiesDialog(ProgramFullPath, SW_SHOW);
+	Success = ShowPropertiesDialog(ProgramFullPath, SW_SHOW, FALSE);
 	if (!Success) {
 		ULONG ErrorCode;
 
@@ -969,7 +969,8 @@ STATIC INT_PTR CALLBACK DialogProc(
 
 			ShowPropertiesDialog(
 				GetProgramFullPathFromListViewIndex(ItemIndex),
-				SW_SHOWDEFAULT);
+				SW_SHOWDEFAULT,
+				FALSE);
 		} else {
 			return FALSE;
 		}
diff --git a/KexDll/dllpath.c b/KexDll/dllpath.c
@@ -165,7 +165,7 @@ NTSTATUS KexpAddKex3264ToDllPath(
 	RtlCopyUnicodeString(DllPath, &NewDllPath);
 	
 	Status = KexpPadDllPathToOriginalLength(DllPath, DllPathOriginalLength);
-	ASSERT (NT_SUCCESS(Status));
+	// ASSERT (NT_SUCCESS(Status));
 
 	//
 	// Remove any embedded nulls in the path. Sometimes the system or another
@@ -178,7 +178,8 @@ NTSTATUS KexpAddKex3264ToDllPath(
 		}
 	}
 
-	return Status;
+	// return Status;
+	return STATUS_SUCCESS;
 }
 
 //
diff --git a/KexDll/kexdata.c b/KexDll/kexdata.c
@@ -79,16 +79,16 @@ STATIC NTSTATUS KexpInitializeGlobalConfig(
 	HANDLE KeyHandle;
 	UNICODE_STRING KeyName;
 	OBJECT_ATTRIBUTES ObjectAttributes;
-	ULONG DisableLogging;
+	ULONG EnableLogging;
 
 	ULONG QueryTableNumberOfElements;
 	KEX_RTL_QUERY_KEY_MULTIPLE_VARIABLE_TABLE_ENTRY QueryTable[] = {
-		{RTL_CONSTANT_STRING(L"DisableLogging"), 0, 8, &DisableLogging, REG_RESTRICT_DWORD, 0},
+		{RTL_CONSTANT_STRING(L"EnableLogging"), 0, 8, &EnableLogging, REG_RESTRICT_DWORD, 0},
 		GENERATE_QKMV_TABLE_ENTRY_UNICODE_STRING	(KexDir),
 		GENERATE_QKMV_TABLE_ENTRY_UNICODE_STRING	(LogDir)
 	};
 
-	DisableLogging = 0;
+	EnableLogging = 0;
 
 	//
 	// Open the vxkex HKLM key.
@@ -117,7 +117,7 @@ STATIC NTSTATUS KexpInitializeGlobalConfig(
 		&QueryTableNumberOfElements,
 		0);
 
-	if (DisableLogging) {
+	if (!EnableLogging) {
 		_KexData.Flags |= KEXDATA_FLAG_DISABLE_LOGGING;
 	}
 
@@ -144,15 +144,15 @@ STATIC NTSTATUS KexpInitializeLocalConfig(
 	HANDLE KeyHandle;
 	UNICODE_STRING KeyName;
 	OBJECT_ATTRIBUTES ObjectAttributes;
-	ULONG DisableLogging;
+	ULONG EnableLogging;
 
 	ULONG QueryTableNumberOfElements;
 	KEX_RTL_QUERY_KEY_MULTIPLE_VARIABLE_TABLE_ENTRY QueryTable[] = {
-		{RTL_CONSTANT_STRING(L"DisableLogging"), 0, 8, &DisableLogging, REG_RESTRICT_DWORD, 0},
+		{RTL_CONSTANT_STRING(L"EnableLogging"), 0, 8, &EnableLogging, REG_RESTRICT_DWORD, 0},
 		GENERATE_QKMV_TABLE_ENTRY_UNICODE_STRING	(LogDir)
 	};
 
-	DisableLogging = _KexData.Flags & KEXDATA_FLAG_DISABLE_LOGGING;
+	EnableLogging = !(_KexData.Flags & KEXDATA_FLAG_DISABLE_LOGGING);
 
 	Status = RtlOpenCurrentUser(KEY_ENUMERATE_SUB_KEYS, &CurrentUserKeyHandle);
 	if (!NT_SUCCESS(Status)) {
@@ -186,7 +186,7 @@ STATIC NTSTATUS KexpInitializeLocalConfig(
 		&QueryTableNumberOfElements,
 		0);
 
-	if (DisableLogging) {
+	if (!EnableLogging) {
 		_KexData.Flags |= KEXDATA_FLAG_DISABLE_LOGGING;
 	} else {
 		_KexData.Flags &= ~KEXDATA_FLAG_DISABLE_LOGGING;
diff --git a/KexGui/shprops.c b/KexGui/shprops.c
@@ -6,13 +6,15 @@
 
 KEXGDECLSPEC BOOLEAN KEXGAPI ShowPropertiesDialog(
 	IN	PCWSTR	FilePath,
-	IN	INT		ShowControl)
+	IN	INT		ShowControl,
+	IN	BOOL	NoErrorBox)
 {
 	SHELLEXECUTEINFO ShellExecuteInfo;
 
 	RtlZeroMemory(&ShellExecuteInfo, sizeof(ShellExecuteInfo));
 	ShellExecuteInfo.cbSize	= sizeof(ShellExecuteInfo);
 	ShellExecuteInfo.fMask	= SEE_MASK_INVOKEIDLIST | SEE_MASK_NOASYNC | SEE_MASK_UNICODE;
+	if (NoErrorBox) ShellExecuteInfo.fMask |= SEE_MASK_FLAG_NO_UI;
 	ShellExecuteInfo.hwnd	= KexgApplicationMainWindow;
 	ShellExecuteInfo.lpVerb	= L"properties";
 	ShellExecuteInfo.lpFile	= FilePath;
diff --git a/KexShlEx/ckxshlex.c b/KexShlEx/ckxshlex.c
@@ -186,8 +186,6 @@ HRESULT STDMETHODCALLTYPE CKexShlEx_Initialize(
 		// Get the path to the file that the .LNK points to.
 		//
 
-		/*
-
 		Result = GetTargetFromLnkfile(This->ExeFullPath);
 		if (FAILED(Result)) {
 			return Result;
@@ -206,17 +204,26 @@ HRESULT STDMETHODCALLTYPE CKexShlEx_Initialize(
 			return Result;
 		}
 
-		*/
-
 		//
 		// If it's not .EXE or .MSI, we won't display a property page.
 		//
 
-		if (!StringEqualI(FileExtension, L".EXE") &&
-			!StringEqualI(FileExtension, L".MSI")) {
+		if (StringEqualI(FileExtension, L".EXE") ||
+			StringEqualI(FileExtension, L".MSI")) {
+				
+			WCHAR WinDir[MAX_PATH];
+			WCHAR KexDir[MAX_PATH];
+			
+			GetWindowsDirectory(WinDir, ARRAYSIZE(WinDir));
+			unless (!KxCfgGetKexDir(KexDir, ARRAYSIZE(KexDir)) ||
+				PathIsPrefix(WinDir, This->ExeFullPath) ||
+				PathIsPrefix(KexDir, This->ExeFullPath)) {
+				ShowPropertiesDialog(This->ExeFullPath, SW_SHOW, TRUE);
+			}
 
-			return E_NOTIMPL;
 		}
+
+		return E_NOTIMPL;
 	}
 
 	return S_OK;
diff --git a/KxCfgHlp/logging.c b/KxCfgHlp/logging.c
@@ -32,12 +32,12 @@ KXCFGDECLSPEC BOOLEAN KXCFGAPI KxCfgQueryLoggingSettings(
 	}
 
 	if (IsEnabled != NULL) {
-		ULONG DisableLogging;
+		ULONG EnableLogging;
 
-		ErrorCode = RegReadI32(VxKexUserKeyHandle, NULL, L"DisableLogging", &DisableLogging);
+		ErrorCode = RegReadI32(VxKexUserKeyHandle, NULL, L"EnableLogging", &EnableLogging);
 		ASSERT (ErrorCode == ERROR_SUCCESS || ErrorCode == ERROR_FILE_NOT_FOUND);
 
-		*IsEnabled = !DisableLogging;
+		*IsEnabled = !!EnableLogging;
 	}
 
 	if (LogDir != NULL) {
@@ -90,7 +90,7 @@ KXCFGDECLSPEC BOOLEAN KXCFGAPI KxCfgConfigureLoggingSettings(
 	}
 
 	try {
-		ErrorCode = RegWriteI32(VxKexUserKeyHandle, NULL, L"DisableLogging", !Enabled);
+		ErrorCode = RegWriteI32(VxKexUserKeyHandle, NULL, L"EnableLogging", Enabled);
 		ASSERT (ErrorCode == ERROR_SUCCESS);
 
 		if (ErrorCode != ERROR_SUCCESS) {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@ HRESULT WINAPI Ext_CoCreateInstance(`
`11`	`11`	`OUT LPVOID *ppv)`
`12`	`12`	`{`
`13`	`13`	`unless (KexData->IfeoParameters.DisableAppSpecific){`
`14`		`- if (AshExeBaseNameIs(L"firefox.exe")) {`
	`14`	`+ if (AshExeBaseNameIs(L"firefox.exe")`
	`15`	`+ \|\| AshExeBaseNameIs(L"thunderbird.exe")`
	`16`	`+ \|\| AshExeBaseNameIs(L"betterbird.exe")`
	`17`	`+ \|\| AshExeBaseNameIs(L"librewolf.exe")) {`
`15`	`18`	`if ((IsEqualCLSID(rclsid, &CLSID_DestinationList) && pUnkOuter == NULL && dwClsContext == CLSCTX_INPROC_SERVER && IsEqualIID(riid, &IID_ICustomDestinationList)) \|\| (pUnkOuter == NULL && dwClsContext == CLSCTX_INPROC_SERVER && IsEqualIID(riid, &IID_IObjectCollection))) return E_NOTIMPL;`
`16`	`19`	`}`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ NTSTATUS KexpAddKex3264ToDllPath(`
`165`	`165`	`RtlCopyUnicodeString(DllPath, &NewDllPath);`
`166`	`166`
`167`	`167`	`Status = KexpPadDllPathToOriginalLength(DllPath, DllPathOriginalLength);`
`168`		`- ASSERT (NT_SUCCESS(Status));`
	`168`	`+ // ASSERT (NT_SUCCESS(Status));`
`169`	`169`
`170`	`170`	`//`
`171`	`171`	`// Remove any embedded nulls in the path. Sometimes the system or another`
`@@ -178,7 +178,8 @@ NTSTATUS KexpAddKex3264ToDllPath(`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`- return Status;`
	`181`	`+ // return Status;`
	`182`	`+ return STATUS_SUCCESS;`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`//`