Skip to content

Commit c2af5cc

Browse files
jet2jetjet2jet
committed
Update version to 0.12.0.1
1 parent 9c42076 commit c2af5cc

File tree

13 files changed

+40
-29
lines changed

13 files changed

+40
-29
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# ChangeLog
22

3+
## v0.12.0.1
4+
5+
- Add implementation for use from VBA, PowerShell, and etc.
6+
- EasySFTP.dll now provides type library
7+
- Restore showing icons on transfer dialog
8+
- Fix some bugs, especially for Shell Extension
9+
310
## v0.11.1.1
411

512
- Fix for reauthenticating process on SFTP

‎EasySFTP.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
--- EasySFTP Version 0.11.1.1 ---
2+
--- EasySFTP Version 0.12.0.1 ---
33

44
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
55
概要
@@ -23,7 +23,8 @@ FTPとSFTPのプロトコルに対応しています。
2323
・RegESFTP.exe
2424
　EasySFTP.dll をシステム(レジストリ)へ登録するプログラムです。
2525
　「/unregister」オプションを付けると登録を削除することが出来ます。
26-
　[Vista 以降] 管理者権限でのみ実行可能です。
26+
　管理者権限で実行するとシステムに、通常権限で実行すると
27+
　現在のユーザーに対して有効になる登録を行います。
2728
・EasySFTP.txt
2829
　この説明ファイルです。
2930
・EasySFTP.ini (一度起動すると自動作成)

‎EasySFTP/EasySFTP.rc

2 Bytes
Binary file not shown.

‎EasySFTP/EasySFTP.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</ClCompile>
112112
<Link>
113113
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
114-
<Version>0.11</Version>
114+
<Version>0.12</Version>
115115
<GenerateDebugInformation>true</GenerateDebugInformation>
116116
<SubSystem>Windows</SubSystem>
117117
<TargetMachine>MachineX86</TargetMachine>
@@ -143,7 +143,7 @@
143143
</ClCompile>
144144
<Link>
145145
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
146-
<Version>0.11</Version>
146+
<Version>0.12</Version>
147147
<GenerateDebugInformation>true</GenerateDebugInformation>
148148
<SubSystem>Windows</SubSystem>
149149
<TargetMachine>MachineX64</TargetMachine>
@@ -174,7 +174,7 @@
174174
</ClCompile>
175175
<Link>
176176
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
177-
<Version>0.11</Version>
177+
<Version>0.12</Version>
178178
<GenerateDebugInformation>true</GenerateDebugInformation>
179179
<SubSystem>Windows</SubSystem>
180180
<OptimizeReferences>true</OptimizeReferences>
@@ -208,7 +208,7 @@
208208
</ClCompile>
209209
<Link>
210210
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
211-
<Version>0.11</Version>
211+
<Version>0.12</Version>
212212
<GenerateDebugInformation>true</GenerateDebugInformation>
213213
<SubSystem>Windows</SubSystem>
214214
<OptimizeReferences>true</OptimizeReferences>

