Skip to content

Commit 8eb3bc1

Browse files
hiyohiyohiyohiyo
committed
CrystalDiskMark 8.0.5
- Added Aoi Edition - Improved OS version acquisition function
1 parent 94d0d10 commit 8eb3bc1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2143
-953
lines changed

‎AboutDlg.cpp

+64-27
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#include "stdafx.h"
@@ -43,7 +43,7 @@ CAboutDlg::~CAboutDlg()
4343
void CAboutDlg::DoDataExchange(CDataExchange* pDX)
4444
{
4545
CDialogFx::DoDataExchange(pDX);
46-
DDX_Control(pDX, IDC_CRYSTAL_DEW_WORLD, m_CtrlCrystalDewWorld);
46+
DDX_Control(pDX, IDC_LOGO, m_CtrlLogo);
4747

4848
DDX_Control(pDX, IDC_PROJECT_SITE_1, m_CtrlProjectSite1);
4949
DDX_Control(pDX, IDC_PROJECT_SITE_2, m_CtrlProjectSite2);
@@ -81,7 +81,7 @@ BOOL CAboutDlg::OnInitDialog()
8181
}
8282

8383
BEGIN_MESSAGE_MAP(CAboutDlg, CDialogFx)
84-
ON_BN_CLICKED(IDC_CRYSTAL_DEW_WORLD, &CAboutDlg::OnCrystalDewWorld)
84+
ON_BN_CLICKED(IDC_LOGO, &CAboutDlg::OnLogo)
8585
ON_BN_CLICKED(IDC_LICENSE, &CAboutDlg::OnLicense)
8686
ON_BN_CLICKED(IDC_VERSION, &CAboutDlg::OnVersion)
8787
#ifdef SUISHO_SHIZUKU_SUPPORT
@@ -103,60 +103,97 @@ void CAboutDlg::UpdateDialogSize()
103103
SetClientSize(SIZE_X, SIZE_Y, m_ZoomRatio);
104104
UpdateBackground(TRUE, m_bDarkMode);
105105

