Thanks to visit codestin.com
Credit goes to github.com

Skip to content

x64環境でmp3infp_cplが起動しない・クラッシュする #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k-takata merged 2 commits into from
Feb 11, 2014
Merged

x64環境でmp3infp_cplが起動しない・クラッシュする #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
381aad7
fix LPTSTR to LPCTSTR
unarist Feb 10, 2014
a96a678
mp3infp_cpl: fix crash on x64
unarist Feb 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/GlobalCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/mp3infp_cpl/mp3infp_cpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand All @@ -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();
Expand All @@ -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:
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/mp3infp_cpl/mp3infp_cpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down