per-app group setting is back.

Author: git

directwrite.cpp

@@ -1399,7 +1399,7 @@ bool hookDirectWrite(IUnknown ** factory)	//此函数需要改进以判断是否
 		HOOK(pDWriteFactory, CreateGlyphRunAnalysis, 23);
 		HOOK(pDWriteFactory, GetGdiInterop, 17);
 		const CGdippSettings* pSettings = CGdippSettings::GetInstance();
-		if (pSettings->GetFontSubstitutesInfoForDW().GetSize())
+		if (pSettings->GetFontSubstitutesInfo().GetSize())
 			hookFontCreation(pDWriteFactory);
 		MyDebug(L"DW1 hooked");
 
@@ -1514,8 +1514,12 @@ void HookD2DDll()
 #ifdef DEBUG
 	MessageBox(0, L"HookD2DDll", NULL, MB_OK);
 #endif
-	HMODULE d2d1 = LoadLibrary(_T("d2d1.dll"));
-	HMODULE dw = LoadLibrary(_T("dwrite.dll"));
+	HMODULE d2d1 = GetModuleHandle(_T("d2d1.dll"));
+	if (!d2d1)
+		d2d1 = LoadLibrary(_T("d2d1.dll"));
+	HMODULE dw = GetModuleHandle(_T("dwrite.dll"));
+	if (!dw)
+		dw = LoadLibrary(_T("dwrite.dll"));
 	void* D2D1Factory = GetProcAddress(d2d1, "D2D1CreateFactory");
 	void* D2D1Device = GetProcAddress(d2d1, "D2D1CreateDevice");
 	void* D2D1Context = GetProcAddress(d2d1, "D2D1CreateDeviceContext");
@@ -1612,7 +1616,7 @@ HRESULT WINAPI IMPL_CreateFontFace(IDWriteFont* self,
 		if (FAILED(g_pGdiInterop->ConvertFontFaceToLOGFONT(*fontFace, &lf)))
 			return ret;
 		const CGdippSettings* pSettings = CGdippSettings::GetInstance();
-		if (pSettings->CopyForceFontForDW(lf, lf))
+		if (pSettings->CopyForceFont(lf, lf))
 		{
 			IDWriteFont* writefont = NULL;
 			if (FAILED(g_pGdiInterop->CreateFontFromLOGFONT(&lf, &writefont)))
@@ -1631,7 +1635,7 @@ bool SubstituteDWriteFont3(__out IDWriteFontFace3** fontFace3)
 	if (FAILED(g_pGdiInterop->ConvertFontFaceToLOGFONT(*fontFace3, &lf)))
 		return false;
 	const CGdippSettings* pSettings = CGdippSettings::GetInstance();
-	if (pSettings->CopyForceFontForDW(lf, lf))
+	if (pSettings->CopyForceFont(lf, lf))
 	{
 		CComPtr<IDWriteFont> writefont;
 		if (FAILED(g_pGdiInterop->CreateFontFromLOGFONT(&lf, &writefont)))
@@ -1686,7 +1690,7 @@ HRESULT  WINAPI IMPL_CreateTextFormat(IDWriteFactory* self,
 	LOGFONT lf = { 0 };
 	StringCchCopy(lf.lfFaceName, LF_FACESIZE, fontFamilyName);
 	const CGdippSettings* pSettings = CGdippSettings::GetInstance();
-	if (pSettings->CopyForceFontForDW(lf, lf))
+	if (pSettings->CopyForceFont(lf, lf))
 		return ORIG_CreateTextFormat(self, lf.lfFaceName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat);
 	else
 		return ORIG_CreateTextFormat(self, fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat);

gdidll.rc

@@ -24,8 +24,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2018,1019,0
- PRODUCTVERSION 1,2018,1019,0
+ FILEVERSION 1,2018,1107,0
+ PRODUCTVERSION 1,2018,1107,0
  FILEFLAGSMASK 0x8L
 #ifdef _DEBUG
  FILEFLAGS 0xbL
@@ -43,13 +43,13 @@ BEGIN
             VALUE "Comments", "Portions of this software are copyright (c) 2005-2017 The FreeType Project (www.freetype.org). All rights reserved."
             VALUE "CompanyName", "2ch & THEMEX"
             VALUE "FileDescription", "The Ultimate Font Rasterizer with Infinality patch"
-            VALUE "FileVersion", "1.2018.1019.0"
+            VALUE "FileVersion", "1.2018.1107.0"
             VALUE "InternalName", "MacType"
             VALUE "LegalCopyright", "(C) 460, 168, Higambana, 555 and sy567. All rights reserved. FlyingSnow republished"
             VALUE "OriginalFilename", "MacType.dll"
             VALUE "PrivateBuild", "True"
             VALUE "ProductName", "The Ultimate Font Rasterizer"
-            VALUE "ProductVersion", "1.2018.1019.0"
+            VALUE "ProductVersion", "1.2018.1107.0"
             VALUE "URL", "http://www.mactype.net http://drwatson.nobody.jp/gdi++/"
         END
     END

gdipp.vcxproj

@@ -55,14 +55,14 @@
     <ProjectGuid>{15C33FD9-0811-4981-B08F-E0BAD74A3028}</ProjectGuid>
     <RootNamespace>gdipp</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Infinality|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -72,7 +72,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Infinality|Win32'" Label="Configuration">
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -106,7 +106,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Infinality|x64'" Label="Configuration">
@@ -173,27 +173,31 @@
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName).Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Infinality|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName).Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName)64.Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Infinality|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName)64.Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -215,27 +219,31 @@
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName).Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Infinality|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName).Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName)64.Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Infinality|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <TargetName>$(ProjectName)64.Core</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);D:\Archives\Documents\Visual Studio 2013\Projects\IniParser;D:\Archives\Documents\Visual Studio 2008\Projects\freetype2\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

