Tera TermRevision: 8664
https://osdn.net/projects/ttssh2/scm/svn/commits/8664
Author: zmatsuo
Date: 2020-04-01 23:30:36 +0900 (Wed, 01 Apr 2020)
Log Message:
-----------
VS2005でビルドエラーが出たので修正
- PIDLIST_ABSOLUTE -> LPITEMIDLIST
- "errno.h" を include (ttl_gui.cpp)
- r8658
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8658
Modified Paths:
--------------
branches/unicode_macro_2/teraterm/common/compat_win.cpp
branches/unicode_macro_2/teraterm/common/compat_win.h
branches/unicode_macro_2/teraterm/common/layer_for_unicode.cpp
branches/unicode_macro_2/teraterm/common/layer_for_unicode.h
branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp
-------------- next part --------------
Modified: branches/unicode_macro_2/teraterm/common/compat_win.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/common/compat_win.cpp 2020-04-01 14:30:24 UTC (rev 8663)
+++ branches/unicode_macro_2/teraterm/common/compat_win.cpp 2020-04-01 14:30:36 UTC (rev 8664)
@@ -102,8 +102,8 @@
// shell32
UINT (WINAPI *pDragQueryFileW)(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch);
BOOL (WINAPI *pShell_NotifyIconW)(DWORD dwMessage, NOTIFYICONDATAW *lpData);
-PIDLIST_ABSOLUTE (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);
-BOOL (WINAPI *pSHGetPathFromIDListW)(PCIDLIST_ABSOLUTE pidl, LPWSTR pszPath);
+LPITEMIDLIST (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);
+BOOL (WINAPI *pSHGetPathFromIDListW)(LPITEMIDLIST pidl, LPWSTR pszPath);
// comctl32
HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(LPCPROPSHEETPAGEW constPropSheetPagePointer);
Modified: branches/unicode_macro_2/teraterm/common/compat_win.h
===================================================================
--- branches/unicode_macro_2/teraterm/common/compat_win.h 2020-04-01 14:30:24 UTC (rev 8663)
+++ branches/unicode_macro_2/teraterm/common/compat_win.h 2020-04-01 14:30:36 UTC (rev 8664)
@@ -131,8 +131,8 @@
extern BOOL (WINAPI *pWritePrivateProfileStringW)(LPCWSTR lpAppName,LPCWSTR lpKeyName,LPCWSTR lpString,LPCWSTR lpFileName);
// shlobj_core.h
-extern PIDLIST_ABSOLUTE (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);
-extern BOOL (WINAPI *pSHGetPathFromIDListW)(PCIDLIST_ABSOLUTE pidl, LPWSTR pszPath);
+extern LPITEMIDLIST (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);
+extern BOOL (WINAPI *pSHGetPathFromIDListW)(LPITEMIDLIST pidl, LPWSTR pszPath);
void WinCompatInit();
Modified: branches/unicode_macro_2/teraterm/common/layer_for_unicode.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/common/layer_for_unicode.cpp 2020-04-01 14:30:24 UTC (rev 8663)
+++ branches/unicode_macro_2/teraterm/common/layer_for_unicode.cpp 2020-04-01 14:30:36 UTC (rev 8664)
@@ -582,7 +582,7 @@
return r;
}
-PIDLIST_ABSOLUTE _SHBrowseForFolderW(LPBROWSEINFOW lpbi)
+LPITEMIDLIST _SHBrowseForFolderW(LPBROWSEINFOW lpbi)
{
if (pSHBrowseForFolderW != NULL) {
return pSHBrowseForFolderW(lpbi);
@@ -596,7 +596,7 @@
biA.ulFlags = lpbi->ulFlags;
biA.lpfn = lpbi->lpfn;
biA.lParam = lpbi->lParam;
- PIDLIST_ABSOLUTE pidlBrowse = SHBrowseForFolderA(&biA);
+ LPITEMIDLIST pidlBrowse = SHBrowseForFolderA(&biA);
free(biA.pszDisplayName);
free((void *)biA.lpszTitle);
@@ -603,7 +603,7 @@
return pidlBrowse;
}
-BOOL _SHGetPathFromIDListW(PCIDLIST_ABSOLUTE pidl, LPWSTR pszPath)
+BOOL _SHGetPathFromIDListW(LPITEMIDLIST pidl, LPWSTR pszPath)
{
if (pSHGetPathFromIDListW != NULL) {
return pSHGetPathFromIDListW(pidl, pszPath);
Modified: branches/unicode_macro_2/teraterm/common/layer_for_unicode.h
===================================================================
--- branches/unicode_macro_2/teraterm/common/layer_for_unicode.h 2020-04-01 14:30:24 UTC (rev 8663)
+++ branches/unicode_macro_2/teraterm/common/layer_for_unicode.h 2020-04-01 14:30:36 UTC (rev 8664)
@@ -139,8 +139,8 @@
// shell32.lib
UINT _DragQueryFileW(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch);
BOOL _Shell_NotifyIconW(DWORD dwMessage, TT_NOTIFYICONDATAW_V2 *lpData);
-PIDLIST_ABSOLUTE _SHBrowseForFolderW(LPBROWSEINFOW lpbi);
-BOOL _SHGetPathFromIDListW(PCIDLIST_ABSOLUTE pidl, LPWSTR pszPath);
+LPITEMIDLIST _SHBrowseForFolderW(LPBROWSEINFOW lpbi);
+BOOL _SHGetPathFromIDListW(LPITEMIDLIST pidl, LPWSTR pszPath);
HWND _CreateDialogIndirectParamW(HINSTANCE hInstance, LPCDLGTEMPLATEW lpTemplate,
HWND hWndParent, DLGPROC lpDialogFunc,
Modified: branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp 2020-04-01 14:30:24 UTC (rev 8663)
+++ branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp 2020-04-01 14:30:36 UTC (rev 8664)
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <crtdbg.h>
#include <string.h>
+#include <errno.h>
#include "ttmdlg.h"
#include "ttmparse.h"
#include "ttmlib.h"