version 2.5.3

delhoume · Dec 28, 2021 · e58a147 · e58a147
1 parent 3fc4455
commit e58a147
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 28 deletions.
diff --git a/src/dialogs.c b/src/dialogs.c
@@ -14,7 +14,7 @@ static HWND progress;
 
 BOOL StaticToURLControl(HWND hDlg, UINT staticid, TCHAR *szURL, COLORREF crLink);
 
-BOOL CALLBACK DialogProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+BOOL CALLBACK DialogProcAbout (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
      switch (message) {
      case WM_INITDIALOG :
 	 ShowWindow (hDlg, SW_HIDE);
@@ -42,6 +42,48 @@ BOOL CALLBACK DialogProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
      return FALSE ;
 }
 
+const char* credits = 
+"libtiff 4.3.0\n"
+"   Copyright (c) 1988-1997 Sam Leffler\n"
+"   Copyright (c) 1991-1997 Silicon Graphics, Inc.\n\n"
+"libpng 1.6.37\n"
+"   Copyright (c) 1995-2019 The PNG Reference Library Authors.\n"
+"   Copyright (c) 2018-2019 Cosmin Truta.\n"
+"   Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.\n"
+"   Copyright (c) 1996-1997 Andreas Dilger.\n"
+"   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n\n"
+"zlib 1.2.11\n"
+"   Copyright (c)  1995-2017 Jean-loup Gailly and Mark Adler\n\n"
+"libjpeg 6b\n"
+"   Copyright (c) 1994-1998, Thomas G. Lane.\n\n"
+"libjpeg-turbo 2.1.2\n"
+"   Copyright (c)2009-2021 D. R. Commander.\n"
+"   Copyright (c)2015 Viktor Szathmáry.\n\n"
+"Ownd\n"
+"   Copyright (c) 1998 Russell Freeman."
+;
+
+
+BOOL CALLBACK DialogProcCredits (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+     switch (message) {
+     case WM_INITDIALOG :
+	 ShowWindow (hDlg, SW_HIDE);
+	 SendDlgItemMessage(hDlg, IDC_STATIC, WM_SETTEXT, 0, (LPARAM)credits);
+	 CenterDialog (hDlg, GetWindow(hDlg, GW_OWNER));
+	 ShowWindow (hDlg, SW_SHOW);
+	 return TRUE ;
+     case WM_COMMAND :
+	 switch (LOWORD (wParam)) {
+	 case IDOK :
+	 case IDCANCEL :
+	     EndDialog (hDlg, 0) ;
+	     return TRUE ;
+	 }
+	 break ;
+     }
+     return FALSE ;
+}
+
 const char* VlivRegLicenseInfo = "Software\\Delhoume\\Vliv\\License";
 
 const char* hextable = "0123456789ABCDEF";

diff --git a/src/dialogs.h b/src/dialogs.h
@@ -1,10 +1,10 @@
 #ifndef _VLIV_DIALOGS_H
 #define _VLIV_DIALOGS_H
 
-#include <windows.h>
 #include <vliv.h>
 
-BOOL CALLBACK DialogProc (HWND, UINT, WPARAM, LPARAM);
+BOOL CALLBACK DialogProcAbout (HWND, UINT, WPARAM, LPARAM);
+BOOL CALLBACK DialogProcCredits (HWND, UINT, WPARAM, LPARAM);
 BOOL CALLBACK RegisterProc (HWND, UINT, WPARAM, LPARAM);
 BOOL CALLBACK AbortDialogProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam);
 BOOL CALLBACK AbortProc(HDC hdc, int nCode);

diff --git a/src/resources/vliv.rc b/src/resources/vliv.rc
@@ -21,30 +21,17 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,68,75,50,14
-    CTEXT           "Vliv 2.5.2 - January 2008",IDC_VERSION,6,14,180,8
-    CTEXT           "Unregistered Version",3,6,26,180,8
-    CTEXT           "(c) 2003-2008, Fr�d�ric Delhoume",4,6,45,180,8
+    CTEXT           "Vliv 2.5.3",IDC_VERSION,6,14,180,8
+    CTEXT           "(c) 2003-2022, Fr�d�ric Delhoume",4,6,45,180,8
     CTEXT           "http://vlivviewer.free.fr/vliv.htm",IDC_HYPERLINK,6,58,180,8
 END
 
