diff --git a/XScreenSaverWin.iss b/XScreenSaverWin.iss index 77f9802..1aad9d3 100644 --- a/XScreenSaverWin.iss +++ b/XScreenSaverWin.iss @@ -7,7 +7,7 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{B7914227-CD94-4B6F-859C-E3823C9552DA} AppName=XScreenSaver for Windows -AppVerName=XScreenSaver for Windows v0.77 +AppVerName=XScreenSaver for Windows v0.78 AppPublisher=Katayama Hirofumi MZ AppPublisherURL=http://katahiromz.web.fc2.com/xscreensaverwin/eindex.html AppSupportURL=http://katahiromz.web.fc2.com/xscreensaverwin/eindex.html diff --git a/debughelper/debughelper.rc b/debughelper/debughelper.rc index 1bb814c..89aa173 100644 --- a/debughelper/debughelper.rc +++ b/debughelper/debughelper.rc @@ -21,8 +21,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -33,10 +33,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin debughelper\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" diff --git a/non-wgl/non-wgl.c b/non-wgl/non-wgl.c index 6d33db6..476ba73 100644 --- a/non-wgl/non-wgl.c +++ b/non-wgl/non-wgl.c @@ -93,7 +93,10 @@ void ss_term(void) free(ss.modeinfo.colors); free(ss.modeinfo.pixels); XFreeGC(ss.modeinfo.dpy, ss.modeinfo.gc); - hack_free(&ss.modeinfo); + if (hack_free != NULL) + { + hack_free(&ss.modeinfo); + } ReleaseDC(ss.hwnd, ss.hdc); DeleteObject(ss.hbmScreenShot); CloseHandle(g_hMapping); diff --git a/random/random.rc b/random/random.rc index 954b33d..f218479 100644 --- a/random/random.rc +++ b/random/random.rc @@ -9,8 +9,8 @@ // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -21,10 +21,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin random screensaver\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" diff --git a/screenhack.rc b/screenhack.rc index 0795987..bae0d2c 100644 --- a/screenhack.rc +++ b/screenhack.rc @@ -79,8 +79,8 @@ FONT 8, "Arial" // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -91,10 +91,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin screenhack\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" diff --git a/wgl/wgl.c b/wgl/wgl.c index 57a4655..891053b 100644 --- a/wgl/wgl.c +++ b/wgl/wgl.c @@ -91,7 +91,10 @@ void ss_term(void) { free(ss.modeinfo.colors); free(ss.modeinfo.pixels); - hack_free(&ss.modeinfo); + if (hack_free != NULL) + { + hack_free(&ss.modeinfo); + } ReleaseDC(ss.hwnd, ss.hdc); DeleteObject(ss.hbmScreenShot); CloseHandle(g_hMapping); diff --git a/xlockmore.rc b/xlockmore.rc index 3f7b61d..c1a12d0 100644 --- a/xlockmore.rc +++ b/xlockmore.rc @@ -79,8 +79,8 @@ FONT 8, "Arial" // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -91,10 +91,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin xlockmore\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" diff --git a/xscreensaver-text/xscreensaver-text.c b/xscreensaver-text/xscreensaver-text.c index 7285745..481871e 100644 --- a/xscreensaver-text/xscreensaver-text.c +++ b/xscreensaver-text/xscreensaver-text.c @@ -36,7 +36,7 @@ const char *saver_key = "Software\\Katayama Hirofumi MZ\\%s"; void show_version(void) { - fprintf(stderr, "XScreenSaver for Windows v0.77 text client utility\n"); + fprintf(stderr, "XScreenSaver for Windows v0.78 text client utility\n"); fprintf(stderr, "Written by Katayama Hirofumi MZ\n"); } diff --git a/xscreensaver-text/xscreensaver-text.rc b/xscreensaver-text/xscreensaver-text.rc index 079296e..fd11d97 100644 --- a/xscreensaver-text/xscreensaver-text.rc +++ b/xscreensaver-text/xscreensaver-text.rc @@ -9,8 +9,8 @@ // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -21,10 +21,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin text\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" diff --git a/xscreensaver/xscreensaver.rc b/xscreensaver/xscreensaver.rc index a11b4c8..0f437fc 100644 --- a/xscreensaver/xscreensaver.rc +++ b/xscreensaver/xscreensaver.rc @@ -16,8 +16,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 7, 0 -PRODUCTVERSION 0, 7, 7, 0 +FILEVERSION 0, 7, 8, 0 +PRODUCTVERSION 0, 7, 8, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -28,10 +28,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin\0" - VALUE "FileVersion", "0.77\0" + VALUE "FileVersion", "0.78\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.77\0" + VALUE "ProductVersion", "0.78\0" END END BLOCK "VarFileInfo" @@ -56,7 +56,7 @@ END 1 DIALOGEX 0, 0, 215, 180 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XScreenSaver for Windows v0.77" +CAPTION "XScreenSaver for Windows v0.78" LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US FONT 9, "Arial" {