‎EasySFTP/MainWnd.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,20 +1863,29 @@ static INT_PTR CALLBACK _AboutDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP
18631863
{
18641864
case WM_INITDIALOG:
18651865
{
1866-
IEasySFTPOldRoot2* pRoot2 = NULL;
1867-
auto hr = theApp.m_pEasySFTPRoot->QueryInterface(IID_IEasySFTPOldRoot2, reinterpret_cast<void**>(&pRoot2));
1866+
IEasySFTPRoot* pRoot = NULL;
1867+
auto hr = theApp.m_pEasySFTPRoot->QueryInterface(IID_IEasySFTPRoot, reinterpret_cast<void**>(&pRoot));
18681868
if (SUCCEEDED(hr))
18691869
{
1870+
CMyStringW str;
18701871
BSTR bstr = NULL;
1871-
hr = pRoot2->GetDependencyLibraryInfo(&bstr);
1872-
pRoot2->Release();
1872+
hr = pRoot->get_Version(&bstr);
18731873
if (SUCCEEDED(hr))
18741874
{
1875-
CMyStringW str;
1876-
str.SetString(bstr, ::SysStringLen(bstr));
1875+
MyBSTRToString(bstr, str);
1876+
::SysFreeString(bstr);
1877+
str.InsertString(L" version ", 0);
1878+
str.InsertString(theApp.m_strTitle, 0);
1879+
::MySetDlgItemTextW(hDlg, IDC_VERSION, str);
1880+
}
1881+
hr = pRoot->GetDependencyLibraryInfo(&bstr);
1882+
if (SUCCEEDED(hr))
1883+
{
1884+
MyBSTRToString(bstr, str);
18771885
::SysFreeString(bstr);
18781886
::MySetDlgItemTextW(hDlg, IDC_FEATURES, str);
18791887
}
1888+
pRoot->Release();
18801889
}
18811890
}
18821891
break;

‎EasySFTP/resource.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//{{NO_DEPENDENCIES}}
1+
//{{NO_DEPENDENCIES}}
22
// Microsoft Visual C++ で生成されたインクルード ファイル。
33
// EasySFTP.rc で使用
44
//
@@ -33,7 +33,6 @@
3333
#define IDD_OPTION 134
3434
#define IDR_POPUP 135
3535
#define IDB_ADDRESS_BUTTONS 138
36-
#define IDB_BITMAP1 144
3736
#define IDB_TOOLBAR_L 144
3837
#define IDB_ADDRESS_BUTTONS_L 145
3938
#define IDS_HEAD_FILE_NAME 201
@@ -68,6 +67,7 @@
6867
#define IDC_REGISTER_SYSTEM 1052
6968
#define IDC_FEATURES 1053
7069
#define IDC_LINK_TO_REPOSITORY 1054
70+
#define IDC_VERSION 1055
7171
#define IDS_UNKNOWN_HOST 10001
7272
#define IDS_FAILED_TO_CONNECT 10002
7373
#define IDS_DIRCHANGE_FAILED 11001
@@ -138,7 +138,7 @@
138138
#define _APS_NO_MFC 1
139139
#define _APS_NEXT_RESOURCE_VALUE 146
140140
#define _APS_NEXT_COMMAND_VALUE 32870
141-
#define _APS_NEXT_CONTROL_VALUE 1055
141+
#define _APS_NEXT_CONTROL_VALUE 1056
142142
#define _APS_NEXT_SYMED_VALUE 117
143143
#endif
144144
#endif

‎README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ EasySFTPはFTPとSFTPに対応したファイル転送を行うWindows用クラ
88

99
[EasySFTP.txt](./EasySFTP.txt) をご覧ください。
1010

11-
## 未実装機能
12-
13-
- ディレクトリ(フォルダー)のアップロード機能
14-
- 「すべてアップロード」「すべてダウンロード」の機能
15-
- etc.
16-
1711
## ソースコードのビルド方法
1812

1913
(Visual Studio 2019 における手順であり、他の環境では未確認です。)

‎RegESFTP/RegESFTP.rc

0 Bytes
Binary file not shown.

‎RegESFTP/RegESFTP.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
106106
</ClCompile>
107107
<Link>
108-
<Version>0.10</Version>
108+
<Version>0.12</Version>
109109
<GenerateDebugInformation>true</GenerateDebugInformation>
110110
<OptimizeReferences>false</OptimizeReferences>
111111
<EnableCOMDATFolding>false</EnableCOMDATFolding>
@@ -131,7 +131,7 @@
131131
<OptimizeReferences>false</OptimizeReferences>
132132
<EnableCOMDATFolding>false</EnableCOMDATFolding>
133133
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
134-
<Version>0.10</Version>
134+
<Version>0.12</Version>
135135
</Link>
136136
<Manifest>
137137
<AdditionalManifestFiles>$(TargetFileName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -150,7 +150,7 @@
150150
<OptimizeReferences>true</OptimizeReferences>
151151
<EnableCOMDATFolding>true</EnableCOMDATFolding>
152152
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
153-
<Version>0.10</Version>
153+
<Version>0.12</Version>
154154
</Link>
155155
</ItemDefinitionGroup>
156156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -173,7 +173,7 @@
173173
<OptimizeReferences>true</OptimizeReferences>
174174
<Version>0.1</Version>
175175
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
176-
<Version>0.10</Version>
176+
<Version>0.12</Version>
177177
</Link>
178178
<Manifest>
179179
<AdditionalManifestFiles>$(TargetFileName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

‎RegESFTP/resource.h

-585 Bytes
Binary file not shown.

‎ShellDLL/ShellDLL.rc

54 Bytes
Binary file not shown.

‎ShellDLL/ShellDLL.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</ClCompile>
107107
<Link>
108108
<AdditionalDependencies>$(TargetDir)Common.lib;ws2_32.lib;crypt32.lib;$(OpenSSLLibraryNames);$(LibSSH2LibraryNames);comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
109-
<Version>0.11</Version>
109+
<Version>0.12</Version>
110110
<ModuleDefinitionFile>ShellDLL.def</ModuleDefinitionFile>
111111
<GenerateDebugInformation>true</GenerateDebugInformation>
112112
<ProgramDatabaseFile>$(TargetDir)ShellDLL.pdb</ProgramDatabaseFile>
@@ -164,7 +164,7 @@ exit /b 0
164164
<Link>
165165
<AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
166166
<AdditionalDependencies>$(TargetDir)Common.lib;ws2_32.lib;crypt32.lib;$(OpenSSLLibraryNames);$(LibSSH2LibraryNames);comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
167-
<Version>0.11</Version>
167+
<Version>0.12</Version>
168168
<ModuleDefinitionFile>ShellDLL.def</ModuleDefinitionFile>
169169
<GenerateDebugInformation>true</GenerateDebugInformation>
170170
<ProgramDatabaseFile>$(TargetDir)ShellDLL.pdb</ProgramDatabaseFile>
@@ -205,7 +205,7 @@ exit /b 0
205205
</ClCompile>
206206
<Link>
207207
<AdditionalDependencies>$(TargetDir)Common.lib;ws2_32.lib;crypt32.lib;$(OpenSSLLibraryNames);$(LibSSH2LibraryNames);comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
208-
<Version>0.11</Version>
208+
<Version>0.12</Version>
209209
<ModuleDefinitionFile>ShellDLL.def</ModuleDefinitionFile>
210210
<GenerateDebugInformation>true</GenerateDebugInformation>
211211
<ProgramDatabaseFile>$(TargetDir)ShellDLL.pdb</ProgramDatabaseFile>
@@ -266,7 +266,7 @@ exit /b 0
266266
<Link>
267267
<AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
268268
<AdditionalDependencies>$(TargetDir)Common.lib;ws2_32.lib;crypt32.lib;$(OpenSSLLibraryNames);$(LibSSH2LibraryNames);comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
269-
<Version>0.11</Version>
269+
<Version>0.12</Version>
270270
<ModuleDefinitionFile>ShellDLL.def</ModuleDefinitionFile>
271271
<GenerateDebugInformation>true</GenerateDebugInformation>
272272
<ProgramDatabaseFile>$(TargetDir)ShellDLL.pdb</ProgramDatabaseFile>

‎ShellDLL/resource.h

-10.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)