-CREDITSDLG DIALOGEX 0, 0, 212, 230
+CREDITSDLG DIALOGEX 0, 0, 240, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,78,212,50,14
-    GROUPBOX        "TIFF library 4beta",6,8,8,196,37
-    CTEXT           "Copyright (c) 1988-1997 Sam Leffler",7,9,20,193,8
-    CTEXT           "Copyright (c) 1991-1997 Silicon Graphics, Inc.",8,9,30,193,8
-    GROUPBOX        "ZLIB Library 1.2.3",9,8,50,196,30
-    CTEXT           "(c) 1995-2005 Jean-loup Gailly and Mark Adler",10,9,64,193,8
-    GROUPBOX        "IJG Library v6b",11,8,85,196,30
-    CTEXT           "(c) 1991-1998, Thomas G. Lane",12,9,98,193,8
-    GROUPBOX        "Ownd dll",13,8,120,196,30
-    CTEXT           "(c) 1998, Russell Freeman",14,9,132,193,8
-    GROUPBOX        "PNG Library 1.2.13", 15,8,153,196,51
-    CTEXT           "Copyright (c) 1998-2006 Glenn Randers-Pehrson",16, 9,166,193,8
-    CTEXT           "Copyright (c) 1996-1997 Andreas Dilger",17,9,178,193,8
-    CTEXT           "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.",18,9,190,193,8
+    DEFPUSHBUTTON   "OK",IDOK,92,236,50,14
+    LTEXT     	    "", IDC_STATIC, 10, 10, 220, 226
 END
 
 REGISTERDLG DIALOGEX 0, 0, 200, 90
@@ -152,19 +139,19 @@ BEGIN
 END
 
 1 VERSIONINFO 
-    FILEVERSION 2,5,2,0
-    PRODUCTVERSION 2,5,2,0
+    FILEVERSION 2,5,3,0
+    PRODUCTVERSION 2,5,3,0
     BEGIN 
 	BLOCK "StringFileInfo"
     	BEGIN
 	    BLOCK "040904e4"
             BEGIN
 		VALUE "CompanyName", "Fr�d�ric Delhoume\0"
             	VALUE "FileDescription", "Very Large Image Viewer\0"
-            	VALUE "FileVersion", "2.5.2\0"
-       		VALUE "LegalCopyright", "Copyright � Fr�d�ric Delhoume 2003-2008\0"
+            	VALUE "FileVersion", "2.5.3\0"
+       		VALUE "LegalCopyright", "Copyright � Fr�d�ric Delhoume 2003-2022\0"
             	VALUE "ProductName", "Vliv\0"
-            	VALUE "ProductVersion", "2.5.2\0"
+            	VALUE "ProductVersion", "2.5.3\0"
             END
       END
 END
diff --git a/src/vliv.c b/src/vliv.c
@@ -730,10 +730,10 @@ LRESULT CALLBACK TopWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 	    UpdateScrollbars(TRUE);
 	    break;
 	case ID_HELP_ABOUT:
-	    DialogBox(languageInst, "AboutDlg", mainwindow, DialogProc);
+	    DialogBox(languageInst, "AboutDlg", mainwindow, DialogProcAbout);
 	    break;
 	case ID_HELP_CREDITS:
-	    DialogBox(hInst, "CreditsDlg", mainwindow, DialogProc);
+	    DialogBox(hInst, "CreditsDlg", mainwindow, DialogProcCredits);
 	    break;
 	}
 	if ((LOWORD(wParam) >= ID_FILE_RECENT) && (LOWORD(wParam) < (ID_FILE_RECENT + GetNumRecent())))