From 381aad7d52887f77098933ac9ab7331d0519907b Mon Sep 17 00:00:00 2001 From: unarist Date: Tue, 11 Feb 2014 02:44:39 +0900 Subject: [PATCH 1/2] fix LPTSTR to LPCTSTR --- src/GlobalCommand.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GlobalCommand.cpp b/src/GlobalCommand.cpp index 6794615..900f3f0 100644 --- a/src/GlobalCommand.cpp +++ b/src/GlobalCommand.cpp @@ -110,7 +110,7 @@ BOOL GetDLLVersion(IN LPTSTR szDLLFileName, //文末がYenのときTRUE BOOL IsTailYenSign(LPCTSTR szStr) { - LPTSTR yen = _tcsrchr(szStr,_T('\\')); + LPCTSTR yen = _tcsrchr(szStr,_T('\\')); if(yen && (&szStr[lstrlen(szStr)-1] == yen)) { return TRUE; From a96a678263b196acaee951300ac2407db797e84e Mon Sep 17 00:00:00 2001 From: unarist Date: Tue, 11 Feb 2014 02:54:16 +0900 Subject: [PATCH 2/2] mp3infp_cpl: fix crash on x64 LPARAM parameter in callback function was defined as LONG. --- src/mp3infp_cpl/mp3infp_cpl.cpp | 16 ++++++++-------- src/mp3infp_cpl/mp3infp_cpl.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mp3infp_cpl/mp3infp_cpl.cpp b/src/mp3infp_cpl/mp3infp_cpl.cpp index 244cf0b..74726b0 100644 --- a/src/mp3infp_cpl/mp3infp_cpl.cpp +++ b/src/mp3infp_cpl/mp3infp_cpl.cpp @@ -83,7 +83,7 @@ CMp3infp_cplApp::~CMp3infp_cplApp() { } -extern "C" LONG __stdcall CMp3infp_cplApp::CPlApplet(HWND hWnd,UINT uMsg,LONG lParam1,LONG lParam2) +extern "C" LONG __stdcall CMp3infp_cplApp::CPlApplet(HWND hWnd, UINT uMsg, LPARAM lParam1,LPARAM lParam2) { AFX_MANAGE_STATE(AfxGetStaticModuleState()); @@ -105,7 +105,7 @@ extern "C" LONG __stdcall CMp3infp_cplApp::CPlApplet(HWND hWnd,UINT uMsg,LONG lP switch(uMsg){ case CPL_DBLCLK: - return OnDblclk(hWnd,lParam1,lParam2); + return OnDblclk(hWnd,(UINT)lParam1,(LONG_PTR)lParam2); case CPL_EXIT: return OnExit(); @@ -117,16 +117,16 @@ extern "C" LONG __stdcall CMp3infp_cplApp::CPlApplet(HWND hWnd,UINT uMsg,LONG lP return OnInit(); case CPL_INQUIRE: - return OnInquire(lParam1,(CPLINFO *)lParam2); + return OnInquire((UINT)lParam1, (CPLINFO *)lParam2); case CPL_NEWINQUIRE: - return OnNewInquire(lParam1,(NEWCPLINFO *)lParam2); + return OnNewInquire((UINT)lParam1, (NEWCPLINFO *)lParam2); case CPL_STOP: - return OnStop(lParam1,lParam2); + return OnStop((UINT)lParam1, (LONG_PTR)lParam2); case CPL_STARTWPARMS: - OnDblclk(hWnd, lParam1, lParam2); + OnDblclk(hWnd, (UINT)lParam1, (LONG_PTR)lParam2); return TRUE; default: @@ -167,7 +167,7 @@ LONG CMp3infp_cplApp::OnInquire(UINT uAppNum,CPLINFO* pInfo) return 0; } -LONG CMp3infp_cplApp::OnDblclk(HWND hWnd,UINT uAppNum,LONG lData) +LONG CMp3infp_cplApp::OnDblclk(HWND hWnd,UINT uAppNum,LONG_PTR lData) { #ifdef _DEBUG OutputDebugString("CMp3infp_cplApp::OnDblclk()\n"); @@ -227,7 +227,7 @@ LONG CMp3infp_cplApp::OnInit() return 1; // OK } -LONG CMp3infp_cplApp::OnStop(UINT uAppNum,LONG lData) +LONG CMp3infp_cplApp::OnStop(UINT uAppNum,LONG_PTR lData) { #ifdef _DEBUG OutputDebugString("CMp3infp_cplApp::OnStop()\n"); diff --git a/src/mp3infp_cpl/mp3infp_cpl.h b/src/mp3infp_cpl/mp3infp_cpl.h index b9498ff..0725558 100644 --- a/src/mp3infp_cpl/mp3infp_cpl.h +++ b/src/mp3infp_cpl/mp3infp_cpl.h @@ -26,15 +26,15 @@ class CMp3infp_cplApp : public CWinApp public: CMp3infp_cplApp(); virtual ~CMp3infp_cplApp(); - static LONG __stdcall CPlApplet(HWND hWnd,UINT uMsg,LONG lParam1,LONG lParam2); + static LONG __stdcall CPlApplet(HWND hWnd,UINT uMsg,LPARAM lParam1,LPARAM lParam2); - static LONG OnDblclk(HWND hWnd,UINT uAppNum,LONG lData); + static LONG OnDblclk(HWND hWnd,UINT uAppNum,LONG_PTR lData); static LONG OnExit(); static LONG OnGetCount(); static LONG OnInit(); static LONG OnInquire(UINT uAppNum,CPLINFO* pInfo); static LONG OnNewInquire(UINT uAppNum,NEWCPLINFO* pInfo); - static LONG OnStop(UINT uAppNum,LONG lData); + static LONG OnStop(UINT uAppNum,LONG_PTR lData); static LONG LoadLanguage(); static CMp3infp_cplApp* m_pThis;