Commit: 804aaf37a565845cab19b37f3f17fbf8c0b8436d - ffftp (git)

Loweynet

Commit MetaInfo

• Revisión: 804aaf37a565845cab19b37f3f17fbf8c0b8436d (tree)
• Tiempo: 2014-06-21 15:01:48
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add workarounds for Windows 2000/XP.

Cambiar Resumen

• modified: FFFTP.vc80ee.vcproj
• modified: FFFTP.vc90.vcproj
• modified: FFFTP.vcproj
• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_English.vc80ee.vcproj
• modified: FFFTP_English.vc90.vcproj
• modified: FFFTP_English.vcproj
• modified: Release/FFFTP.exe
• modified: config.h
• modified: updater.c

Diferencia incremental

--- a/FFFTP.vc80ee.vcproj
+++ b/FFFTP.vc80ee.vcproj
@@ -416,6 +416,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -601,6 +605,10 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

--- a/FFFTP.vc90.vcproj
+++ b/FFFTP.vc90.vcproj
@@ -413,6 +413,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -574,6 +578,10 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -416,6 +416,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -581,6 +585,10 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

--- a/FFFTP_English.vc80ee.vcproj
+++ b/FFFTP_English.vc80ee.vcproj
@@ -416,6 +416,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -597,6 +601,10 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -413,6 +413,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -574,6 +578,10 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -416,6 +416,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\apiemulator.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bookmark.c"
 				>
 			</File>
@@ -577,6 +581,10 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
+				RelativePath=".\apiemulator.h"
+				>
+			</File>
+			<File
 				RelativePath=".\common.h"
 				>
 			</File>

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

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

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