diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..360ea12 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vs diff --git a/ClassicShellSrc/ClassicExplorer/ClassicCopy.cpp b/ClassicShellSrc/ClassicExplorer/ClassicCopy.cpp index 92c90df..eac303c 100644 --- a/ClassicShellSrc/ClassicExplorer/ClassicCopy.cpp +++ b/ClassicShellSrc/ClassicExplorer/ClassicCopy.cpp @@ -182,21 +182,21 @@ void CClassicCopyFile::AddAccChild( IAccessible *pAcc, const VARIANT &id, CStrin m_YesButton.first=pAcc; m_YesButton.second=id.intVal; if (pLog) - LogPrint(pLog,L"YES button: %x, %d\r\n",(DWORD)pAcc,id.intVal); + LogPrint(pLog,L"YES button: %p, %d\r\n",pAcc,id.intVal); } else if (_wcsicmp(name,g_ButtonDontCopy)==0 || _wcsicmp(name,g_ButtonDontMove)==0) { m_NoButton.first=pAcc; m_NoButton.second=id.intVal; if (pLog) - LogPrint(pLog,L"NO button: %x, %d\r\n",(DWORD)pAcc,id.intVal); + LogPrint(pLog,L"NO button: %p, %d\r\n",pAcc,id.intVal); } else if (_wcsicmp(name,g_ButtonCancel)==0) { m_Cancel.first=pAcc; m_Cancel.second=id.intVal; if (pLog) - LogPrint(pLog,L"CANCEL button: %x, %d\r\n",(DWORD)pAcc,id.intVal); + LogPrint(pLog,L"CANCEL button: %p, %d\r\n",pAcc,id.intVal); } } } @@ -616,7 +616,7 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } } else if (g_bLogLevel) - LogPrint(&log,L"AccessibleObjectFromWindow: error=0x%X, hWnd=0x%X",h,(DWORD)hWnd); + LogPrint(&log,L"AccessibleObjectFromWindow: error=0x%X, hWnd=0x%p",h,hWnd); if (g_bLogLevel) { @@ -632,6 +632,7 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM fwprintf(f,L"\xFEFF"); OSVERSIONINFOEX ver={sizeof(ver)}; + #pragma warning(suppress:4996) GetVersionEx((OSVERSIONINFO*)&ver); fwprintf(f,L"version = %d.%d.%d - %d.%d\r\n\r\n",ver.dwMajorVersion,ver.dwMinorVersion,ver.dwBuildNumber,ver.wServicePackMajor,ver.wServicePackMinor); @@ -728,7 +729,7 @@ LRESULT CALLBACK ClassicCopyHook( int nCode, WPARAM wParam, LPARAM lParam ) HWND hWnd=(HWND)wParam; CBT_CREATEWND *create=(CBT_CREATEWND*)lParam; HINSTANCE hInst=(HINSTANCE)GetWindowLongPtr(hWnd,GWLP_HINSTANCE); - if (create->lpcs->lpszName && (int)create->lpcs->lpszClass==32770 && hInst==g_hShell32) + if (create->lpcs->lpszName && (intptr_t)create->lpcs->lpszClass==32770 && hInst==g_hShell32) { WaitDllInitThread(); static LONG id; diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.rc b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.rc index 59dfcd2..0661046 100644 --- a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.rc +++ b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" +#include "winres.h" #include "..\ClassicShellLib\resource.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcproj b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcproj deleted file mode 100644 index da8513a..0000000 --- a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcproj +++ /dev/null @@ -1,928 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj new file mode 100644 index 0000000..06c8903 --- /dev/null +++ b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj @@ -0,0 +1,408 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {9AF324B7-F786-4D85-B2E1-6E51720F874E} + ClassicExplorer + AtlProj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + true + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + true + $(ProjectName)64 + + + $(Configuration)\ + $(Configuration)\ + true + false + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + false + $(ProjectName)64 + + + $(Configuration)\ + $(Configuration)\ + true + false + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + false + $(ProjectName)64 + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + true + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + true + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + true + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicExplorer_i.h + + ClassicExplorer_i.c + ClassicExplorer_p.c + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + + + + NotUsing + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj.filters b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj.filters new file mode 100644 index 0000000..c25dfcf --- /dev/null +++ b/ClassicShellSrc/ClassicExplorer/ClassicExplorer.vcxproj.filters @@ -0,0 +1,149 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {5fffcfa3-305b-4c53-b51b-b387b5702497} + False + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + + + Source Files + + + + + Source Files + + + Source Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Resource Files + + + Generated Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.rc b/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.rc index b669394..d414d77 100644 --- a/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.rc +++ b/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcproj b/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcproj deleted file mode 100644 index 5d4a172..0000000 --- a/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcproj +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj b/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj new file mode 100644 index 0000000..74a8fb4 --- /dev/null +++ b/ClassicShellSrc/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Setup + Win32 + + + + {E93271C8-0252-4A08-8227-1978C64C2D34} + ClassicExplorerSettings + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + + + + + + + + + + + + + + ..\$(Configuration)\ + $(Configuration)\ + true + + + ..\$(Configuration)\ + $(Configuration)\ + false + + + ..\$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + true + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + {9af324b7-f786-4d85-b2e1-6e51720f874e} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicExplorer/ExplorerBand.cpp b/ClassicShellSrc/ClassicExplorer/ExplorerBand.cpp index 2e03f30..3a79e8c 100644 --- a/ClassicShellSrc/ClassicExplorer/ExplorerBand.cpp +++ b/ClassicShellSrc/ClassicExplorer/ExplorerBand.cpp @@ -448,7 +448,7 @@ void CBandWindow::SendEmail( void ) CComPtr pDataObj; if (FAILED(pView->GetItemObject(SVGIO_SELECTION,IID_IDataObject,(void**)&pDataObj))) return; - CComQIPtr pAsync=pDataObj; + CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); @@ -506,7 +506,7 @@ void CBandWindow::SendToZip( void ) CComPtr pDataObj; if (FAILED(pView->GetItemObject(SVGIO_SELECTION,IID_IDataObject,(void**)&pDataObj))) return; - CComQIPtr pAsync=pDataObj; + CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); diff --git a/ClassicShellSrc/ClassicExplorer/dllmain.cpp b/ClassicShellSrc/ClassicExplorer/dllmain.cpp index 6b1c042..658e3bf 100644 --- a/ClassicShellSrc/ClassicExplorer/dllmain.cpp +++ b/ClassicShellSrc/ClassicExplorer/dllmain.cpp @@ -275,7 +275,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID lpRe LocalFree((HLOCAL)pData); TlsSetValue(g_TlsIndex,NULL); TlsFree(g_TlsIndex); - GlobalDeleteAtom((ATOM)g_LoadedSettingsAtom); + GlobalDeleteAtom((ATOM)(uintptr_t)g_LoadedSettingsAtom); } return _AtlModule.DllMain(dwReason, lpReserved); diff --git a/ClassicShellSrc/ClassicIE/ClassicIE.cpp b/ClassicShellSrc/ClassicIE/ClassicIE.cpp index 3ecbf4e..dceea31 100644 --- a/ClassicShellSrc/ClassicIE/ClassicIE.cpp +++ b/ClassicShellSrc/ClassicIE/ClassicIE.cpp @@ -69,7 +69,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL { wchar_t token[100]; const wchar_t *url=GetToken(lpCmdLine+5,token,_countof(token),L" "); - ZoneConfigure((HWND)_wtol(token),url); + ZoneConfigure((HWND)(uintptr_t)_wtol(token),url); return 0; } @@ -115,7 +115,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL DWORD settings=GetIESettings(); - HWND topWindow=(HWND)_wtol(lpCmdLine); + HWND topWindow=(HWND)(uintptr_t)_wtol(lpCmdLine); if (topWindow) { DWORD processId; @@ -169,7 +169,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL return settings; HWND caption=FindWindowEx(topWindow,NULL,L"Client Caption",NULL); - DllLogToFile(CIE_LOG,L"exe: topWindow=%X, caption=%X",(DWORD)topWindow,(DWORD)caption); + DllLogToFile(CIE_LOG,L"exe: topWindow=%p, caption=%p",topWindow,caption); UINT message=RegisterWindowMessage(L"ClassicIE.Injected"); if (caption) { diff --git a/ClassicShellSrc/ClassicIE/ClassicIE.vcproj b/ClassicShellSrc/ClassicIE/ClassicIE.vcproj deleted file mode 100644 index 466d528..0000000 --- a/ClassicShellSrc/ClassicIE/ClassicIE.vcproj +++ /dev/null @@ -1,527 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicIE/ClassicIE.vcxproj b/ClassicShellSrc/ClassicIE/ClassicIE.vcxproj new file mode 100644 index 0000000..d78e079 --- /dev/null +++ b/ClassicShellSrc/ClassicIE/ClassicIE.vcxproj @@ -0,0 +1,279 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {65D5C193-E807-4094-AE19-19E6A310A312} + ClassicIE + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + $(ProjectName)_32 + + + $(Configuration)64\ + $(Configuration)64\ + true + $(ProjectName)_64 + + + $(Configuration)\ + $(Configuration)\ + false + $(ProjectName)_32 + + + $(Configuration)64\ + $(Configuration)64\ + false + $(ProjectName)_64 + + + $(Configuration)\ + $(Configuration)\ + false + $(ProjectName)_32 + + + $(Configuration)64\ + $(Configuration)64\ + false + $(ProjectName)_64 + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + EditAndContinue + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + ProgramDatabase + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + true + + + shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + {bc0e6e7c-08c1-4f12-a754-4608e5a22fa8} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp index 3fbd7a8..88697e1 100644 --- a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp +++ b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp @@ -102,7 +102,7 @@ HRESULT STDMETHODCALLTYPE CClassicIEBHO::SetSite( IUnknown *pUnkSite ) if (topWindow) { wchar_t param[100]; - Sprintf(param,_countof(param),L"%u",(DWORD)topWindow); + Sprintf(param,_countof(param),L"%u",(DWORD)(uintptr_t)topWindow); m_Settings=StartBroker(bLowIntegrity,param); if (m_Settings&(IE_SETTING_PROGRESS|IE_SETTING_ZONE)) @@ -237,7 +237,7 @@ LRESULT CALLBACK CClassicIEBHO::SubclassStatusProc( HWND hWnd, UINT uMsg, WPARAM if (pThis->m_pWebBrowser && SUCCEEDED(pThis->m_pWebBrowser->get_LocationURL(&url))) { wchar_t buf[1024]; - Sprintf(buf,_countof(buf),L"zone %u %s",(unsigned)GetAncestor(hWnd,GA_ROOT),(const wchar_t*)url); + Sprintf(buf,_countof(buf),L"zone %u %s",(unsigned)(uintptr_t)GetAncestor(hWnd,GA_ROOT),(const wchar_t*)url); StartBroker(false,buf); } diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.rc b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.rc index f40c3ba..ebb1f15 100644 --- a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.rc +++ b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" #include "..\..\ClassicShellLib\resource.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcproj b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcproj deleted file mode 100644 index 388d035..0000000 --- a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcproj +++ /dev/null @@ -1,845 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj new file mode 100644 index 0000000..39bcec6 --- /dev/null +++ b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -0,0 +1,377 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {BC0E6E7C-08C1-4F12-A754-4608E5A22FA8} + ClassicIEDLL + AtlProj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + ..\$(Configuration)\ + $(Configuration)\ + true + $(ProjectName)_32 + + + ..\$(Configuration)64\ + $(Configuration)64\ + true + $(ProjectName)_64 + + + ..\$(Configuration)\ + $(Configuration)\ + false + $(ProjectName)_32 + + + ..\$(Configuration)64\ + $(Configuration)64\ + false + $(ProjectName)_64 + + + ..\$(Configuration)\ + $(Configuration)\ + false + $(ProjectName)_32 + + + ..\$(Configuration)64\ + $(Configuration)64\ + false + $(ProjectName)_64 + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + true + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + true + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + true + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + true + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + ClassicIEDLL_i.h + + ClassicIEDLL_i.c + ClassicIEDLL_p.c + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + + + NotUsing + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters new file mode 100644 index 0000000..011bc2c --- /dev/null +++ b/ClassicShellSrc/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters @@ -0,0 +1,101 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {8ffd1dbd-fd04-405c-a733-b3147c1c95e9} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + + + Source Files + + + + + Source Files + + + Source Files + + + Resource Files + + + Resource Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicIE/ClassicIEDLL/DrawCaption.cpp b/ClassicShellSrc/ClassicIE/ClassicIEDLL/DrawCaption.cpp index 565b858..c619da9 100644 --- a/ClassicShellSrc/ClassicIE/ClassicIEDLL/DrawCaption.cpp +++ b/ClassicShellSrc/ClassicIE/ClassicIEDLL/DrawCaption.cpp @@ -294,7 +294,7 @@ static BOOL CALLBACK EnumTopWindows( HWND hwnd, LPARAM lParam ) HWND caption=FindWindowEx(hwnd,NULL,L"Client Caption",NULL); if (caption) { - LogToFile(CIE_LOG,L"InitClassicIE: caption=%X",(DWORD)caption); + LogToFile(CIE_LOG,L"InitClassicIE: caption=%p",caption); if (!g_OldClassCaptionProc) g_OldClassCaptionProc=(WNDPROC)SetClassLongPtr(caption,GCLP_WNDPROC,(LONG_PTR)ClassCaptionProc); WNDPROC proc=(WNDPROC)SetWindowLongPtr(caption,GWLP_WNDPROC,(LONG_PTR)SubclassCaptionProc); diff --git a/ClassicShellSrc/ClassicShell.sln b/ClassicShellSrc/ClassicShell.sln index 6c3f9e5..0d38081 100644 --- a/ClassicShellSrc/ClassicShell.sln +++ b/ClassicShellSrc/ClassicShell.sln @@ -1,225 +1,69 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorer", "ClassicExplorer\ClassicExplorer.vcproj", "{9AF324B7-F786-4D85-B2E1-6E51720F874E}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicStartMenu", "ClassicStartMenu\ClassicStartMenu.vcproj", "{87D5FE20-AF86-458A-9AA3-3131EB06179B}" - ProjectSection(ProjectDependencies) = postProject - {5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089} = {5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089} - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - {066C9721-26D5-4C4D-868E-50C2BA0A8196} = {066C9721-26D5-4C4D-868E-50C2BA0A8196} - {81EB6336-366C-47DD-82CF-FF6C36CCD2B5} = {81EB6336-366C-47DD-82CF-FF6C36CCD2B5} - {63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} = {63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} - {CA5BFC96-428D-42F5-9F7D-CDDE048A357C} = {CA5BFC96-428D-42F5-9F7D-CDDE048A357C} - {A2CCDE9F-17CE-461E-8BD9-00261B8855A6} = {A2CCDE9F-17CE-461E-8BD9-00261B8855A6} - {66D1EAA4-65D1-45CC-9989-E616FC0575EB} = {66D1EAA4-65D1-45CC-9989-E616FC0575EB} - {9EC23CA9-384A-4EEB-979E-69879DC1A78C} = {9EC23CA9-384A-4EEB-979E-69879DC1A78C} - {ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94} = {ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94} - {598AB4AC-008E-4501-90B3-C5213834C1DA} = {598AB4AC-008E-4501-90B3-C5213834C1DA} - {7BD26CB3-5280-48FD-9A86-C13E321018D5} = {7BD26CB3-5280-48FD-9A86-C13E321018D5} - {85DEECBB-1F9B-4983-9D54-3BF42182B7E7} = {85DEECBB-1F9B-4983-9D54-3BF42182B7E7} - {404821C5-4EE4-4908-A759-5EF6DAC14AB6} = {404821C5-4EE4-4908-A759-5EF6DAC14AB6} - {EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75} = {EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75} - {31C016FB-9EA1-4AF5-987A-37210C04DA06} = {31C016FB-9EA1-4AF5-987A-37210C04DA06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicStartMenuDLL", "ClassicStartMenu\ClassicStartMenuDLL\ClassicStartMenuDLL.vcproj", "{85DEECBB-1F9B-4983-9D54-3BF42182B7E7}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellSetup", "ClassicShellSetup\ClassicShellSetup.vcproj", "{A4A4D3B1-24E7-401E-A37C-72141D7603DC}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection -EndProject +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2010 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8-C0DB-4991-AF03-124128EDEF98}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero", "Skins\Win7Aero\Win7Aero.vcproj", "{EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Basic", "Skins\Win7Basic\Win7Basic.vcproj", "{404821C5-4EE4-4908-A759-5EF6DAC14AB6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicSkin", "Skins\ClassicSkin\ClassicSkin.vcproj", "{9EC23CA9-384A-4EEB-979E-69879DC1A78C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FullGlass", "Skins\FullGlass\FullGlass.vcproj", "{066C9721-26D5-4C4D-868E-50C2BA0A8196}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmokedGlass", "Skins\SmokedGlass\SmokedGlass.vcproj", "{66D1EAA4-65D1-45CC-9989-E616FC0575EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinXP", "Skins\WinXP\WinXP.vcproj", "{81EB6336-366C-47DD-82CF-FF6C36CCD2B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupHelper", "ClassicShellSetup\SetupHelper\SetupHelper.vcproj", "{E1017135-9916-4B11-9AC5-1EC0BD8F8CD6}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorerSettings", "ClassicExplorer\ClassicExplorerSettings\ClassicExplorerSettings.vcproj", "{E93271C8-0252-4A08-8227-1978C64C2D34}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - {9AF324B7-F786-4D85-B2E1-6E51720F874E} = {9AF324B7-F786-4D85-B2E1-6E51720F874E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-US", "ClassicShellSetup\en-US\en-US.vcproj", "{0A60FD06-3A81-4651-A869-9850DBC115EA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{B695E1F6-785D-45CB-BCE0-0E9635DFC1DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellLib", "ClassicShellLib\ClassicShellLib.vcproj", "{D42FE717-485B-492D-884A-1999F6D51154}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorer", "ClassicExplorer\ClassicExplorer.vcxproj", "{9AF324B7-F786-4D85-B2E1-6E51720F874E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIE", "ClassicIE\ClassicIE.vcproj", "{65D5C193-E807-4094-AE19-19E6A310A312}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - {BC0E6E7C-08C1-4F12-A754-4608E5A22FA8} = {BC0E6E7C-08C1-4F12-A754-4608E5A22FA8} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicStartMenu", "ClassicStartMenu\ClassicStartMenu.vcxproj", "{87D5FE20-AF86-458A-9AA3-3131EB06179B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIEDLL", "ClassicIE\ClassicIEDLL\ClassicIEDLL.vcproj", "{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicStartMenuDLL", "ClassicStartMenu\ClassicStartMenuDLL\ClassicStartMenuDLL.vcxproj", "{85DEECBB-1F9B-4983-9D54-3BF42182B7E7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellUpdate", "ClassicShellUpdate\ClassicShellUpdate.vcproj", "{171B46B0-6083-4D9E-BD33-946EA3BD76FA}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellSetup", "ClassicShellSetup\ClassicShellSetup.vcxproj", "{A4A4D3B1-24E7-401E-A37C-72141D7603DC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero7", "Skins\Win7Aero7\Win7Aero7.vcproj", "{A2CCDE9F-17CE-461E-8BD9-00261B8855A6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero", "Skins\Win7Aero\Win7Aero.vcxproj", "{EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicSkin7", "Skins\ClassicSkin7\ClassicSkin7.vcproj", "{31C016FB-9EA1-4AF5-987A-37210C04DA06}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Basic", "Skins\Win7Basic\Win7Basic.vcxproj", "{404821C5-4EE4-4908-A759-5EF6DAC14AB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win87", "Skins\Win87\Win87.vcproj", "{5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicSkin", "Skins\ClassicSkin\ClassicSkin.vcxproj", "{9EC23CA9-384A-4EEB-979E-69879DC1A78C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win8", "Skins\Win8\Win8.vcproj", "{ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FullGlass", "Skins\FullGlass\FullGlass.vcxproj", "{066C9721-26D5-4C4D-868E-50C2BA0A8196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartMenuHelper", "ClassicStartMenu\StartMenuHelper\StartMenuHelper.vcproj", "{A42C6159-ACA8-46D1-A0FB-19C398B137D5}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmokedGlass", "Skins\SmokedGlass\SmokedGlass.vcxproj", "{66D1EAA4-65D1-45CC-9989-E616FC0575EB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateBin", "ClassicShellSetup\UpdateBin\UpdateBin.vcproj", "{F92A5473-F9E0-412F-923C-6632A66D13C1}" - ProjectSection(ProjectDependencies) = postProject - {DAE66C9B-05DC-4ACE-97DA-2547B490BBFF} = {DAE66C9B-05DC-4ACE-97DA-2547B490BBFF} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinXP", "Skins\WinXP\WinXP.vcxproj", "{81EB6336-366C-47DD-82CF-FF6C36CCD2B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellUtility", "ClassicShellSetup\ClassicShellUtility\ClassicShellUtility.vcproj", "{DAE66C9B-05DC-4ACE-97DA-2547B490BBFF}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupHelper", "ClassicShellSetup\SetupHelper\SetupHelper.vcxproj", "{E1017135-9916-4B11-9AC5-1EC0BD8F8CD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midnight7", "Skins\Midnight7\Midnight7.vcproj", "{7BD26CB3-5280-48FD-9A86-C13E321018D5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorerSettings", "ClassicExplorer\ClassicExplorerSettings\ClassicExplorerSettings.vcxproj", "{E93271C8-0252-4A08-8227-1978C64C2D34}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro7", "Skins\Metro7\Metro7.vcproj", "{598AB4AC-008E-4501-90B3-C5213834C1DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-US", "ClassicShellSetup\en-US\en-US.vcxproj", "{0A60FD06-3A81-4651-A869-9850DBC115EA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro", "Skins\Metro\Metro.vcproj", "{63BAF573-170B-4FA0-AEE3-16E04F3E9DF5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellLib", "ClassicShellLib\ClassicShellLib.vcxproj", "{D42FE717-485B-492D-884A-1999F6D51154}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic7\Metallic7.vcproj", "{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIE", "ClassicIE\ClassicIE.vcxproj", "{65D5C193-E807-4094-AE19-19E6A310A312}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIEDLL", "ClassicIE\ClassicIEDLL\ClassicIEDLL.vcxproj", "{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellUpdate", "ClassicShellUpdate\ClassicShellUpdate.vcxproj", "{171B46B0-6083-4D9E-BD33-946EA3BD76FA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero7", "Skins\Win7Aero7\Win7Aero7.vcxproj", "{A2CCDE9F-17CE-461E-8BD9-00261B8855A6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicSkin7", "Skins\ClassicSkin7\ClassicSkin7.vcxproj", "{31C016FB-9EA1-4AF5-987A-37210C04DA06}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win87", "Skins\Win87\Win87.vcxproj", "{5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win8", "Skins\Win8\Win8.vcxproj", "{ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartMenuHelper", "ClassicStartMenu\StartMenuHelper\StartMenuHelper.vcxproj", "{A42C6159-ACA8-46D1-A0FB-19C398B137D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateBin", "ClassicShellSetup\UpdateBin\UpdateBin.vcxproj", "{F92A5473-F9E0-412F-923C-6632A66D13C1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellUtility", "ClassicShellSetup\ClassicShellUtility\ClassicShellUtility.vcxproj", "{DAE66C9B-05DC-4ACE-97DA-2547B490BBFF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midnight7", "Skins\Midnight7\Midnight7.vcxproj", "{7BD26CB3-5280-48FD-9A86-C13E321018D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro7", "Skins\Metro7\Metro7.vcxproj", "{598AB4AC-008E-4501-90B3-C5213834C1DA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro", "Skins\Metro\Metro.vcxproj", "{63BAF573-170B-4FA0-AEE3-16E04F3E9DF5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic7\Metallic7.vcxproj", "{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}" EndProject Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 29 - SccProjectUniqueName0 = ClassicExplorer\\ClassicExplorer.vcproj - SccLocalPath0 = . - SccProjectFilePathRelativizedFromConnection0 = ClassicExplorer\\ - SccProjectUniqueName1 = ClassicStartMenu\\ClassicStartMenu.vcproj - SccLocalPath1 = . - SccProjectFilePathRelativizedFromConnection1 = ClassicStartMenu\\ - SccProjectUniqueName2 = ClassicStartMenu\\ClassicStartMenuDLL\\ClassicStartMenuDLL.vcproj - SccLocalPath2 = . - SccProjectFilePathRelativizedFromConnection2 = ClassicStartMenu\\ClassicStartMenuDLL\\ - SccProjectUniqueName3 = Skins\\ClassicSkin\\ClassicSkin.vcproj - SccProjectTopLevelParentUniqueName3 = ClassicShell.sln - SccLocalPath3 = . - SccProjectFilePathRelativizedFromConnection3 = Skins\\ClassicSkin\\ - SccProjectUniqueName4 = ClassicExplorer\\ClassicExplorerSettings\\ClassicExplorerSettings.vcproj - SccLocalPath4 = . - SccProjectFilePathRelativizedFromConnection4 = ClassicExplorer\\ClassicExplorerSettings\\ - SccProjectUniqueName5 = ClassicShellSetup\\ClassicShellSetup.vcproj - SccProjectTopLevelParentUniqueName5 = ClassicShell.sln - SccLocalPath5 = . - SccProjectFilePathRelativizedFromConnection5 = ClassicShellSetup\\ - SccProjectUniqueName6 = ClassicShellLib\\ClassicShellLib.vcproj - SccLocalPath6 = . - SccProjectFilePathRelativizedFromConnection6 = ClassicShellLib\\ - SccProjectUniqueName7 = ClassicIE\\ClassicIE.vcproj - SccLocalPath7 = . - SccProjectFilePathRelativizedFromConnection7 = ClassicIE\\ - SccProjectUniqueName8 = ClassicIE\\ClassicIEDLL\\ClassicIEDLL.vcproj - SccLocalPath8 = . - SccProjectFilePathRelativizedFromConnection8 = ClassicIE\\ClassicIEDLL\\ - SccProjectUniqueName9 = ClassicShellUpdate\\ClassicShellUpdate.vcproj - SccLocalPath9 = . - SccProjectFilePathRelativizedFromConnection9 = ClassicShellUpdate\\ - SccProjectUniqueName10 = Skins\\ClassicSkin7\\ClassicSkin7.vcproj - SccProjectTopLevelParentUniqueName10 = ClassicShell.sln - SccLocalPath10 = . - SccProjectFilePathRelativizedFromConnection10 = Skins\\ClassicSkin7\\ - SccProjectUniqueName11 = ClassicShellSetup\\ClassicShellUtility\\ClassicShellUtility.vcproj - SccProjectTopLevelParentUniqueName11 = ClassicShell.sln - SccLocalPath11 = . - SccProjectFilePathRelativizedFromConnection11 = ClassicShellSetup\\ClassicShellUtility\\ - SccLocalPath12 = . - SccProjectUniqueName13 = Skins\\Win7Aero\\Win7Aero.vcproj - SccProjectTopLevelParentUniqueName13 = ClassicShell.sln - SccLocalPath13 = Skins\\Win7Aero - SccProjectUniqueName14 = Skins\\Win7Basic\\Win7Basic.vcproj - SccProjectTopLevelParentUniqueName14 = ClassicShell.sln - SccLocalPath14 = Skins\\Win7Basic - SccProjectUniqueName15 = Skins\\FullGlass\\FullGlass.vcproj - SccProjectTopLevelParentUniqueName15 = ClassicShell.sln - SccLocalPath15 = . - SccProjectFilePathRelativizedFromConnection15 = Skins\\FullGlass\\ - SccProjectUniqueName16 = Skins\\SmokedGlass\\SmokedGlass.vcproj - SccProjectTopLevelParentUniqueName16 = ClassicShell.sln - SccLocalPath16 = . - SccProjectFilePathRelativizedFromConnection16 = Skins\\SmokedGlass\\ - SccProjectUniqueName17 = Skins\\WinXP\\WinXP.vcproj - SccProjectTopLevelParentUniqueName17 = ClassicShell.sln - SccLocalPath17 = . - SccProjectFilePathRelativizedFromConnection17 = Skins\\WinXP\\ - SccProjectUniqueName18 = ClassicShellSetup\\SetupHelper\\SetupHelper.vcproj - SccProjectTopLevelParentUniqueName18 = ClassicShell.sln - SccLocalPath18 = . - SccProjectFilePathRelativizedFromConnection18 = ClassicShellSetup\\SetupHelper\\ - SccProjectUniqueName19 = ClassicShellSetup\\en-US\\en-US.vcproj - SccProjectTopLevelParentUniqueName19 = ClassicShell.sln - SccLocalPath19 = . - SccProjectFilePathRelativizedFromConnection19 = ClassicShellSetup\\en-US\\ - SccProjectUniqueName20 = Skins\\Win7Aero7\\Win7Aero7.vcproj - SccProjectTopLevelParentUniqueName20 = ClassicShell.sln - SccLocalPath20 = . - SccProjectFilePathRelativizedFromConnection20 = Skins\\Win7Aero7\\ - SccProjectUniqueName21 = Skins\\Win87\\Win87.vcproj - SccProjectTopLevelParentUniqueName21 = ClassicShell.sln - SccLocalPath21 = . - SccProjectFilePathRelativizedFromConnection21 = Skins\\Win87\\ - SccProjectUniqueName22 = Skins\\Win8\\Win8.vcproj - SccProjectTopLevelParentUniqueName22 = ClassicShell.sln - SccLocalPath22 = . - SccProjectFilePathRelativizedFromConnection22 = Skins\\Win8\\ - SccProjectUniqueName23 = ClassicStartMenu\\StartMenuHelper\\StartMenuHelper.vcproj - SccLocalPath23 = . - SccProjectFilePathRelativizedFromConnection23 = ClassicStartMenu\\StartMenuHelper\\ - SccProjectUniqueName24 = ClassicShellSetup\\UpdateBin\\UpdateBin.vcproj - SccProjectTopLevelParentUniqueName24 = ClassicShell.sln - SccLocalPath24 = . - SccProjectFilePathRelativizedFromConnection24 = ClassicShellSetup\\UpdateBin\\ - SccProjectUniqueName25 = Skins\\Midnight7\\Midnight7.vcproj - SccProjectTopLevelParentUniqueName25 = ClassicShell.sln - SccLocalPath25 = . - SccProjectFilePathRelativizedFromConnection25 = Skins\\Midnight7\\ - SccProjectUniqueName26 = Skins\\Metro7\\Metro7.vcproj - SccProjectTopLevelParentUniqueName26 = ClassicShell.sln - SccLocalPath26 = . - SccProjectFilePathRelativizedFromConnection26 = Skins\\Metro7\\ - SccProjectUniqueName27 = Skins\\Metro\\Metro.vcproj - SccProjectTopLevelParentUniqueName27 = ClassicShell.sln - SccLocalPath27 = . - SccProjectFilePathRelativizedFromConnection27 = Skins\\Metro\\ - SccProjectUniqueName28 = Skins\\Metallic7\\Metallic7.vcproj - SccProjectTopLevelParentUniqueName28 = ClassicShell.sln - SccLocalPath28 = . - SccProjectFilePathRelativizedFromConnection28 = Skins\\Metallic7\\ - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -535,24 +379,27 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E1017135-9916-4B11-9AC5-1EC0BD8F8CD6} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} - {0A60FD06-3A81-4651-A869-9850DBC115EA} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} {A4A4D3B1-24E7-401E-A37C-72141D7603DC} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} - {F92A5473-F9E0-412F-923C-6632A66D13C1} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} - {DAE66C9B-05DC-4ACE-97DA-2547B490BBFF} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} {EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75} = {409484D8-C0DB-4991-AF03-124128EDEF98} {404821C5-4EE4-4908-A759-5EF6DAC14AB6} = {409484D8-C0DB-4991-AF03-124128EDEF98} {9EC23CA9-384A-4EEB-979E-69879DC1A78C} = {409484D8-C0DB-4991-AF03-124128EDEF98} {066C9721-26D5-4C4D-868E-50C2BA0A8196} = {409484D8-C0DB-4991-AF03-124128EDEF98} {66D1EAA4-65D1-45CC-9989-E616FC0575EB} = {409484D8-C0DB-4991-AF03-124128EDEF98} {81EB6336-366C-47DD-82CF-FF6C36CCD2B5} = {409484D8-C0DB-4991-AF03-124128EDEF98} + {E1017135-9916-4B11-9AC5-1EC0BD8F8CD6} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} + {0A60FD06-3A81-4651-A869-9850DBC115EA} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} {A2CCDE9F-17CE-461E-8BD9-00261B8855A6} = {409484D8-C0DB-4991-AF03-124128EDEF98} {31C016FB-9EA1-4AF5-987A-37210C04DA06} = {409484D8-C0DB-4991-AF03-124128EDEF98} {5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089} = {409484D8-C0DB-4991-AF03-124128EDEF98} {ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94} = {409484D8-C0DB-4991-AF03-124128EDEF98} + {F92A5473-F9E0-412F-923C-6632A66D13C1} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} + {DAE66C9B-05DC-4ACE-97DA-2547B490BBFF} = {B695E1F6-785D-45CB-BCE0-0E9635DFC1DE} {7BD26CB3-5280-48FD-9A86-C13E321018D5} = {409484D8-C0DB-4991-AF03-124128EDEF98} {598AB4AC-008E-4501-90B3-C5213834C1DA} = {409484D8-C0DB-4991-AF03-124128EDEF98} {63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} = {409484D8-C0DB-4991-AF03-124128EDEF98} {CA5BFC96-428D-42F5-9F7D-CDDE048A357C} = {409484D8-C0DB-4991-AF03-124128EDEF98} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AF7D0AE8-B556-4840-92EF-CEADC95A5CD1} + EndGlobalSection EndGlobal diff --git a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.rc b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.rc index 20e332d..d16aad0 100644 --- a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.rc +++ b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcproj b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcproj deleted file mode 100644 index f31c188..0000000 --- a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcproj +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj new file mode 100644 index 0000000..c3707bc --- /dev/null +++ b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D42FE717-485B-492D-884A-1999F6D51154} + ClassicShellLib + Win32Proj + 10.0.16299.0 + + + + StaticLibrary + v141 + Static + Unicode + + + StaticLibrary + v141 + Static + Unicode + + + StaticLibrary + v141 + Static + Unicode + + + StaticLibrary + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)64\ + $(Configuration)64\ + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)64\ + $(Configuration)64\ + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + true + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + true + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + MachineX86 + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj.filters b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj.filters new file mode 100644 index 0000000..e69357b --- /dev/null +++ b/ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj.filters @@ -0,0 +1,152 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {2dafcc43-3a9f-4c0e-8d8a-b43c78f07e35} + + + {48a0589e-ec5e-4ded-b507-ca72c33429c7} + + + {402c170e-bb90-4637-85b7-98857963160f} + + + {40e914e4-1c35-4b97-a4f6-15dce5ff5b20} + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + Strings + + + Strings + + + Strings + + + Strings + + + Resources + + + Resources + + + Resources + + + Resources + + + Resources + + + Settings + + + Settings + + + Settings + + + Settings + + + Settings + + + Settings + + + Lib + + + Lib + + + + + Strings + + + Strings + + + Strings + + + Strings + + + Resources + + + Resources + + + Resources + + + Resources + + + Resources + + + Settings + + + Settings + + + Settings + + + Settings + + + Settings + + + Settings + + + Lib + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellLib/IatHookHelper.cpp b/ClassicShellSrc/ClassicShellLib/IatHookHelper.cpp index faa0b4f..35d1c9f 100644 --- a/ClassicShellSrc/ClassicShellLib/IatHookHelper.cpp +++ b/ClassicShellSrc/ClassicShellLib/IatHookHelper.cpp @@ -55,7 +55,7 @@ IatHookData *SetIatHook( IMAGE_DOS_HEADER *dosHeader, DWORD iatOffset, DWORD int { if (origThunk->u1.Ordinal&IMAGE_ORDINAL_FLAG) { - if (IS_INTRESOURCE(targetProc) && IMAGE_ORDINAL(origThunk->u1.Ordinal)==(WORD)targetProc) + if (IS_INTRESOURCE(targetProc) && IMAGE_ORDINAL(origThunk->u1.Ordinal)==(uintptr_t)targetProc) break; } else diff --git a/ClassicShellSrc/ClassicShellLib/ResourceHelper.cpp b/ClassicShellSrc/ClassicShellLib/ResourceHelper.cpp index 58f176c..5108d79 100644 --- a/ClassicShellSrc/ClassicShellLib/ResourceHelper.cpp +++ b/ClassicShellSrc/ClassicShellLib/ResourceHelper.cpp @@ -611,7 +611,7 @@ HBITMAP LoadImageResource( HMODULE hModule, const wchar_t *name, bool bTopDown, { for (UINT y=0;yCopyPixels(&rc,width*4,width*4,bits+(height-y-1)*width*4); } } @@ -645,6 +645,7 @@ WORD GetWinVersion( void ) static WORD version; if (!version) { + #pragma warning(suppress:4996) DWORD ver=GetVersion(); version=MAKEWORD(HIBYTE(ver),LOBYTE(ver)); } diff --git a/ClassicShellSrc/ClassicShellLib/Settings.cpp b/ClassicShellSrc/ClassicShellLib/Settings.cpp index cd90ff9..bd0719e 100644 --- a/ClassicShellSrc/ClassicShellLib/Settings.cpp +++ b/ClassicShellSrc/ClassicShellLib/Settings.cpp @@ -2585,8 +2585,8 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a fprintf_s(fAdmx,admxText1); fprintf_s(fAdmx,g_AdmxText1b); - fprintf_s(fAdml,"%s",ReplaceStrings(CStringA(g_AdmlText1a),docMap)); - fprintf_s(fAdml,"%s",ReplaceStrings(CStringA(admlText1),docMap)); + fprintf_s(fAdml,"%s",(const char*)ReplaceStrings(CStringA(g_AdmlText1a),docMap)); + fprintf_s(fAdml,"%s",(const char*)ReplaceStrings(CStringA(admlText1),docMap)); // policies and strings int stringIdx=1; @@ -2616,14 +2616,14 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a // name string int nameIdx=stringIdx++; - fprintf_s(fAdml,"\t\t\t%s\r\n",prefix,nameIdx,EscapeXmlString(pDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting->nameID):pDoc->nameOverride)); + fprintf_s(fAdml,"\t\t\t%s\r\n",prefix,nameIdx,(const char*)EscapeXmlString(pDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting->nameID):pDoc->nameOverride)); // tip string int tipIdx=stringIdx++; CStringA tip=pDoc->tipOverride; if (tip.IsEmpty()) tip=LoadStringUTF8(pSetting->tipID); tip+=pDoc->tipAddition; - fprintf_s(fAdml,"\t\t\t%s\r\n\r\n%s\r\n",prefix,tipIdx,EscapeXmlString(tip),ReplaceStrings(g_StateTip,docMap)); + fprintf_s(fAdml,"\t\t\t%s\r\n\r\n%s\r\n",prefix,tipIdx,(const char*)EscapeXmlString(tip),(const char*)ReplaceStrings(g_StateTip,docMap)); // policy fprintf_s(fAdmx,"\t\t\r\n", @@ -2671,16 +2671,16 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a fprintf_s(fAdmx,"\t\t\t\r\n"); fprintf_s(fAdmx,"\t\t\t\t\r\n",pSetting->name); - fprintf_s(fAdmx,"\t\t\t\t\t\r\n",pSetting->name); - fprintf_s(fAdmx,"\t\t\t\t\t\r\n",pSetting->name); - fprintf_s(fAdmx,"\t\t\t\t\t\r\n",pSetting->name); + fprintf_s(fAdmx,"\t\t\t\t\t\r\n"); + fprintf_s(fAdmx,"\t\t\t\t\t\r\n"); + fprintf_s(fAdmx,"\t\t\t\t\t\r\n"); fprintf_s(fAdmx,"\t\t\t\t\r\n"); if (pSetting->type==CSetting::TYPE_BOOL) { fprintf_s(fAdmx,"\t\t\t\t\r\n",pSetting->name); - fprintf_s(fAdmx,"\t\t\t\t\t\r\n",pSetting->name); - fprintf_s(fAdmx,"\t\t\t\t\t\r\n",pSetting->name); + fprintf_s(fAdmx,"\t\t\t\t\t\r\n"); + fprintf_s(fAdmx,"\t\t\t\t\t\r\n"); fprintf_s(fAdmx,"\t\t\t\t\r\n"); } else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO) @@ -2699,7 +2699,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a } int radioIdx=stringIdx++; - fprintf_s(fAdml,"\t\t\t%s\r\n",prefix,radioIdx,pRadioDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting[i].nameID):pRadioDoc->nameOverride); + fprintf_s(fAdml,"\t\t\t%s\r\n",prefix,radioIdx,(const char*)(pRadioDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting[i].nameID):pRadioDoc->nameOverride)); fprintf_s(fAdmx,"\t\t\t\t\t%S\r\n",prefix,radioIdx,pSetting[i].name); } fprintf_s(fAdmx,"\t\t\t\t\r\n"); @@ -2758,23 +2758,23 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a if (pSetting->type==CSetting::TYPE_BOOL) { - fprintf_s(fAdml,"\t\t\t\t%s\r\n",name); + fprintf_s(fAdml,"\t\t\t\t%s\r\n",(const char*)name); } else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO) { - fprintf_s(fAdml,"\t\t\t\t%s\r\n",name); + fprintf_s(fAdml,"\t\t\t\t%s\r\n",(const char*)name); } else if (pSetting->type==CSetting::TYPE_INT || pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY || pSetting->type==CSetting::TYPE_COLOR) { - fprintf_s(fAdml,"\t\t\t\t%s\r\n",name); + fprintf_s(fAdml,"\t\t\t\t%s\r\n",(const char*)name); } else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT) { - fprintf_s(fAdml,"\t\t\t\t\r\n",name); + fprintf_s(fAdml,"\t\t\t\t\r\n",(const char*)name); } else if (pSetting->type==CSetting::TYPE_MULTISTRING) { - fprintf_s(fAdml,"\t\t\t\t%s\r\n",name); + fprintf_s(fAdml,"\t\t\t\t%s\r\n",(const char*)name); } fprintf_s(fAdml,"\t\t\t\r\n"); } diff --git a/ClassicShellSrc/ClassicShellLib/SettingsUIHelper.cpp b/ClassicShellSrc/ClassicShellLib/SettingsUIHelper.cpp index 2631fc7..2026854 100644 --- a/ClassicShellSrc/ClassicShellLib/SettingsUIHelper.cpp +++ b/ClassicShellSrc/ClassicShellLib/SettingsUIHelper.cpp @@ -177,7 +177,7 @@ CString CTreeItem::GetDisplayName( bool bTitle ) const if (SUCCEEDED(pItem->GetDisplayName(SIGDN_NORMALDISPLAY,&pName))) { CString name; - name.Format(L"%s (%s)",LoadStringEx(pStdCommand->displayNameId),pName); + name.Format(L"%s (%s)",(const wchar_t*)LoadStringEx(pStdCommand->displayNameId),(const wchar_t*)pName); return name; } } @@ -970,7 +970,7 @@ void CEditCustomItemDlg::InitDialog( CWindow commandCombo, const CStdCommand *pS if (SUCCEEDED(SHGetNameFromIDList(path,SIGDN_DESKTOPABSOLUTEPARSING,&pPath))) { wchar_t text[_MAX_PATH*2]; - int len=Sprintf(text,_countof(text),L"%s | ",pName); + int len=Sprintf(text,_countof(text),L"%s | ",(const wchar_t*)pName); if (!PathUnExpandEnvStrings(pPath,text+len,_countof(text)-len)) Strcpy(text+len,_countof(text)-len,pPath); linkCombo.SendMessage(CB_ADDSTRING,0,(LPARAM)text); @@ -2644,7 +2644,7 @@ LRESULT CTreeSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO m_EditBox.GetWindowText(str); str.TrimLeft(); str.TrimRight(); wchar_t *end; - int val=wcstol(str,&end,16)&0xFFFFFF; + COLORREF val=wcstol(str,&end,16)&0xFFFFFF; static COLORREF customColors[16]; CHOOSECOLOR choose={sizeof(choose),m_hWnd,NULL,val,customColors}; choose.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT; diff --git a/ClassicShellSrc/ClassicShellLib/StringSet.cpp b/ClassicShellSrc/ClassicShellLib/StringSet.cpp index 7934a33..41e6e5f 100644 --- a/ClassicShellSrc/ClassicShellLib/StringSet.cpp +++ b/ClassicShellSrc/ClassicShellLib/StringSet.cpp @@ -37,7 +37,7 @@ BOOL CALLBACK CStringSet::EnumResNameProc( HMODULE hModule, LPCTSTR lpszType, LP { for (int i=0;i<16;i++) { - UINT id=(((int)lpszName)<<4)+i-16; + int id=(((int)(intptr_t)lpszName)<<4)+i-16; CString str=CreateString(res); if (!str.IsEmpty()) diff --git a/ClassicShellSrc/ClassicShellLib/TrackResources.cpp b/ClassicShellSrc/ClassicShellLib/TrackResources.cpp index 1a539d5..1abc36c 100644 --- a/ClassicShellSrc/ClassicShellLib/TrackResources.cpp +++ b/ClassicShellSrc/ClassicShellLib/TrackResources.cpp @@ -167,7 +167,7 @@ void DumpResourceLeaks( void ) { if (cells[i].pKernel && cells[i].nProcess==pid) { - HGDIOBJ handle=(HGDIOBJ)((cells[i].nUpper<<16)|i); + HGDIOBJ handle=(HGDIOBJ)(intptr_t)((cells[i].nUpper<<16)|i); const TrackedResource *res=NULL; TrackedResourceMap::const_iterator it=g_TrackedGdiResources.find(handle); if (it!=g_TrackedGdiResources.end()) diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.cpp b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.cpp index 7b73a24..1616d80 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.cpp +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.cpp @@ -290,6 +290,7 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm } // check Windows version + #pragma warning(suppress:4996) WORD winVer=LOWORD(GetVersion()); winVer=MAKEWORD(HIBYTE(winVer),LOBYTE(winVer)); if (winVer<0x601) diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.rc b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.rc index 4764ce6..666de22 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.rc +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.sln b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.sln index b2573cc..931413e 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.sln +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.sln @@ -1,27 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellSetup", "ClassicShellSetup.vcproj", "{A4A4D3B1-24E7-401E-A37C-72141D7603DC}" - ProjectSection(ProjectDependencies) = postProject - {D42FE717-485B-492D-884A-1999F6D51154} = {D42FE717-485B-492D-884A-1999F6D51154} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2010 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellSetup", "ClassicShellSetup.vcxproj", "{A4A4D3B1-24E7-401E-A37C-72141D7603DC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellLib", "..\ClassicShellLib\ClassicShellLib.vcproj", "{D42FE717-485B-492D-884A-1999F6D51154}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicShellLib", "..\ClassicShellLib\ClassicShellLib.vcxproj", "{D42FE717-485B-492D-884A-1999F6D51154}" EndProject Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 3 - SccProjectName0 = Perforce\u0020Project - SccLocalPath0 = .. - SccProvider0 = MSSCCI:Perforce\u0020SCM - SccProjectFilePathRelativizedFromConnection0 = ClassicShellSetup\\ - SccProjectUniqueName1 = ClassicShellSetup.vcproj - SccLocalPath1 = .. - SccProjectFilePathRelativizedFromConnection1 = ClassicShellSetup\\ - SccProjectUniqueName2 = ..\\ClassicShellLib\\ClassicShellLib.vcproj - SccLocalPath2 = .. - SccProjectFilePathRelativizedFromConnection2 = ClassicShellLib\\ - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -47,16 +33,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 3 - SccProjectName0 = Perforce\u0020Project - SccLocalPath0 = .. - SccProvider0 = MSSCCI:Perforce\u0020SCM - SccProjectFilePathRelativizedFromConnection0 = ClassicShellSetup\\ - SccProjectUniqueName1 = ClassicShellSetup.vcproj - SccLocalPath1 = .. - SccProjectFilePathRelativizedFromConnection1 = ClassicShellSetup\\ - SccProjectUniqueName2 = ..\\StringUtils\\StringUtils.vcproj - SccLocalPath2 = ..\\StringUtils + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E16503A7-2270-43F6-B312-98FBCB237FA4} EndGlobalSection EndGlobal diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcproj b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcproj deleted file mode 100644 index 6e0b96e..0000000 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj new file mode 100644 index 0000000..d9ad360 --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj @@ -0,0 +1,133 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A4A4D3B1-24E7-401E-A37C-72141D7603DC} + ClassicShellSetup + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Unicode + + + Application + v141 + Unicode + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;Psapi.lib;version.lib;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;Psapi.lib;version.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj.filters b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj.filters new file mode 100644 index 0000000..fb7e0bb --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.vcxproj.filters @@ -0,0 +1,68 @@ + + + + + {554caf03-9189-4f7c-955b-7407887d81f2} + + + {dfc73fe3-75a1-4823-b7c6-090157a15da7} + + + + + Bootstrapper + + + Setup Files + + + Setup Files + + + + + Bootstrapper + + + + + Bootstrapper + + + + + Bootstrapper + + + + + Bootstrapper + + + + + Setup Files + + + Setup Files + + + Setup Files + + + Setup Files + + + Setup Files + + + Setup Files + + + Setup Files + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.cpp b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.cpp index 56ae761..b496c84 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.cpp +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.cpp @@ -612,7 +612,7 @@ int GenerateUpdateFile( wchar_t *const *params, int count ) CString str=it2->second; str.Replace(L"\r\n",L"\\r\\n"); str.Replace(L"\"",L"\"\""); - fwprintf(f,L"%4d \"%s\"\r\n",it2->first,str); + fwprintf(f,L"%4d \"%s\"\r\n",it2->first,(const wchar_t*)str); } fwprintf(f,L"END\r\n\r\n"); @@ -650,7 +650,7 @@ int GenerateUpdateFile( wchar_t *const *params, int count ) for (std::map::const_iterator it3=languages.begin();it3!=languages.end();++it3) { if (!it3->second.bitmap.IsEmpty()) - fwprintf(f,L"%d BITMAP \"%s\"\r\n",it3->first,it3->second.bitmap); + fwprintf(f,L"%d BITMAP \"%s\"\r\n",it3->first,(const wchar_t*)it3->second.bitmap); } fwprintf(f,L"\r\n"); } diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.rc b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.rc index 1ab14f9..19840bb 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.rc +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcproj b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcproj deleted file mode 100644 index 6eea497..0000000 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcxproj b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcxproj new file mode 100644 index 0000000..3e83bc6 --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcxproj @@ -0,0 +1,212 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {DAE66C9B-05DC-4ACE-97DA-2547B490BBFF} + ClassicShellUtility + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + + + $(Configuration)64\ + $(Configuration)64\ + true + + + $(Configuration)\ + $(Configuration)\ + false + + + $(Configuration)64\ + $(Configuration)64\ + false + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + EditAndContinue + + + comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies) + true + Windows + + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + ProgramDatabase + + + _UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions) + + + comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + true + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + + + comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + true + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + ProgramDatabase + + + _UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions) + + + comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/SaveLogFile.cpp b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/SaveLogFile.cpp index c703749..d9eacde 100644 --- a/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/SaveLogFile.cpp +++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/SaveLogFile.cpp @@ -137,7 +137,7 @@ static void WriteRegKey( FILE *f, CRegKey &key, int tabs, const wchar_t *annotat CString val=(wchar_t*)&buf[0]; val.Replace(L"\r",L"\\r"); val.Replace(L"\n",L"\\n"); - fwprintf(f,L"%s",val); + fwprintf(f,L"%s",(const wchar_t*)val); } break; case REG_MULTI_SZ: @@ -146,7 +146,7 @@ static void WriteRegKey( FILE *f, CRegKey &key, int tabs, const wchar_t *annotat CString val=str; val.Replace(L"\r",L"\\r"); val.Replace(L"\n",L"\\n"); - fwprintf(f,L"%s\\0",val); + fwprintf(f,L"%s\\0",(const wchar_t*)val); } break; } @@ -210,7 +210,7 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive else if (FAILED(pTarget->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&target))) fwprintf(f,L" target='no name'"); else - fwprintf(f,L" target='%s'",target); + fwprintf(f,L" target='%s'",(const wchar_t*)target); wchar_t args[256]; if (FAILED(pLink->GetArguments(args,_countof(args)))) args[0]=0; @@ -230,7 +230,7 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive if (args[0]) fwprintf(f,L" args='%s'",args); if (!appid.IsEmpty()) - fwprintf(f,L" appid='%s'",appid); + fwprintf(f,L" appid='%s'",(const wchar_t*)appid); } } } @@ -245,10 +245,10 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive CString policy; ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers",fname,policy); if (!policy.IsEmpty()) - fwprintf(f,L" usercompat='%s'",policy); + fwprintf(f,L" usercompat='%s'",(const wchar_t*)policy); ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers",fname,policy); if (!policy.IsEmpty()) - fwprintf(f,L" compat='%s'",policy); + fwprintf(f,L" compat='%s'",(const wchar_t*)policy); } } fwprintf(f,L"\r\n"); @@ -315,7 +315,7 @@ static void WriteProcessInfo( FILE *f, HANDLE hProcess, int tabs ) for (std::set::const_iterator it=names.begin();it!=names.end();++it) { DWORD ver=GetFileVersion(*it,NULL); - fwprintf(f,L"%s%s (%d.%d.%d)\r\n",GetTabs(tabs),*it,ver>>24,(ver>>16)&255,ver&65535); + fwprintf(f,L"%s%s (%d.%d.%d)\r\n",GetTabs(tabs),(const wchar_t*)(*it),ver>>24,(ver>>16)&255,ver&65535); } } @@ -377,7 +377,7 @@ static void WriteLogFile( FILE *f ) CString strVer1, strVer2; ReadRegistryValue(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",L"ProductName",strVer1); ReadRegistryValue(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",L"CurrentVersion",strVer2); - fwprintf(f,L"\tWindows version (registry): %s %s\r\n",strVer1,strVer2); + fwprintf(f,L"\tWindows version (registry): %s %s\r\n",(const wchar_t*)strVer1,(const wchar_t*)strVer2); wchar_t user1[256]={0}, user2[256]={0}; ULONG size=_countof(user1); @@ -558,7 +558,7 @@ static void WriteLogFile( FILE *f ) CComString pPath; if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Startup,0,NULL,&pPath))) { - fwprintf(f,L"\r\n\t%s:\r\n",pPath); + fwprintf(f,L"\r\n\t%s:\r\n",(const wchar_t*)pPath); WriteFolder(f,pPath,2,false); fwprintf(f,L"\r\n"); } @@ -568,7 +568,7 @@ static void WriteLogFile( FILE *f ) CComString pPath; if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_CommonStartup,0,NULL,&pPath))) { - fwprintf(f,L"\r\n\t%s:\r\n",pPath); + fwprintf(f,L"\r\n\t%s:\r\n",(const wchar_t*)pPath); WriteFolder(f,pPath,2,false); fwprintf(f,L"\r\n"); } @@ -659,7 +659,7 @@ static void WriteLogFile( FILE *f ) } for (std::set::const_iterator it=programs.begin();it!=programs.end();++it) - fwprintf(f,L"\t\t%s\r\n",*it); + fwprintf(f,L"\t\t%s\r\n",(const wchar_t*)(*it)); fwprintf(f,L"\r\nClassic Shell\r\n"); wchar_t csPath[_MAX_PATH]=L""; @@ -748,13 +748,13 @@ static void WriteLogFile( FILE *f ) fwprintf(f,L"Explorer addons:\r\n"); CString text; if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Internet Explorer\\Main",L"Enable Browser Extensions",text)==ERROR_SUCCESS) - fwprintf(f,L"\tEnable Browser Extensions (user): %s\r\n",text); + fwprintf(f,L"\tEnable Browser Extensions (user): %s\r\n",(const wchar_t*)text); if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Internet Explorer\\Main",L"Enable Browser Extensions",text)==ERROR_SUCCESS) - fwprintf(f,L"\tEnable Browser Extensions: %s\r\n",text); + fwprintf(f,L"\tEnable Browser Extensions: %s\r\n",(const wchar_t*)text); if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Internet Explorer\\Main",L"Isolation",text)==ERROR_SUCCESS) - fwprintf(f,L"\tIsolation (user): %s\r\n",text); + fwprintf(f,L"\tIsolation (user): %s\r\n",(const wchar_t*)text); if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Internet Explorer\\Main",L"Isolation",text)==ERROR_SUCCESS) - fwprintf(f,L"\tIsolation: %s\r\n",text); + fwprintf(f,L"\tIsolation: %s\r\n",(const wchar_t*)text); } if (bClassicExplorer) { @@ -763,11 +763,11 @@ static void WriteLogFile( FILE *f ) fwprintf(f,L"\tExplorerBand flags: 0x%08X\r\n",flags); CString policy; if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{553891B7-A0D5-4526-BE18-D3CE461D6310}",policy)==ERROR_SUCCESS) - fwprintf(f,L"\tExplorerBand policy: %s\r\n",policy); + fwprintf(f,L"\tExplorerBand policy: %s\r\n",(const wchar_t*)policy); if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\CurrentVersion\\Ext\\Settings\\{449D0D6E-2412-4E61-B68F-1CB625CD9E52}",L"Flags",flags)==ERROR_SUCCESS) fwprintf(f,L"\tExplorerBHO flags: 0x%08X\r\n",flags); if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{449D0D6E-2412-4E61-B68F-1CB625CD9E52}",policy)==ERROR_SUCCESS) - fwprintf(f,L"\tExplorerBHO policy: %s\r\n",policy); + fwprintf(f,L"\tExplorerBHO policy: %s\r\n",(const wchar_t*)policy); } if (bClassicIE) { @@ -776,7 +776,7 @@ static void WriteLogFile( FILE *f ) if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\CurrentVersion\\Ext\\Settings\\{EA801577-E6AD-4BD5-8F71-4BE0154331A4}",L"Flags",flags)==ERROR_SUCCESS) fwprintf(f,L"\tClassicIE flags: 0x%08X\r\n",flags); if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{EA801577-E6AD-4BD5-8F71-4BE0154331A4}",policy)==ERROR_SUCCESS) - fwprintf(f,L"\tClassicIE policy: %s\r\n",policy); + fwprintf(f,L"\tClassicIE policy: %s\r\n",(const wchar_t*)policy); } if (bClassicExplorer || bClassicIE) fwprintf(f,L"\r\n"); @@ -793,7 +793,7 @@ static void WriteLogFile( FILE *f ) { if (guid.IsEmpty()) guid=L"(empty)"; - fwprintf(f,L"TreatAs: %s%s\r\n",guid,_wcsicmp(guid,L"{D3214FBB-3CA1-406a-B3E8-3EB7C393A15E}")==0?L" (correct)":L" (wrong)"); + fwprintf(f,L"TreatAs: %s%s\r\n",(const wchar_t*)guid,_wcsicmp(guid,L"{D3214FBB-3CA1-406a-B3E8-3EB7C393A15E}")==0?L" (correct)":L" (wrong)"); } CString emulation; @@ -804,7 +804,7 @@ static void WriteLogFile( FILE *f ) { if (emulation.IsEmpty()) emulation=L"(empty)"; - fwprintf(f,L"Emulation: %s%s\r\n",emulation,_wcsicmp(emulation,L"StartMenuEmulation")==0?L" (correct)":L" (wrong)"); + fwprintf(f,L"Emulation: %s%s\r\n",(const wchar_t*)emulation,_wcsicmp(emulation,L"StartMenuEmulation")==0?L" (correct)":L" (wrong)"); } CString server; @@ -820,7 +820,7 @@ static void WriteLogFile( FILE *f ) state=L" (missing file)"; else state=L" (correct)"; - fwprintf(f,L"Server: %s%s\r\n",server,state); + fwprintf(f,L"Server: %s%s\r\n",(const wchar_t*)server,state); } } } @@ -868,9 +868,9 @@ static void WriteLogFileAdmin( FILE *f ) CloseServiceHandle(hManager); for (std::map::const_iterator it=services.begin();it!=services.end();++it) if (it->second.group.IsEmpty()) - fwprintf(f,L"\t%s (%s): %s\r\n",it->first,it->second.desc,it->second.status); + fwprintf(f,L"\t%s (%s): %s\r\n",(const wchar_t*)it->first,(const wchar_t*)it->second.desc,it->second.status); else - fwprintf(f,L"\t%s (%s): %s (%s)\r\n",it->first,it->second.desc,it->second.status,it->second.group); + fwprintf(f,L"\t%s (%s): %s (%s)\r\n",(const wchar_t*)it->first,(const wchar_t*)it->second.desc,it->second.status,(const wchar_t*)it->second.group); } } @@ -1007,7 +1007,7 @@ int SaveLogFile( const wchar_t *fname, bool bAdmin ) GetModuleFileName(NULL,exe,_countof(exe)); wchar_t cmdLine[1024]; Sprintf(cmdLine,_countof(cmdLine),L"saveloga \"%s\"",fname); - if ((int)ShellExecute(NULL,L"runas",exe,cmdLine,NULL,SW_SHOWNORMAL)<=32) + if ((intptr_t)ShellExecute(NULL,L"runas",exe,cmdLine,NULL,SW_SHOWNORMAL)<=32) { f=NULL; if (_wfopen_s(&f,fname,L"ab")==0 && f) diff --git a/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcproj b/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcproj deleted file mode 100644 index 235533f..0000000 --- a/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcproj +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcxproj b/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcxproj new file mode 100644 index 0000000..5c96207 --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/SetupHelper/SetupHelper.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E1017135-9916-4B11-9AC5-1EC0BD8F8CD6} + SetupHelper + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Unicode + + + Application + v141 + Unicode + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + true + EditAndContinue + + + true + Windows + + + + + MaxSpeed + true + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + true + ProgramDatabase + + + true + Windows + true + true + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcproj b/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcproj deleted file mode 100644 index 73bf15d..0000000 --- a/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcproj +++ /dev/null @@ -1,951 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcxproj b/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcxproj new file mode 100644 index 0000000..b20354b --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/UpdateBin/UpdateBin.vcxproj @@ -0,0 +1,495 @@ + + + + + update_4.1.0 + Win32 + + + update_4.2.0 + Win32 + + + update_4.2.1 + Win32 + + + update_4.2.2 + Win32 + + + update_4.2.3 + Win32 + + + update_4.2.4 + Win32 + + + update_4.2.5 + Win32 + + + update_4.2.6 + Win32 + + + update_4.2.7 + Win32 + + + update_4.3.0 + Win32 + + + update_4.3.1 + Win32 + + + + {F92A5473-F9E0-412F-923C-6632A66D13C1} + UpdateBin + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + $(Configuration)\ + $(Configuration)\ + false + false + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + ..\ClassicShellUtility\Debug\ClassicShellUtility.exe update .\$(Configuration).txt .\UpdateBin.rc + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATEBIN_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + ..\Final\$(Configuration).ver + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + {dae66c9b-05dc-4ace-97da-2547b490bbff} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellSetup/en-US/en-US.rc b/ClassicShellSrc/ClassicShellSetup/en-US/en-US.rc index 8b4e784..d3b8008 100644 --- a/ClassicShellSrc/ClassicShellSetup/en-US/en-US.rc +++ b/ClassicShellSrc/ClassicShellSetup/en-US/en-US.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcproj b/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcproj deleted file mode 100644 index 85765e1..0000000 --- a/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcproj +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcxproj b/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcxproj new file mode 100644 index 0000000..8711cec --- /dev/null +++ b/ClassicShellSrc/ClassicShellSetup/en-US/en-US.vcxproj @@ -0,0 +1,55 @@ + + + + + Resource + Win32 + + + + {0A60FD06-3A81-4651-A869-9850DBC115EA} + enUS + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + ..\..\ + $(Configuration)\ + true + false + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.cpp b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.cpp index 5a20cf3..a28c547 100644 --- a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.cpp +++ b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.cpp @@ -512,7 +512,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC Sleep(sleep); HWND balloon=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(IsLanguageRTL()?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_CLOSE|TTS_NOPREFIX,0,0,0,0,NULL,NULL,g_Instance,NULL); SendMessage(balloon,TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0U)}; tool.uId=1; CString message=LoadStringEx(g_UpdateDlg.HasNewLanguage()?IDS_LANG_NEWVERSION:IDS_NEWVERSION); tool.lpszText=(wchar_t*)(const wchar_t*)message; diff --git a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.rc b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.rc index 397d4e5..3931e35 100644 --- a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.rc +++ b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" #include "..\ClassicShellLib\resource.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcproj b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcproj deleted file mode 100644 index 4bfc719..0000000 --- a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcxproj b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcxproj new file mode 100644 index 0000000..7a4dcc0 --- /dev/null +++ b/ClassicShellSrc/ClassicShellUpdate/ClassicShellUpdate.vcxproj @@ -0,0 +1,121 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {171B46B0-6083-4D9E-BD33-946EA3BD76FA} + ClassicShellUpdate + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + EditAndContinue + + + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + shlwapi.lib;comctl32.lib;uxtheme.lib;winmm.lib;wininet.lib;htmlhelp.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + false + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + NotUsing + Level3 + true + ProgramDatabase + + + $(IntDir);..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + shlwapi.lib;comctl32.lib;uxtheme.lib;winmm.lib;wininet.lib;htmlhelp.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.rc b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.rc index 6845b97..a7fe3a6 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.rc +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcproj b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcproj deleted file mode 100644 index 60a62bc..0000000 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcproj +++ /dev/null @@ -1,597 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcxproj b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcxproj new file mode 100644 index 0000000..9896355 --- /dev/null +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenu.vcxproj @@ -0,0 +1,352 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {87D5FE20-AF86-458A-9AA3-3131EB06179B} + ClassicStartMenu + Win32Proj + 10.0.16299.0 + + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + Application + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + + + $(Configuration)64\ + $(Configuration)64\ + true + + + $(Configuration)\ + $(Configuration)\ + false + + + $(Configuration)64\ + $(Configuration)64\ + false + + + $(Configuration)\ + $(Configuration)\ + false + + + $(Configuration)64\ + $(Configuration)64\ + false + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + + + + + Disabled + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + true + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + true + Windows + true + true + + + + + MaxSpeed + ..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + + + true + Windows + true + true + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + {31c016fb-9ea1-4af5-987a-37210c04da06} + false + + + {9ec23ca9-384a-4eeb-979e-69879dc1a78c} + false + + + {066c9721-26d5-4c4d-868e-50c2ba0a8196} + false + + + {ca5bfc96-428d-42f5-9f7d-cdde048a357c} + false + + + {598ab4ac-008e-4501-90b3-c5213834c1da} + false + + + {63baf573-170b-4fa0-aee3-16e04f3e9df5} + false + + + {7bd26cb3-5280-48fd-9a86-c13e321018d5} + false + + + {66d1eaa4-65d1-45cc-9989-e616fc0575eb} + false + + + {a2ccde9f-17ce-461e-8bd9-00261b8855a6} + false + + + {ea65fddd-cb77-417f-8bb4-2f3ecb5b3e75} + false + + + {404821c5-4ee4-4908-a759-5ef6dac14ab6} + false + + + {5c875214-0e3a-4cf0-bc0c-bff6faa4c089} + false + + + {ed74eba9-1bcb-4b8f-9ae1-dc63b3c24a94} + false + + + {81eb6336-366c-47dd-82cf-ff6c36ccd2b5} + false + + + {85deecbb-1f9b-4983-9d54-3bf42182b7e7} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartButton.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartButton.cpp index 603db68..0a2cff4 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartButton.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartButton.cpp @@ -121,7 +121,7 @@ CStartButton::CStartButton( void ) LRESULT CStartButton::OnCreate( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled ) { - int params=(int)(((CREATESTRUCT*)lParam)->lpCreateParams); + int params=(int)(intptr_t)(((CREATESTRUCT*)lParam)->lpCreateParams); m_bRTL=(params&1)!=0; m_TaskbarId=params>>1; m_bSmallIcons=IsTaskbarSmallIcons(); @@ -405,7 +405,7 @@ void CStartButton::SetPressed( bool bPressed ) m_bPressed=bPressed; m_HotBlend=m_bHot?BLEND_PRECISION:0; KillTimer(TIMER_BLEND); - TOOLINFO tool={sizeof(tool),TTF_CENTERTIP|TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT|(m_bRTL?TTF_RTLREADING:0),m_hWnd}; + TOOLINFO tool={sizeof(tool),TTF_CENTERTIP|TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT|(m_bRTL?TTF_RTLREADING:0U),m_hWnd}; tool.uId=(UINT_PTR)m_hWnd; CString startStr=GetSettingString(L"StartButtonTip"); const wchar_t *startText=startStr; @@ -608,7 +608,7 @@ HWND CreateStartButton( int taskbarId, HWND taskBar, HWND rebar, const RECT &rcT bool bRTL=(GetWindowLong(rebar,GWL_EXSTYLE)&WS_EX_LAYOUTRTL)!=0; DWORD styleTopmost=GetWindowLong(taskBar,GWL_EXSTYLE)&WS_EX_TOPMOST; CStartButton &button=g_StartButtons[taskbarId]; - button.Create(taskBar,NULL,NULL,WS_POPUP,styleTopmost|WS_EX_TOOLWINDOW|WS_EX_LAYERED,0U,(void*)(taskbarId*2+(bRTL?1:0))); + button.Create(taskBar,NULL,NULL,WS_POPUP,styleTopmost|WS_EX_TOOLWINDOW|WS_EX_LAYERED,0U,(void*)(intptr_t)(taskbarId*2+(bRTL?1:0))); SIZE size=button.GetSize(); RECT rcButton; MONITORINFO info; diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.cpp index 943c31f..322bfcf 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.cpp @@ -535,8 +535,8 @@ public: // IDropTarget virtual HRESULT STDMETHODCALLTYPE DragEnter( IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect ) { - FORMATETC format1={RegisterClipboardFormat(CFSTR_SHELLIDLIST),NULL,DVASPECT_CONTENT,-1,TYMED_HGLOBAL}; - FORMATETC format2={RegisterClipboardFormat(CFSTR_INETURL),NULL,DVASPECT_CONTENT,-1,TYMED_HGLOBAL}; + FORMATETC format1={(CLIPFORMAT)RegisterClipboardFormat(CFSTR_SHELLIDLIST),NULL,DVASPECT_CONTENT,-1,TYMED_HGLOBAL}; + FORMATETC format2={(CLIPFORMAT)RegisterClipboardFormat(CFSTR_INETURL),NULL,DVASPECT_CONTENT,-1,TYMED_HGLOBAL}; if (pDataObj->QueryGetData(&format1)==S_OK || pDataObj->QueryGetData(&format2)==S_OK) { PostMessage(g_TaskBar,g_StartMenuMsg,(grfKeyState&MK_SHIFT)?MSG_SHIFTDRAG:MSG_DRAG,m_TaskbarId); diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.rc b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.rc index 9430e4e..2d27cd1 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.rc +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcproj b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcproj deleted file mode 100644 index a7dddc0..0000000 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcproj +++ /dev/null @@ -1,877 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj new file mode 100644 index 0000000..c5e090c --- /dev/null +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj @@ -0,0 +1,349 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {85DEECBB-1F9B-4983-9D54-3BF42182B7E7} + ClassicStartMenuDLL + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + ..\$(Configuration)\ + $(Configuration)\ + true + + + ..\$(Configuration)64\ + $(Configuration)64\ + true + + + ..\$(Configuration)\ + $(Configuration)\ + false + + + ..\$(Configuration)64\ + $(Configuration)64\ + false + + + ..\$(Configuration)\ + $(Configuration)\ + false + + + ..\$(Configuration)64\ + $(Configuration)64\ + false + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + + + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + true + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + true + Windows + true + true + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj.filters b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj.filters new file mode 100644 index 0000000..89a7ff6 --- /dev/null +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ClassicStartMenuDLL.vcxproj.filters @@ -0,0 +1,207 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Resource Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/DragDrop.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/DragDrop.cpp index 34705aa..fb123b3 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/DragDrop.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/DragDrop.cpp @@ -319,7 +319,7 @@ bool CMenuContainer::DragOut( int index, bool bApp ) // force synchronous operation { - CComQIPtr pAsync=pDataObj; + CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); } @@ -850,7 +850,7 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf dwEffect=*pdwEffect; pTarget->DragOver(MK_LBUTTON|grfKeyState,pt,pdwEffect); } - CComQIPtr pAsync=pDataObj; + CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ItemManager.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ItemManager.cpp index 9d1ed82..9d0ad30 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ItemManager.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ItemManager.cpp @@ -1191,7 +1191,7 @@ void CItemManager::WaitForShortcuts( const POINT &balloonPos ) return; CWindow tooltip=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(IsLanguageRTL()?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_BALLOON|TTS_NOPREFIX,0,0,0,0,NULL,NULL,g_Instance,NULL); tooltip.SendMessage(TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0U)}; tool.uId=1; CString message=LoadStringEx(IDS_MENU_BUSY); tool.lpszText=(LPWSTR)(const wchar_t*)message; @@ -1262,7 +1262,7 @@ void EncodeUserAssistPath( wchar_t *path ) CComString guid; StringFromCLSID(g_KnownPrefixes[i],&guid); wchar_t name[_MAX_PATH]; - Sprintf(name,_countof(name),L"%s%s",guid,path+len); + Sprintf(name,_countof(name),L"%s%s",(const wchar_t*)guid,path+len); Strcpy(path,_MAX_PATH,name); return; } @@ -1291,7 +1291,7 @@ bool CItemManager::IsPathUsed( CRegKey ®Key, const wchar_t *path, const FILET Strcpy(name,_countof(name),path); else if (wcsncmp(path,knownPaths[i].path,knownPaths[i].pathLen)==0) { - Sprintf(name,_countof(name),L"%s%s",knownPaths[i].guid,path+knownPaths[i].pathLen); + Sprintf(name,_countof(name),L"%s%s", (const wchar_t*)knownPaths[i].guid,path+knownPaths[i].pathLen); break; } } @@ -1351,7 +1351,7 @@ void CItemManager::UpdateNewPrograms( const POINT &balloonPos ) installTime=Int32x32To64(time,10000000)+116444736000000000; } } - FILETIME ft={(DWORD)installTime,installTime>>32}; + FILETIME ft={(DWORD)installTime,(DWORD)(installTime>>32)}; SYSTEMTIME st; GetSystemTime(&st); LOG_MENU(LOG_NEW,L"Current time: %02d.%02d.%04d:%02d:%02d",st.wDay,st.wMonth,st.wYear,st.wHour,st.wMinute); @@ -3342,7 +3342,7 @@ DWORD CALLBACK CItemManager::SaveCacheFileThread( void *param ) } std::vector*> itemInfos; - std::vector blackList; + std::vector blackList; { RWLock lock(pThis,false,RWLOCK_ITEMS); for (std::multimap::const_iterator it=pThis->m_ItemInfos.begin();it!=pThis->m_ItemInfos.end();++it) @@ -3437,12 +3437,12 @@ DWORD CALLBACK CItemManager::SaveCacheFileThread( void *param ) WriteCacheFile(file,(*it)->second.appid); WriteCacheFile(file,(*it)->second.metroName); WriteCacheFile(file,(*it)->second.iconPath); - if (log) fwprintf(log,L"0x%08X - %s\r\n",(*it)->first,(*it)->second.PATH); + if (log) fwprintf(log,L"0x%08X - %s\r\n",(*it)->first,(const wchar_t*)(*it)->second.PATH); } { WriteCacheFile(file,'BLAK'); WriteCacheFile(file,(DWORD)blackList.size()); - for (std::vector::const_iterator it=blackList.begin();it!=blackList.end();++it) + for (std::vector::const_iterator it=blackList.begin();it!=blackList.end();++it) WriteCacheFile(file,*it); } if (log) fclose(log); diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/JumpLists.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/JumpLists.cpp index 9f6c3a8..0aa13a4 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/JumpLists.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/JumpLists.cpp @@ -250,7 +250,7 @@ static void AddJumpItem( CJumpGroup &group, IUnknown *pUnknown, std::vectorGetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName))) { - LOG_MENU(LOG_OPEN,L"Jumplist Item Path: %s",pName); + LOG_MENU(LOG_OPEN,L"Jumplist Item Path: %s",(const wchar_t*)pName); pName.MakeUpper(); item.hash=CalcFNVHash(pName); } @@ -304,7 +304,7 @@ static void AddJumpItem( CJumpGroup &group, IUnknown *pUnknown, std::vector CComString pName; if (SUCCEEDED(pChild->GetDisplayName(SIGDN_PARENTRELATIVEPARSING,&pName))) { - LOG_MENU(LOG_OPEN,L"%s, 0x%08X, 0x%08X",pName,flags,hrFlags); + LOG_MENU(LOG_OPEN,L"%s, 0x%08X, 0x%08X",(const wchar_t*)pName,flags,hrFlags); MenuItem item(MENU_NO); if (ignore && ILIsEqual(childPidl,ignore)) continue; @@ -923,7 +921,7 @@ void CMenuContainer::AddSecondFolder( IShellItem *pFolder, std::vector CComString pName; if (SUCCEEDED(pChild->GetDisplayName(SIGDN_PARENTRELATIVEPARSING,&pName))) { - LOG_MENU(LOG_OPEN,L"%s, 0x%08X, 0x%08X",pName,flags,hrFlags); + LOG_MENU(LOG_OPEN,L"%s, 0x%08X, 0x%08X",(const wchar_t*)pName,flags,hrFlags); bool bLibrary=_wcsicmp(PathFindExtension(pName),L".library-ms")==0; bool bStartScreen=( #ifndef STARTSCREEN_WIN7 @@ -1765,7 +1763,7 @@ void CMenuContainer::GetRecentPrograms( std::vector &items, int maxCou if (SUCCEEDED(SHGetKnownFolderPath(guid,KF_FLAG_DONT_VERIFY,NULL,&pPath))) { wchar_t path[_MAX_PATH]; - Sprintf(path,_countof(path),L"%s%s",pPath,end+1); + Sprintf(path,_countof(path),L"%s%s",(const wchar_t*)pPath,end+1); Strcpy(uaItem.name,_countof(uaItem.name),path); } } @@ -3068,7 +3066,7 @@ void CMenuContainer::InitWindowInternal( bool bDontShrink, const POINT &corner, { s_Tooltip=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|WS_EX_TRANSPARENT|(s_bRTL?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_NOPREFIX|TTS_ALWAYSTIP,0,0,0,0,NULL,NULL,g_Instance,NULL); s_Tooltip.SendMessage(TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRACK|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRACK|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0U)}; tool.uId=1; s_Tooltip.SendMessage(TTM_ADDTOOL,0,(LPARAM)&tool); } @@ -4211,7 +4209,7 @@ void CMenuContainer::InitWindowInternal( bool bDontShrink, const POINT &corner, RECT rcScroll=m_rContent; rcScroll.bottom=rcScroll.top+m_SearchScrollHeight*s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight; rcScroll.left=rcScroll.right-scrollWidth; - SCROLLINFO info={sizeof(info),SIF_ALL,0,m_SearchScrollCount-1,m_SearchScrollHeight}; + SCROLLINFO info={sizeof(info),SIF_ALL,0,m_SearchScrollCount-1,(UINT)m_SearchScrollHeight}; m_Scrollbar.SetScrollInfo(SB_CTL,&info,FALSE); m_Scrollbar.SetWindowPos(NULL,&rcScroll,SWP_NOZORDER|SWP_SHOWWINDOW); } @@ -4229,7 +4227,7 @@ void CMenuContainer::InitWindowInternal( bool bDontShrink, const POINT &corner, if (!m_bSubMenu) { - TOOLINFO tool={sizeof(tool),TTF_SUBCLASS|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_SUBCLASS|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0U)}; tool.hwnd=m_hWnd; tool.uId=2; s_Tooltip.SendMessage(TTM_DELTOOL,0,(LPARAM)&tool); @@ -5239,7 +5237,7 @@ LRESULT CMenuContainer::OnTimer( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& if (!m_bSubMenu && s_MenuMode==MODE_SEARCH && s_SearchResults.bSearching) return 0; - TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRACK|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRACK|TTF_TRANSPARENT|(s_bRTL?TTF_RTLREADING:0U)}; tool.uId=1; wchar_t text[1024]; @@ -6707,7 +6705,7 @@ bool CMenuContainer::GetDescription( int index, wchar_t *text, int size ) return bLabel; if (bLabel) - Sprintf(text,size,L"\r\n%s",pTip); + Sprintf(text,size,L"\r\n%s",(const wchar_t*)pTip); else Strcpy(text,size,pTip); return true; @@ -7984,7 +7982,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr } CComString pPath; ShGetKnownFolderPath(FOLDERID_StartMenu,&pPath); - Sprintf(path,_countof(path),L"%s\\" STARTSCREEN_COMMAND,pPath); + Sprintf(path,_countof(path),L"%s\\" STARTSCREEN_COMMAND,(const wchar_t*)pPath); if (GetFileAttributes(path)==INVALID_FILE_ATTRIBUTES) { if (!bPinned && bShortcut) @@ -8509,7 +8507,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr Strcat(MenuSkin::s_SkinError,_countof(MenuSkin::s_SkinError),LoadStringEx(IDS_SKIN_ERR_DISABLE)); s_TooltipBalloon=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(s_bRTL?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_BALLOON|TTS_CLOSE|TTS_NOPREFIX,0,0,0,0,pStartMenu->m_hWnd,NULL,g_Instance,NULL); s_TooltipBalloon.SendMessage(TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_TRANSPARENT|TTF_TRACK|(s_bRTL?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_TRANSPARENT|TTF_TRACK|(s_bRTL?TTF_RTLREADING:0U)}; tool.uId=1; tool.lpszText=MenuSkin::s_SkinError; s_TooltipBalloon.SendMessage(TTM_ADDTOOL,0,(LPARAM)&tool); diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuPaint.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuPaint.cpp index 9e38a09..9f64be5 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuPaint.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuPaint.cpp @@ -1169,7 +1169,7 @@ void CMenuContainer::CreateBackground( int width1, int width2, int height1, int } else { - BLENDFUNCTION func={AC_SRC_OVER,0,bMask?255:alpha,bMask?AC_SRC_ALPHA:0}; + BLENDFUNCTION func={AC_SRC_OVER,0U,bMask?255U:(BYTE)alpha,bMask?AC_SRC_ALPHA:0U}; AlphaBlend(hdc,pos.x,pos.y,s_Skin.User_image_size,s_Skin.User_image_size,hdcTemp,0,0,s_Skin.User_image_size,s_Skin.User_image_size,func); } @@ -2504,7 +2504,7 @@ LRESULT CMenuContainer::OnPaint( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& } else if (opacity==MenuSkin::OPACITY_REGION) { - DWM_BLURBEHIND blur={DWM_BB_ENABLE|((uMsg==WM_PRINTCLIENT)?DWM_BB_BLURREGION:0),(uMsg==WM_PRINTCLIENT),m_Region,FALSE}; + DWM_BLURBEHIND blur={DWM_BB_ENABLE|((uMsg==WM_PRINTCLIENT)?DWM_BB_BLURREGION:0U),(uMsg==WM_PRINTCLIENT),m_Region,FALSE}; DwmEnableBlurBehindWindow(m_hWnd,&blur); } } diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MetroLinkManager.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MetroLinkManager.cpp index 306151b..d6cb776 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MetroLinkManager.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/MetroLinkManager.cpp @@ -18,7 +18,6 @@ PROPERTYKEY PKEY_MetroPackageName={{0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE PROPERTYKEY PKEY_MetroPackagePath={{0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 15}; PROPERTYKEY PKEY_AppUserModel_ParentID={{0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 19}; // non-empty for content tiles PROPERTYKEY PKEY_AppUserModel_InstalledBy={{0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 18}; -PROPERTYKEY PKEY_AppUserModel_IsDualMode={{0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 11}; PROPERTYKEY PKEY_Launcher_AppState={{0x0ded77b3, 0xc614, 0x456c, {0xae, 0x5b, 0x28, 0x5b, 0x38, 0xd7, 0xb0, 0x1b}}, 7}; // FOLDERID_AppsFolder is defined in the 8.0 SDK, but we don't want to require it @@ -45,7 +44,7 @@ void GetMetroLinks( std::vector &links, bool bLog, std::vectorGetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName); - LOG_MENU(LOG_APPS,L"App: %s",pName); + LOG_MENU(LOG_APPS,L"App: %s",(const wchar_t*)pName); } CComPtr pStore; if (FAILED(pChild->BindToHandler(NULL,BHID_PropertyStore,IID_IPropertyStore,(void**)&pStore))) @@ -110,7 +109,7 @@ void GetMetroLinks( std::vector &links, bool bLog, std::vectorGetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName); - LOG_MENU(LOG_APPS,L" Link: %s",pName); + LOG_MENU(LOG_APPS,L" Link: %s",(const wchar_t*)pName); } } LOG_MENU(LOG_APPS,L"Collect Metro Links (end)"); @@ -128,7 +127,7 @@ void ExecuteMetroLink( const CItemManager::ItemInfo *pInfo ) execute.nShow=SW_SHOWNORMAL; execute.lpClass=MetroAppClassId; BOOL res=ShellExecuteEx(&execute); - LOG_MENU(LOG_EXECUTE,L"ExecuteMetroLink: 0x%08X 0x%08X",res?0:GetLastError(),(int)execute.hInstApp); + LOG_MENU(LOG_EXECUTE,L"ExecuteMetroLink: 0x%08X 0x%p",res?0:GetLastError(),execute.hInstApp); // create UserAssist entry { diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ProgramsTree.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ProgramsTree.cpp index 82ca10c..45938dd 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ProgramsTree.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/ProgramsTree.cpp @@ -1590,7 +1590,7 @@ HRESULT CProgramsTree::Drop( IDataObject *pDataObj, DWORD grfKeyState, POINTL pt dwEffect=*pdwEffect; pTarget->DragOver(MK_LBUTTON|grfKeyState,pt,pdwEffect); } - CComQIPtr pAsync=pDataObj; + CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); for (std::vector::iterator it=CMenuContainer::s_Menus.begin();it!=CMenuContainer::s_Menus.end();++it) diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SearchManager.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SearchManager.cpp index 3d4ada4..0c2847a 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SearchManager.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SearchManager.cpp @@ -869,7 +869,7 @@ void CSearchManager::SearchThread( void ) if (*str=='\\') *str='/'; CString path; - path.Format(L"FILE:%s/",pPath); + path.Format(L"FILE:%s/",(const wchar_t*)pPath); path.Replace(L"'",L"''"); scope.roots.push_back(path); LOG_MENU(LOG_SEARCH,L" Scope: %s",path); @@ -1117,12 +1117,12 @@ void CSearchManager::SearchThread( void ) { CComString pPath; if (SUCCEEDED(ShGetKnownFolderPath(FOLDERID_StartMenu,&pPath))) - len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",pPath); + len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",(const wchar_t*)pPath); } { CComString pPath; if (SUCCEEDED(ShGetKnownFolderPath(FOLDERID_Programs,&pPath))) - len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",pPath); + len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",(const wchar_t*)pPath); } } if (searchRequest.bSearchPrograms || searchRequest.bNoCommonFolders) @@ -1131,12 +1131,12 @@ void CSearchManager::SearchThread( void ) { CComString pPath; if (SUCCEEDED(ShGetKnownFolderPath(FOLDERID_CommonStartMenu,&pPath))) - len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",pPath); + len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",(const wchar_t*)pPath); } { CComString pPath; if (SUCCEEDED(ShGetKnownFolderPath(FOLDERID_CommonPrograms,&pPath))) - len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",pPath); + len+=Sprintf(query+len,_countof(query)-len,L" AND NOT SCOPE='%s'",(const wchar_t*)pPath); } } } diff --git a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SettingsUI.cpp b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SettingsUI.cpp index 5a7b3e2..c502118 100644 --- a/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SettingsUI.cpp +++ b/ClassicShellSrc/ClassicStartMenu/ClassicStartMenuDLL/SettingsUI.cpp @@ -690,7 +690,7 @@ LRESULT CSkinSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO m_EditBox.GetWindowText(str); str.TrimLeft(); str.TrimRight(); wchar_t *end; - int val=wcstol(str,&end,16)&0xFFFFFF; + COLORREF val=wcstol(str,&end,16)&0xFFFFFF; static COLORREF customColors[16]; CHOOSECOLOR choose={sizeof(choose),m_hWnd,NULL,val,customColors}; choose.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT; @@ -3754,7 +3754,7 @@ LRESULT CMenuStyleDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BO bool bRTL=IsLanguageRTL(); m_Tooltip=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|WS_EX_TRANSPARENT|(bRTL?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_NOPREFIX,0,0,0,0,m_hWnd,NULL,g_Instance,NULL); m_Tooltip.SendMessage(TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_IDISHWND|TTF_SUBCLASS|(bRTL?TTF_RTLREADING:0)}; + TOOLINFO tool={sizeof(tool),TTF_IDISHWND|TTF_SUBCLASS|(bRTL?TTF_RTLREADING:0U)}; tool.uId=(UINT_PTR)m_ImageClassic1.m_hWnd; tool.lpszText=(wchar_t*)(const wchar_t*)tip1; m_Tooltip.SendMessage(TTM_ADDTOOL,0,(LPARAM)&tool); diff --git a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuExt.cpp b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuExt.cpp index a654a29..eab40c4 100644 --- a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuExt.cpp +++ b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuExt.cpp @@ -107,7 +107,7 @@ STDMETHODIMP CStartMenuExt::Initialize( PCIDLIST_ABSOLUTE pidlFolder, IDataObjec { CComString pPath; if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_StartMenu,0,NULL,&pPath))) - Sprintf(m_PinFolder1,_countof(m_PinFolder1),L"%s\\",pPath); + Sprintf(m_PinFolder1,_countof(m_PinFolder1),L"%s\\",(const wchar_t*)pPath); } str=GetSettingString(L"FolderCommonStartMenu"); @@ -120,7 +120,7 @@ STDMETHODIMP CStartMenuExt::Initialize( PCIDLIST_ABSOLUTE pidlFolder, IDataObjec { CComString pPath; if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_CommonStartMenu,0,NULL,&pPath))) - Sprintf(m_PinFolder2,_countof(m_PinFolder2),L"%s\\",pPath); + Sprintf(m_PinFolder2,_countof(m_PinFolder2),L"%s\\",(const wchar_t*)pPath); } } diff --git a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcproj b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcproj deleted file mode 100644 index 1891deb..0000000 --- a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcproj +++ /dev/null @@ -1,831 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj new file mode 100644 index 0000000..0e900a1 --- /dev/null +++ b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -0,0 +1,376 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Setup + Win32 + + + Setup + x64 + + + + {A42C6159-ACA8-46D1-A0FB-19C398B137D5} + StartMenuHelper + AtlProj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + DynamicLibrary + v141 + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\ + $(Configuration)\ + true + true + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + true + $(ProjectName)64 + + + $(Configuration)\ + $(Configuration)\ + true + false + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + false + $(ProjectName)64 + + + $(Configuration)\ + $(Configuration)\ + true + false + $(ProjectName)32 + + + $(Configuration)64\ + $(Configuration)64\ + true + false + $(ProjectName)64 + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + true + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + true + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + _DEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + + + Disabled + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + true + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + true + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + true + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + true + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + true + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + true + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + NDEBUG;%(PreprocessorDefinitions) + false + true + StartMenuHelper_i.h + StartMenuHelper_i.c + StartMenuHelper_p.c + + + MaxSpeed + ..\..\ClassicShellLib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + true + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + .\$(TargetName).def + true + Windows + true + true + + + + + + + + NotUsing + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + {d42fe717-485b-492d-884a-1999f6d51154} + false + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters new file mode 100644 index 0000000..496c1d9 --- /dev/null +++ b/ClassicShellSrc/ClassicStartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters @@ -0,0 +1,85 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {49e172a6-5240-42a4-8d6b-f1654677b1b4} + False + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + + + Source Files + + + + + Source Files + + + Source Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.rc b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.rc index 4bcd2b6..42647db 100644 --- a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.rc +++ b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcproj b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcproj deleted file mode 100644 index b2769d0..0000000 --- a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcproj +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj new file mode 100644 index 0000000..896f3ee --- /dev/null +++ b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj @@ -0,0 +1,65 @@ + + + + + Resource + Win32 + + + + {9EC23CA9-384A-4EEB-979E-69879DC1A78C} + ClassicSkin + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Classic Skin + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj.filters b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj.filters new file mode 100644 index 0000000..6df3cfc --- /dev/null +++ b/ClassicShellSrc/Skins/ClassicSkin/ClassicSkin.vcxproj.filters @@ -0,0 +1,48 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.rc b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.rc index c28ecab..ea296a1 100644 --- a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.rc +++ b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcproj b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcproj deleted file mode 100644 index 4fb1479..0000000 --- a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj new file mode 100644 index 0000000..03255a7 --- /dev/null +++ b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj @@ -0,0 +1,66 @@ + + + + + Resource + Win32 + + + + {31C016FB-9EA1-4AF5-987A-37210C04DA06} + ClassicSkin7 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin7 + Classic Skin + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj.filters b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj.filters new file mode 100644 index 0000000..fa5b1f7 --- /dev/null +++ b/ClassicShellSrc/Skins/ClassicSkin7/ClassicSkin7.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/FullGlass/FullGlass.rc b/ClassicShellSrc/Skins/FullGlass/FullGlass.rc index 3a72035..f91c668 100644 --- a/ClassicShellSrc/Skins/FullGlass/FullGlass.rc +++ b/ClassicShellSrc/Skins/FullGlass/FullGlass.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/FullGlass/FullGlass.vcproj b/ClassicShellSrc/Skins/FullGlass/FullGlass.vcproj deleted file mode 100644 index bfea460..0000000 --- a/ClassicShellSrc/Skins/FullGlass/FullGlass.vcproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj b/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj new file mode 100644 index 0000000..7cc372e --- /dev/null +++ b/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj @@ -0,0 +1,78 @@ + + + + + Resource + Win32 + + + + {066C9721-26D5-4C4D-868E-50C2BA0A8196} + FullGlass + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Full Glass + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj.filters b/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj.filters new file mode 100644 index 0000000..fc467ec --- /dev/null +++ b/ClassicShellSrc/Skins/FullGlass/FullGlass.vcxproj.filters @@ -0,0 +1,87 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metallic7/Metallic7.rc b/ClassicShellSrc/Skins/Metallic7/Metallic7.rc index 7429f11..ff99f6b 100644 --- a/ClassicShellSrc/Skins/Metallic7/Metallic7.rc +++ b/ClassicShellSrc/Skins/Metallic7/Metallic7.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Metallic7/Metallic7.vcproj b/ClassicShellSrc/Skins/Metallic7/Metallic7.vcproj deleted file mode 100644 index 75c93ce..0000000 --- a/ClassicShellSrc/Skins/Metallic7/Metallic7.vcproj +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj b/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj new file mode 100644 index 0000000..587e2a5 --- /dev/null +++ b/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj @@ -0,0 +1,88 @@ + + + + + Resource + Win32 + + + + {CA5BFC96-428D-42F5-9F7D-CDDE048A357C} + Metallic7 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + false + true + Metallic + .skin7 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj.filters b/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj.filters new file mode 100644 index 0000000..8459550 --- /dev/null +++ b/ClassicShellSrc/Skins/Metallic7/Metallic7.vcxproj.filters @@ -0,0 +1,117 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metro/Metro.rc b/ClassicShellSrc/Skins/Metro/Metro.rc index 4d0c133..e3480ca 100644 --- a/ClassicShellSrc/Skins/Metro/Metro.rc +++ b/ClassicShellSrc/Skins/Metro/Metro.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Metro/Metro.vcproj b/ClassicShellSrc/Skins/Metro/Metro.vcproj deleted file mode 100644 index c9dbff8..0000000 --- a/ClassicShellSrc/Skins/Metro/Metro.vcproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Metro/Metro.vcxproj b/ClassicShellSrc/Skins/Metro/Metro.vcxproj new file mode 100644 index 0000000..b714ea3 --- /dev/null +++ b/ClassicShellSrc/Skins/Metro/Metro.vcxproj @@ -0,0 +1,77 @@ + + + + + Resource + Win32 + + + + {63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} + Metro + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Metro + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metro/Metro.vcxproj.filters b/ClassicShellSrc/Skins/Metro/Metro.vcxproj.filters new file mode 100644 index 0000000..7128603 --- /dev/null +++ b/ClassicShellSrc/Skins/Metro/Metro.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metro7/Metro7.rc b/ClassicShellSrc/Skins/Metro7/Metro7.rc index 9e172df..e7100b7 100644 --- a/ClassicShellSrc/Skins/Metro7/Metro7.rc +++ b/ClassicShellSrc/Skins/Metro7/Metro7.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Metro7/Metro7.vcproj b/ClassicShellSrc/Skins/Metro7/Metro7.vcproj deleted file mode 100644 index ed07047..0000000 --- a/ClassicShellSrc/Skins/Metro7/Metro7.vcproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj b/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj new file mode 100644 index 0000000..2d2a1ac --- /dev/null +++ b/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj @@ -0,0 +1,85 @@ + + + + + Resource + Win32 + + + + {598AB4AC-008E-4501-90B3-C5213834C1DA} + Metro7 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + Metro + .skin7 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj.filters b/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj.filters new file mode 100644 index 0000000..e89970f --- /dev/null +++ b/ClassicShellSrc/Skins/Metro7/Metro7.vcxproj.filters @@ -0,0 +1,108 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Midnight7/Midnight7.rc b/ClassicShellSrc/Skins/Midnight7/Midnight7.rc index 84a9b46..04f47b8 100644 --- a/ClassicShellSrc/Skins/Midnight7/Midnight7.rc +++ b/ClassicShellSrc/Skins/Midnight7/Midnight7.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Midnight7/Midnight7.vcproj b/ClassicShellSrc/Skins/Midnight7/Midnight7.vcproj deleted file mode 100644 index 0daded3..0000000 --- a/ClassicShellSrc/Skins/Midnight7/Midnight7.vcproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj b/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj new file mode 100644 index 0000000..e95a371 --- /dev/null +++ b/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj @@ -0,0 +1,98 @@ + + + + + Resource + Win32 + + + + {7BD26CB3-5280-48FD-9A86-C13E321018D5} + Midnight7 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + Midnight + .skin7 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj.filters b/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj.filters new file mode 100644 index 0000000..68e7aa7 --- /dev/null +++ b/ClassicShellSrc/Skins/Midnight7/Midnight7.vcxproj.filters @@ -0,0 +1,147 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.rc b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.rc index 6628ec3..cd2288e 100644 --- a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.rc +++ b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcproj b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcproj deleted file mode 100644 index f85081f..0000000 --- a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj new file mode 100644 index 0000000..2c35ec5 --- /dev/null +++ b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj @@ -0,0 +1,72 @@ + + + + + Resource + Win32 + + + + {66D1EAA4-65D1-45CC-9989-E616FC0575EB} + SmokedGlass + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Smoked Glass + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj.filters b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj.filters new file mode 100644 index 0000000..5d82aaa --- /dev/null +++ b/ClassicShellSrc/Skins/SmokedGlass/SmokedGlass.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.rc b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.rc index e36da21..4bc49eb 100644 --- a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.rc +++ b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcproj b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcproj deleted file mode 100644 index d1ac33f..0000000 --- a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj new file mode 100644 index 0000000..2481352 --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj @@ -0,0 +1,81 @@ + + + + + Resource + Win32 + + + + {EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75} + Win7Aero + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Windows Aero + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj.filters b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj.filters new file mode 100644 index 0000000..4e6a1ca --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Aero/Win7Aero.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.rc b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.rc index 8f065c9..d64d62b 100644 --- a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.rc +++ b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcproj b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcproj deleted file mode 100644 index f7d2aff..0000000 --- a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj new file mode 100644 index 0000000..73a5aca --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj @@ -0,0 +1,90 @@ + + + + + Resource + Win32 + + + + {A2CCDE9F-17CE-461E-8BD9-00261B8855A6} + Win7Aero7 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + false + true + Windows Aero + .skin7 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj.filters b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj.filters new file mode 100644 index 0000000..afd78e5 --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Aero7/Win7Aero7.vcxproj.filters @@ -0,0 +1,123 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.rc b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.rc index e36da21..4bc49eb 100644 --- a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.rc +++ b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcproj b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcproj deleted file mode 100644 index 3fdafd2..0000000 --- a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj new file mode 100644 index 0000000..8289de5 --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj @@ -0,0 +1,81 @@ + + + + + Resource + Win32 + + + + {404821C5-4EE4-4908-A759-5EF6DAC14AB6} + Win7Basic + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Windows Basic + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj.filters b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj.filters new file mode 100644 index 0000000..9c9f6d5 --- /dev/null +++ b/ClassicShellSrc/Skins/Win7Basic/Win7Basic.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win8/Win8.rc b/ClassicShellSrc/Skins/Win8/Win8.rc index 61140f1..b561719 100644 --- a/ClassicShellSrc/Skins/Win8/Win8.rc +++ b/ClassicShellSrc/Skins/Win8/Win8.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Win8/Win8.vcproj b/ClassicShellSrc/Skins/Win8/Win8.vcproj deleted file mode 100644 index a5f4b52..0000000 --- a/ClassicShellSrc/Skins/Win8/Win8.vcproj +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Win8/Win8.vcxproj b/ClassicShellSrc/Skins/Win8/Win8.vcxproj new file mode 100644 index 0000000..ba42031 --- /dev/null +++ b/ClassicShellSrc/Skins/Win8/Win8.vcxproj @@ -0,0 +1,87 @@ + + + + + Resource + Win32 + + + + {ED74EBA9-1BCB-4B8F-9AE1-DC63B3C24A94} + Win8 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Windows 8 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win8/Win8.vcxproj.filters b/ClassicShellSrc/Skins/Win8/Win8.vcxproj.filters new file mode 100644 index 0000000..65ec469 --- /dev/null +++ b/ClassicShellSrc/Skins/Win8/Win8.vcxproj.filters @@ -0,0 +1,114 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win87/Win87.rc b/ClassicShellSrc/Skins/Win87/Win87.rc index dce0712..023bffa 100644 --- a/ClassicShellSrc/Skins/Win87/Win87.rc +++ b/ClassicShellSrc/Skins/Win87/Win87.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/Win87/Win87.vcproj b/ClassicShellSrc/Skins/Win87/Win87.vcproj deleted file mode 100644 index 75cf254..0000000 --- a/ClassicShellSrc/Skins/Win87/Win87.vcproj +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/Win87/Win87.vcxproj b/ClassicShellSrc/Skins/Win87/Win87.vcxproj new file mode 100644 index 0000000..ade5d72 --- /dev/null +++ b/ClassicShellSrc/Skins/Win87/Win87.vcxproj @@ -0,0 +1,88 @@ + + + + + Resource + Win32 + + + + {5C875214-0E3A-4CF0-BC0C-BFF6FAA4C089} + Win87 + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + Windows 8 + .skin7 + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/Win87/Win87.vcxproj.filters b/ClassicShellSrc/Skins/Win87/Win87.vcxproj.filters new file mode 100644 index 0000000..5851e49 --- /dev/null +++ b/ClassicShellSrc/Skins/Win87/Win87.vcxproj.filters @@ -0,0 +1,117 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/WinXP/WinXP.rc b/ClassicShellSrc/Skins/WinXP/WinXP.rc index 9ee32b7..a0d03e8 100644 --- a/ClassicShellSrc/Skins/WinXP/WinXP.rc +++ b/ClassicShellSrc/Skins/WinXP/WinXP.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ClassicShellSrc/Skins/WinXP/WinXP.vcproj b/ClassicShellSrc/Skins/WinXP/WinXP.vcproj deleted file mode 100644 index 8b5a9e6..0000000 --- a/ClassicShellSrc/Skins/WinXP/WinXP.vcproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj b/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj new file mode 100644 index 0000000..2923f3f --- /dev/null +++ b/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj @@ -0,0 +1,86 @@ + + + + + Resource + Win32 + + + + {81EB6336-366C-47DD-82CF-FF6C36CCD2B5} + WinXP + Win32Proj + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + + + + + + + + + + $(SolutionDir)ClassicStartMenu\Skins\ + $(Configuration)\ + true + false + .skin + Windows XP Luna + + + + false + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj.filters b/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj.filters new file mode 100644 index 0000000..a7a3953 --- /dev/null +++ b/ClassicShellSrc/Skins/WinXP/WinXP.vcxproj.filters @@ -0,0 +1,111 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file