Skip to content

Commit 41f5063

Browse files
hiyohiyohiyohiyo
committed
- Fixed Priscilla files
- Fixed manifest
1 parent ecccb9c commit 41f5063

26 files changed

+6522
-29
lines changed

‎DeclareDPIAware.manifest

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
2-
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
1+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
32
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
43
<application>
54
<!-- Windows Vista -->
@@ -14,10 +13,10 @@
1413
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
1514
</application>
1615
</compatibility>
17-
<application xmlns="urn:schemas-microsoft-com:asm.v3">
18-
<windowsSettings>
19-
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
16+
<asmv3:application>
17+
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
18+
<dpiAware>True/PM</dpiAware>
2019
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
21-
</windowsSettings>
22-
</application>
23-
</assembly>
20+
</asmv3:windowsSettings>
21+
</asmv3:application>
22+
</assembly>

‎DiskBench.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ BOOL Init(void* dlg)
359359
#elif _M_ARM64
360360
DiskSpdExe.Format(L"%s\\%s", temp, DISK_SPD_EXE_ARM64);
361361
#elif _M_X64
362-
if(Is8orLater())
362+
if(IsWin8orLater())
363363
{
364364
DiskSpdExe.Format(L"%s\\%s", temp, DISK_SPD_EXE_64);
365365
}

‎DiskMark.vcxproj

+20-20
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
<OutputFile>..\Cecile\DiskMark.exe</OutputFile>
475475
</Link>
476476
<Manifest>
477-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
477+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
478478
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
479479
</Manifest>
480480
</ItemDefinitionGroup>
@@ -510,7 +510,7 @@
510510
<TargetMachine>MachineX64</TargetMachine>
511511
</Link>
512512
<Manifest>
513-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
513+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
514514
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
515515
</Manifest>
516516
</ItemDefinitionGroup>
@@ -544,7 +544,7 @@
544544
</DataExecutionPrevention>
545545
</Link>
546546
<Manifest>
547-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
547+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
548548
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
549549
</Manifest>
550550
</ItemDefinitionGroup>
@@ -578,7 +578,7 @@
578578
</DataExecutionPrevention>
579579
</Link>
580580
<Manifest>
581-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
581+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
582582
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
583583
</Manifest>
584584
</ItemDefinitionGroup>
@@ -620,7 +620,7 @@
620620
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions>
621621
</Link>
622622
<Manifest>
623-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
623+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
624624
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
625625
</Manifest>
626626
</ItemDefinitionGroup>
@@ -662,7 +662,7 @@
662662
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions>
663663
</Link>
664664
<Manifest>
665-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
665+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
666666
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
667667
</Manifest>
668668
</ItemDefinitionGroup>
@@ -704,7 +704,7 @@
704704
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions>
705705
</Link>
706706
<Manifest>
707-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
707+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
708708
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
709709
</Manifest>
710710
</ItemDefinitionGroup>
@@ -746,7 +746,7 @@
746746
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions>
747747
</Link>
748748
<Manifest>
749-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
749+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
750750
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
751751
</Manifest>
752752
</ItemDefinitionGroup>
@@ -788,7 +788,7 @@
788788
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions>
789789
</Link>
790790
<Manifest>
791-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
791+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
792792
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
793793
</Manifest>
794794
</ItemDefinitionGroup>
@@ -827,7 +827,7 @@
827827
<OutputFile>..\Cecile\$(ProjectName)A64S.exe</OutputFile>
828828
</Link>
829829
<Manifest>
830-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
830+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
831831
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
832832
</Manifest>
833833
</ItemDefinitionGroup>
@@ -866,7 +866,7 @@
866866
<OutputFile>..\Cecile\$(ProjectName)A32S.exe</OutputFile>
867867
</Link>
868868
<Manifest>
869-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
869+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
870870
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
871871
</Manifest>
872872
</ItemDefinitionGroup>
@@ -906,7 +906,7 @@
906906
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions>
907907
</Link>
908908
<Manifest>
909-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
909+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
910910
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
911911
</Manifest>
912912
</ItemDefinitionGroup>
@@ -945,7 +945,7 @@
945945
<OutputFile>..\Cecile\$(ProjectName)A64S_UWP.exe</OutputFile>
946946
</Link>
947947
<Manifest>
948-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
948+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
949949
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
950950
</Manifest>
951951
</ItemDefinitionGroup>
@@ -984,7 +984,7 @@
984984
<OutputFile>..\Cecile\$(ProjectName)A32S_UWP.exe</OutputFile>
985985
</Link>
986986
<Manifest>
987-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
987+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
988988
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
989989
</Manifest>
990990
</ItemDefinitionGroup>
@@ -1026,7 +1026,7 @@
10261026
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions>
10271027
</Link>
10281028
<Manifest>
1029-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1029+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
10301030
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
10311031
</Manifest>
10321032
</ItemDefinitionGroup>
@@ -1065,7 +1065,7 @@
10651065
<OutputFile>..\Cecile\$(ProjectName)A64.exe</OutputFile>
10661066
</Link>
10671067
<Manifest>
1068-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1068+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
10691069
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
10701070
</Manifest>
10711071
</ItemDefinitionGroup>
@@ -1104,7 +1104,7 @@
11041104
<OutputFile>..\Cecile\$(ProjectName)A32.exe</OutputFile>
11051105
</Link>
11061106
<Manifest>
1107-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1107+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
11081108
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
11091109
</Manifest>
11101110
</ItemDefinitionGroup>
@@ -1144,7 +1144,7 @@
11441144
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions>
11451145
</Link>
11461146
<Manifest>
1147-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1147+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
11481148
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
11491149
</Manifest>
11501150
</ItemDefinitionGroup>
@@ -1183,7 +1183,7 @@
11831183
<OutputFile>..\Cecile\$(ProjectName)A64_UWP.exe</OutputFile>
11841184
</Link>
11851185
<Manifest>
1186-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1186+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
11871187
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
11881188
</Manifest>
11891189
</ItemDefinitionGroup>
@@ -1222,7 +1222,7 @@
12221222
<OutputFile>..\Cecile\$(ProjectName)A32_UWP.exe</OutputFile>
12231223
</Link>
12241224
<Manifest>
1225-
<AdditionalManifestFiles>DeclareDPIAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
1225+
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
12261226
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
12271227
</Manifest>
12281228
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)