Added more information to About encfsw dialog, update dependencies

Dokany bumped to v1.2.1.2000 OpenSSL bumped to v1.0.2q EncFS and Dokany versions added to About dialog in encfsw
jetwhiz · Jan 21, 2019 · fd351fa · fd351fa
1 parent 8df5b33
commit fd351fa
Show file tree

Hide file tree

Showing 7 changed files with 1,824 additions and 247 deletions.
diff --git a/build-dokany.bat b/build-dokany.bat
@@ -33,8 +33,8 @@ if defined USE_LEGACY_DOKAN (
   set VERSION=v0.7.4
   set VERSION_STR=0.7.4
 ) else (
-  set VERSION=v1.2.0.1000
-  set VERSION_STR=v1.2.0.1000
+  set VERSION=v1.2.1.2000
+  set VERSION_STR=v1.2.1.2000
 )
 
 

diff --git a/build-openssl.bat b/build-openssl.bat
@@ -23,8 +23,8 @@ REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 REM versioning variables 
-set VERSION=1.0.2p
-set VERSION_STR=1_0_2p
+set VERSION=1.0.2q
+set VERSION_STR=1_0_2q
 set SOURCE_URI=https://github.com/openssl/openssl.git
 
 

diff --git a/encfs/encfs-installer.nsi b/encfs/encfs-installer.nsi
@@ -73,8 +73,8 @@ Section "VC++ Redist v140" SEC02
 SectionEnd
 
 Section "Dokany v1.2" SEC03
-  File "..\..\encfs-bin\DokanSetup_redist-1.2.0.1000.exe"
-  ExecWait "$INSTDIR\DokanSetup_redist-1.2.0.1000.exe /install /passive /norestart"
+  File "..\..\encfs-bin\DokanSetup_redist-1.2.1.2000.exe"
+  ExecWait "$INSTDIR\DokanSetup_redist-1.2.1.2000.exe /install /passive /norestart"
 SectionEnd
 
 Section "encfs" SEC04
@@ -117,7 +117,7 @@ Section "encfs" SEC04
   # Cleanup
   Delete $INSTDIR\vc_redist-120_x86.exe
   Delete $INSTDIR\vc_redist-140_x86.exe
-  Delete $INSTDIR\DokanSetup_redist-1.2.0.1000.exe
+  Delete $INSTDIR\DokanSetup_redist-1.2.1.2000.exe
 SectionEnd
 
 LangString DESC_SEC01 ${LANG_ENGLISH} "Microsoft Visual C++ Redistributable 2013"

diff --git a/encfs/win/guiutils.h b/encfs/win/guiutils.h
@@ -23,6 +23,7 @@
 #define IDC_CHKSTARTUP                          1011
 #define IDC_PASSWORD                            1011
 #define IDC_CHKOPEN                             1012
+#define IDC_ABOUTTEXT							1013
 
 
 extern HINSTANCE hFuseDllInstance;

diff --git a/encfs/win/maingui.cpp b/encfs/win/maingui.cpp
@@ -46,7 +46,7 @@ static void SetPath()
   SetCurrentDirectory(path);
 }
 
-#define DOKAN_VERSION           600
+ULONG dokanVersion = 0;
 
 static bool CheckDokan()
 {
@@ -64,6 +64,7 @@ static bool CheckDokan()
   ResolvedDokanVersion = (DokanVersionType)GetProcAddress(dll, "DokanVersion");
   if (!ResolvedDokanVersion)
     res = false;
+  dokanVersion = ResolvedDokanVersion();
 
   if (!GetProcAddress(dll, "DokanMain") || !GetProcAddress(dll, "DokanUnmount"))
     res = false;
@@ -638,8 +639,15 @@ MainDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 static INT_PTR CALLBACK
 AboutDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM /* lParam*/)
 {
+  std::wstring someText = L"EncFS GUI\r\n\r\nEncFS v" VERSION L"\r\nBuilt for Dokany v" +
+                          std::to_wstring(DOKAN_VERSION) +
+						  L" (v" +
+                          std::to_wstring(dokanVersion) +
+                          L" loaded)"
+                          L"\r\nhttps://github.com/jetwhiz/encfs4win";
   switch (message) {
   case WM_INITDIALOG:
+    SetDlgItemText(hDlg, IDC_ABOUTTEXT, someText.c_str());
     return TRUE;
   case WM_COMMAND:
     if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {