From 383ea7d92bf1e38a042f7b130f9f4ee00c1a827e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20S=C5=82abo=C5=84?= Date: Tue, 6 Oct 2020 16:39:14 +0200 Subject: [PATCH] [BOOTDATA][FONTS] Add vgaoem.fon font (#3272) Converted from the XFree vga.bdf font. This is needed for Vista+ x64 Winload. ReactOS x64 now boots with Vista x64 Winload out of the box (like Windows Server 2003 x64). Tested with winload.exe from Vista x64 RTM (6.0.6000.16386) and winload.efi from Server 2008 x64 Beta 3 (6.0.6001.16497). --- boot/bootdata/hivesys.inf | 1 + media/fonts/CMakeLists.txt | 1 + media/fonts/doc/vgaoem/LICENSE.txt | 23 +++++++++++++++++++++++ media/fonts/vgaoem.fon | Bin 0 -> 5728 bytes 4 files changed, 25 insertions(+) create mode 100644 media/fonts/doc/vgaoem/LICENSE.txt create mode 100644 media/fonts/vgaoem.fon diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index eea43abf7a1..5e201a59a71 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -992,6 +992,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","28606",0x00000000,"c_28606 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","ACP",0x00000000,"1252" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMCP",0x00000000,"437" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","MACCP",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMHAL",0x00000000,"vgaoem.fon" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","932",2,"F040-F9FC" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","936",2,"AAA1-AFFE,F8A1-FEFE,A140-A7A0" diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index ef0284283c6..2bb1a844709 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -65,6 +65,7 @@ list(APPEND FONT_FILES verdanaz.ttf verdanai.ttf verdana.ttf + vgaoem.fon wingding.ttf) foreach(item ${FONT_FILES}) diff --git a/media/fonts/doc/vgaoem/LICENSE.txt b/media/fonts/doc/vgaoem/LICENSE.txt new file mode 100644 index 00000000000..23fa07a5fe1 --- /dev/null +++ b/media/fonts/doc/vgaoem/LICENSE.txt @@ -0,0 +1,23 @@ +Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. \ No newline at end of file diff --git a/media/fonts/vgaoem.fon b/media/fonts/vgaoem.fon new file mode 100644 index 0000000000000000000000000000000000000000..25c7544dd180fff359f7b8d5061d56806a91b897 GIT binary patch literal 5728 zcmchbO^9396@c%!jyzH2@ucn#tgm2ShLf1$z)i>UZwXdr#AnWv}Mb zd*_~W?mhSKyr=nf>FCsyQtB{_$4Y(4Rm!{i`}@Bhpq@F^nNk0E{p+{Boch(*Z+&+2 z*4^~w<=Z!wuY8`qc4cYl_PzAg#q{zYmeRMD(w9E|H2wMQ>x)N|KM5QD=!4g$9y;kS z?k2kalt|uHHT96sv;?XnJ>(1yA67>m=xTLbO{>ePb6PWP>*iE(Dm!=ifisuukqm(Hi1Mf&Wy^l2>9%Zqo<#M@G8 zN?lg!(BF&pFMy6=UO_K&7M!+ zSiW`l+RfiziP}o3GM^Of>GIbp)?!v=rx}zQuSq|YCf(@b0z>$J_g!PBjHgxY@U&_| z3);|uF7#mlLrA_ht=@zT;9s6q{z(1JE}pbLE%zz~uN{2>E*C_)LUP=hA4pbZ`9 zLLUY&gya$YAp?0RLJ6u+gC?|~4ISu09|kaleMJPcPYS4rhw4noC=)(YpkUWMzWFQYkC_xo!(1aGWp#xp$ z!vKbmoW&n9kcT3apb9l;LJQi^fiCo607FQ=fj?v*4@D?J6>89g7PO%QUFgFAhLHRb z{*Zw@6rluFs6i82(1s3lp$`KXLh{G>Lk99tgc4Mt22E%|8#>U1J`7+8$>aD#2J%pZ z5>%lksi+vfZr8f#yyt$p!mZLMMD@z!{}wL2bLSt)-+spn>mo(z|($3?GD z*xlXryn@wxg$B-%Of@E+(T;W5ee#43r0Cj0<^A_7#$8uFdGys+kDgfl$;8Z?t3Ar9 zX`xV|6g)aG@`ayW$Wrd?JvH+EYxl2FZtOl=Hx-_@RoE?TS^Ed;Pxtmm`+HBbYq7 zB13)0+7#$t*?1Ug^qkiQKCNp+^1OQRc)gxTJPhh?1doH1mn{eOg&^nqxs`3!Yejpr zG-Z9`zOdEBOPQLim(sU2i3;wXq>9 zW(>XDDs55h`qTqs9@sXK6NN+~;g&ZwSMYlyLOyByM=Zvxm_AoV4k&gzjPN&OHufC9 zKyZ4wZ{VL=wSk+Jh{AWWn;#t>vzBo7ipXv7QdJh6jM(UDKgH-wD^f*8{QS?#gp4F0 zWB-aBP?sJ5%E*PvV@A0C*d9=|?~Afh@%N2>RJnR{^=A2M#m<+N%jLb8|4tB8@XvA_-Z2Qk%jCQ_>WIfj++V#-m zlO}9@R==@RPt8aRS}$X?{h=@CQi;&N(I`#CD^2TS+qaVM4xGpv8ylnNzKt*NIgNED z-N-VRdJgRPN5Ml`yvJ_;70hwTX02Y4!S3Yd!hBUQ$0wE2dRa}=?*I5E+h()z#A0n$ zQ}yt?s;A|$%r=`KY@r^o0o?q}(UXt4J>Ozf4>$x)pYyMm^%~jvMZY5Ey?RQgaN74* zq+=w?5&nIc3f>$2pZSGcuVE*n1P} ziL;v6A3Zf8lWivC9C>xZUeO~q&o>GE=yV*Rm!Zr%U2lnR^}UEy;r$sw5FK$1FLoYF;3Zxk|K0G;qiL*O3S>L$jgwtvuJt0*W3SR zZ-*}Fh%$2mjc7e@Q+9|nWvmq+VOL?#}wpNOCR6+2%@flIi$zk=^C#Ggj; zI-pEbT2BVzue|QYrz_z1)WJ*|<+Ry_L;-xU1xU1-9N@PPrRv652a|r`Ok0UTAOQ zd&iAOU*E}Ih`QqLLUvOBQibhnyRmwCz(2IN`p{n6y^QR2JmaW6+fHcj{9XK7X8aTV z&CiGNy75^%bBT@D)?YZ_AGT-W@ea=K!SxE~PyYyteYyBt)!u<}>_D-06XB|r?aj^2 zZS#Jv(?1DT|O@5Nf20y_X)?29`B#{5zaNW&i%aY#9**R(JKryu@odV}xTV18&Stj!ugUFGH^sH^z1P_PBx82}0T~?EApigX literal 0 HcmV?d00001