From 9ef44c8b45ef93ed83bceb17e83ecd784f40c8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bo=20Brant=C3=A9n?= Date: Mon, 9 Mar 2020 20:09:34 +0100 Subject: [PATCH] Updated Ext2Mgr to build for 64-bit --- Ext2Mgr/Ext2Mgr.cpp | 2 +- Ext2Mgr/Ext2MgrDlg.cpp | 10 +++++----- Ext2Mgr/Ext2MgrDlg.h | 4 ++-- Ext2Mgr/Ext2Pipe.cpp | 8 ++++---- Ext2Mgr/HyperLink.cpp | 2 +- Ext2Mgr/PerfStatDlg.cpp | 2 +- Ext2Mgr/PerfStatDlg.h | 2 +- Ext2Mgr/TreeList.cpp | 4 ++-- Ext2Mgr/enumDisk.cpp | 14 +++++++------- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Ext2Mgr/Ext2Mgr.cpp b/Ext2Mgr/Ext2Mgr.cpp index 24fbc9c..c555479 100644 --- a/Ext2Mgr/Ext2Mgr.cpp +++ b/Ext2Mgr/Ext2Mgr.cpp @@ -127,7 +127,7 @@ void WINAPI ManagerCtrlService(DWORD ctrlcode) VOID __cdecl ManagerStartMain(VOID * arg) { - BOOL isService = (BOOL) arg; + BOOL isService = arg != 0; CExt2MgrDlg* dlg = (CExt2MgrDlg*)theApp.m_pMainWnd; if (dlg) { diff --git a/Ext2Mgr/Ext2MgrDlg.cpp b/Ext2Mgr/Ext2MgrDlg.cpp index 3f7cceb..efcbc6f 100644 --- a/Ext2Mgr/Ext2MgrDlg.cpp +++ b/Ext2Mgr/Ext2MgrDlg.cpp @@ -48,7 +48,7 @@ protected: afx_msg void OnPaint(); afx_msg void OnExt2fsd(); afx_msg void OnDonate(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -176,7 +176,7 @@ void CAboutDlg::OnDonate() GetParent()->SendMessage(WM_COMMAND, ID_DONATE); } -void CAboutDlg::OnTimer(UINT nIDEvent) +void CAboutDlg::OnTimer(UINT_PTR nIDEvent) { // TODO: Add your message handler code here and/or call default @@ -597,7 +597,7 @@ void CExt2MgrDlg::OnSysCommand(UINT nID, LPARAM lParam) } } -BOOL CExt2MgrDlg::OnDeviceChange(UINT nEventType, DWORD dwData) +BOOL CExt2MgrDlg::OnDeviceChange(UINT nEventType, DWORD_PTR dwData) { PDEV_BROADCAST_HDR lpdb = (PDEV_BROADCAST_HDR)dwData; PDEV_BROADCAST_DEVICEINTERFACE pdbch = (PDEV_BROADCAST_DEVICEINTERFACE)dwData; @@ -1643,7 +1643,7 @@ void CExt2MgrDlg::OnCopyAll() } } -void CExt2MgrDlg::OnTimer(UINT nIDEvent) +void CExt2MgrDlg::OnTimer(UINT_PTR nIDEvent) { // TODO: Add your message handler code here and/or call default @@ -2115,7 +2115,7 @@ void CExt2MgrDlg::OnPartType() if (PartType.m_cPartType) { for (int i=0; i < m_DiskView.GetItemCount(); i++) { - if ((ULONG)part == m_DiskView.GetItemData(i)) { + if ((ULONG_PTR)part == m_DiskView.GetItemData(i)) { Ext2RefreshDVPT(&m_DiskView, part, i); break; } diff --git a/Ext2Mgr/Ext2MgrDlg.h b/Ext2Mgr/Ext2MgrDlg.h index f8823bc..fc7a9cb 100644 --- a/Ext2Mgr/Ext2MgrDlg.h +++ b/Ext2Mgr/Ext2MgrDlg.h @@ -154,7 +154,7 @@ protected: virtual BOOL OnInitDialog(); virtual void OnWindowPosChanging(WINDOWPOS* lpwndpos); afx_msg void OnSysCommand(UINT nID, LPARAM lParam); - afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD dwData); + afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData); afx_msg void OnDestroy(); afx_msg void OnPaint(); afx_msg HCURSOR OnQueryDragIcon(); @@ -185,7 +185,7 @@ protected: afx_msg void OnRemoveService(); afx_msg void OnEnableAutorun(); afx_msg void OnDisableAutorun(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnDrvLetter(); afx_msg void OnDrvQuickMount(); afx_msg void OnShowMain(); diff --git a/Ext2Mgr/Ext2Pipe.cpp b/Ext2Mgr/Ext2Pipe.cpp index c9629f8..3d16119 100644 --- a/Ext2Mgr/Ext2Pipe.cpp +++ b/Ext2Mgr/Ext2Pipe.cpp @@ -206,7 +206,7 @@ BOOL Ext2DefineDosDevicePipe(DWORD flags, CHAR *dos, CHAR *symlink) q->drive = (UCHAR)toupper(dos[0]); q->flags = flags; strcpy(&q->name[0], symlink); - p->len += strlen(symlink) + 1; + p->len += (int)strlen(symlink) + 1; rc = Ext2PipeControl(&p, &len); if (!rc) { @@ -235,7 +235,7 @@ BOOL Ext2DefineDosDevicePipe(DWORD flags, CHAR *dos, CHAR *symlink) q->drive = (UCHAR)toupper(dos[0]); q->flags = flags; strcpy(&q->name[0], symlink); - p->len += strlen(symlink) + 1; + p->len += (int)strlen(symlink) + 1; rc = Ext2PipeControl(&p, &len); if ( !rc) { @@ -460,7 +460,7 @@ errorout: TCHAR *Ext2StrLastA(TCHAR *t, TCHAR *s) { - int lt = strlen(t), ls = strlen(s), i; + int lt = (int)strlen(t), ls = (int)strlen(s), i; for (i = lt - ls; i >= 0; i--) { if (0 == _strnicmp(&t[i], s, ls)) @@ -506,7 +506,7 @@ errorout: WCHAR *Ext2StrLastW(WCHAR *t, WCHAR *s) { - int lt = wcslen(t), ls = wcslen(s), i; + int lt = (int)wcslen(t), ls = (int)wcslen(s), i; for (i = lt - ls; i >= 0; i--) { if (0 == _wcsnicmp(&t[i], s, ls)) diff --git a/Ext2Mgr/HyperLink.cpp b/Ext2Mgr/HyperLink.cpp index d2c2d14..81a560a 100644 --- a/Ext2Mgr/HyperLink.cpp +++ b/Ext2Mgr/HyperLink.cpp @@ -65,7 +65,7 @@ bool CMyHyperLink::GoToLinkUrl(CString csLink) HINSTANCE hInstance = (HINSTANCE)ShellExecute(NULL, _T("open"), csLink.operator LPCTSTR(), NULL, NULL, 2); - if ((UINT)hInstance < HINSTANCE_ERROR){ + if ((UINT_PTR)hInstance < HINSTANCE_ERROR){ return false; }else return true; diff --git a/Ext2Mgr/PerfStatDlg.cpp b/Ext2Mgr/PerfStatDlg.cpp index 04687ec..3502c23 100644 --- a/Ext2Mgr/PerfStatDlg.cpp +++ b/Ext2Mgr/PerfStatDlg.cpp @@ -219,7 +219,7 @@ errorout: return; } -void CPerfStatDlg::OnTimer(UINT nIDEvent) +void CPerfStatDlg::OnTimer(UINT_PTR nIDEvent) { RefreshPerfStat(); diff --git a/Ext2Mgr/PerfStatDlg.h b/Ext2Mgr/PerfStatDlg.h index adba4e9..ced6a26 100644 --- a/Ext2Mgr/PerfStatDlg.h +++ b/Ext2Mgr/PerfStatDlg.h @@ -41,7 +41,7 @@ protected: // Generated message map functions //{{AFX_MSG(CPerfStatDlg) virtual BOOL OnInitDialog(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnDestroy(); afx_msg void OnChangePerfstatInterval(); virtual void OnOK(); diff --git a/Ext2Mgr/TreeList.cpp b/Ext2Mgr/TreeList.cpp index 5932c41..fa76768 100644 --- a/Ext2Mgr/TreeList.cpp +++ b/Ext2Mgr/TreeList.cpp @@ -214,7 +214,7 @@ void CTreeList::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) rcText.bottom += 1; rcText.top = rcText.bottom - 6 + lf.lfHeight; - ::DrawText(lpDrawItemStruct->hDC, lpBuffer, strlen(lpBuffer), + ::DrawText(lpDrawItemStruct->hDC, lpBuffer, (int)strlen(lpBuffer), &rcText, DT_LEFT) ; CRect rect = lpDrawItemStruct->rcItem; @@ -263,7 +263,7 @@ void CTreeList::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) lvi.cchTextMax = sizeof(lpBuffer); GetItem(&lvi); - ::DrawText(lpDrawItemStruct->hDC, lpBuffer, strlen(lpBuffer), + ::DrawText(lpDrawItemStruct->hDC, lpBuffer, (int)strlen(lpBuffer), &rcText, uFormat) ; if (nCol == 0) { diff --git a/Ext2Mgr/enumDisk.cpp b/Ext2Mgr/enumDisk.cpp index 49173d4..1f74406 100644 --- a/Ext2Mgr/enumDisk.cpp +++ b/Ext2Mgr/enumDisk.cpp @@ -2803,7 +2803,7 @@ Ext2SetGlobalProperty ( 0, REG_SZ, (BYTE *)Codepage, - strlen(Codepage)); + (int)strlen(Codepage)); /* set hiding filter patterns */ status = RegSetValueEx( hKey, @@ -2811,14 +2811,14 @@ Ext2SetGlobalProperty ( 0, REG_SZ, (BYTE *)sPrefix, - strlen(sPrefix)); + (int)strlen(sPrefix)); status = RegSetValueEx( hKey, "HidingSuffix", 0, REG_SZ, (BYTE *)sSuffix, - strlen(sSuffix)); + (int)strlen(sSuffix)); RegCloseKey(hKey); @@ -4382,7 +4382,7 @@ Ext2SetRegistryMountPoint ( hKey, drvPath, 0, REG_SZ, (BYTE *)devName, - strlen(devName) + (int)strlen(devName) ); } else { /* delete key */ @@ -5056,7 +5056,7 @@ Ext2SetAppAutorunXP(BOOL bInstall) } } else { status = RegSetValueEx( key, EXT2_MANAGER_NAME, 0, REG_SZ, - (BYTE *)appPath, strlen(appPath)); + (BYTE *)appPath, (int)strlen(appPath)); if (status != ERROR_SUCCESS) { goto errorout; } @@ -5127,7 +5127,7 @@ BOOL Ext2SetAutoRunUserList(CHAR *userList) } status = RegSetValueEx( key, "AutorunUsers", 0, REG_SZ, - (BYTE *)userList, strlen(userList)); + (BYTE *)userList, (int)strlen(userList)); if (status != ERROR_SUCCESS) { goto errorout; } @@ -5142,7 +5142,7 @@ errorout: TCHAR * Ext2StrStr(TCHAR *s, TCHAR *t) { - int ls = _tcslen(s), lt = _tcslen(t), i; + int ls = (int)_tcslen(s), lt = (int)_tcslen(t), i; for (i = 0; i + lt <= ls; i++) { if (0 == _tcsnicmp(&s[i], t, lt)) return &s[i];