uniformize line endings

This commit is contained in:
namazso 2020-12-06 08:59:02 +01:00
parent 02bb123f21
commit 98f62cb4b1
9 changed files with 1061 additions and 1061 deletions

View File

@ -1,4 +1,4 @@
#include "directwrite.h"
#include "directwrite.h"
#include "settings.h"
#include "dynCodeHelper.h"

216
gdidll.rc
View File

@ -1,108 +1,108 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource."
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Neutral (Sys. Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
#pragma code_page(936)
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2019,523,1
PRODUCTVERSION 1,2019,5,23
FILEFLAGSMASK 0x8L
#ifdef _DEBUG
FILEFLAGS 0xbL
#else
FILEFLAGS 0xaL
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
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"
VALUE "FileVersion", "1.2019.523.1"
VALUE "InternalName", "MacType"
VALUE "LegalCopyright", "(C) 460, 168, Higambana, 555 and sy567. All rights reserved. FlyingSnow republished"
VALUE "OriginalFilename", "MacType.dll"
VALUE "ProductName", "The Ultimate Font Rasterizer"
VALUE "ProductVersion", "1.2019.5.23"
VALUE "URL", "http://www.mactype.net http://drwatson.nobody.jp/gdi++/"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0, 1200
END
END
#endif // Neutral (Sys. Default) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Chinese (Simplified, PRC) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
#pragma code_page(936)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.\0"
END
3 TEXTINCLUDE
BEGIN
"\r\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\0"
END
#endif // APSTUDIO_INVOKED
#endif // Chinese (Simplified, PRC) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
// Microsoft Visual C++ generated resource script.
//
#include "resource."
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Neutral (Sys. Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
#pragma code_page(936)
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2019,523,1
PRODUCTVERSION 1,2019,5,23
FILEFLAGSMASK 0x8L
#ifdef _DEBUG
FILEFLAGS 0xbL
#else
FILEFLAGS 0xaL
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
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"
VALUE "FileVersion", "1.2019.523.1"
VALUE "InternalName", "MacType"
VALUE "LegalCopyright", "(C) 460, 168, Higambana, 555 and sy567. All rights reserved. FlyingSnow republished"
VALUE "OriginalFilename", "MacType.dll"
VALUE "ProductName", "The Ultimate Font Rasterizer"
VALUE "ProductVersion", "1.2019.5.23"
VALUE "URL", "http://www.mactype.net http://drwatson.nobody.jp/gdi++/"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0, 1200
END
END
#endif // Neutral (Sys. Default) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Chinese (Simplified, PRC) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
#pragma code_page(936)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.\0"
END
3 TEXTINCLUDE
BEGIN
"\r\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\0"
END
#endif // APSTUDIO_INVOKED
#endif // Chinese (Simplified, PRC) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Infinality|ARM">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">

View File

@ -493,7 +493,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpReserved)
IsUnload = IsProcessUnload();
bEnableDW = pSettings->DirectWrite();
}
if (!IsUnload) hook_initinternal(); //イサシモヤリオトト」ソ鮴ヘイサラ<EFBDBB>ホコホハツヌ・
if (!IsUnload) hook_initinternal(); //イサシモヤリオトト」ソ鮴ヘイサラ<EFBDBB>ホコホハツヌ・
//5
if (!IsProcessExcluded() && !IsUnload) {
#ifndef _WIN64
@ -567,7 +567,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpReserved)
//delete AACacheFull;
//delete AACache;
// for (int i=0;i<CACHE_SIZE;i++)
// delete g_AACache2[i]; //ヌ蟲<EFBE87>サコエ・
// delete g_AACache2[i]; //ヌ蟲<EFBE87>サコエ・
//free(g_charmapCache);
}
#ifndef DEBUG

View File