settings.cpp

@@ -124,13 +124,13 @@ void CGdippSettings::DelayedInit()
 	m_FontSubstitutesInfo.init(m_nFontSubstitutes, arrFontSubstitutes);
 
 	//FontSubstitutesDW
-	CFontSubstitutesIniArray arrFontSubstitutesForDW;
+	/*CFontSubstitutesIniArray arrFontSubstitutesForDW;
 	names = _T("FontSubstitutesDW@") + wstring(m_szexeName);
 	if (_IsFreeTypeProfileSectionExists(names.c_str(), m_szFileName))
 		AddListFromSection(names.c_str(), m_szFileName, arrFontSubstitutesForDW);
 	else
 		AddListFromSection(_T("FontSubstitutesDW"), m_szFileName, arrFontSubstitutesForDW);
-	m_FontSubstitutesInfoForDW.init(m_nFontSubstitutes, arrFontSubstitutesForDW);
+	m_FontSubstitutesInfoForDW.init(m_nFontSubstitutes, arrFontSubstitutesForDW);*/
 
 	names = _T("Individual@") + wstring(m_szexeName);
 	if (_IsFreeTypeProfileSectionExists(names.c_str(), NULL))
@@ -301,8 +301,14 @@ DWORD CGdippSettings::FastGetProfileString(LPCTSTR lpszSection, LPCTSTR lpszKey,
 	}
 	else
 	{
-		StringCchCopy(lpszRet, cch, lpszDefault);
-		return wcslen(lpszDefault);
+		if (lpszDefault) {
+			StringCchCopy(lpszRet, cch, lpszDefault);
+			return wcslen(lpszDefault);
+		}
+		else {
+			lpszRet = NULL;
+			return 0;
+		}
 	}
 }
 
@@ -395,6 +401,7 @@ bool CGdippSettings::LoadAppSettings(LPCTSTR lpszFile)
 		m_Config.LoadFromFile(lpszFile);
 	}
 
+	_GetAlternativeProfileName(m_szexeName, lpszFile);
 	CFontSettings& fs = m_FontSettings;
 	fs.Clear();
 	fs.SetHintingMode(_GetFreeTypeProfileBoundInt(_T("HintingMode"), 0, HINTING_MIN, HINTING_MAX, lpszFile));
@@ -1056,31 +1063,26 @@ const CFontSettings& CGdippSettings::FindIndividual(LPCTSTR lpFaceName) const
 	return GetFontSettings();
 }
 
