Skip to content

Commit 58597db

Browse files
committed
Migrate to VS2017
1 parent 2c67094 commit 58597db

File tree

132 files changed

+7074
-10990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+7074
-10990
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vs

ClassicShellSrc/ClassicExplorer/ClassicCopy.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,21 @@ void CClassicCopyFile::AddAccChild( IAccessible *pAcc, const VARIANT &id, CStrin
182182
m_YesButton.first=pAcc;
183183
m_YesButton.second=id.intVal;
184184
if (pLog)
185-
LogPrint(pLog,L"YES button: %x, %d\r\n",(DWORD)pAcc,id.intVal);
185+
LogPrint(pLog,L"YES button: %p, %d\r\n",pAcc,id.intVal);
186186
}
187187
else if (_wcsicmp(name,g_ButtonDontCopy)==0 || _wcsicmp(name,g_ButtonDontMove)==0)
188188
{
189189
m_NoButton.first=pAcc;
190190
m_NoButton.second=id.intVal;
191191
if (pLog)
192-
LogPrint(pLog,L"NO button: %x, %d\r\n",(DWORD)pAcc,id.intVal);
192+
LogPrint(pLog,L"NO button: %p, %d\r\n",pAcc,id.intVal);
193193
}
194194
else if (_wcsicmp(name,g_ButtonCancel)==0)
195195
{
196196
m_Cancel.first=pAcc;
197197
m_Cancel.second=id.intVal;
198198
if (pLog)
199-
LogPrint(pLog,L"CANCEL button: %x, %d\r\n",(DWORD)pAcc,id.intVal);
199+
LogPrint(pLog,L"CANCEL button: %p, %d\r\n",pAcc,id.intVal);
200200
}
201201
}
202202
}
@@ -616,7 +616,7 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
616616
}
617617
}
618618
else if (g_bLogLevel)
619-
LogPrint(&log,L"AccessibleObjectFromWindow: error=0x%X, hWnd=0x%X",h,(DWORD)hWnd);
619+
LogPrint(&log,L"AccessibleObjectFromWindow: error=0x%X, hWnd=0x%p",h,hWnd);
620620

621621
if (g_bLogLevel)
622622
{
@@ -632,6 +632,7 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
632632
fwprintf(f,L"\xFEFF");
633633

634634
OSVERSIONINFOEX ver={sizeof(ver)};
635+
#pragma warning(suppress:4996)
635636
GetVersionEx((OSVERSIONINFO*)&ver);
636637
fwprintf(f,L"version = %d.%d.%d - %d.%d\r\n\r\n",ver.dwMajorVersion,ver.dwMinorVersion,ver.dwBuildNumber,ver.wServicePackMajor,ver.wServicePackMinor);
637638

@@ -728,7 +729,7 @@ LRESULT CALLBACK ClassicCopyHook( int nCode, WPARAM wParam, LPARAM lParam )
728729
HWND hWnd=(HWND)wParam;
729730
CBT_CREATEWND *create=(CBT_CREATEWND*)lParam;
730731
HINSTANCE hInst=(HINSTANCE)GetWindowLongPtr(hWnd,GWLP_HINSTANCE);
731-
if (create->lpcs->lpszName && (int)create->lpcs->lpszClass==32770 && hInst==g_hShell32)
732+
if (create->lpcs->lpszName && (intptr_t)create->lpcs->lpszClass==32770 && hInst==g_hShell32)
732733
{
733734
WaitDllInitThread();
734735
static LONG id;

ClassicShellSrc/ClassicExplorer/ClassicExplorer.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88
// Generated from the TEXTINCLUDE 2 resource.
99
//
10-
#include "afxres.h"
10+
#include "windows.h"
11+
#include "winres.h"
1112
#include "..\ClassicShellLib\resource.h"
1213
/////////////////////////////////////////////////////////////////////////////
1314
#undef APSTUDIO_READONLY_SYMBOLS

0 commit comments

Comments
 (0)