diff --git a/WeaselDeployer/resource.h b/WeaselDeployer/resource.h index fd0195f1b..02c4dee38 100644 Binary files a/WeaselDeployer/resource.h and b/WeaselDeployer/resource.h differ diff --git a/WeaselUI/StandardLayout.cpp b/WeaselUI/StandardLayout.cpp index 5229c4b39..b4f0878dc 100644 --- a/WeaselUI/StandardLayout.cpp +++ b/WeaselUI/StandardLayout.cpp @@ -25,7 +25,7 @@ void weasel::StandardLayout::GetTextSizeDW( lpSize->cy = 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 307f6f92a..3a40f51c7 100644 Binary files a/include/resource.h and b/include/resource.h differ