From 2ca5a5282d52d006eaccdb6f004239a1fa66e52d Mon Sep 17 00:00:00 2001 From: cc Date: Tue, 11 Jun 2024 23:37:38 +0800 Subject: [PATCH] correct file encoding --- WeaselDeployer/resource.h | Bin 5250 -> 2624 bytes WeaselUI/StandardLayout.cpp | 4 ++-- include/VersionHelpers.hpp | 8 ++++---- include/resource.h | Bin 3124 -> 1561 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WeaselDeployer/resource.h b/WeaselDeployer/resource.h index fd0195f1b6d66500525c6d2a846a6712b2c49feb..02c4dee38fe369040b8c0864744dd36fb222cdfb 100644 GIT binary patch literal 2624 zcmZ{mUvJtl6vf{s?K@c7u1LOq*zXRz)sf8Bho|L+@V9Tt_i|hA zm&fvvthW!Fr^k}4)|>Kuy`VV2*WaGWyj&j2O;-Ng?4Ha0`~5?8_w}nckL7B;Es4x{ z$QP0uO`?C-T{H`G!JJS~pE3(!LnfIrckMztLa^+?Se}k)RoGFEw^Cvp`*oAG# znbfzI<>HK7F6cFav*6~^^Lwb)3Gbyom0Pc%*Ppt|0Q-d!F%oc^jJmL_asnSNKi$2e z3GKoec*Q*wuGyW)h4x(*l#z7~%CN0{h^s%)Bd#8J0NDtheGzwTdPv?xyAoJZG|F2u)Ce?E?xG#Mh~@zHw5w z>C*%y*ucWtmURowLosVBrzuMC44;$>J<(>~wgOF2f&s&9fpIIo2)lxF;T)2tX(aASxwYd~!tTD*9Els+JIFlZa~g@eQf59Vm!xWWZUYnWOmr@28j0JnnFtI!QLUllNZc@HLS;iAr{hT6{;Pih zj>O&ACI*d2$FaEUy&Quh30lF8%>p+C9vpNWNw6L?)#h~frqfm6MkK)rcdltDyn>EV zf;_b8DcS7zP9)&-XoQSD)0uGG%Bh##;{|BsG!J*exB8wT;VQ!sK2~^ur<#aGKfY!i z(8y~Jo+$&PzuJ3)(*kH@HqE_nDq)c0-MJzOhAj ztYDeZY7yKb|7?`I98LjN2Y9W@Z+Wz=&J#4KfUbx0%M_N2Fk`AX8;efJ3(QRpCwqoj pl3d^1M77~<%Uh#*I33Z>P`QZ1^N7AQ^hF(0xqV!(;7Qy6{{e4weP93p literal 5250 zcmb7|(NEhj5XSF$(*B1^dz=Oo*w`LRTc9GeUDKBJDS|>LCIl0u8`HFZecSi>TI{B| z#3+htyUEYz^LJ;*|Nd^vw*1D`m7ZkMlD715cU`F~P3fSP${$>>N^&-p zQTZRqA5AjHOKu1LJ;LZ4sI?<|sKXaFnSM^;>5dFBe@V+KKN6BZnKmnV zi1|uDV=pmGrPpN-{;(8BKWjXx9=t`>C6enVnKrkal7}eK<6Ydxu$=zx!XtJMB-^S> zod!w z<-Dc7PV$E+a;Onivi6dqKlZ`dXv^p4zDTyCJM?oA`5a6}k+;;BNVa1zBx|%n;V#aDna)OEOQsKT5fsxZKIcy = 0; return; } - // 创建文本布局 + // 鍒涘缓鏂囨湰甯冨眬 if (pTextFormat != NULL) { if (_style.layout_type == UIStyle::LAYOUT_VERTICAL_TEXT) hr = pDWR->CreateTextLayout(text.c_str(), (int)nCount, pTextFormat.Get(), @@ -43,7 +43,7 @@ void weasel::StandardLayout::GetTextSizeDW( pDWR->SetLayoutReadingDirection(DWRITE_READING_DIRECTION_TOP_TO_BOTTOM); pDWR->SetLayoutFlowDirection(flow); } - // 获取文本尺寸 + // 鑾峰彇鏂囨湰灏哄 DWRITE_TEXT_METRICS textMetrics; hr = pDWR->GetLayoutMetrics(&textMetrics); sz = D2D1::SizeF(ceil(textMetrics.widthIncludingTrailingWhitespace), diff --git a/include/VersionHelpers.hpp b/include/VersionHelpers.hpp index 9d667adb8..30f8c038b 100644 --- a/include/VersionHelpers.hpp +++ b/include/VersionHelpers.hpp @@ -9,16 +9,16 @@ typedef __success(return >= 0) LONG NTSTATUS; inline BOOL GetVersionEx2(LPOSVERSIONINFOW lpVersionInformation) { - HMODULE hNtDll = GetModuleHandleW(L"NTDLL"); // 获取ntdll.dll的句柄 - typedef NTSTATUS(NTAPI* tRtlGetVersion)(PRTL_OSVERSIONINFOW povi); // RtlGetVersion的原型 + HMODULE hNtDll = GetModuleHandleW(L"NTDLL"); // 鑾峰彇ntdll.dll鐨勫彞鏌 + typedef NTSTATUS(NTAPI* tRtlGetVersion)(PRTL_OSVERSIONINFOW povi); // RtlGetVersion鐨勫師鍨 tRtlGetVersion pRtlGetVersion = NULL; if (hNtDll) { - pRtlGetVersion = (tRtlGetVersion)GetProcAddress(hNtDll, "RtlGetVersion"); // 获取RtlGetVersion地址 + pRtlGetVersion = (tRtlGetVersion)GetProcAddress(hNtDll, "RtlGetVersion"); // 鑾峰彇RtlGetVersion鍦板潃 } if (pRtlGetVersion) { - return pRtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation) >= 0; // 调用RtlGetVersion + return pRtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation) >= 0; // 璋冪敤RtlGetVersion } return FALSE; } diff --git a/include/resource.h b/include/resource.h index 307f6f92a7abb77276e641c37677cdbb695aa3c5..3a40f51c74221a14a326a29867cc11345eba5a60 100644 GIT binary patch literal 1561 zcmaKsU2obj6o&6B^*>nJWu=m=-PfgS8)D(unLp^*jYYwkGDSfmun$%J@3SeaHYMdI zQu3TP$9WECG+IM zrdzhVl>>Fty6b&`>HY18zu?|2de>?-zTPaugUgF|D_1w20~AwxPoN?Uoc-llmcoRe z<@Pu8EKlL@#arfTM}+;B`QD0n8F2Q z<6-zy499KQ0&<?UW4sV0so>-o?F&PC z;xfi5R~j;gsXV?S;EBx`H;PCk_?S*&JnG_~0KP-2QSf~&^G!@bZHDRhw_<#>;l0+JA{nwn) z!$byrP!kiANKrUNz`dsZhT`te7WiGX*tJ{mYtimp59;*>bnZ7;Km2sdZGTu;P3zEhpc!l|%_65wSDK%>RMQv*^$- qFcPI#g;RDvo6)+9ajvCcC%9jvXKCLgIgJM3d6T+s)zrTI!}T9Y?u8uy literal 3124 zcmbW3U2obj6o$|Br2U6TyPP!Ewfnkc5NK5hEP;024QeS&ovK#q$F^$PU*Gn;4pyOX z(t@lgw&OfLetnL8{{5|4&3;od>)FVfmRg@D3$@G|wnwY5Ka}V8jIlLKtZQdBwkx}| zYo4jy(04%JwcXmWozrUAOG;wjY+@HYSM=ZTKBe!Bo-w0tX-#NP={cwNYHo%hta9{; z-7)5n)^X@Nw*mIF7<~mL+NAf3z!Oa~CRpC&8S!swb^b}ML+{hemc6D_k)_kqdG{kl z-l`;jwcU-$Zz{=o(4mJS&9!Eb&D$@e;b{BuUm{j%}}=^X8FuKdzD%wwgXwkj~0(!o@5<7@yOLA($}}W!A_@U;;u%zA2pusEv(KVcOMYv`H{Zk?x;uKg|1lbV|9DU>T-@q_v6x|%U252 zP+WDw37jvjBGUcX^ytHIj^`-fW1bfN({|~8e0p@<5d(_W&}OE2y<O(iqdj#%QHEiHzi%CqIau#^nxf-dL<+WK_z(F3F{mkTw0}eQ785oo{2tUI$N6)>nGW z8KX;Df}(v^JYeloSlOfE=78Eht8dQzaZ&M)^iwXPcV#X+ ezYABfOC_}z)m-T!cD!Ykv!9YjPiN{cw*LdytcMx^