@ -1,4 +1,4 @@
HOOK_DEFINE(int, GetObjectW, (__in HANDLE h, __in int c, __out_bcount_opt(c) LPVOID pv))
HOOK_DEFINE(int, GetObjectW, (__in HANDLE h, __in int c, __out_bcount_opt(c) LPVOID pv))
HOOK_DEFINE(int, GetObjectA, (__in HANDLE h, __in int c, __out_bcount_opt(c) LPVOID pv))
HOOK_DEFINE(int, GetTextFaceAliasW, (HDC hdc, int nLen, LPWSTR lpAliasW))
HOOK_DEFINE(BOOL, DeleteObject, ( HGDIOBJ hObject))

View File

@ -568,8 +568,8 @@ SKIP:
INF_INT_ENV( "INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH", 25);
INF_INT_ENV( "INFINALITY_FT_FRINGE_FILTER_STRENGTH", 0);
INF_INT_ENV("INFINALITY_FT_GLOBAL_EMBOLDEN_X_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_BOLD_EMBOLDEN_Y_VALUE", 0);
INF_INT_ENV("INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE", 0);
@ -636,10 +636,10 @@ SKIP:
// [IncludeModule]セクションから対象モジュールリストを読み込む
AddListFromSection(_T("IncludeModule"), lpszFile, m_arrIncludeModule);
//AddListFromSection(_T("IncludeModule"), szMainFile, m_arrIncludeModule);
// [UnloadDLL]ヘ・ォイサシモヤリオトト」ソ・
// [UnloadDLL]ヘ・ォイサシモヤリオトト」ソ・
AddListFromSection(_T("UnloadDLL"), lpszFile, m_arrUnloadModule);
//AddListFromSection(_T("UnloadDLL"), szMainFile, m_arrUnloadModule);
// [ExcludeSub]イサス<EFBDBB>ミラヨフ衫貊サオトト」ソ・
// [ExcludeSub]イサス<EFBDBB>ミラヨフ衫貊サオトト」ソ・
AddListFromSection(L"ExcludeSub", lpszFile, m_arrUnFontSubModule);
//AddListFromSection(L"ExcludeSub", szMainFile, m_arrUnFontSubModule);
//ネ郢鈹ヌナナウ<EFBE85>オトト」ソ鬟ャヤ<EFBDAC>リアユラヨフ衫貊サ
@ -688,7 +688,7 @@ bool CGdippSettings::AddExcludeListFromSection(LPCTSTR lpszSection, LPCTSTR lpsz
LOGFONT truefont={0};
while (*p) {
bool b = false;
GetFontLocalName(p, buff);//ラェササラヨフ蠹・
GetFontLocalName(p, buff);//ラェササラヨフ蠹・
set<wstring>::const_iterator it = arr.find(buff);
if (it==arr.end())
arr.insert(buff);
@ -769,7 +769,7 @@ bool CGdippSettings::AddIndividualFromSection(LPCTSTR lpszSection, LPCTSTR lpszF
argc = token.Parse(value);
}
GetFontLocalName(p, buff);//ラェササラヨフ蠹・
GetFontLocalName(p, buff);//ラェササラヨフ蠹・
CFontIndividual fi(buff);
const CFontSettings& fsCommon = m_FontSettings;
@ -988,7 +988,7 @@ bool CGdippSettings::IsProcessUnload() const
return false;
}
bool CGdippSettings::IsExeUnload(LPCTSTR lpApp) const //シ・鯡ヌキ<EFBE87>レコレテ遧・チミア朗?
bool CGdippSettings::IsExeUnload(LPCTSTR lpApp) const //シ・鯡ヌキ<EFBE87>レコレテ遧・チミア朗?
{
if (m_bRunFromGdiExe) {
return false;
@ -998,14 +998,14 @@ bool CGdippSettings::IsExeUnload(LPCTSTR lpApp) const //
return false;
ModuleHashMap::const_iterator it = m_arrUnloadModule.begin();
for(; it != m_arrUnloadModule.end(); ++it) {
if (!lstrcmpi(lpApp, it->c_str())) { //ニ・ナ菁ナウ<EFBE85>マ・
if (!lstrcmpi(lpApp, it->c_str())) { //ニ・ナ菁ナウ<EFBE85>マ・
return true;
}
}
return false;
}
bool CGdippSettings::IsExeInclude(LPCTSTR lpApp) const //シ・鯡ヌキ<EFBE87>レーラテ遧・チミア朗?
bool CGdippSettings::IsExeInclude(LPCTSTR lpApp) const //シ・鯡ヌキ<EFBE87>レーラテ遧・チミア朗?
{
if (m_bRunFromGdiExe) {
return false;
@ -1015,7 +1015,7 @@ bool CGdippSettings::IsExeInclude(LPCTSTR lpApp) const //
return false;
ModuleHashMap::const_iterator it = m_arrIncludeModule.begin();
for(; it != m_arrIncludeModule.end(); ++it) {
if (!lstrcmpi(lpApp, it->c_str())) { //ニ・ナ菁ナウ<EFBE85>マ・
if (!lstrcmpi(lpApp, it->c_str())) { //ニ・ナ菁ナウ<EFBE85>マ・
return true;
}
}
@ -1232,7 +1232,7 @@ void CFontLinkInfo::init()
LONG rc;
DWORD regtype;
for (int k = 0; ; ++k) { //サ<>テラヨフ螻櫢ミオトヒ<EFBE84>ミラヨフ・
for (int k = 0; ; ++k) { //サ<>テラヨフ螻櫢ミオトヒ<EFBE84>ミラヨフ・
namesz = nBufSize;
valuesz = nBufSize;
rc = RegEnumValue(h2, k, name, &namesz, 0, &regtype, (LPBYTE)value, &valuesz); //エモラヨフ螻櫢ミムーユメ
@ -1248,7 +1248,7 @@ void CFontLinkInfo::init()
}
while (buf[wcslen(buf)-1] == L' ')
buf[wcslen(buf)-1] = 0;
//サ<>テオトカヤモヲオトラヨフ蠹・
//サ<>テオトカヤモヲオトラヨフ蠹・
FontNameCache.Add(value, buf);
}
@ -1269,7 +1269,7 @@ void CFontLinkInfo::init()
TCHAR buff[LF_FACESIZE];
GetFontLocalName(name, buff);
info[row][col] = _wcsdup(buff); //オレメサマ﨩ェラヨフ蠹・
info[row][col] = _wcsdup(buff); //オレメサマ﨩ェラヨフ蠹・
++col;
for (LPCWSTR linep = value; col < FONTMAX && *linep; linep += wcslen(linep) + 1) {
@ -1293,7 +1293,7 @@ void CFontLinkInfo::init()
if (rc == ERROR_NO_MORE_ITEMS) break;
if (rc != ERROR_SUCCESS) break;
if (regtype != REG_SZ) continue;
if (lstrcmpi(value2, linep) != 0) continue; //ムーユメラヨフ蠱エスモヨミラヨフ衾トシ<EFBE84>カヤモヲオトラヨフ蠹・
if (lstrcmpi(value2, linep) != 0) continue; //ムーユメラヨフ蠱エスモヨミラヨフ衾トシ<EFBE84>カヤモヲオトラヨフ蠹・
StringCchCopyW(buf, sizeof(buf)/sizeof(buf[0]), name);
if (buf[wcslen(buf) - 1] == L')') { //ネ・オ<EFBDA5>ィコナ
@ -1317,7 +1317,7 @@ void CFontLinkInfo::init()
if (valp) {
GetFontLocalName((TCHAR*)valp, buff);;
//StringCchCopy(truefont.lfFaceName, LF_FACESIZE, buff); //クエヨニオスス盪ケヨミ
//pSettings->CopyForceFont(truefont, truefont); //サ<>テフ貊サラヨフ・
//pSettings->CopyForceFont(truefont, truefont); //サ<>テフ貊サラヨフ・
info[row][col] = _wcsdup(buff);//truefont.lfFaceName); //クエヨニオスチエスモア櫢ミ
++col;
}
@ -1328,11 +1328,11 @@ void CFontLinkInfo::init()
} else {
/*if (sOsVinfo.dwMajorVersion>=6 && sOsVinfo.dwMinorVersion>=1) //ー豎セコナ>=6.1」ャハヌWin7マオチミ
{
//カヤラヨフ蠱エスモア櫤<EFBDB1><EFBFBD>ヲタ・
//カヤラヨフ蠱エスモア櫤<EFBDB1><EFBFBD>ヲタ・
LPWSTR swapbuff[32];
memcpy(swapbuff, info[row], 32*sizeof(LPWSTR)); //ユ鄕<EFBE95>昤エヨニケ<EFBE86>タエ
for (int i=1; i<col; i++)
info[row][i]=swapbuff[col-i]; //ト賻<EFBE84>ヨフ蠱エスモア・
info[row][i]=swapbuff[col-i]; //ト賻<EFBE84>ヨフ蠱エスモア・
}*/
++row;
}
@ -1348,20 +1348,20 @@ void CFontLinkInfo::init()
extern HFONT g_alterGUIFont;
const CGdippSettings* pSettings = CGdippSettings::GetInstance();
if (pSettings->FontSubstitutes()>=SETTING_FONTSUBSTITUTE_SAFE && pSettings->CopyForceFont(truefont, syslf)) //ハケモテヘ・ォフ貊サト」ハスハア」ャフ貊サオ<EFBDBB>オヘウラヨフ・
if (pSettings->FontSubstitutes()>=SETTING_FONTSUBSTITUTE_SAFE && pSettings->CopyForceFont(truefont, syslf)) //ハケモテヘ・ォフ貊サト」ハスハア」ャフ貊サオ<EFBDBB>オヘウラヨフ・
{
WCHAR envname[30] = L"MT_SYSFONT";
WCHAR envvalue[30] = { 0 };
HFONT tempfont;
if (GetEnvironmentVariable(L"MT_SYSFONT", envvalue, 29) && GetObjectType(tempfont = (HFONT)wcstoull(envvalue, 0 ,10)) == OBJ_FONT)//メムセュモミラヨフ蟠贇レ
{
g_alterGUIFont = tempfont; //ヨアスモハケモテマネヌーオトラヨフ・
g_alterGUIFont = tempfont; //ヨアスモハケモテマネヌーオトラヨフ・
}
else
{
g_alterGUIFont = CreateFontIndirectW(&truefont); //エエスィメサク<EFBDBB>ツオトフ貊サラヨフ・
g_alterGUIFont = CreateFontIndirectW(&truefont); //エエスィメサク<EFBDBB>ツオトフ貊サラヨフ・
_ui64tow((ULONG_PTR)g_alterGUIFont, envvalue, 10); //ラェササホェラヨキ逸ョ
SetEnvironmentVariable(envname, envvalue); //ミエネ・キセウア菽?
SetEnvironmentVariable(envname, envvalue); //ミエネ・キセウア菽?
}
}
@ -1585,13 +1585,13 @@ CFontSubstitutesInfo::initini(const CFontSubstitutesIniArray& iniarray)
/* StringCchCopy(truefont.lfFaceName, LF_FACESIZE, buf);
truefont.lfCharSet=DEFAULT_CHARSET;
if (!GetFontLocalName(truefont))
continue; //テサモミエヒラヨフ・
continue; //テサモミエヒラヨフ・
buff = truefont.lfFaceName;
StringCchCopy(truefont2.lfFaceName, LF_FACESIZE, vp);
truefont2.lfCharSet=DEFAULT_CHARSET;
if (!GetFontLocalName(truefont2))
continue; //テサモミエヒラヨフ・
continue; //テサモミエヒラヨフ・
buff2 = truefont2.lfFaceName;
if (m_mfontsub.find(buff)==m_mfontsub.end())
@ -1634,7 +1634,7 @@ CFontSubstitutesInfo::lookup(LOGFONT& lf) const
k.m_bCharSet = true;
k.m_lf = lf;
TCHAR * buff; //ソ・ルサ<EFBE99>テラヨフ蠏トユ賁オテ﨤?
TCHAR * buff; //ソ・ルサ<EFBE99>テラヨフ蠏トユ賁オテ﨤?
LOGFONT mylf(lf);
if (!(buff = FontNameCache.Find((TCHAR*)lf.lfFaceName)))
{

1844
settings.h

File diff suppressed because it is too large Load Diff