scmno****@osdn*****
scmno****@osdn*****
2018年 9月 15日 (土) 15:06:48 JST
Tera TermRevision: 7246
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7246
Author: zmatsuo
Date: 2018-09-15 15:06:48 +0900 (Sat, 15 Sep 2018)
Log Message:
-----------
TTProxyがビルドできるようになった
Modified Paths:
--------------
branches/cmake/CMakeLists.txt
branches/cmake/TTProxy/CMakeLists.txt
branches/cmake/TTProxy/TTProxy.h
branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
branches/cmake/TTProxy/YCL/include/YCL/Window.h
branches/cmake/TTProxy/YCL/include/YCL/common.h
branches/cmake/TTXKanjiMenu/CMakeLists.txt
Removed Paths:
-------------
branches/cmake/TTProxy/TTX.def
-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/CMakeLists.txt 2018-09-15 06:06:48 UTC (rev 7246)
@@ -31,9 +31,7 @@
add_subdirectory(teraterm)
add_subdirectory(ttpmenu)
-if(NOT MINGW)
- add_subdirectory(TTProxy)
-endif()
+add_subdirectory(TTProxy)
add_subdirectory(ttssh2)
add_subdirectory(TTXKanjiMenu)
if(${ENABLE_TTXSAMPLES})
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/CMakeLists.txt 2018-09-15 06:06:48 UTC (rev 7246)
@@ -57,7 +57,6 @@
TTProxy.cpp
TTProxy.h
TTProxy.rc
- TTX.def
)
include_directories(
@@ -81,10 +80,17 @@
${YCL_SRC}
)
+set_target_properties(
+ ttproxy
+ PROPERTIES
+ PREFIX ""
+ )
+
target_link_libraries(
ttproxy
ttpcmn
ws2_32.lib
+ version.lib
)
Modified: branches/cmake/TTProxy/TTProxy.h
===================================================================
--- branches/cmake/TTProxy/TTProxy.h 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/TTProxy.h 2018-09-15 06:06:48 UTC (rev 7246)
@@ -6,7 +6,7 @@
#include "ProxyWSockHook.h"
-extern BOOL PASCAL TTXBind(WORD Version, TTXExports* exports);
+__declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports);
char UILanguageFile[MAX_PATH];
Deleted: branches/cmake/TTProxy/TTX.def
===================================================================
--- branches/cmake/TTProxy/TTX.def 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/TTX.def 2018-09-15 06:06:48 UTC (rev 7246)
@@ -1,2 +0,0 @@
-EXPORTS
- TTXBind @1
Modified: branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Dialog.h 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/Dialog.h 2018-09-15 06:06:48 UTC (rev 7246)
@@ -51,7 +51,7 @@
|| message == WM_CTLCOLORLISTBOX
|| message == WM_CTLCOLORSCROLLBAR
|| message == WM_CTLCOLORSTATIC)) {
- result = (BOOL) ::GetWindowLong(dialog, DWL_MSGRESULT);
+ result = (BOOL) ::GetWindowLong(dialog, DWLP_MSGRESULT);
}
return result;
}
@@ -85,7 +85,7 @@
}
void setResult(LRESULT result) {
- SetWindowLong(DWL_MSGRESULT, result);
+ SetWindowLong(DWLP_MSGRESULT, result);
}
int getDefID()const {
return LOWORD(SendMessage(DM_GETDEFID));
@@ -109,7 +109,7 @@
}
int open(HINSTANCE instance, int resourceId, HWND owner = NULL) {
YCLVERIFY(prepareOpen(this) == NULL, "Another dialog has been opening yet.");
- return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
+ return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, (DLGPROC)DialogProc, NULL);
}
protected:
virtual bool dispatch(int message, int wparam, long lparam) {
Modified: branches/cmake/TTProxy/YCL/include/YCL/Window.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-09-15 06:06:48 UTC (rev 7246)
@@ -279,16 +279,16 @@
return SetWindowLong(GWL_EXSTYLE, exStyle);
}
WNDPROC getWndProc()const {
- return (WNDPROC) GetWindowLong(GWL_WNDPROC);
+ return (WNDPROC) GetWindowLong(GWLP_WNDPROC);
}
WNDPROC setWndProc(WNDPROC proc) {
- return (WNDPROC) SetWindowLong(GWL_WNDPROC, (long) proc);
+ return (WNDPROC) SetWindowLong(GWLP_WNDPROC, (long) proc);
}
HWND getOwner()const {
- return (HWND) GetWindowLong(GWL_HWNDPARENT);
+ return (HWND) GetWindowLong(GWLP_HWNDPARENT);
}
HWND setOwner(HWND owner) {
- return (HWND) SetWindowLong(GWL_HWNDPARENT, (long) owner);
+ return (HWND) SetWindowLong(GWLP_HWNDPARENT, (long) owner);
}
HWND getChildWindow()const {
return GetWindow(GW_CHILD);
@@ -331,28 +331,28 @@
return GetClassLong(GCL_CBWNDEXTRA);
}
HBRUSH getBackgroundBrush()const {
- return (HBRUSH) GetClassLong(GCL_HBRBACKGROUND);
+ return (HBRUSH) GetClassLong(GCLP_HBRBACKGROUND);
}
HCURSOR getClassCursor()const {
- return (HCURSOR) GetClassLong(GCL_HCURSOR);
+ return (HCURSOR) GetClassLong(GCLP_HCURSOR);
}
HICON getClassIcon()const {
- return (HICON) GetClassLong(GCL_HICON);
+ return (HICON) GetClassLong(GCLP_HICON);
}
HICON getClassSmallIcon()const {
- return (HICON) GetClassLong(GCL_HICONSM);
+ return (HICON) GetClassLong(GCLP_HICONSM);
}
HINSTANCE getClassInstance()const {
- return (HINSTANCE) GetClassLong(GCL_HMODULE);
+ return (HINSTANCE) GetClassLong(GCLP_HMODULE);
}
int getMenuResourceId()const {
- return GetClassLong(GCL_MENUNAME);
+ return GetClassLong(GCLP_MENUNAME);
}
int getClassStyle()const {
return GetClassLong(GCL_STYLE);
}
WNDPROC getClassWindowProc()const {
- return (WNDPROC) GetClassLong(GCL_WNDPROC);
+ return (WNDPROC) GetClassLong(GCLP_WNDPROC);
}
};
Modified: branches/cmake/TTProxy/YCL/include/YCL/common.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/common.h 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/common.h 2018-09-15 06:06:48 UTC (rev 7246)
@@ -72,8 +72,8 @@
return false;
}
-#define YCLASSERT(condition, message) if (YclAssert(condition, message)) {__asm { int 3 }}
-#define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__asm { int 3 }}
+#define YCLASSERT(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
+#define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
#ifdef __cplusplus
extern "C" {
Modified: branches/cmake/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt 2018-09-15 06:06:35 UTC (rev 7245)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt 2018-09-15 06:06:48 UTC (rev 7246)
@@ -27,6 +27,12 @@
${SRC}
)
+set_target_properties(
+ ttxkanjimenu
+ PROPERTIES
+ PREFIX ""
+ )
+
target_link_libraries(
ttxkanjimenu
ttpcmn