• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7246 (tree)
Time2018-09-15 15:06:48
Authorzmatsuo

Log Message

TTProxyがビルドできるようになった

Change Summary

Incremental Difference

--- branches/cmake/TTProxy/CMakeLists.txt (revision 7245)
+++ branches/cmake/TTProxy/CMakeLists.txt (revision 7246)
@@ -57,7 +57,6 @@
5757 TTProxy.cpp
5858 TTProxy.h
5959 TTProxy.rc
60- TTX.def
6160 )
6261
6362 include_directories(
@@ -81,10 +80,17 @@
8180 ${YCL_SRC}
8281 )
8382
83+set_target_properties(
84+ ttproxy
85+ PROPERTIES
86+ PREFIX ""
87+ )
88+
8489 target_link_libraries(
8590 ttproxy
8691 ttpcmn
8792 ws2_32.lib
93+ version.lib
8894 )
8995
9096
--- branches/cmake/TTProxy/YCL/include/YCL/common.h (revision 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/common.h (revision 7246)
@@ -72,8 +72,8 @@
7272 return false;
7373 }
7474
75-#define YCLASSERT(condition, message) if (YclAssert(condition, message)) {__asm { int 3 }}
76-#define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__asm { int 3 }}
75+#define YCLASSERT(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
76+#define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
7777
7878 #ifdef __cplusplus
7979 extern "C" {
--- branches/cmake/TTProxy/YCL/include/YCL/Dialog.h (revision 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/Dialog.h (revision 7246)
@@ -51,7 +51,7 @@
5151 || message == WM_CTLCOLORLISTBOX
5252 || message == WM_CTLCOLORSCROLLBAR
5353 || message == WM_CTLCOLORSTATIC)) {
54- result = (BOOL) ::GetWindowLong(dialog, DWL_MSGRESULT);
54+ result = (BOOL) ::GetWindowLong(dialog, DWLP_MSGRESULT);
5555 }
5656 return result;
5757 }
@@ -85,7 +85,7 @@
8585 }
8686
8787 void setResult(LRESULT result) {
88- SetWindowLong(DWL_MSGRESULT, result);
88+ SetWindowLong(DWLP_MSGRESULT, result);
8989 }
9090 int getDefID()const {
9191 return LOWORD(SendMessage(DM_GETDEFID));
@@ -109,7 +109,7 @@
109109 }
110110 int open(HINSTANCE instance, int resourceId, HWND owner = NULL) {
111111 YCLVERIFY(prepareOpen(this) == NULL, "Another dialog has been opening yet.");
112- return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
112+ return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, (DLGPROC)DialogProc, NULL);
113113 }
114114 protected:
115115 virtual bool dispatch(int message, int wparam, long lparam) {
--- branches/cmake/TTProxy/YCL/include/YCL/Window.h (revision 7245)
+++ branches/cmake/TTProxy/YCL/include/YCL/Window.h (revision 7246)
@@ -279,16 +279,16 @@
279279 return SetWindowLong(GWL_EXSTYLE, exStyle);
280280 }
281281 WNDPROC getWndProc()const {
282- return (WNDPROC) GetWindowLong(GWL_WNDPROC);
282+ return (WNDPROC) GetWindowLong(GWLP_WNDPROC);
283283 }
284284 WNDPROC setWndProc(WNDPROC proc) {
285- return (WNDPROC) SetWindowLong(GWL_WNDPROC, (long) proc);
285+ return (WNDPROC) SetWindowLong(GWLP_WNDPROC, (long) proc);
286286 }
287287 HWND getOwner()const {
288- return (HWND) GetWindowLong(GWL_HWNDPARENT);
288+ return (HWND) GetWindowLong(GWLP_HWNDPARENT);
289289 }
290290 HWND setOwner(HWND owner) {
291- return (HWND) SetWindowLong(GWL_HWNDPARENT, (long) owner);
291+ return (HWND) SetWindowLong(GWLP_HWNDPARENT, (long) owner);
292292 }
293293 HWND getChildWindow()const {
294294 return GetWindow(GW_CHILD);
@@ -331,28 +331,28 @@
331331 return GetClassLong(GCL_CBWNDEXTRA);
332332 }
333333 HBRUSH getBackgroundBrush()const {
334- return (HBRUSH) GetClassLong(GCL_HBRBACKGROUND);
334+ return (HBRUSH) GetClassLong(GCLP_HBRBACKGROUND);
335335 }
336336 HCURSOR getClassCursor()const {
337- return (HCURSOR) GetClassLong(GCL_HCURSOR);
337+ return (HCURSOR) GetClassLong(GCLP_HCURSOR);
338338 }
339339 HICON getClassIcon()const {
340- return (HICON) GetClassLong(GCL_HICON);
340+ return (HICON) GetClassLong(GCLP_HICON);
341341 }
342342 HICON getClassSmallIcon()const {
343- return (HICON) GetClassLong(GCL_HICONSM);
343+ return (HICON) GetClassLong(GCLP_HICONSM);
344344 }
345345 HINSTANCE getClassInstance()const {
346- return (HINSTANCE) GetClassLong(GCL_HMODULE);
346+ return (HINSTANCE) GetClassLong(GCLP_HMODULE);
347347 }
348348 int getMenuResourceId()const {
349- return GetClassLong(GCL_MENUNAME);
349+ return GetClassLong(GCLP_MENUNAME);
350350 }
351351 int getClassStyle()const {
352352 return GetClassLong(GCL_STYLE);
353353 }
354354 WNDPROC getClassWindowProc()const {
355- return (WNDPROC) GetClassLong(GCL_WNDPROC);
355+ return (WNDPROC) GetClassLong(GCLP_WNDPROC);
356356 }
357357 };
358358
--- branches/cmake/TTProxy/TTProxy.h (revision 7245)
+++ branches/cmake/TTProxy/TTProxy.h (revision 7246)
@@ -6,7 +6,7 @@
66
77 #include "ProxyWSockHook.h"
88
9-extern BOOL PASCAL TTXBind(WORD Version, TTXExports* exports);
9+__declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports);
1010
1111 char UILanguageFile[MAX_PATH];
1212
--- branches/cmake/CMakeLists.txt (revision 7245)
+++ branches/cmake/CMakeLists.txt (revision 7246)
@@ -31,9 +31,7 @@
3131
3232 add_subdirectory(teraterm)
3333 add_subdirectory(ttpmenu)
34-if(NOT MINGW)
35- add_subdirectory(TTProxy)
36-endif()
34+add_subdirectory(TTProxy)
3735 add_subdirectory(ttssh2)
3836 add_subdirectory(TTXKanjiMenu)
3937 if(${ENABLE_TTXSAMPLES})
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt (revision 7245)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt (revision 7246)
@@ -27,6 +27,12 @@
2727 ${SRC}
2828 )
2929
30+set_target_properties(
31+ ttxkanjimenu
32+ PROPERTIES
33+ PREFIX ""
34+ )
35+
3036 target_link_libraries(
3137 ttxkanjimenu
3238 ttpcmn
Show on old repository browser