106-
#ifdef TSUKUMO_TOKKA_SUPPORT
107-
m_CtrlCrystalDewWorld.InitControl(20, 20, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
108-
m_CtrlProjectSite1.ShowWindow(SW_HIDE);
109-
m_CtrlProjectSite2.ShowWindow(SW_HIDE);
110-
m_CtrlProjectSite3.ShowWindow(SW_HIDE);
111-
m_CtrlProjectSite4.ShowWindow(SW_HIDE);
112-
m_CtrlProjectSite5.ShowWindow(SW_HIDE);
106+
#ifdef SUISHO_AOI_SUPPORT
107+
m_CtrlLogo.InitControl(32, 484, 128, 144, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
108+
m_CtrlSecretVoice.InitControl(392, 288, 60, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
109+
m_CtrlProjectSite1.InitControl(184, 508, 148, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
110+
m_CtrlProjectSite2.InitControl(244, 540, 108, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
111+
m_CtrlProjectSite3.InitControl(232, 556, 180, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
112+
m_CtrlProjectSite4.InitControl(244, 576, 120, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
113+
m_CtrlProjectSite5.InitControl(0, 0, 0, 0, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
114+
m_CtrlSecretVoice.SetHandCursor();
115+
m_CtrlProjectSite1.SetHandCursor();
116+
m_CtrlProjectSite2.SetHandCursor();
117+
m_CtrlProjectSite3.SetHandCursor();
118+
m_CtrlProjectSite4.SetHandCursor();
119+
m_CtrlProjectSite5.SetHandCursor();
120+
121+
#elif MSI_MEI_SUPPORT
122+
m_CtrlProjectSite1.InitControl(24, 476, 348, 128, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
123+
m_CtrlProjectSite2.InitControl(168, 632, 36, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
124+
m_CtrlProjectSite3.InitControl(332, 632, 104, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
125+
m_CtrlProjectSite4.InitControl(20, 20, 120, 40, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
126+
m_CtrlProjectSite5.InitControl(460, 632, 168, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
127+
m_CtrlLogo.InitControl(80, 64, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
128+
m_CtrlProjectSite1.SetHandCursor();
129+
m_CtrlProjectSite2.SetHandCursor();
130+
m_CtrlProjectSite3.SetHandCursor();
131+
m_CtrlProjectSite4.SetHandCursor();
132+
m_CtrlProjectSite5.SetHandCursor();
133+
113134
#elif SUISHO_SHIZUKU_SUPPORT
114135
m_CtrlProjectSite1.InitControl(64, 372, 140, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
115136
m_CtrlProjectSite2.InitControl(64, 416, 148, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
116137
m_CtrlProjectSite3.InitControl(64, 432, 184, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
117138
m_CtrlProjectSite4.InitControl(40, 460, 208, 16, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
118139
m_CtrlProjectSite5.InitControl(92, 504, 432, 124, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
119-
m_CtrlCrystalDewWorld.InitControl(80, 12, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
140+
m_CtrlLogo.InitControl(80, 12, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
120141
m_CtrlProjectSite1.SetHandCursor();
121142
m_CtrlProjectSite2.SetHandCursor();
122143
m_CtrlProjectSite3.SetHandCursor();
123144
m_CtrlProjectSite4.SetHandCursor();
124145
m_CtrlProjectSite5.SetHandCursor();
125146
#else
126-
m_CtrlCrystalDewWorld.InitControl(12, 12, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
147+
m_CtrlLogo.InitControl(12, 12, 128, 128, m_ZoomRatio, &m_BkDC, IP(L"Logo"), 1, BS_CENTER, OwnerDrawImage, FALSE, FALSE, FALSE);
127148
m_CtrlProjectSite1.ShowWindow(SW_HIDE);
128149
m_CtrlProjectSite2.ShowWindow(SW_HIDE);
129150
m_CtrlProjectSite3.ShowWindow(SW_HIDE);
130151
m_CtrlProjectSite4.ShowWindow(SW_HIDE);
131152
m_CtrlProjectSite5.ShowWindow(SW_HIDE);
132153
#endif
133154

134-
m_CtrlCrystalDewWorld.SetHandCursor();
155+
m_CtrlLogo.SetHandCursor();
135156

136-
m_CtrlVersion.SetFontEx(m_FontFace, 22, 22, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_BOLD, m_FontRender);
137-
m_CtrlEdition.SetFontEx(m_FontFace, 22, 22, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_BOLD, m_FontRender);
138-
m_CtrlRelease.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_NORMAL, m_FontRender);
139-
m_CtrlCopyright1.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_NORMAL, m_FontRender);
140-
m_CtrlCopyright2.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_NORMAL, m_FontRender);
141-
m_CtrlLicense.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, RGB(0, 0, 0), FW_NORMAL, m_FontRender);
157+
#ifdef MSI_MEI_SUPPORT
158+
COLORREF fontColor = RGB(255, 255, 255);
159+
#else
160+
COLORREF fontColor = RGB(0, 0, 0);
161+
#endif
162+
163+
m_CtrlVersion.SetFontEx(m_FontFace, 22, 22, m_ZoomRatio, m_FontRatio, fontColor, FW_BOLD, m_FontRender);
164+
m_CtrlEdition.SetFontEx(m_FontFace, 22, 22, m_ZoomRatio, m_FontRatio, fontColor, FW_BOLD, m_FontRender);
165+
m_CtrlRelease.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, fontColor, FW_NORMAL, m_FontRender);
166+
m_CtrlCopyright1.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, fontColor, FW_NORMAL, m_FontRender);
167+
m_CtrlCopyright2.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, fontColor, FW_NORMAL, m_FontRender);
168+
m_CtrlLicense.SetFontEx(m_FontFace, 16, 16, m_ZoomRatio, m_FontRatio, fontColor, FW_NORMAL, m_FontRender);
142169

143170
m_CtrlVersion.SetHandCursor();
144171
m_CtrlLicense.SetHandCursor();
145172

146-
#ifdef TSUKUMO_TOKKA_SUPPORT
147-
m_CtrlVersion.InitControl(152, 12, 476, 28, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
148-
m_CtrlEdition.InitControl(152, 40, 476, 28, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
149-
m_CtrlRelease.InitControl(152, 72, 476, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
150-
m_CtrlCopyright1.InitControl(152, 96, 476, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
151-
m_CtrlCopyright2.InitControl(152, 116, 476, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
152-
m_CtrlLicense.InitControl(152, 136, 476, 20, m_ZoomRatio, & m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
173+
#ifdef SUISHO_AOI_SUPPORT
174+
m_CtrlVersion.InitControl(0, 152, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
175+
m_CtrlEdition.InitControl(0, 180, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
176+
m_CtrlRelease.InitControl(0, 216, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
177+
m_CtrlCopyright1.InitControl(0, 236, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
178+
m_CtrlCopyright2.InitControl(0, 256, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
179+
m_CtrlLicense.InitControl(0, 276, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
180+
181+
#elif MSI_MEI_SUPPORT
182+
m_CtrlVersion.InitControl(0, 204, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
183+
m_CtrlEdition.InitControl(0, 232, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
184+
m_CtrlRelease.InitControl(0, 268, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
185+
m_CtrlCopyright1.InitControl(0, 288, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
186+
m_CtrlCopyright2.InitControl(0, 308, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
187+
m_CtrlLicense.InitControl(0, 328, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
188+
153189
#elif SUISHO_SHIZUKU_SUPPORT
154190
m_CtrlVersion.InitControl(0, 152, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
155191
m_CtrlEdition.InitControl(0, 180, 288, 28, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
156192
m_CtrlRelease.InitControl(0, 216, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
157193
m_CtrlCopyright1.InitControl(0, 236, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
158194
m_CtrlCopyright2.InitControl(0, 256, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
159195
m_CtrlLicense.InitControl(0, 276, 288, 20, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, FALSE, FALSE, FALSE);
196+
160197
#else
161198
m_CtrlVersion.InitControl(140, 12, 340, 28, m_ZoomRatio, &m_BkDC, NULL, 0, BS_CENTER, OwnerDrawTransparent, m_bHighContrast, m_bDarkMode, FALSE);
162199
m_CtrlEdition.InitControl(140, 40, 340, 28, m_ZoomRatio, &m_BkDC, NULL, 0, SS_CENTER, OwnerDrawTransparent, m_bHighContrast, m_bDarkMode, FALSE);
@@ -169,7 +206,7 @@ void CAboutDlg::UpdateDialogSize()
169206
Invalidate();
170207
}
171208

172-
void CAboutDlg::OnCrystalDewWorld()
209+
void CAboutDlg::OnLogo()
173210
{
174211
if (GetUserDefaultLCID() == 0x0411)// Japanese
175212
{

‎AboutDlg.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#pragma once
@@ -14,7 +14,10 @@ class CAboutDlg : public CDialogFx
1414
{
1515
DECLARE_DYNCREATE(CAboutDlg)
1616

17-
#ifdef SUISHO_SHIZUKU_SUPPORT
17+
#ifdef SUISHO_AOI_SUPPORT
18+
static const int SIZE_X = 640;
19+
static const int SIZE_Y = 640;
20+
#elif SUISHO_SHIZUKU_SUPPORT
1821
static const int SIZE_X = 640;
1922
static const int SIZE_Y = 660;
2023
#else
@@ -34,7 +37,7 @@ class CAboutDlg : public CDialogFx
3437
virtual void UpdateDialogSize();
3538

3639
DECLARE_MESSAGE_MAP()
37-
afx_msg void OnCrystalDewWorld();
40+
afx_msg void OnLogo();
3841
afx_msg void OnVersion();
3942
afx_msg void OnLicense();
4043
afx_msg void OnProjectSite1();
@@ -43,7 +46,7 @@ class CAboutDlg : public CDialogFx
4346
afx_msg void OnProjectSite4();
4447
afx_msg void OnProjectSite5();
4548

46-
CButtonFx m_CtrlCrystalDewWorld;
49+
CButtonFx m_CtrlLogo;
4750
CButtonFx m_CtrlSecretVoice;
4851
CButtonFx m_CtrlProjectSite1;
4952
CButtonFx m_CtrlProjectSite2;

‎DiskBench.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#include "stdafx.h"
@@ -33,7 +33,7 @@ static BOOL MixMode;
3333
static int MixRatio;
3434

3535
static void ShowErrorMessage(CString message);
36-
static void Interval(UINT time, void* dlg);
36+
static void Interval(void* dlg);
3737

3838
static BOOL Init(void* dlg);
3939
static void DiskSpd(void* dlg, DISK_SPD_CMD cmd);
@@ -116,7 +116,7 @@ void ShowErrorMessage(CString message)
116116
LocalFree( lpMessageBuffer );
117117
}
118118

119-
VOID Interval(void* dlg)
119+
void Interval(void* dlg)
120120
{
121121
int intervalTime = ((CDiskMarkDlg*) dlg)->m_IntervalTime;
122122
CString title;

‎DiskBench.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#pragma once

‎DiskMark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#include "stdafx.h"

‎DiskMark.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Author : hiyohiyo
33
// Mail : [email protected]
44
// Web : https://crystalmark.info/
5-
// License : The MIT License
5+
// License : MIT License
66
/*---------------------------------------------------------------------------*/
77

88
#pragma once

‎DiskMark.rc

+29-26
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
123123
CAPTION "CrystalDiskMark"
124124
FONT 8, "MS Shell Dlg", 400, 0, 0x1
125125
BEGIN
126-
PUSHBUTTON "",IDC_CRYSTAL_DEW_WORLD,26,17,156,107
126+
PUSHBUTTON "",IDC_LOGO,26,17,156,107
127127
PUSHBUTTON "",IDC_VERSION,240,18,193,8
128128
LTEXT "",IDC_EDITION,241,38,33,8
129129
LTEXT "",IDC_RELEASE,239,62,33,8
@@ -212,8 +212,8 @@ END
212212
//
213213

214214
VS_VERSION_INFO VERSIONINFO
215-
FILEVERSION 8,0,4,0
216-
PRODUCTVERSION 8,0,4,0
215+
FILEVERSION 8,0,5,0
216+
PRODUCTVERSION 8,0,5,0
217217
FILEFLAGSMASK 0x3fL
218218
#ifdef _DEBUG
219219
FILEFLAGS 0x1L
@@ -228,27 +228,31 @@ BEGIN
228228
BEGIN
229229
BLOCK "041103a4"
230230
BEGIN
231-
VALUE "FileVersion", "8.0.4.0"
232-
VALUE "ProductVersion", "8.0.4.0"
231+
VALUE "FileVersion", "8.0.5.0"
232+
VALUE "ProductVersion", "8.0.5.0"
233233
VALUE "OriginalFilename", "DiskMark.exe"
234234
VALUE "InternalName", "DiskMark.exe"
235-
VALUE "Comments", "https://crystalmark.info/, The MIT License"
235+
VALUE "Comments", "https://crystalmark.info/, MIT License"
236236
VALUE "CompanyName", "Crystal Dew World"
237-
#ifdef SUISHO_SHIZUKU_SUPPORT
238-
#ifdef TSUKUMO_TOKKA_SUPPORT
239-
VALUE "FileDescription", "CrystalDiskMark 8 Tsukumo Tokka Edition"
240-
VALUE "ProductName", "CrystalDiskMark 8 Tsukumo Tokka Edition"
241-
VALUE "LegalCopyright", "(C) 2007-2021 hiyohiyo, (C) 2021 AURYN/TSUKUMO"
242-
#else
243-
VALUE "FileDescription", "CrystalDiskMark 8 Shizuku Edition"
244-
VALUE "ProductName", "CrystalDiskMark 8 Shizuku Edition"
245-
VALUE "LegalCopyright", "(C) 2007-2021 hiyohiyo, (C) 2012-2021 kirino kasumu"
246-
#endif
237+
238+
#ifdef SUISHO_AOI_SUPPORT
239+
VALUE "FileDescription", "CrystalDiskMark Aoi Edition"
240+
VALUE "ProductName", "CrystalDiskMark Aoi Edition"
241+
VALUE "LegalCopyright", "(C) 2007-2024 hiyohiyo, (C) 2023-2024 nijihashi sola"
242+
#elif MSI_MEI_SUPPORT
243+
VALUE "FileDescription", "CrystalDiskMark MSI Mei Mihoshi Edition"
244+
VALUE "ProductName", "CrystalDiskMark MSI Mei Mihoshi Edition"
245+
VALUE "LegalCopyright", "(C) 2007-2024 hiyohiyo, (C) 2024 Micro-Star INT'L CO., LTD."
246+
#elif SUISHO_SHIZUKU_SUPPORT
247+
VALUE "FileDescription", "CrystalDiskMark Shizuku Edition"
248+
VALUE "ProductName", "CrystalDiskMark Shizuku Edition"
249+
VALUE "LegalCopyright", "(C) 2007-2024 hiyohiyo, (C) 2012-2024 kirino kasumu"
247250
#else
248-
VALUE "FileDescription", "CrystalDiskMark 8"
249-
VALUE "ProductName", "CrystalDiskMark 8"
250-
VALUE "LegalCopyright", "(C) 2007-2021 hiyohiyo"
251+
VALUE "FileDescription", "CrystalDiskMark"
252+
VALUE "ProductName", "CrystalDiskMark"
253+
VALUE "LegalCopyright", "(C) 2007-2024 hiyohiyo"
251254
#endif
255+
252256
END
253257
END
254258
BLOCK "VarFileInfo"
@@ -372,11 +376,7 @@ BEGIN
372376
POPUP "&Help"
373377
BEGIN
374378
MENUITEM "Help", ID_HELP
375-
#ifdef TSUKUMO_TOKKA_SUPPORT
376-
MENUITEM "Tokka [Web]", ID_CRYSTALDEWWORLD
377-
#else
378379
MENUITEM "Crystal Dew World [Web]", ID_CRYSTALDEWWORLD
379-
#endif
380380
MENUITEM SEPARATOR
381381
MENUITEM "About CrystalDiskMark", ID_ABOUT
382382
END
@@ -401,9 +401,12 @@ END
401401

402402
// Icon with lowest ID value placed first to ensure application icon
403403
// remains consistent on all systems.
404-
#ifdef TSUKUMO_TOKKA_SUPPORT
405-
IDR_MAINFRAME ICON "res\\DiskMarkT.ico"
406-
IDI_TRAY_ICON ICON "res\\DiskMarkT16.ico"
404+
#ifdef SUISHO_AOI_SUPPORT
405+
IDR_MAINFRAME ICON "res\\DiskMarkA.ico"
406+
IDI_TRAY_ICON ICON "res\\DiskMarkA16.ico"
407+
#elif MSI_MEI_SUPPORT
408+
IDR_MAINFRAME ICON "res\\DiskMarkM.ico"
409+
IDI_TRAY_ICON ICON "res\\DiskMarkM16.ico"
407410
#elif SUISHO_SHIZUKU_SUPPORT
408411
IDR_MAINFRAME ICON "res\\DiskMarkS.ico"
409412
IDI_TRAY_ICON ICON "res\\DiskMarkS16.ico"

0 commit comments

Comments
 (0)