Skip to content

Commit

Permalink
mp3infp/u 2.54j3
Browse files Browse the repository at this point in the history
・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 以前をサポート対象から除外。
  • Loading branch information
k-takata committed May 2, 2016
1 parent 4da8a63 commit 51cc574
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 49 deletions.
20 changes: 12 additions & 8 deletions src/Installer/make_installer.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ setlocal

rem インストーラ作成

rem Target OS
set target_x86=wxp
set target_x64=win7

rem バージョンを ..\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.=%
Expand All @@ -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 インストーラ作成
Expand Down
42 changes: 25 additions & 17 deletions src/ReadMe.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
mp3infp/u �V�F���g���^�^�O�G�f�B�^ (mp3�C���t�s�[) (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

���r���h�‹�(�ʓ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�Ƀr���h����ꍇ)

��mp3infp/u (Unicode��) �ŗL�̐�������
�����_�Ŕ������Ă��鐧�������͈ȉ��̒ʂ�ł��B
Expand All @@ -26,37 +26,45 @@ http://www.microsoft.com/downloads/details.aspx?FamilyID=36a2630f-5d56-43b5-b996
mp3infp_LoadW Unicode �Ŋ֐�

���r���h���@
�{�o�[�W�����́A32bit �ł� WDK 6001.18002�A64bit �ł� WDK 7.1.0 ���g����
�r���h����Ă��܂��B�iWDK �ɂ� MFC ���܂܂�Ă��܂��B�j

Win2k �ȍ~�Ŏg���� 32bit ���s�t�@�C�����r���h����ꍇ�A�X�^�[�g���j���[����
�{�o�[�W�����́AWDK 7.1.0 ���g���ăr���h����Ă��܂��B�iWDK �ɂ� MFC ���܂܂�
�Ă��܂��B�j
x64 �r���h�̏ꍇ�A�X�^�[�g���j���[����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 �̃����[�X�r���h�p�̊‹����J���܂��̂ŁA
��I������� x64 �����[�X�r���h�p�̊‹����J���܂��̂ŁA
mp3infp �� src �f�B���N�g���Ɉړ����āA�R�}���h���C������ build -g ��
���s����ƃr���h����܂��Bmp3infp.dll �� dll �f�B���N�g���̉���
�f�B���N�g�����쐬����A���̉��ɏo�͂���܂��B

64bit ���s�t�@�C�����r���h����Ƃ��́A
x86 �r���h�̏ꍇ�A�X�^�[�g���j���[����ȉ���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 �r���h���K�v�ȏꍇ�AWDK 6001.18002 ���C���X�g�[��������ŁA
�X�^�[�g���j���[����

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�̎��s�t�@�C���̓r���h�̓T�|�[�g����Ă��܂���B
���o�[�W������ WDK 6001.18002 ���K�v�ł��B
�܂��AWDK 6001.18002 ���g�����ꍇ�ł��A�ꕔ�̊֐����g�p����ƁA
Win2k �ł͎��s�ł��Ȃ��t�@�C�����ł��Ă��܂��܂��Bw2kstub.cpp ��
����𖳗����C�����邽�߂̃\�[�X�ł��B
����𖳗����C�����邽�߂̃\�[�X�ł��i�ꕔ XP �p�j�B

�� WDK �Ɋ܂܂�Ă��� MFC �� 6.0 �ł��B�iVisual C++ 6.0 �Ɠ����j
MFC 7.0 ����� CString ���g������AUnicode �������₷���Ȃ��Ă���
Expand All @@ -70,7 +78,7 @@ OggVorbis

mp4�̓ǂݏ����ɂ�mp4v2���C�u�������g�p���Ă��܂�
http://code.google.com/p/mp4v2/
���\�[�X���ꕔ���ς��Ă��܂�(���ωӏ��ɂ�"K.Takata"�̏������L�ڂ��Ă��܂�)
���\�[�X���ꕔ���ς��Ă��܂�(���ωӏ��ɂ� "K.Takata" �̏������L�ڂ��Ă��܂�)

�����C�Z���X
���̃\�t�g�E�F�A��LGPL���C�Z���X�Ŕz�z���Ă��܂��B
Expand Down
6 changes: 3 additions & 3 deletions src/ReadMe_dll.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mp3infp/u �V�F���g���^�^�O�G�f�B�^ (mp3�C���t�s�[) (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

���g�p���C�u����
OggVorbis�`���̃t�@�C���ǂݏ����ɂ͉��L�I�[�v���\�[�X���C�u�������g�p���܂��B
Expand All @@ -11,7 +11,7 @@ OggVorbis

mp4�̓ǂݏ����ɂ�mp4v2���C�u�������g�p���Ă��܂�
http://code.google.com/p/mp4v2/
���\�[�X���ꕔ���ς��Ă��܂�(���ωӏ��ɂ�"K.Takata"�̏������L�ڂ��Ă��܂�)
���\�[�X���ꕔ���ς��Ă��܂�(���ωӏ��ɂ� "K.Takata" �̏������L�ڂ��Ă��܂�)

�����C�Z���X
���̃\�t�g�E�F�A��LGPL���C�Z���X�Ŕz�z���Ă��܂��B
Expand Down
4 changes: 2 additions & 2 deletions src/classID.h
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/lang_japanese/res/mp3infp.dll.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="2.54.92.0"
version="2.54.93.0"
processorArchitecture="*"
name="mp3infp.dll"
/>
Expand Down
19 changes: 14 additions & 5 deletions src/mp3infp.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mp3infp/u �V�F���g���^�^�O�G�f�B�^ (mp3�C���t�s�[) (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���[�\�t�g�E�F�A�ł�������
���̃\�t�g�E�F�A�́u�����v�ŗ��p�ł��܂����u���ۏ؁v�ł��B
Expand All @@ -15,7 +15,7 @@ Windows

mp3infp/u �́AT-Matsuo �����쐬���� mp3infp 2.54a �����ɁARem ����
���ǂ��� mp3infp 2.54i alpha1 �� K.Takata �� Unicode �r���h����
�����łł��BOS �́AWindows 2000 �ȍ~�̑Ή��ƂȂ��Ă��܂��B
�����łł��BOS �́AWindows 7 �ȍ~�̑Ή��ƂȂ��Ă��܂��B

���Ή��t�@�C���`��
�Empeg1.0/2.0/2.5 Layer1�`3 (.mp3/.mp2/.mp1/.rmp)
Expand All @@ -33,7 +33,7 @@ mp3infp/u
�EMP4 (.mp4/.m4a/.m4v/.3gp/.3g2)

������‹�
�E�p��łƓ��{��ł� Windows2000/XP/Vista/7
�E�p��łƓ��{��ł� Windows 7/8/10

���ݒ�
[�R���g���[���p�l��]��[mp3infp�ݒ�]�Őݒ���s���܂��B
Expand Down Expand Up @@ -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 �ɍX�V�B
�Emp4v2 2.0.0 (r507) �ɍX�V�B
�Ex64 �� mp3infp.cpl ���N���b�V������̂��C���B(PR #7, Thanks unarist)
�Emp3infp.cpl �� High DPI �ɑΉ��B
�E�R���p�C���� WDK 7.1.0 �ɕύX�B
�EWindows Vista �ȑO���T�|�[�g�Ώۂ��珜�O�B

2012/11/19 Ver.2.54j2
�EMP4 �t�@�C���̓ǂݍ��݂��x���̂��C���B(mp4v2 2.0.0 �ōĔ����Ă����B)
�Emp4v2 2.0.0 (r500) �ɍX�V�B

2012/11/18 Ver.2.54j
�EUnicode�ł̐������̂� mp3infp/u �ɕύX�B
�Elibogg 1.3.0, libvorbis 1.3.3 �ɍX�V�B
�Emp4v2 2.0.0 �ɍX�V�B
�Emp4v2 2.0.0 (r497) �ɍX�V�B
�Emulti-sample description ���܂� mp4 �t�@�C���ŗ�����̂��C���B
�E�^�O�X�V���Ƀ^�C���X�^���v���X�V���Ȃ��ݒ�̎��ɁA�^�C���X�^���v��
�@�ۑ����ł��Ȃ������ꍇ�A�ُ�ȃ^�C���X�^���v�ɂȂ�̂��C���B
Expand Down
2 changes: 1 addition & 1 deletion src/mp3infp_cpl/res/mp3infp.cpl.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="2.54.92.0"
version="2.54.93.0"
processorArchitecture="*"
name="mp3infp.cpl"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/mp3infp_cpl/res/mp3infp_cpl.rc2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/mp3infp_eng.txt
Original file line number Diff line number Diff line change
@@ -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 ****

Expand Down
2 changes: 1 addition & 1 deletion src/mp3infp_regist/res/mp3infp_regist.exe.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="2.54.92.0"
version="2.54.93.0"
processorArchitecture="*"
name="mp3infp_regist"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/mp3infp_regist/res/mp3infp_regist.rc2
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/res/mp3infp.dll.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="2.54.92.0"
version="2.54.93.0"
processorArchitecture="*"
name="mp3infp.dll"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/res/mp3infp.rc2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/ver.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 51cc574

Please sign in to comment.