Add workarounds for Windows 2000/XP.

diff --git a/FFFTP.vc80ee.vcproj b/FFFTP.vc80ee.vcproj
index fa0ad87..2621a63 100644 (file)
--- a/FFFTP.vc80ee.vcproj
+++ b/FFFTP.vc80ee.vcproj
@@ -416,6 +416,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -601,6 +605,10 @@
                        Filter="h;hpp;hxx;hm;inl;fi;fd"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/FFFTP.vc90.vcproj b/FFFTP.vc90.vcproj
index 14f062b..586ad13 100644 (file)
--- a/FFFTP.vc90.vcproj
+++ b/FFFTP.vc90.vcproj
@@ -413,6 +413,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -574,6 +578,10 @@
                        Filter="h;hpp;hxx;hm;inl;fi;fd"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/FFFTP.vcproj b/FFFTP.vcproj
index 1dff84a..573f6e4 100644 (file)
--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -416,6 +416,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -581,6 +585,10 @@
                        Filter="h;hpp;hxx;hm;inl;fi;fd"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 0ad2903..be17951 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_English.vc80ee.vcproj b/FFFTP_English.vc80ee.vcproj
index 4630e61..149d658 100644 (file)
--- a/FFFTP_English.vc80ee.vcproj
+++ b/FFFTP_English.vc80ee.vcproj
@@ -416,6 +416,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -597,6 +601,10 @@
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/FFFTP_English.vc90.vcproj b/FFFTP_English.vc90.vcproj
index c63c153..e61401e 100644 (file)
--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -413,6 +413,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -574,6 +578,10 @@
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/FFFTP_English.vcproj b/FFFTP_English.vcproj
index bba58fc..292b395 100644 (file)
--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -416,6 +416,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\apiemulator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\bookmark.c"\r
                                >\r
                        </File>\r
@@ -577,6 +581,10 @@
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
+                               RelativePath=".\apiemulator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\common.h"\r
                                >\r
                        </File>\r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 7d30b84..56e8997 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/config.h b/config.h
index fd266f2..b2fe717 100644 (file)
--- a/config.h
+++ b/config.h
@@ -27,4 +27,6 @@
 #include "socketwrapper.h"\r
 // プロセスをDLL Injectionから保護する\r
 #include "protectprocess.h"\r
+// 一部のWin32 APIのエミュレーションを行う\r
+#include "apiemulator.h"\r
 \r

diff --git a/updater.c b/updater.c
index 943d436..fdd45f4 100644 (file)
--- a/updater.c
+++ b/updater.c
@@ -15,6 +15,7 @@ typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE;
 #include "socketwrapper.h"\r
 #include "protectprocess.h"\r
 #include "mbswrapper.h"\r
+#include "apiemulator.h"\r
 \r
 typedef struct\r
 {\r
@@ -541,7 +542,10 @@ BOOL RestartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword)
                                memset(&Info, 0, sizeof(SHELLEXECUTEINFO));\r
                                Info.cbSize = sizeof(SHELLEXECUTEINFO);\r
                                Info.fMask = SEE_MASK_NOCLOSEPROCESS;\r
-                               Info.lpVerb = _T("runas");\r
+                               if(IsUserAnAdmin())\r
+                                       Info.lpVerb = _T("open");\r
+                               else\r
+                                       Info.lpVerb = _T("runas");\r
                                Info.lpFile = Path;\r
                                Info.lpParameters = NewCommandLine;\r
                                Info.nShow = SW_SHOW;\r