-bool CGdippSettings::CopyForceFont(LOGFONT& lf, const LOGFONT& lfOrg) const
+int CGdippSettings::_GetAlternativeProfileName(LPTSTR lpszName, LPCTSTR lpszFile)
 {
-	_ASSERTE(m_bDelayedInit);
-	//__asm{ int 3 }
-	GetEnvironmentVariableW(L"MACTYPE_FONTSUBSTITUTES_ENV", NULL, 0);
-	if (GetLastError()!=ERROR_ENVVAR_NOT_FOUND)
-		return false;
-	//&lf == &lfOrgも可
-	bool bForceFont = !!GetForceFontName();
-	BOOL bFontExist = true;
-	const LOGFONT *lplf;
-	if (bForceFont) {
-		lplf = &m_lfForceFont;
-	} else {
-		lplf = GetFontSubstitutesInfo().lookup((LOGFONT&)lfOrg);
-		if (lplf) bForceFont = true;
+	TCHAR szexe[MAX_PATH + 1];
+	TCHAR* pexe = szexe + GetModuleFileName(NULL, szexe, MAX_PATH);
+	while (pexe >= szexe && *pexe != '\\')
+		pexe--;
+	pexe++;
+	wstring exename = _T("General@") + wstring((LPTSTR)pexe);
+	if (FastGetProfileString(exename.c_str(), _T("Alternative"), NULL, lpszName, MAX_PATH))
+	{
+		return true;
 	}
-	if (bForceFont) {
-		memcpy(&lf, &lfOrg, sizeof(LOGFONT)-sizeof(lf.lfFaceName));
-		StringCchCopy(lf.lfFaceName, LF_FACESIZE, lplf->lfFaceName);
+	else
+	{
+		//StringCchCopy(lpszName, MAX_PATH + 1, pexe);
+		return false;
 	}
-	return bForceFont;
 }
 
-bool CGdippSettings::CopyForceFontForDW(LOGFONT& lf, const LOGFONT& lfOrg) const
+bool CGdippSettings::CopyForceFont(LOGFONT& lf, const LOGFONT& lfOrg) const
 {
 	_ASSERTE(m_bDelayedInit);
 	//__asm{ int 3 }
@@ -1094,7 +1096,7 @@ bool CGdippSettings::CopyForceFontForDW(LOGFONT& lf, const LOGFONT& lfOrg) const
 	if (bForceFont) {
 		lplf = &m_lfForceFont;
 	} else {
-		lplf = GetFontSubstitutesInfoForDW().lookup((LOGFONT&)lfOrg);
+		lplf = GetFontSubstitutesInfo().lookup((LOGFONT&)lfOrg);
 		if (lplf) bForceFont = true;
 	}
 	if (bForceFont) {

settings.h

@@ -357,6 +357,7 @@ class CGdippSettings
 	void InitInitTuneTable();
 	static void InitTuneTable(int v, int* table);
 	void DelayedInit();
+	int	_GetAlternativeProfileName(LPTSTR lpszName, LPCTSTR lpszFile);
 
 	CFontLinkInfo m_fontlinkinfo;
 	CFontSubstitutesInfo m_FontSubstitutesInfo;
@@ -432,8 +433,8 @@ class CGdippSettings
 	float ContrastForDW() const { return m_fContrastForDW;  }
 	float ClearTypeLevelForDW() const { return m_fClearTypeLevelForDW;  }
 	int RenderingModeForDW() const { return m_nRenderingModeForDW; }
-	const CFontSubstitutesInfo& GetFontSubstitutesInfoForDW() const
-		{ _ASSERTE(m_bDelayedInit); return m_FontSubstitutesInfoForDW; }
+	/*const CFontSubstitutesInfo& GetFontSubstitutesInfoForDW() const
+		{ _ASSERTE(m_bDelayedInit); return m_FontSubstitutesInfoForDW; }*/
 
 	float RenderWeight() const { return m_fRenderWeight; }
 	float Contrast() const { return m_fContrast; }
@@ -468,7 +469,6 @@ class CGdippSettings
 	}
 
 	bool CopyForceFont(LOGFONT& lf, const LOGFONT& lfOrg) const;
-    bool CopyForceFontForDW(LOGFONT& lf, const LOGFONT& lfOrg) const;
 
 	//それ以外
 	bool IsWinXPorLater() const { return m_bIsWinXPorLater; }