From 51cc5740190ed7939a57134dead2fb2649312408 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 2 May 2016 10:50:56 +0900 Subject: [PATCH] mp3infp/u 2.54j3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・libogg 1.3.2, libvorbis 1.3.5 に更新。 ・mp4v2 2.0.0 (r507) に更新。 ・x64 で mp3infp.cpl がクラッシュするのを修正。(PR #7, Thanks unarist) ・mp3infp.cpl を High DPI に対応。 ・コンパイラを WDK 7.1.0 に変更。 ・Windows Vista 以前をサポート対象から除外。 --- src/Installer/make_installer.bat | 20 +++++---- src/ReadMe.txt | 42 +++++++++++-------- src/ReadMe_dll.txt | 6 +-- src/classID.h | 4 +- src/lang_japanese/res/mp3infp.dll.manifest | 2 +- src/mp3infp.txt | 19 ++++++--- src/mp3infp_cpl/res/mp3infp.cpl.manifest | 2 +- src/mp3infp_cpl/res/mp3infp_cpl.rc2 | 4 +- src/mp3infp_eng.txt | 4 +- .../res/mp3infp_regist.exe.manifest | 2 +- src/mp3infp_regist/res/mp3infp_regist.rc2 | 2 +- src/res/mp3infp.dll.manifest | 2 +- src/res/mp3infp.rc2 | 4 +- src/ver.h | 6 +-- 14 files changed, 70 insertions(+), 49 deletions(-) diff --git a/src/Installer/make_installer.bat b/src/Installer/make_installer.bat index 5c8b684..a252371 100755 --- a/src/Installer/make_installer.bat +++ b/src/Installer/make_installer.bat @@ -3,6 +3,10 @@ setlocal rem CXg[쐬 +rem Target OS +set target_x86=wxp +set target_x64=win7 + rem o[W ..\classID.h 擾 (e.g. 2.54h/u4) for /f tokens^=2^ delims^=^" %%i in ('find ^"SOFT_NAME^" ^< ..\classID.h') do set version=%%i set version=%version:mp3infp/u Ver.=% @@ -21,17 +25,17 @@ rem WDK if not exist ..\x86 mkdir ..\x86 if not exist ..\x64 mkdir ..\x64 -copy ..\dll\objfre_w2k_x86\i386\mp3infp.dll ..\x86 /y -copy ..\dll\objfre_wnet_amd64\amd64\mp3infp.dll ..\x64 /y +copy ..\dll\objfre_%target_x86%_x86\i386\mp3infp.dll ..\x86 /y +copy ..\dll\objfre_%target_x64%_amd64\amd64\mp3infp.dll ..\x64 /y -copy ..\lang_japanese\objfre_w2k_x86\i386\Japanese.lng ..\x86 /y -copy ..\lang_japanese\objfre_wnet_amd64\amd64\Japanese.lng ..\x64 /y +copy ..\lang_japanese\objfre_%target_x86%_x86\i386\Japanese.lng ..\x86 /y +copy ..\lang_japanese\objfre_%target_x64%_amd64\amd64\Japanese.lng ..\x64 /y -copy ..\mp3infp_cpl\objfre_w2k_x86\i386\mp3infp.cpl ..\x86 /y -copy ..\mp3infp_cpl\objfre_wnet_amd64\amd64\mp3infp.cpl ..\x64 /y +copy ..\mp3infp_cpl\objfre_%target_x86%_x86\i386\mp3infp.cpl ..\x86 /y +copy ..\mp3infp_cpl\objfre_%target_x64%_amd64\amd64\mp3infp.cpl ..\x64 /y -copy ..\mp3infp_regist\objfre_w2k_x86\i386\mp3infp_regist.exe ..\x86 /y -copy ..\mp3infp_regist\objfre_wnet_amd64\amd64\mp3infp_regist.exe ..\x64 /y +copy ..\mp3infp_regist\objfre_%target_x86%_x86\i386\mp3infp_regist.exe ..\x86 /y +copy ..\mp3infp_regist\objfre_%target_x64%_amd64\amd64\mp3infp_regist.exe ..\x64 /y rem CXg[쐬 diff --git a/src/ReadMe.txt b/src/ReadMe.txt index c8b585b..9ee9f06 100644 --- a/src/ReadMe.txt +++ b/src/ReadMe.txt @@ -1,13 +1,13 @@ mp3infp/u VFg^^OGfB^ (mp3Cts[) (Unicode) -Ver.2.54j2 Source code for Windows2000/XP/Vista/7 +Ver.2.54j3 Source code for Windows 7/8/10 Copyright(C) 1998-2007 T-Matsuo (win32lab.com) Copyright(C) 2009 Rem -Copyright(C) 2009-2012 K.Takata +Copyright(C) 2009-2016 K.Takata rh‹(ʓr肵Ă) -EWindows Driver Kit 6001.18002 EWindows Driver Kit 7.1.0 (7600.16385.1) http://www.microsoft.com/downloads/details.aspx?FamilyID=36a2630f-5d56-43b5-b996-7633f2ec14ff&displaylang=en +EWindows Driver Kit 6001.18002 (Win2k pɃrhꍇ) mp3infp/u (Unicode) ŗL̐ _ŔĂ鐧͈ȉ̒ʂłB @@ -26,37 +26,45 @@ http://www.microsoft.com/downloads/details.aspx?FamilyID=36a2630f-5d56-43b5-b996 mp3infp_LoadW Unicode Ŋ֐ rh@ -{o[ẂA32bit ł WDK 6001.18002A64bit ł WDK 7.1.0 g -rhĂ܂BiWDK ɂ MFC ܂܂Ă܂Bj - -Win2k ȍ~Ŏg 32bit st@CrhꍇAX^[gj[ +{o[ẂAWDK 7.1.0 gărhĂ܂BiWDK ɂ MFC ܂܂ +Ă܂Bj +x64 rh̏ꍇAX^[gj[A Windows Driver Kits - WDK 6001.18002 + WDK 7600.16385.1 Build Environments - Windows 2000 - Open a build window for Windows 2000 x86 Free Build Environment + Windows Server 2003 (邢 Windows 7) + x64 Free Build Environment -IĂBWin2k ̃[Xrhp̊‹J܂̂ŁA +I x64 [Xrhp̊‹J܂̂ŁA mp3infp src fBNgɈړāAR}hC build -g sƃrh܂Bmp3infp.dll dll fBNg̉ fBNg쐬Ảɏo͂܂B -64bit st@CrhƂ́A +x86 rh̏ꍇAX^[gj[ȉIĂB Windows Driver Kits WDK 7600.16385.1 Build Environments - Windows Server 2003 - x64 Free Build Environment + Windows XP + x86 Free Build Environment + +Win2k x86 rhKvȏꍇAWDK 6001.18002 CXg[ŁA +X^[gj[ + + Windows Driver Kits + WDK 6001.18002 + Build Environments + Windows 2000 + Open a build window for Windows 2000 x86 Free Build Environment -ȂǂIƂ悢ł傤B +IĂB WDK 7.0.0 ȍ~ł́AWin2k p̎st@C̓rh̓T|[gĂ܂B o[W WDK 6001.18002 KvłB ܂AWDK 6001.18002 gꍇłAꕔ̊֐gpƁA Win2k ł͎słȂt@CłĂ܂܂Bw2kstub.cpp - 𖳗C邽߂̃\[XłB + 𖳗C邽߂̃\[Xłiꕔ XP pjB WDK Ɋ܂܂Ă MFC 6.0 łBiVisual C++ 6.0 Ɠj MFC 7.0 CString gAUnicode ₷ȂĂ @@ -70,7 +78,7 @@ OggVorbis mp4̓ǂݏɂmp4v2CugpĂ܂ http://code.google.com/p/mp4v2/ -\[XꕔςĂ܂(ωӏɂ"K.Takata"̏LڂĂ܂) +\[XꕔςĂ܂(ωӏɂ "K.Takata" ̏LڂĂ܂) CZX ̃\tgEFALGPLCZXŔzzĂ܂B diff --git a/src/ReadMe_dll.txt b/src/ReadMe_dll.txt index ad0652d..4f87fa8 100644 --- a/src/ReadMe_dll.txt +++ b/src/ReadMe_dll.txt @@ -1,8 +1,8 @@ mp3infp/u VFg^^OGfB^ (mp3Cts[) (Unicode) -Ver.2.54j2 Dll for Windows2000/XP/Vista/7 +Ver.2.54j3 Dll for Windows 7/8/10 Copyright(C) 1998-2007 T-Matsuo (win32lab.com) Copyright(C) 2009 Rem -Copyright(C) 2009-2012 K.Takata +Copyright(C) 2009-2016 K.Takata gpCu OggVorbis`̃t@Cǂݏɂ͉LI[v\[XCugp܂B @@ -11,7 +11,7 @@ OggVorbis mp4̓ǂݏɂmp4v2CugpĂ܂ http://code.google.com/p/mp4v2/ -\[XꕔςĂ܂(ωӏɂ"K.Takata"̏LڂĂ܂) +\[XꕔςĂ܂(ωӏɂ "K.Takata" ̏LڂĂ܂) CZX ̃\tgEFALGPLCZXŔzzĂ܂B diff --git a/src/classID.h b/src/classID.h index dc0ca7b..b3894ff 100644 --- a/src/classID.h +++ b/src/classID.h @@ -5,9 +5,9 @@ DEFINE_GUID(CLSID_ShellExt, #define CLSID_STR_ShellExt _T("{DDB066B3-8D19-11d2-8763-006052014B08}") #define LANG_VER 248 -#define SOFT_NAME _T("mp3infp/u Ver.2.54j2") +#define SOFT_NAME _T("mp3infp/u Ver.2.54j3") #define APP_NAME _T("mp3infp") -#define COPY_RIGHT _T("Copyright(c) 1998-2012 T-Matsuo, Rem, K.Takata\nmailto:tms2@win32lab.com\nhttp://win32lab.com/") +#define COPY_RIGHT _T("Copyright(c) 1998-2016 T-Matsuo, Rem, K.Takata\nmailto:tms2@win32lab.com\nhttp://win32lab.com/") #define HELP_FILE _T("mp3infp.chm") #define README_FILE _T("mp3infp.txt") #define MP3INFP_REG_ENTRY _T("Software\\win32lab.com\\mp3infp") diff --git a/src/lang_japanese/res/mp3infp.dll.manifest b/src/lang_japanese/res/mp3infp.dll.manifest index 88af0b9..4d02a49 100644 --- a/src/lang_japanese/res/mp3infp.dll.manifest +++ b/src/lang_japanese/res/mp3infp.dll.manifest @@ -1,7 +1,7 @@ diff --git a/src/mp3infp.txt b/src/mp3infp.txt index fff8b8b..6917657 100644 --- a/src/mp3infp.txt +++ b/src/mp3infp.txt @@ -1,8 +1,8 @@ mp3infp/u VFg^^OGfB^ (mp3Cts[) (Unicode) -Ver.2.54j2 for 2000/XP/Vista/7 +Ver.2.54j3 for Windows 7/8/10 Copyright(C) 1998-2007 T-Matsuo (win32lab.com) Copyright(C) 2009 Rem -Copyright(C) 2009-2012 K.Takata +Copyright(C) 2009-2016 K.Takata mp3infp/u̓t[\tgEFAł ̃\tgEFÁuvŗpł܂uۏ؁vłB @@ -15,7 +15,7 @@ Windows mp3infp/u ́AT-Matsuo 쐬 mp3infp 2.54a ɁARem ǂ mp3infp 2.54i alpha1 K.Takata Unicode rh -łłBOS ́AWindows 2000 ȍ~̑ΉƂȂĂ܂B +łłBOS ́AWindows 7 ȍ~̑ΉƂȂĂ܂B Ήt@C` Empeg1.0/2.0/2.5 Layer1`3 (.mp3/.mp2/.mp1/.rmp) @@ -33,7 +33,7 @@ mp3infp/u EMP4 (.mp4/.m4a/.m4v/.3gp/.3g2) ‹ -EpłƓ{ł Windows2000/XP/Vista/7 +EpłƓ{ł Windows 7/8/10 ݒ [Rg[pl][mp3infpݒ]Őݒs܂B @@ -72,13 +72,22 @@ https://github.com/k-takata/mp3infp ϗ * K.Takata ɂ mp3infp/u ̗ +2016/05/02 Ver.2.54j3 +Elibogg 1.3.2, libvorbis 1.3.5 ɍXVB +Emp4v2 2.0.0 (r507) ɍXVB +Ex64 mp3infp.cpl NbV̂CB(PR #7, Thanks unarist) +Emp3infp.cpl High DPI ɑΉB +ERpC WDK 7.1.0 ɕύXB +EWindows Vista ȑOT|[gΏۂ珜OB + 2012/11/19 Ver.2.54j2 EMP4 t@C̓ǂݍ݂x̂CB(mp4v2 2.0.0 ōĔĂB) +Emp4v2 2.0.0 (r500) ɍXVB 2012/11/18 Ver.2.54j EUnicodeł̐̂ mp3infp/u ɕύXB Elibogg 1.3.0, libvorbis 1.3.3 ɍXVB -Emp4v2 2.0.0 ɍXVB +Emp4v2 2.0.0 (r497) ɍXVB Emulti-sample description ܂ mp4 t@Cŗ̂CB E^OXVɃ^CX^vXVȂݒ̎ɁA^CX^v @ۑłȂꍇAُȃ^CX^vɂȂ̂CB diff --git a/src/mp3infp_cpl/res/mp3infp.cpl.manifest b/src/mp3infp_cpl/res/mp3infp.cpl.manifest index 928061c..0090b68 100644 --- a/src/mp3infp_cpl/res/mp3infp.cpl.manifest +++ b/src/mp3infp_cpl/res/mp3infp.cpl.manifest @@ -1,7 +1,7 @@ diff --git a/src/mp3infp_cpl/res/mp3infp_cpl.rc2 b/src/mp3infp_cpl/res/mp3infp_cpl.rc2 index 1cf795c..31d813c 100644 --- a/src/mp3infp_cpl/res/mp3infp_cpl.rc2 +++ b/src/mp3infp_cpl/res/mp3infp_cpl.rc2 @@ -40,11 +40,11 @@ BEGIN VALUE "FileDescription", "mp3infp_cpl DLL\0" VALUE "FileVersion", BUILD_STR VALUE "InternalName", "mp3infp_cpl\0" - VALUE "LegalCopyright", "Copyright (C) 1998-2012 T-Matsuo, Rem, K.Takata\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2016 T-Matsuo, Rem, K.Takata\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mp3infp.cpl\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "mp3infp.cpl ޲Я ݸ ײ\0" + VALUE "ProductName", "mp3infp.cpl Control Panel Item\0" VALUE "ProductVersion", PRODUCT_STR VALUE "SpecialBuild", "\0" END diff --git a/src/mp3infp_eng.txt b/src/mp3infp_eng.txt index 8dff345..44efe76 100644 --- a/src/mp3infp_eng.txt +++ b/src/mp3infp_eng.txt @@ -1,8 +1,8 @@ mp3infp/u - Shell extension type tag editor - -Ver.2.54j2 for Windows2000/XP/Vista/7 +Ver.2.54j3 for Windows 7/8/10 Copyright(C) 1998-2007 T-Matsuo (win32lab.com) Copyright(C) 2009 Rem -Copyright(C) 2009-2012 K.Takata +Copyright(C) 2009-2016 K.Takata **** mp3infp/u is freeware **** diff --git a/src/mp3infp_regist/res/mp3infp_regist.exe.manifest b/src/mp3infp_regist/res/mp3infp_regist.exe.manifest index b45c828..d892054 100644 --- a/src/mp3infp_regist/res/mp3infp_regist.exe.manifest +++ b/src/mp3infp_regist/res/mp3infp_regist.exe.manifest @@ -1,7 +1,7 @@ diff --git a/src/mp3infp_regist/res/mp3infp_regist.rc2 b/src/mp3infp_regist/res/mp3infp_regist.rc2 index bade035..b5f7fc1 100644 --- a/src/mp3infp_regist/res/mp3infp_regist.rc2 +++ b/src/mp3infp_regist/res/mp3infp_regist.rc2 @@ -40,7 +40,7 @@ BEGIN VALUE "FileDescription", "mp3infp_regist\0" VALUE "FileVersion", BUILD_STR VALUE "InternalName", "mp3infp\0" - VALUE "LegalCopyright", "Copyright (C) 1998-2012 T-Matsuo, Rem, K.Takata\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2016 T-Matsuo, Rem, K.Takata\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mp3infp_regist.exe\0" VALUE "PrivateBuild", "\0" diff --git a/src/res/mp3infp.dll.manifest b/src/res/mp3infp.dll.manifest index 88af0b9..4d02a49 100644 --- a/src/res/mp3infp.dll.manifest +++ b/src/res/mp3infp.dll.manifest @@ -1,7 +1,7 @@ diff --git a/src/res/mp3infp.rc2 b/src/res/mp3infp.rc2 index 302f0d5..36aea7c 100644 --- a/src/res/mp3infp.rc2 +++ b/src/res/mp3infp.rc2 @@ -40,11 +40,11 @@ BEGIN VALUE "FileDescription", "mp3infp DLL\0" VALUE "FileVersion", BUILD_STR VALUE "InternalName", "mp3infp\0" - VALUE "LegalCopyright", "Copyright (C) 1998-2012 T-Matsuo, Rem, K.Takata\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2016 T-Matsuo, Rem, K.Takata\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mp3infp.DLL\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "mp3infp ޲Я ݸ ײ\0" + VALUE "ProductName", "mp3infp dynamic link library\0" VALUE "ProductVersion", PRODUCT_STR VALUE "SpecialBuild", "\0" END diff --git a/src/ver.h b/src/ver.h index 4378e53..2946d79 100644 --- a/src/ver.h +++ b/src/ver.h @@ -4,7 +4,7 @@ // #define MAJOR_REL 2 #define MINOR_REL 54 -#define BUILD_NUM 92 -#define BUILD_STR "2.54.92.0\0" -#define PRODUCT_STR "2.54.92.0\0" +#define BUILD_NUM 93 +#define BUILD_STR "2.54.93.0\0" +#define PRODUCT_STR "2.54.93.0\0"