Tera TermRevision: 7394
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7394
Author: zmatsuo
Date: 2019-01-17 23:02:15 +0900 (Thu, 17 Jan 2019)
Log Message:
-----------
ソースの文字コードを揃えた
Shift_JIS
Modified Paths:
--------------
branches/cmake/teraterm/common/compat_win.h
branches/cmake/teraterm/common/dlglib_cpp.cpp
branches/cmake/teraterm/common/tmfc_frame.cpp
branches/cmake/teraterm/teraterm/teraterml.h
branches/cmake/teraterm/teraterm/ttutil.c
branches/cmake/teraterm/teraterm/ttutil.h
branches/cmake/teraterm/ttpcmn/ttcmn_notify.c
branches/cmake/teraterm/ttpdlg/ttdlg.h
branches/cmake/teraterm/ttpmacro/ttl_gui.h
branches/cmake/teraterm/ttptek/tttek.h
-------------- next part --------------
Modified: branches/cmake/teraterm/common/compat_win.h
===================================================================
--- branches/cmake/teraterm/common/compat_win.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/common/compat_win.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,70 +1,70 @@
-/*
- * (C) 2018 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* compat_win */
-
-#pragma once
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(DPI_AWARENESS_CONTEXT_SYSTEM_AWARE)
-#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2)
-#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3)
-#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4)
-DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
-#endif
-
-#if !defined(WM_DPICHANGED)
-#define WM_DPICHANGED 0x02E0
-#endif
-
-#if 0
-// BLENDFUNCTIONと同一
-typedef struct _BGBLENDFUNCTION
-{
- BYTE BlendOp;
- BYTE BlendFlags;
- BYTE SourceConstantAlpha;
- BYTE AlphaFormat;
-}BGBLENDFUNCTION;
-#endif
-extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
-extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
-extern DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
-extern UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
-extern BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
-
-void WinCompatInit();
-
-#ifdef __cplusplus
-}
-#endif
+/*
+ * (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* compat_win */
+
+#pragma once
+
+#include <windows.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(DPI_AWARENESS_CONTEXT_SYSTEM_AWARE)
+#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2)
+#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3)
+#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4)
+DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
+#endif
+
+#if !defined(WM_DPICHANGED)
+#define WM_DPICHANGED 0x02E0
+#endif
+
+#if 0
+// BLENDFUNCTION\x82Ɠ\xAF\x88\xEA
+typedef struct _BGBLENDFUNCTION
+{
+ BYTE BlendOp;
+ BYTE BlendFlags;
+ BYTE SourceConstantAlpha;
+ BYTE AlphaFormat;
+}BGBLENDFUNCTION;
+#endif
+extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
+extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+extern DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
+extern UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
+extern BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
+
+void WinCompatInit();
+
+#ifdef __cplusplus
+}
+#endif
Modified: branches/cmake/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/cmake/teraterm/common/dlglib_cpp.cpp 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/common/dlglib_cpp.cpp 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2005-2018 TeraTerm Project
* All rights reserved.
*
@@ -31,7 +31,7 @@
#include <windows.h>
#include "dlglib.h"
-// ダイアログモーダル状態の時、OnIdle()を実行する
+// \x83_\x83C\x83A\x83\x8D\x83O\x83\x82\x81[\x83_\x83\x8B\x8F\xF3\x91Ԃ̎\x9E\x81AOnIdle()\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
//#define ENABLE_CALL_IDLE_MODAL 1
extern BOOL CallOnIdle(LONG lCount);
@@ -56,26 +56,26 @@
for (;;)
{
if (!IsWindow(hDlgWnd)) {
- // ウインドウが閉じられた
+ // \x83E\x83C\x83\x93\x83h\x83E\x82\xAA\x95\xB6\x82\xE7\x82ꂽ
return IDCANCEL;
}
#if defined(_DEBUG)
if (!IsWindowVisible(hDlgWnd)) {
- // 誤ってEndDialog()が使われた? -> TTEndDialog()を使うこと
+ // \x8C\xEB\x82\xC1\x82\xC4EndDialog()\x82\xAA\x8Eg\x82\xED\x82ꂽ? -> TTEndDialog()\x82\xF0\x8Eg\x82\xA4\x82\xB1\x82\xC6
::ShowWindow(hDlgWnd, SW_SHOWNORMAL);
}
#endif
if (data->EndDialogFlag) {
- // TTEndDialog()が呼ばれた
+ // TTEndDialog()\x82\xAA\x8CĂꂽ
return data->DlgResult;
}
if(!::PeekMessage(&Msg, NULL, NULL, NULL, PM_NOREMOVE))
{
- // メッセージがない
- // OnIdel() を処理する
+ // \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82Ȃ\xA2
+ // OnIdel() \x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
if (!CallOnIdle(lIdleCount++)) {
- // Idle処理がなくなった
+ // Idle\x8F\x88\x97\x9D\x82\xAA\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD
lIdleCount = 0;
Sleep(10);
}
@@ -83,7 +83,7 @@
}
else
{
- // メッセージがある
+ // \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82\xA0\x82\xE9
// pump message
BOOL quit = !::GetMessage(&Msg, NULL, NULL, NULL);
@@ -94,7 +94,7 @@
}
if (!::IsDialogMessage(hDlgWnd, &Msg)) {
- // ダイアログ以外の処理
+ // \x83_\x83C\x83A\x83\x8D\x83O\x88ȊO\x82̏\x88\x97\x9D
::TranslateMessage(&Msg);
::DispatchMessage(&Msg);
}
@@ -101,7 +101,7 @@
}
}
- // ここには来ない
+ // \x82\xB1\x82\xB1\x82ɂ͗\x88\x82Ȃ\xA2
return IDOK;
}
#endif
@@ -118,10 +118,10 @@
}
if (data == NULL) {
- // WM_INITDIALOGよりも前は設定されていない
+ // WM_INITDIALOG\x82\xE6\x82\xE8\x82\xE0\x91O\x82͐ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2
data = TTDialogTmpData;
} else {
- // TTEndDialog()が呼ばれたとき、DWLP_USER が参照できない
+ // TTEndDialog()\x82\xAA\x8CĂꂽ\x82Ƃ\xAB\x81ADWLP_USER \x82\xAA\x8EQ\x8FƂł\xAB\x82Ȃ\xA2
TTDialogTmpData = data;
}
@@ -142,7 +142,7 @@
}
/**
- * EndDialog() 互換関数
+ * EndDialog() \x8C݊\xB7\x8A\x94
*/
BOOL TTEndDialog(HWND hDlgWnd, INT_PTR nResult)
{
@@ -157,14 +157,14 @@
}
/**
- * CreateDialogIndirectParam() 互換関数
+ * CreateDialogIndirectParam() \x8C݊\xB7\x8A\x94
*/
HWND TTCreateDialogIndirectParam(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
- HWND hWndParent, // オーナーウィンドウのハンドル
- DLGPROC lpDialogFunc, // ダイアログボックスプロシージャへのポインタ
- LPARAM lParamInit) // 初期化値
+ HWND hWndParent, // \x83I\x81[\x83i\x81[\x83E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+ DLGPROC lpDialogFunc, // \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x82ւ̃|\x83C\x83\x93\x83^
+ LPARAM lParamInit) // \x8F\x89\x8A\xFA\x89\xBB\x92l
{
TTDialogData *data = (TTDialogData *)malloc(sizeof(TTDialogData));
data->OrigProc = lpDialogFunc;
@@ -184,7 +184,7 @@
}
/**
- * CreateDialog() 互換関数
+ * CreateDialog() \x8C݊\xB7\x8A\x94
*/
HWND TTCreateDialog(
HINSTANCE hInstance,
@@ -197,15 +197,15 @@
}
/**
- * DialogBoxParam() 互換関数
- * EndDialog()ではなく、TTEndDialog()を使用すること
+ * DialogBoxParam() \x8C݊\xB7\x8A\x94
+ * EndDialog()\x82ł͂Ȃ\xAD\x81ATTEndDialog()\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82\xC6
*/
INT_PTR TTDialogBoxParam(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
- HWND hWndParent, // オーナーウィンドウのハンドル
- DLGPROC lpDialogFunc, // ダイアログボックスプロシージャへのポインタ
- LPARAM lParamInit) // 初期化値
+ HWND hWndParent, // \x83I\x81[\x83i\x81[\x83E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+ DLGPROC lpDialogFunc, // \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x82ւ̃|\x83C\x83\x93\x83^
+ LPARAM lParamInit) // \x8F\x89\x8A\xFA\x89\xBB\x92l
{
#if ENABLE_CALL_IDLE_MODAL
HWND hDlgWnd = TTCreateDialogIndirectParam(
@@ -227,8 +227,8 @@
}
/**
- * DialogBoxParam() 互換関数
- * EndDialog()ではなく、TTEndDialog()を使用すること
+ * DialogBoxParam() \x8C݊\xB7\x8A\x94
+ * EndDialog()\x82ł͂Ȃ\xAD\x81ATTEndDialog()\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82\xC6
*/
INT_PTR TTDialogBox(
HINSTANCE hInstance,
Modified: branches/cmake/teraterm/common/tmfc_frame.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc_frame.cpp 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/common/tmfc_frame.cpp 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,132 +1,132 @@
-/*
- * Copyright (C) 2018 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Tera term Micro Framework class
- */
-#include "tmfc.h"
-#include "ttlib.h"
-
-#if (defined(_MSC_VER) && (_MSC_VER <= 1500)) || \
- (__cplusplus <= 199711L)
-#define nullptr NULL // C++11,nullptr / > VS2010
-#endif
-
-const RECT TTCFrameWnd::rectDefault =
-{
- CW_USEDEFAULT, CW_USEDEFAULT,
-// 2*CW_USEDEFAULT, 2*CW_USEDEFAULTg
- 0, 0
-};
-
-TTCFrameWnd::TTCFrameWnd()
-{
-}
-
-TTCFrameWnd::~TTCFrameWnd()
-{
-}
-
-BOOL TTCFrameWnd::Create(
- HINSTANCE hInstance,
- LPCTSTR lpszClassName,
- LPCTSTR lpszWindowName,
- DWORD dwStyle,
- const RECT& rect,
- HWND hParentWnd,
- LPCTSTR lpszMenuName,
- DWORD dwExStyle)
-{
- m_hInst = hInstance;
- m_hParentWnd = hParentWnd;
- pseudoPtr = this;
- HWND hWnd = ::CreateWindowEx(
- 0,
- lpszClassName,
- lpszWindowName,
- dwStyle,
- rect.left, rect.top,
- rect.right - rect.left, rect.bottom - rect.top,
- hParentWnd,
- nullptr,
- hInstance,
- nullptr);
- pseudoPtr = nullptr;
- if (hWnd == nullptr) {
- OutputDebugPrintf("CreateWindow %d\n", GetLastError());
- return FALSE;
- } else {
- m_hWnd = hWnd;
- SetWindowLongPtr(GWLP_USERDATA, (LONG_PTR)this);
- return TRUE;
- }
-}
-
-TTCFrameWnd *TTCFrameWnd::pseudoPtr;
-
-LRESULT TTCFrameWnd::ProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
-{
- TTCFrameWnd *self;
- if (pseudoPtr != nullptr) {
- self = pseudoPtr;
- self->m_hWnd = hWnd;
- } else {
- self = (TTCFrameWnd *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
- }
- return self->Proc(msg, wp, lp);
-}
-
-BOOL TTCFrameWnd::OnCommand(WPARAM wParam, LPARAM lParam)
-{
- return FALSE;
-}
-
-void TTCFrameWnd::OnKillFocus(HWND hNewWnd)
-{}
-
-void TTCFrameWnd::OnDestroy()
-{}
-
-void TTCFrameWnd::OnSetFocus(HWND hOldWnd)
-{}
-
-void TTCFrameWnd::OnSysCommand(UINT nID, LPARAM lParam)
-{}
-
-void TTCFrameWnd::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
-{
- DefWindowProc(WM_SYSKEYDOWN, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
-}
-
-void TTCFrameWnd::OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
-{
- DefWindowProc(WM_SYSKEYUP, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
-}
-
-void TTCFrameWnd::OnClose()
-{}
+/*
+ * Copyright (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Tera term Micro Framework class
+ */
+#include "tmfc.h"
+#include "ttlib.h"
+
+#if (defined(_MSC_VER) && (_MSC_VER <= 1500)) || \
+ (__cplusplus <= 199711L)
+#define nullptr NULL // C++11,nullptr / > VS2010
+#endif
+
+const RECT TTCFrameWnd::rectDefault =
+{
+ CW_USEDEFAULT, CW_USEDEFAULT,
+// 2*CW_USEDEFAULT, 2*CW_USEDEFAULTg
+ 0, 0
+};
+
+TTCFrameWnd::TTCFrameWnd()
+{
+}
+
+TTCFrameWnd::~TTCFrameWnd()
+{
+}
+
+BOOL TTCFrameWnd::Create(
+ HINSTANCE hInstance,
+ LPCTSTR lpszClassName,
+ LPCTSTR lpszWindowName,
+ DWORD dwStyle,
+ const RECT& rect,
+ HWND hParentWnd,
+ LPCTSTR lpszMenuName,
+ DWORD dwExStyle)
+{
+ m_hInst = hInstance;
+ m_hParentWnd = hParentWnd;
+ pseudoPtr = this;
+ HWND hWnd = ::CreateWindowEx(
+ 0,
+ lpszClassName,
+ lpszWindowName,
+ dwStyle,
+ rect.left, rect.top,
+ rect.right - rect.left, rect.bottom - rect.top,
+ hParentWnd,
+ nullptr,
+ hInstance,
+ nullptr);
+ pseudoPtr = nullptr;
+ if (hWnd == nullptr) {
+ OutputDebugPrintf("CreateWindow %d\n", GetLastError());
+ return FALSE;
+ } else {
+ m_hWnd = hWnd;
+ SetWindowLongPtr(GWLP_USERDATA, (LONG_PTR)this);
+ return TRUE;
+ }
+}
+
+TTCFrameWnd *TTCFrameWnd::pseudoPtr;
+
+LRESULT TTCFrameWnd::ProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+ TTCFrameWnd *self;
+ if (pseudoPtr != nullptr) {
+ self = pseudoPtr;
+ self->m_hWnd = hWnd;
+ } else {
+ self = (TTCFrameWnd *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
+ }
+ return self->Proc(msg, wp, lp);
+}
+
+BOOL TTCFrameWnd::OnCommand(WPARAM wParam, LPARAM lParam)
+{
+ return FALSE;
+}
+
+void TTCFrameWnd::OnKillFocus(HWND hNewWnd)
+{}
+
+void TTCFrameWnd::OnDestroy()
+{}
+
+void TTCFrameWnd::OnSetFocus(HWND hOldWnd)
+{}
+
+void TTCFrameWnd::OnSysCommand(UINT nID, LPARAM lParam)
+{}
+
+void TTCFrameWnd::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+{
+ DefWindowProc(WM_SYSKEYDOWN, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+}
+
+void TTCFrameWnd::OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
+{
+ DefWindowProc(WM_SYSKEYUP, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+}
+
+void TTCFrameWnd::OnClose()
+{}
Modified: branches/cmake/teraterm/teraterm/teraterml.h
===================================================================
--- branches/cmake/teraterm/teraterm/teraterml.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/teraterm/teraterml.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2018 TeraTerm Project
* All rights reserved.
*
Modified: branches/cmake/teraterm/teraterm/ttutil.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttutil.c 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/teraterm/ttutil.c 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2018 TeraTerm Project
* All rights reserved.
*
Modified: branches/cmake/teraterm/teraterm/ttutil.h
===================================================================
--- branches/cmake/teraterm/teraterm/ttutil.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/teraterm/ttutil.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2018 TeraTerm Project
* All rights reserved.
*
Modified: branches/cmake/teraterm/ttpcmn/ttcmn_notify.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn_notify.c 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/ttpcmn/ttcmn_notify.c 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 1994-1998 T. Teranishi
* (C) 2004-2017 TeraTerm Project
* All rights reserved.
@@ -27,9 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-//#ifndef _WIN32_IE
-//#define _WIN32_IE 0x501
-//#endif
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0500 // 2000
//#define _WIN32_WINNT 0x0501 // XP
@@ -45,7 +42,7 @@
#include "ttftypes.h"
#include "ttcommon.h"
-// Notify Icon 関連
+// Notify Icon \x8A֘A
static HICON CustomIcon = NULL;
typedef struct {
Modified: branches/cmake/teraterm/ttpdlg/ttdlg.h
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,32 @@
-#include "teraterm.h"
+/*
+ * (C) 2018-2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "teraterm.h"
#include "tttypes.h"
BOOL WINAPI _SetupTerminal(HWND WndParent, PTTSet ts);
Modified: branches/cmake/teraterm/ttpmacro/ttl_gui.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttl_gui.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/ttpmacro/ttl_gui.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,4 +1,30 @@
-
+/*
+ * (C) 2018-2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#ifdef __cplusplus
extern "C" {
Modified: branches/cmake/teraterm/ttptek/tttek.h
===================================================================
--- branches/cmake/teraterm/ttptek/tttek.h 2019-01-17 13:43:47 UTC (rev 7393)
+++ branches/cmake/teraterm/ttptek/tttek.h 2019-01-17 14:02:15 UTC (rev 7394)
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2018 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* TTTEK.DLL, TEK escape sequences */
-
-DllExport void WINAPI TEKInit(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKChangeCaret(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKDestroyCaret(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H);
-DllExport int WINAPI TEKParse(PTEKVar tk, PTTSet ts, PComVar cv);
-DllExport void WINAPI TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode);
-DllExport void WINAPI TEKPaint(PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo);
-DllExport void WINAPI TEKWMLButtonDown(PTEKVar tk, PTTSet ts, PComVar cv, POINT pos);
-DllExport void WINAPI TEKWMLButtonUp(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p);
-DllExport void WINAPI TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy);
-DllExport void WINAPI TEKCMCopy(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKCMCopyScreen(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag);
-DllExport void WINAPI TEKClearScreen(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKSetupFont(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld);
-DllExport void WINAPI TEKRestoreSetup(PTEKVar tk, PTTSet ts);
-DllExport void WINAPI TEKEnd(PTEKVar tk);
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* TTTEK.DLL, TEK escape sequences */
+
+DllExport void WINAPI TEKInit(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKChangeCaret(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKDestroyCaret(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H);
+DllExport int WINAPI TEKParse(PTEKVar tk, PTTSet ts, PComVar cv);
+DllExport void WINAPI TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode);
+DllExport void WINAPI TEKPaint(PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo);
+DllExport void WINAPI TEKWMLButtonDown(PTEKVar tk, PTTSet ts, PComVar cv, POINT pos);
+DllExport void WINAPI TEKWMLButtonUp(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p);
+DllExport void WINAPI TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy);
+DllExport void WINAPI TEKCMCopy(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKCMCopyScreen(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag);
+DllExport void WINAPI TEKClearScreen(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKSetupFont(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld);
+DllExport void WINAPI TEKRestoreSetup(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKEnd(PTEKVar tk);