Tera TermRevision: 7298
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7298
Author: zmatsuo
Date: 2018-12-01 01:50:31 +0900 (Sat, 01 Dec 2018)
Log Message:
-----------
64bit実行ファイルがある程度動作するようになった
Modified Paths:
--------------
branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
branches/cmake/TTProxy/YCL/include/YCL/Window.h
branches/cmake/teraterm/common/dlglib.c
branches/cmake/teraterm/common/dlglib.h
branches/cmake/teraterm/common/dlglib_cpp.cpp
branches/cmake/teraterm/common/tmfc.cpp
branches/cmake/teraterm/teraterm/ttplug.c
branches/cmake/teraterm/teraterm/vtwin.cpp
branches/cmake/teraterm/ttpcmn/ttcmn.c
branches/cmake/teraterm/ttpdlg/ttdlg.c
branches/cmake/ttpmenu/ttpmenu.cpp
branches/cmake/ttpmenu/winmisc.cpp
branches/cmake/ttssh2/ttxssh/auth.c
branches/cmake/ttssh2/ttxssh/hosts.c
branches/cmake/ttssh2/ttxssh/key.c
branches/cmake/ttssh2/ttxssh/sftp.c
branches/cmake/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Dialog.h 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/TTProxy/YCL/include/YCL/Dialog.h 2018-11-30 16:50:31 UTC (rev 7298)
@@ -51,7 +51,7 @@
|| message == WM_CTLCOLORLISTBOX
|| message == WM_CTLCOLORSCROLLBAR
|| message == WM_CTLCOLORSTATIC)) {
- result = (BOOL) ::GetWindowLong(dialog, DWLP_MSGRESULT);
+ result = (BOOL) ::GetWindowLongPtr(dialog, DWLP_MSGRESULT);
}
return result;
}
@@ -85,7 +85,7 @@
}
void setResult(LRESULT result) {
- SetWindowLong(DWLP_MSGRESULT, result);
+ SetWindowLongPtr(DWLP_MSGRESULT, result);
}
int getDefID()const {
return LOWORD(SendMessage(DM_GETDEFID));
Modified: branches/cmake/TTProxy/YCL/include/YCL/Window.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-11-30 16:50:31 UTC (rev 7298)
@@ -30,11 +30,11 @@
return window;
}
- long GetWindowLong(int index)const {
- return ::GetWindowLong(window, index);
+ long GetWindowLongPtr(int index)const {
+ return ::GetWindowLongPtr(window, index);
}
- long SetWindowLong(int index, long data) {
- return ::SetWindowLong(window, index, data);
+ long SetWindowLongPtr(int index, long data) {
+ return ::SetWindowLongPtr(window, index, data);
}
int GetWindowTextLength()const {
return ::GetWindowTextLength(window);
@@ -267,28 +267,28 @@
return (HICON) SendMessage(WM_SETICON, large, (LPARAM) icon);
}
long getStyle()const {
- return GetWindowLong(GWL_STYLE);
+ return GetWindowLongPtr(GWL_STYLE);
}
long getExStyle()const {
- return GetWindowLong(GWL_EXSTYLE);
+ return GetWindowLongPtr(GWL_EXSTYLE);
}
long setStyle(long style) {
- return SetWindowLong(GWL_STYLE, style);
+ return SetWindowLongPtr(GWL_STYLE, style);
}
long setExStyle(long exStyle) {
- return SetWindowLong(GWL_EXSTYLE, exStyle);
+ return SetWindowLongPtr(GWL_EXSTYLE, exStyle);
}
WNDPROC getWndProc()const {
- return (WNDPROC) GetWindowLong(GWLP_WNDPROC);
+ return (WNDPROC) GetWindowLongPtr(GWLP_WNDPROC);
}
WNDPROC setWndProc(WNDPROC proc) {
- return (WNDPROC) SetWindowLong(GWLP_WNDPROC, (long) proc);
+ return (WNDPROC) SetWindowLongPtr(GWLP_WNDPROC, (LONG_PTR) proc);
}
HWND getOwner()const {
- return (HWND) GetWindowLong(GWLP_HWNDPARENT);
+ return (HWND) GetWindowLongPtr(GWLP_HWNDPARENT);
}
HWND setOwner(HWND owner) {
- return (HWND) SetWindowLong(GWLP_HWNDPARENT, (long) owner);
+ return (HWND) SetWindowLongPtr(GWLP_HWNDPARENT, (LONG_PTR) owner);
}
HWND getChildWindow()const {
return GetWindow(GW_CHILD);
Modified: branches/cmake/teraterm/common/dlglib.c
===================================================================
--- branches/cmake/teraterm/common/dlglib.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/common/dlglib.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -194,7 +194,7 @@
LONG GetCurSel(HWND HDlg, int Id_Item)
{
- LONG n;
+ LRESULT n;
n = SendDlgItemMessage(HDlg, Id_Item, CB_GETCURSEL, 0, 0);
if (n==CB_ERR) {
@@ -204,7 +204,7 @@
n++;
}
- return n;
+ return (LONG)n;
}
typedef struct {
@@ -221,9 +221,11 @@
static LRESULT CALLBACK HostnameEditProc(HWND dlg, UINT msg,
WPARAM wParam, LPARAM lParam)
{
- EditSubclassData *data = (EditSubclassData *)GetWindowLong(dlg, GWLP_USERDATA);
+ EditSubclassData *data = (EditSubclassData *)GetWindowLongPtr(dlg, GWLP_USERDATA);
LRESULT Result;
- int max, select, len;
+ LRESULT select;
+ LRESULT max;
+ int len;
char *str, *orgstr;
switch (msg) {
@@ -277,7 +279,7 @@
max++; // '\0'
orgstr = str = (char *)malloc(max);
if (str != NULL) {
- len = GetWindowTextA(dlg, str, max);
+ len = GetWindowTextA(dlg, str, (int)max);
if (select >= 0 && select < len) {
if (wParam == 0x44) { // \x83J\x81[\x83\\x83\x8B\x94z\x89\xBA\x82̕\xB6\x8E\x9A\x82݂̂\xF0\x8D폜\x82\xB7\x82\xE9
memmove(&str[select], &str[select + 1], len - select - 1);
@@ -353,8 +355,8 @@
hWndEdit = GetWindow(hWndEdit, GW_CHILD);
}
data = (EditSubclassData *)malloc(sizeof(EditSubclassData));
- data->OrigProc = (WNDPROC)GetWindowLong(hWndEdit, GWLP_WNDPROC);
- data->OrigUser = (LONG_PTR)GetWindowLong(hWndEdit, GWLP_USERDATA);
+ data->OrigProc = (WNDPROC)GetWindowLongPtr(hWndEdit, GWLP_WNDPROC);
+ data->OrigUser = (LONG_PTR)GetWindowLongPtr(hWndEdit, GWLP_USERDATA);
data->ComboBox = ComboBox;
SetWindowLongPtr(hWndEdit, GWLP_WNDPROC, (LONG_PTR)HostnameEditProc);
SetWindowLongPtr(hWndEdit, GWLP_USERDATA, (LONG_PTR)data);
Modified: branches/cmake/teraterm/common/dlglib.h
===================================================================
--- branches/cmake/teraterm/common/dlglib.h 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/common/dlglib.h 2018-11-30 16:50:31 UTC (rev 7298)
@@ -53,8 +53,6 @@
const char *key;
} DlgTextInfo;
void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
-HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
- const char *UILanguageFile, PCHAR key);
void SetDlgMenuTexts(HMENU hMenu, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
////////////////////////////////////////
@@ -77,13 +75,13 @@
LPCTSTR lpTemplateName,
HWND hWndParent,
DLGPROC lpDialogFunc);
-int TTDialogBoxParam(
+INT_PTR TTDialogBoxParam(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
HWND hWndParent,
DLGPROC lpDialogFunc,
LPARAM lParamInit);
-int TTDialogBox(
+INT_PTR TTDialogBox(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
HWND hWndParent,
Modified: branches/cmake/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/cmake/teraterm/common/dlglib_cpp.cpp 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/common/dlglib_cpp.cpp 2018-11-30 16:50:31 UTC (rev 7298)
@@ -200,7 +200,7 @@
* DialogBoxParam() 互換関数
* EndDialog()ではなく、TTEndDialog()を使用すること
*/
-int TTDialogBoxParam(
+INT_PTR TTDialogBoxParam(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
HWND hWndParent, // オーナーウィンドウのハンドル
@@ -218,7 +218,7 @@
return DlgResult;
#else
DLGTEMPLATE *lpTemplate = TTGetDlgTemplate(hInstance, lpTemplateName);
- int DlgResult = DialogBoxIndirectParam(
+ INT_PTR DlgResult = DialogBoxIndirectParam(
hInstance, lpTemplate, hWndParent,
lpDialogFunc, lParamInit);
free(lpTemplate);
@@ -230,7 +230,7 @@
* DialogBoxParam() 互換関数
* EndDialog()ではなく、TTEndDialog()を使用すること
*/
-int TTDialogBox(
+INT_PTR TTDialogBox(
HINSTANCE hInstance,
LPCTSTR lpTemplateName,
HWND hWndParent,
Modified: branches/cmake/teraterm/common/tmfc.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc.cpp 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/common/tmfc.cpp 2018-11-30 16:50:31 UTC (rev 7298)
@@ -389,7 +389,7 @@
case IDOK:
Processed = OnOK();
//self->DestroyWindow();
- //SetWindowLong(hwndDlg, DWL_MSGRESULT, lResult)
+ //SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, lResult)
// return TRUE
break;
case IDCANCEL:
@@ -442,7 +442,7 @@
case IDOK:
Processed = OnOK();
//self->DestroyWindow();
- //SetWindowLong(hwndDlg, DWL_MSGRESULT, lResult)
+ //SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, lResult)
// return TRUE
break;
case IDCANCEL:
Modified: branches/cmake/teraterm/teraterm/ttplug.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttplug.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/teraterm/ttplug.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -118,7 +118,7 @@
if (1) {
char buf[1024];
struct _finddata_t searchData;
- long searchHandle;
+ intptr_t searchHandle;
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s\\TTX*.DLL", ts->HomeDir);
Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp 2018-11-30 16:50:31 UTC (rev 7298)
@@ -849,9 +849,9 @@
#ifdef ALPHABLEND_TYPE2
//<!--by AKASI
if(BGNoFrame && ts.HideTitle > 0) {
- ExStyle = ::GetWindowLong(HVTWin,GWL_EXSTYLE);
+ ExStyle = ::GetWindowLongPtr(HVTWin,GWL_EXSTYLE);
ExStyle &= ~WS_EX_CLIENTEDGE;
- ::SetWindowLong(HVTWin,GWL_EXSTYLE,ExStyle);
+ ::SetWindowLongPtr(HVTWin,GWL_EXSTYLE,ExStyle);
}
//-->
#endif
@@ -1018,7 +1018,7 @@
AppendMenu(PopupBase,
submenu != NULL ? LOBYTE(state) | MF_POPUP : state,
- submenu != NULL ? (UINT)submenu : GetMenuItemID(PopupMenu, i),
+ submenu != NULL ? (UINT_PTR)submenu : GetMenuItemID(PopupMenu, i),
itemText);
}
}
@@ -1286,7 +1286,7 @@
_T("&Window"), ts.UILanguageFile);
::InsertMenu(hMenu, ID_HELPMENU,
MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
- (int)WinMenu, uimsg);
+ (UINT_PTR)WinMenu, uimsg);
}
/* LogMeTT \x82̑\xB6\x8D݂\xF0\x8Am\x94F\x82\xB5\x82ă\x81\x83j\x83\x85\x81[\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9 */
@@ -3375,7 +3375,7 @@
_T("&Window"), ts.UILanguageFile);
::InsertMenu(MainMenu, ID_HELPMENU,
MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
- (int)WinMenu, uimsg);
+ (UINT_PTR)WinMenu, uimsg);
}
else {
RemoveMenu(MainMenu,ID_HELPMENU,MF_BYPOSITION);
@@ -3440,9 +3440,9 @@
#endif
AdjustSize = TRUE;
- ::SetWindowLong(HVTWin, GWL_STYLE, Style);
+ ::SetWindowLongPtr(HVTWin, GWL_STYLE, Style);
#ifdef ALPHABLEND_TYPE2
- ::SetWindowLong(HVTWin, GWL_EXSTYLE, ExStyle);
+ ::SetWindowLongPtr(HVTWin, GWL_EXSTYLE, ExStyle);
#endif
::SetWindowPos(HVTWin, NULL, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
@@ -5515,8 +5515,8 @@
// \x83T\x83u\x83N\x83\x89\x83X\x89\xBB\x82\xB3\x82\xB9\x82ă\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x83\x82\x81[\x83h\x82ɂ\xB7\x82\xE9 (2008.1.21 yutaka)
hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
- OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC);
- SetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)BroadcastEditProc);
+ OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+ SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)BroadcastEditProc);
// \x83f\x83t\x83H\x83\x8B\x83g\x82\xCDon\x81B\x8Ec\x82\xE8\x82\xCDdisable\x81B
SendMessage(GetDlgItem(hWnd, IDC_REALTIME_CHECK), BM_SETCHECK, BST_CHECKED, 0); // default on
EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
@@ -5591,8 +5591,8 @@
// new handler
hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
- OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC);
- SetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)BroadcastEditProc);
+ OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+ SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)BroadcastEditProc);
EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), FALSE);
@@ -5603,7 +5603,7 @@
EnableWindow(GetDlgItem(hWnd, IDC_LIST), TRUE); // true
} else {
// restore old handler
- SetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)OrigBroadcastEditProc);
+ SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)OrigBroadcastEditProc);
EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), TRUE);
EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), TRUE);
@@ -5678,7 +5678,7 @@
// \x83\x82\x81[\x83h\x83\x8C\x83X\x83_\x83C\x83A\x83\x8D\x83O\x82͈\xEA\x93x\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x82ƁA\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xAA\x8FI\x97\xB9\x82\xB7\x82\xE9\x82܂\xC5
// \x94j\x8A\xFC\x82\xB3\x82\xEA\x82Ȃ\xA2\x82̂ŁA\x88ȉ\xBA\x82́u\x83E\x83B\x83\x93\x83h\x83E\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x96߂\xB5\x81v\x82͕s\x97v\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x81B(yutaka)
#if 0
- SetWindowLong(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)OrigBroadcastEditProc);
+ SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG)OrigBroadcastEditProc);
#endif
//EndDialog(hDlgWnd, IDOK);
Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -2565,7 +2565,7 @@
/* do process initialization */
DoCover_IsDebuggerPresent();
hInst = hInstance;
- HMap = CreateFileMapping((HANDLE) 0xFFFFFFFF, NULL, PAGE_READWRITE,
+ HMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
0, sizeof(TMap), TT_FILEMAPNAME);
if (HMap == NULL) {
return FALSE;
Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -142,7 +142,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfosCom, _countof(TextInfosCom), UILanguageFile);
if ( ts->Language==IdJapanese ) {
@@ -275,7 +275,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if ( ts!=NULL ) {
int width, height;
@@ -554,7 +554,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
SetDlgItemTextA(Dialog, IDC_WINTITLE, ts->Title);
@@ -690,7 +690,7 @@
return TRUE;
case WM_COMMAND:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
RestoreVar(Dialog,ts,&IAttr,&IOffset);
switch (LOWORD(wParam)) {
case IDOK:
@@ -942,7 +942,7 @@
break;
case WM_PAINT:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if ( ts==NULL ) {
return TRUE;
}
@@ -951,7 +951,7 @@
break;
case WM_HSCROLL:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if (ts==NULL) {
return TRUE;
}
@@ -1044,7 +1044,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -1070,7 +1070,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if ( ts!=NULL ) {
WORD w;
@@ -1134,7 +1134,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -1205,7 +1205,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if ( ts!=NULL ) {
memset(Temp, 0, sizeof(Temp));
GetDlgItemTextA(Dialog, IDC_SERIALPORT, Temp, sizeof(Temp)-1);
@@ -1285,7 +1285,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -1323,7 +1323,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if (ts!=NULL) {
WritePrivateProfileStringA("Hosts",NULL,NULL,ts->SetupFName);
@@ -1472,7 +1472,7 @@
GetRB(Dialog,&w,IDC_TCPIPTELNET,IDC_TCPIPTELNET);
if (w==1) {
EnableDlgItem(Dialog,IDC_TCPIPTERMTYPELABEL,IDC_TCPIPTERMTYPE);
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if (ts!=NULL) {
SetDlgItemInt(Dialog,IDC_TCPIPPORT,ts->TelPort,FALSE);
}
@@ -1516,7 +1516,7 @@
switch (Message) {
case WM_INITDIALOG:
GetHNRec = (PGetHNRec)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -1621,7 +1621,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- GetHNRec = (PGetHNRec)GetWindowLong(Dialog,DWLP_USER);
+ GetHNRec = (PGetHNRec)GetWindowLongPtr(Dialog,DWLP_USER);
if ( GetHNRec!=NULL ) {
char afstr[BUFSIZ];
GetRB(Dialog,&GetHNRec->PortType,IDC_HOSTTCPIP,IDC_HOSTSERIAL);
@@ -1682,7 +1682,7 @@
case IDC_HOSTTELNET:
GetRB(Dialog,&i,IDC_HOSTTELNET,IDC_HOSTTELNET);
if ( i==1 ) {
- GetHNRec = (PGetHNRec)GetWindowLong(Dialog,DWLP_USER);
+ GetHNRec = (PGetHNRec)GetWindowLongPtr(Dialog,DWLP_USER);
if ( GetHNRec!=NULL ) {
SetDlgItemInt(Dialog,IDC_HOSTTCPPORT,GetHNRec->TelPort,FALSE);
}
@@ -1747,7 +1747,7 @@
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
CurDir = (PCHAR)(lParam);
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgItemTextA(Dialog, IDC_DIRCURRENT, CurDir);
SendDlgItemMessage(Dialog, IDC_DIRNEW, EM_LIMITTEXT,
@@ -1826,7 +1826,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- CurDir = (PCHAR)GetWindowLong(Dialog,DWLP_USER);
+ CurDir = (PCHAR)GetWindowLongPtr(Dialog,DWLP_USER);
if ( CurDir!=NULL ) {
_getcwd(HomeDir,sizeof(HomeDir));
_chdir(CurDir);
@@ -2557,7 +2557,7 @@
switch (Message) {
case WM_INITDIALOG:
ts = (PTTSet)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -2600,7 +2600,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- ts = (PTTSet)GetWindowLong(Dialog,DWLP_USER);
+ ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
if (ts!=NULL) {
w = (WORD)GetCurSel(Dialog, IDC_GENPORT);
if (w>1) {
@@ -2683,7 +2683,7 @@
switch (Message) {
case WM_INITDIALOG:
Close = (PBOOL)lParam;
- SetWindowLong(Dialog, DWLP_USER, lParam);
+ SetWindowLongPtr(Dialog, DWLP_USER, lParam);
SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -2728,7 +2728,7 @@
PostMessage(Hw,WM_SYSCOMMAND,SC_CLOSE,0);
}
else {
- Close = (PBOOL)GetWindowLong(Dialog,DWLP_USER);
+ Close = (PBOOL)GetWindowLongPtr(Dialog,DWLP_USER);
if (Close!=NULL) {
*Close = TRUE;
}
Modified: branches/cmake/ttpmenu/ttpmenu.cpp
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.cpp 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttpmenu/ttpmenu.cpp 2018-11-30 16:50:31 UTC (rev 7298)
@@ -655,9 +655,9 @@
{
HWND passwordControl = GetDlgItem(dlg, item);
- SetWindowLong(passwordControl, GWLP_USERDATA,
- SetWindowLong(passwordControl, GWLP_WNDPROC,
- (LONG) password_wnd_proc));
+ SetWindowLongPtr(passwordControl, GWLP_USERDATA,
+ SetWindowLongPtr(passwordControl, GWLP_WNDPROC,
+ (LONG_PTR) password_wnd_proc));
}
/* ==========================================================================
Modified: branches/cmake/ttpmenu/winmisc.cpp
===================================================================
--- branches/cmake/ttpmenu/winmisc.cpp 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttpmenu/winmisc.cpp 2018-11-30 16:50:31 UTC (rev 7298)
@@ -457,6 +457,6 @@
}
}
- return CallWindowProc((WNDPROC) GetWindowLong(control, GWLP_USERDATA),
+ return CallWindowProc((WNDPROC) GetWindowLongPtr(control, GWLP_USERDATA),
control, msg, wParam, lParam);
}
Modified: branches/cmake/ttssh2/ttxssh/auth.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttssh2/ttxssh/auth.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -748,7 +748,7 @@
return FALSE; /* because we set the focus */
case WM_TIMER:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
// \x94F\x8F؏\x80\x94\x{142A82}ł\xAB\x82Ă\xA9\x82\xE7\x81A\x94F\x8Ff\x81[\x83^\x82𑗐M\x82\xB7\x82\xE9\x81B\x91\x81\x82\xB7\x82\xAC\x82\xE9\x82ƁA\x97\x8E\x82\xBF\x82\xE9\x81B(2004.12.16 yutaka)
if (wParam == IDC_TIMER1) {
// \x8E\xA9\x93\xAE\x83\x8D\x83O\x83C\x83\x93\x82̂\xBD\x82\xDF
@@ -839,7 +839,7 @@
return FALSE;
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDOK:
@@ -1171,7 +1171,7 @@
return FALSE; /* because we set the focus */
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDOK:
@@ -1398,7 +1398,7 @@
return TRUE; /* because we do not set the focus */
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDOK:
Modified: branches/cmake/ttssh2/ttxssh/hosts.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/hosts.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttssh2/ttxssh/hosts.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -1710,7 +1710,7 @@
case WM_INITDIALOG:
pvar = (PTInstVar) lParam;
pvar->hosts_state.hosts_dialog = dlg;
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
// \x92lj\xC1\x81E\x92u\x82\xAB\x8A\xB7\x82\xA6\x82Ƃ\xE0 init_hosts_dlg \x82\xF0\x8CĂ\xF1\x82ł\xA2\x82\xE9\x82̂ŁA\x82\xBB\x82̑O\x82ɃZ\x83b\x83g\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
GetWindowText(dlg, uimsg, sizeof(uimsg));
@@ -1803,7 +1803,7 @@
return TRUE; /* because we do not set the focus */
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDC_CONTINUE:
@@ -1876,7 +1876,7 @@
case WM_INITDIALOG:
pvar = (PTInstVar) lParam;
pvar->hosts_state.hosts_dialog = dlg;
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
// \x92lj\xC1\x81E\x92u\x82\xAB\x8A\xB7\x82\xA6\x82Ƃ\xE0 init_hosts_dlg \x82\xF0\x8CĂ\xF1\x82ł\xA2\x82\xE9\x82̂ŁA\x82\xBB\x82̑O\x82ɃZ\x83b\x83g\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
GetWindowText(dlg, uimsg, sizeof(uimsg));
@@ -1966,7 +1966,7 @@
return TRUE; /* because we do not set the focus */
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDC_CONTINUE:
@@ -2040,7 +2040,7 @@
case WM_INITDIALOG:
pvar = (PTInstVar) lParam;
pvar->hosts_state.hosts_dialog = dlg;
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
// \x92lj\xC1\x81E\x92u\x82\xAB\x8A\xB7\x82\xA6\x82Ƃ\xE0 init_hosts_dlg \x82\xF0\x8CĂ\xF1\x82ł\xA2\x82\xE9\x82̂ŁA\x82\xBB\x82̑O\x82ɃZ\x83b\x83g\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
GetWindowText(dlg, uimsg, sizeof(uimsg));
@@ -2133,7 +2133,7 @@
return TRUE; /* because we do not set the focus */
case WM_COMMAND:
- pvar = (PTInstVar) GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar) GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDC_CONTINUE:
Modified: branches/cmake/ttssh2/ttxssh/key.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/key.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttssh2/ttxssh/key.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -2200,7 +2200,7 @@
switch (msg) {
case WM_INITDIALOG:
pvar = (PTInstVar)lParam;
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
GetWindowText(dlg, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_TITLE", pvar, uimsg);
@@ -2261,7 +2261,7 @@
return TRUE; /* because we do not set the focus */
case WM_COMMAND:
- pvar = (PTInstVar)GetWindowLong(dlg, DWLP_USER);
+ pvar = (PTInstVar)GetWindowLongPtr(dlg, DWLP_USER);
switch (LOWORD(wParam)) {
case IDOK:
Modified: branches/cmake/ttssh2/ttxssh/sftp.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/sftp.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttssh2/ttxssh/sftp.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -1073,8 +1073,8 @@
SetFocus(hEdit);
// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB
- hEditProc = (WNDPROC)GetWindowLong(hEdit, GWLP_WNDPROC);
- SetWindowLong(hEdit, GWLP_WNDPROC, (LONG)EditProc);
+ hEditProc = (WNDPROC)GetWindowLongPtr(hEdit, GWLP_WNDPROC);
+ SetWindowLongPtr(hEdit, GWLP_WNDPROC, (LONG)EditProc);
return TRUE;
Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-11-30 16:50:18 UTC (rev 7297)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-11-30 16:50:31 UTC (rev 7298)
@@ -1255,7 +1255,7 @@
switch (msg) {
case WM_INITDIALOG:
GetHNRec = (PGetHNRec) lParam;
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
GetWindowText(dlg, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_HOST_TITLE", pvar, uimsg);
@@ -1332,8 +1332,8 @@
// C-n/C-p \x82̂\xBD\x82߂ɃT\x83u\x83N\x83\x89\x83X\x89\xBB (2007.9.4 maya)
hwndHostname = GetDlgItem(dlg, IDC_HOSTNAME);
hwndHostnameEdit = GetWindow(hwndHostname, GW_CHILD);
- OrigHostnameEditProc = (WNDPROC)GetWindowLong(hwndHostnameEdit, GWLP_WNDPROC);
- SetWindowLong(hwndHostnameEdit, GWLP_WNDPROC, (LONG)HostnameEditProc);
+ OrigHostnameEditProc = (WNDPROC)GetWindowLongPtr(hwndHostnameEdit, GWLP_WNDPROC);
+ SetWindowLongPtr(hwndHostnameEdit, GWLP_WNDPROC, (LONG_PTR)HostnameEditProc);
CheckRadioButton(dlg, IDC_HOSTTELNET, IDC_HOSTOTHER,
pvar->settings.Enabled ? IDC_HOSTSSH : GetHNRec->
@@ -1488,7 +1488,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- GetHNRec = (PGetHNRec) GetWindowLong(dlg, DWLP_USER);
+ GetHNRec = (PGetHNRec) GetWindowLongPtr(dlg, DWLP_USER);
if (GetHNRec != NULL) {
if (IsDlgButtonChecked(dlg, IDC_HOSTTCPIP)) {
char afstr[BUFSIZ];
@@ -1554,7 +1554,7 @@
}
}
}
- SetWindowLong(hwndHostnameEdit, GWLP_WNDPROC, (LONG)OrigHostnameEditProc);
+ SetWindowLongPtr(hwndHostnameEdit, GWLP_WNDPROC, (LONG_PTR)OrigHostnameEditProc);
EndDialog(dlg, 1);
if (DlgHostFont != NULL) {
@@ -1564,7 +1564,7 @@
return TRUE;
case IDCANCEL:
- SetWindowLong(hwndHostnameEdit, GWLP_WNDPROC, (LONG)OrigHostnameEditProc);
+ SetWindowLongPtr(hwndHostnameEdit, GWLP_WNDPROC, (LONG_PTR)OrigHostnameEditProc);
EndDialog(dlg, 0);
if (DlgHostFont != NULL) {
@@ -1614,7 +1614,7 @@
enable_dlg_items(dlg, IDC_SSH_VERSION, IDC_SSH_VERSION, FALSE); // disabled
hostssh_enabled:
- GetHNRec = (PGetHNRec) GetWindowLong(dlg, DWLP_USER);
+ GetHNRec = (PGetHNRec) GetWindowLongPtr(dlg, DWLP_USER);
if (IsDlgButtonChecked(dlg, IDC_HOSTTELNET)) {
if (GetHNRec != NULL)
@@ -1657,7 +1657,7 @@
static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
{
return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG),
- parent, TTXHostDlg, (LONG) rec);
+ parent, TTXHostDlg, (LPARAM)rec);
}
static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks)
@@ -3297,7 +3297,7 @@
switch (msg) {
case WM_INITDIALOG:
- SetWindowLong(dlg, DWLP_USER, lParam);
+ SetWindowLongPtr(dlg, DWLP_USER, lParam);
init_setup_dlg((PTInstVar) lParam, dlg);
font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
@@ -3361,7 +3361,7 @@
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- complete_setup_dlg((PTInstVar) GetWindowLong(dlg, DWLP_USER), dlg);
+ complete_setup_dlg((PTInstVar) GetWindowLongPtr(dlg, DWLP_USER), dlg);
EndDialog(dlg, 1);
if (DlgSetupFont != NULL) {
DeleteObject(DlgSetupFont);
@@ -4128,9 +4128,9 @@
{
HWND passwordControl = GetDlgItem(dlg, item);
- SetWindowLong(passwordControl, GWLP_USERDATA,
- SetWindowLong(passwordControl, GWLP_WNDPROC,
- (LONG) password_wnd_proc));
+ SetWindowLongPtr(passwordControl, GWLP_USERDATA,
+ SetWindowLongPtr(passwordControl, GWLP_WNDPROC,
+ (LONG_PTR) password_wnd_proc));
}
// bcrypt KDF\x8C`\x8E\xAE\x82Ŕ閧\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9
@@ -5482,7 +5482,7 @@
hInst = hInstance;
pvar = &InstVar;
__mem_mapping =
- CreateFileMapping((HANDLE) 0xFFFFFFFF, NULL, PAGE_READWRITE, 0,
+ CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0,
sizeof(TS_SSH), TTSSH_FILEMAPNAME);
if (__mem_mapping == NULL) {
/* fake it. The settings won't be shared, but what the heck. */