Skip to content

Commit

Permalink
fix minor HashProp UI bug
Browse files Browse the repository at this point in the history
  • Loading branch information
gurnec committed Aug 22, 2016
1 parent b506c68 commit e6fd568
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
1 change: 0 additions & 1 deletion HashCheck.rc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ VS_VERSION_INFO VERSIONINFO
{
BLOCK "040904b0" // English (U.S.)
{
VALUE "CompanyName", HASHCHECK_AUTHOR_STR
VALUE "FileDescription", HASHCHECK_NAME_STR
VALUE "FileVersion", HASHCHECK_VERSION_STR ARCH_NAME_TAIL
VALUE "LegalCopyright", "Copyright © " HASHCHECK_COPYRIGHT_STR
Expand Down
1 change: 1 addition & 0 deletions HashProp.c
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,7 @@ VOID WINAPI HashPropRestart( PHASHPROPCONTEXT phpctx )
EnableControl( phpctx->hWnd, IDC_PAUSE, TRUE);
EnableControl( phpctx->hWnd, IDC_STOP, TRUE);
SetDlgItemText(phpctx->hWnd, IDC_RESULTS, TEXT(""));
SetControlText(phpctx->hWnd, IDC_STATUSBOX, IDS_HP_STATUSBOX);
SetControlText(phpctx->hWnd, IDC_PAUSE, IDS_HC_PAUSE);
SetProgressBarPause((PCOMMONCONTEXT)phpctx, PBST_NORMAL);
SendMessage(phpctx->hWndPBFile, PBM_SETPOS, 0, 0);
Expand Down
6 changes: 3 additions & 3 deletions installer/HashCheck.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ FunctionEnd
!insertmacro MUI_LANGUAGE "Ukrainian"
!insertmacro MUI_LANGUAGE "Catalan"

VIProductVersion "2.4.0.24-beta"
VIProductVersion "2.4.0.25-beta"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "HashCheck Shell Extension"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0.24-beta"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0.25-beta"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Installer distributed from https://github.com/gurnec/HashCheck/releases"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" ""
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © Kai Liu, Christopher Gurnee, Tim Schlueter, et al. All rights reserved."
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installer (x86/x64) from https://github.com/gurnec/HashCheck/releases"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0.24-beta"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0.25-beta"

; With solid compression, files that are required before the
; actual installation should be stored first in the data block,
Expand Down
10 changes: 2 additions & 8 deletions version.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,22 @@
#define HASHCHECK_NAME_STR "HashCheck Shell Extension"

// Full version: MUST be in the form of major,minor,revision,build
#define HASHCHECK_VERSION_FULL 2,4,0,24
#define HASHCHECK_VERSION_FULL 2,4,0,25

// String version: May be any suitable string
#define HASHCHECK_VERSION_STR "2.4.0.24-beta"
#define HASHCHECK_VERSION_STR "2.4.0.25-beta"

#ifdef _USRDLL
// PE version: MUST be in the form of major.minor
#pragma comment(linker, "/version:2.4")
#endif

// String used in the "CompanyName" field of the version resource
#define HASHCHECK_AUTHOR_STR "code.kliu.org"

// Tail portion of the copyright string for the version resource
#define HASHCHECK_COPYRIGHT_STR "Kai Liu, Christopher Gurnee, Tim Schlueter, et al. All rights reserved."

// Name of the DLL
#define HASHCHECK_FILENAME_STR "HashCheck.dll"

// String used for setup
#define HASHCHECK_SETUP_STR "HashCheck Shell Extension Setup"

// Architecture names
#if defined(_M_IX86)
#define ARCH_NAME_TAIL " (x86-32)"
Expand Down

0 comments on commit e6fd568

Please sign in to comment.