Tera TermRevision: 9329
https://osdn.net/projects/ttssh2/scm/svn/commits/9329
Author: zmatsuo
Date: 2021-07-03 13:08:03 +0900 (Sat, 03 Jul 2021)
Log Message:
-----------
DrawTextW() を layer_for_unicode に追加
- 存在したが利用されていなかった
Modified Paths:
--------------
trunk/teraterm/common/layer_for_unicode/.gitignore
trunk/teraterm/common/layer_for_unicode/symbol_list.txt
trunk/teraterm/common/layer_for_unicode.cpp
trunk/teraterm/common/layer_for_unicode.h
-------------- next part --------------
Modified: trunk/teraterm/common/layer_for_unicode/.gitignore
===================================================================
--- trunk/teraterm/common/layer_for_unicode/.gitignore 2021-07-03 04:07:52 UTC (rev 9328)
+++ trunk/teraterm/common/layer_for_unicode/.gitignore 2021-07-03 04:08:03 UTC (rev 9329)
@@ -1,3 +1,5 @@
Makefile
*.asm
*.obj
+list_asm.cmake
+list_obj.cmake
Modified: trunk/teraterm/common/layer_for_unicode/symbol_list.txt
===================================================================
--- trunk/teraterm/common/layer_for_unicode/symbol_list.txt 2021-07-03 04:07:52 UTC (rev 9328)
+++ trunk/teraterm/common/layer_for_unicode/symbol_list.txt 2021-07-03 04:08:03 UTC (rev 9329)
@@ -15,6 +15,7 @@
user32 DialogBoxIndirectParamW ＠ 20
user32 SetWindowLongW ＠ 12
user32 GetWindowLongW ＠ 8
+user32 DrawTextW ＠ 20
kernel32 GetFileAttributesW ＠ 4
kernel32 GetModuleFileNameW ＠ 12
Modified: trunk/teraterm/common/layer_for_unicode.cpp
===================================================================
--- trunk/teraterm/common/layer_for_unicode.cpp 2021-07-03 04:07:52 UTC (rev 9328)
+++ trunk/teraterm/common/layer_for_unicode.cpp 2021-07-03 04:08:03 UTC (rev 9329)
@@ -364,15 +364,9 @@
* @param[in] cchText \x95\xB6\x8E\x9A\x90\x94(-1\x82̂Ƃ\xABlpchText\x82̕\xB6\x8E\x9A\x97\xF1\x92\xB7)
* @param[in] lprc \x95\\x8E\xA6rect
* @param[in] format
- *
- * TODO:9x\x8Cn\x82\xC5DrawTextW\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x8D삷\x82\xE9?
*/
int WINAPI _DrawTextW(HDC hdc, LPCWSTR lpchText, int cchText, LPRECT lprc, UINT format)
{
- if (IsWindowsNTKernel()) {
- return DrawTextW(hdc, lpchText, cchText, lprc, format);
- }
-
int strW_len = (cchText == -1) ? 0 : cchText;
size_t strA_len;
char *strA = _WideCharToMultiByte(lpchText, strW_len, CP_ACP, &strA_len);
Modified: trunk/teraterm/common/layer_for_unicode.h
===================================================================
--- trunk/teraterm/common/layer_for_unicode.h 2021-07-03 04:07:52 UTC (rev 9328)
+++ trunk/teraterm/common/layer_for_unicode.h 2021-07-03 04:08:03 UTC (rev 9329)
@@ -102,7 +102,6 @@
int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance,
LPVOID lpParam);
ATOM WINAPI _RegisterClassW(const WNDCLASSW *lpWndClass);
-int WINAPI _DrawTextW(HDC hdc, LPCWSTR lpchText, int cchText, LPRECT lprc, UINT format);
int WINAPI _MessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
BOOL WINAPI _InsertMenuW(HMENU hMenu, UINT uPosition, UINT uFlags, UINT_PTR uIDNewItem, LPCWSTR lpNewItem);
BOOL WINAPI _AppendMenuW(HMENU hMenu, UINT uFlags, UINT_PTR uIDNewItem, LPCWSTR lpNewItem);
@@ -113,6 +112,7 @@
LONG_PTR WINAPI _SetWindowLongPtrW(HWND hWnd, int nIndex, LONG_PTR dwNewLong);
LONG_PTR WINAPI _GetWindowLongPtrW(HWND hWnd, int nIndex);
LRESULT WINAPI _CallWindowProcW(WNDPROC lpPrevWndFunc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+int WINAPI _DrawTextW(HDC hdc, LPCWSTR lpchText, int cchText, LPRECT lprc, UINT format);
// kernel32.dll
DWORD WINAPI _GetFileAttributesW(LPCWSTR lpFileName);