Index: branches/egtra/ab5.0/abdev/OldWindowsHelper.asm =================================================================== --- branches/egtra/ab5.0/abdev/OldWindowsHelper.asm (revision 778) +++ branches/egtra/ab5.0/abdev/OldWindowsHelper.asm (revision 778) @@ -0,0 +1,49 @@ +.486 +.model flat, stdcall +.data + _imp__IsDebuggerPresent@0 dd IsDebuggerPresent_Helper@0 + PUBLIC _imp__IsDebuggerPresent@0 + + _imp__EncodePointer@4 dd EncodePointer_Helper@4 + PUBLIC _imp__EncodePointer@4 + + _imp__DecodePointer@4 dd DecodePointer_Helper@4 + PUBLIC _imp__DecodePointer@4 + + _imp__IsProcessorFeaturePresent@4 dd IsProcessorFeaturePresent_Helper@4 + PUBLIC _imp__IsProcessorFeaturePresent@4 + + _imp__HeapSetInformation@16 dd HeapSetInformation_Helper@16 + PUBLIC _imp__HeapSetInformation@16 + + _imp__InitializeCriticalSectionAndSpinCount@8 dd InitializeCriticalSectionAndSpinCount_Helper@8 + PUBLIC _imp__InitializeCriticalSectionAndSpinCount@8 + + _imp__InterlockedPushEntrySList@8 dd InterlockedPushEntrySList_Helper@8 + PUBLIC _imp__InterlockedPushEntrySList@8 + + _imp__InterlockedPopEntrySList@4 dd InterlockedPopEntrySList_Helper@4 + PUBLIC _imp__InterlockedPopEntrySList@4 + + _imp__InterlockedCompareExchange@12 dd InterlockedCompareExchange_Helper + PUBLIC _imp__InterlockedCompareExchange@12 + + EXTERN IsDebuggerPresent_Helper@0 : DWORD + EXTERN EncodePointer_Helper@4 : DWORD + EXTERN DecodePointer_Helper@4 : DWORD + EXTERN IsProcessorFeaturePresent_Helper@4 : DWORD + EXTERN HeapSetInformation_Helper@16 : DWORD + EXTERN InitializeCriticalSectionAndSpinCount_Helper@8 : DWORD + EXTERN InterlockedPushEntrySList_Helper@8 : DWORD + EXTERN InterlockedPopEntrySList_Helper@4 : DWORD + + EXTERN _imp__InitializeCriticalSection@4 : DWORD + + InterlockedCompareExchange_Helper PROC PRIVATE + mov ecx,[esp+4] + mov edx,[esp+8] + mov eax,[esp+12] + lock cmpxchg [ecx],edx + ret 12 + InterlockedCompareExchange_Helper ENDP +end Index: branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp =================================================================== --- branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp (revision 778) +++ branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp (revision 778) @@ -0,0 +1,128 @@ +#include "stdafx.h" + +static OSVERSIONINFO GetVersionEx2() +{ + OSVERSIONINFO vi = {sizeof vi}; + GetVersionEx(&vi); + return vi; +} + +static OSVERSIONINFO const vi = GetVersionEx2(); + +#define KERNEL32 (GetModuleHandle(TEXT("kernel32"))) + +#define GET_PROC_ADDRESS(hmod, functionName) reinterpret_cast(GetProcAddress((hmod), #functionName)) + +extern "C" +{ + BOOL WINAPI IsDebuggerPresent_Helper() + { + if (auto IsDebuggerPresent_Real = GET_PROC_ADDRESS(KERNEL32, IsDebuggerPresent)) + { + return IsDebuggerPresent_Real(); + } + else + { + return FALSE; + } + } + + void* WINAPI EncodePointer_Helper(void* p) + { + static bool first = false; + if (!first) + { + ::MessageBox(nullptr, "test", "", 0); + first = true; + } + if (auto EncodePointer_Real = GET_PROC_ADDRESS(KERNEL32, EncodePointer)) + { + return EncodePointer_Real(p); + } + else + { + return reinterpret_cast(reinterpret_cast(p) ^ GetCurrentProcessId()); + } + } + + void* WINAPI DecodePointer_Helper(void* p) + { + if (auto DecodePointer_Real = GET_PROC_ADDRESS(KERNEL32, DecodePointer)) + { + return DecodePointer_Real(p); + } + else + { + return reinterpret_cast(reinterpret_cast(p) ^ GetCurrentProcessId()); + } + } + + BOOL WINAPI IsProcessorFeaturePresent_Helper(DWORD feture) + { + if (auto IsProcessorFeaturePresent_Real = GET_PROC_ADDRESS(KERNEL32, IsProcessorFeaturePresent)) + { + return IsProcessorFeaturePresent_Real(feture); + } + else + { + assert(feture == PF_NX_ENABLED); // ATLから呼ばれる + return FALSE; + } + } + + BOOL WINAPI HeapSetInformation_Helper(HANDLE hHeap, HEAP_INFORMATION_CLASS hic, void* information, SSIZE_T informationLength) + { + if (auto HeapSetInformation_Real = GET_PROC_ADDRESS(KERNEL32, HeapSetInformation)) + { + return HeapSetInformation_Real(hHeap, hic, information, informationLength); + } + else + { + return TRUE; + } + } + + BOOL WINAPI InitializeCriticalSectionAndSpinCount_Helper(LPCRITICAL_SECTION lpcs, DWORD spinCount) + { + __try + { + if (auto InitializeCriticalSectionAndSpinCount_Real = GET_PROC_ADDRESS(KERNEL32, InitializeCriticalSectionAndSpinCount)) + { + OSVERSIONINFO vi = {sizeof vi}; + ::GetVersionEx(&vi); + BOOL ret = InitializeCriticalSectionAndSpinCount_Real(lpcs, spinCount); + return vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS + ? TRUE + : ret; + } + else + { + ::InitializeCriticalSection(lpcs); + return TRUE; + } + } + __except(EXCEPTION_EXECUTE_HANDLER) + { + } + return FALSE; + } + + // Interlocked(Push|Pop)EntrySListは、NXが有効な場合のみ呼ばれる。 + // Windows XP以前はNX対応していないためInterlocked(Push|Pop)EntrySListが呼ばれることはない。 + // そのため、GET_PROC_ADDRESSがnullptrを返すことはないと仮定している。 + // なお、Interlocked(Push|Pop)EntrySListもWindows XPから搭載されている。 + + PSLIST_ENTRY WINAPI InterlockedPushEntrySList_Helper(PSLIST_HEADER head, PSLIST_ENTRY entry) + { + auto InterlockedPushEntrySList_Real = GET_PROC_ADDRESS(KERNEL32, InterlockedPushEntrySList); + assert(InterlockedPushEntrySList_Real != nullptr); + return InterlockedPushEntrySList_Real(head, entry); + } + + PSLIST_ENTRY WINAPI InterlockedPopEntrySList_Helper(PSLIST_HEADER head) + { + auto InterlockedPopEntrySList_Real = GET_PROC_ADDRESS(KERNEL32, InterlockedPopEntrySList); + assert(InterlockedPopEntrySList_Real != nullptr); + return InterlockedPopEntrySList_Real(head); + } +} Index: branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj =================================================================== --- branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj (revision 777) +++ branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj (revision 778) @@ -49,6 +49,5 @@ - - + @@ -222,5 +221,4 @@ - - + Index: branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp =================================================================== --- branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp (revision 778) @@ -273,4 +273,16 @@ }; +static bool IsRemoteSession() +{ + OSVERSIONINFO vi = {sizeof vi}; + BOOL ret = ::GetVersionEx(&vi); + if (ret && vi.dwMajorVersion >= 5) + { + const int SM_REMOTESESSION = 0x1000; + return GetSystemMetrics(SM_REMOTESESSION); + } + return false; +} + void TextEdit_DrawBuffer(HDC hdc,int WndNum,bool drawDirectly){ int i,i2; @@ -307,5 +319,5 @@ OnePage_CharHeight, iLineNumberTextCount, - drawDirectly || GetSystemMetrics(SM_REMOTESESSION)); + drawDirectly || IsRemoteSession()); Index: branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp =================================================================== --- branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp (revision 778) @@ -29,4 +29,5 @@ int hide_caret_switch; +const UINT WM_IME_REQUEST = 0x0288; LRESULT CALLBACK TextEditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ extern HANDLE hHeap; Index: branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj =================================================================== --- branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj (revision 778) @@ -50,4 +50,5 @@ + @@ -101,5 +102,5 @@ Disabled ..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions) false EnableFastChecks @@ -115,7 +116,7 @@ - odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies) + unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies) ..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories) - DWMAPI.DLL;%(DelayLoadDLLs) + PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs) true Windows @@ -158,5 +159,5 @@ - odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies) ..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories) true @@ -186,5 +187,5 @@ MinSpace ..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions) MultiThreaded Use @@ -198,5 +199,5 @@ - odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies) + unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies) ..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories) PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs) @@ -242,5 +243,5 @@ - odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies) ..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories) PSAPI.DLL;%(DelayLoadDLLs) @@ -273,4 +274,8 @@ + + true + true + @@ -682,6 +687,13 @@ + + + true + true + + + Index: branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters =================================================================== --- branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters (revision 778) @@ -336,4 +336,7 @@ Source Files\ProjectManager + + Source Files + @@ -506,3 +509,8 @@ + + + Source Files + + Index: branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h =================================================================== --- branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h (revision 778) @@ -17,7 +17,5 @@ #define WM_DESTROYDEBUGGERVIEW WM_USER+76 //デバッガウィンドウが表示されたとき -#ifdef HAVE_WINDOWS_7_SDK class TaskbarList; -#endif namespace ActiveBasic{ namespace IDE{ @@ -29,7 +27,5 @@ WindowAreaManager wam; UINT TaskbarButtonCreated; -#ifdef HAVE_WINDOWS_7_SDK - boost::shared_ptr taskbarList; -#endif + std::shared_ptr taskbarList; public: @@ -90,5 +86,4 @@ ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled ); -#ifdef HAVE_WINDOWS_7_SDK // タスクバーボタンが生成された ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam); @@ -108,5 +103,4 @@ // サムネイル画像が古くなった（ので更新したい） void InvalidateBitmap( HWND hwndChild ); -#endif // 「新規作成」メニューがクリックされた @@ -301,8 +295,6 @@ MSG_WM_DROPFILES( OnDropFiles ) MSG_WM_PAINT( OnPaint ) - MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) -#ifdef HAVE_WINDOWS_7_SDK + MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated ) -#endif COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew ) COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen ) Index: branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp =================================================================== --- branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp (revision 777) +++ branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp (revision 778) @@ -28,6 +28,4 @@ } -#ifdef HAVE_WINDOWS_7_SDK - #define MSGFLT_ADD 1 @@ -57,4 +55,6 @@ wndTarget(hwndTarget) { + DWORD const WS_EX_NOACTIVATE = 0x08000000; + HWND hwndDummy = Create( hOwner, CRect( -32000, -32000, 1, 1 ), title, WS_BORDER | WS_SYSMENU | WS_CAPTION, WS_EX_NOACTIVATE); @@ -311,7 +311,5 @@ WindowMap windowMap; }; -#endif HAVE_WINDOWS_7_SDK - -#ifdef HAVE_WINDOWS_7_SDK + MainFrame::MainFrame() : TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) ) @@ -330,7 +328,4 @@ } } -#else -MainFrame::MainFrame() {} -#endif void MainFrame::Resized() @@ -925,10 +920,8 @@ ::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM ) { -#ifdef HAVE_WINDOWS_7_SDK if ( msg == 0 ) { // 念のため確認 return 0; } taskbarList.reset(new TaskbarList(*this)); -#endif return 0; } @@ -936,35 +929,25 @@ void MainFrame::AddChildWindow( HWND hwndChild ) { -#ifdef HAVE_WINDOWS_7_SDK taskbarList->RegisterTab( hwndChild ); -#endif } void MainFrame::DeleteChildWindow( HWND hwndChild ) { -#ifdef HAVE_WINDOWS_7_SDK taskbarList->UnregisterTab( hwndChild ); -#endif } void MainFrame::ActivateChildWindow( HWND hwndChild ) { -#ifdef HAVE_WINDOWS_7_SDK taskbarList->SetTabActivate( hwndChild ); -#endif } void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore ) { -#ifdef HAVE_WINDOWS_7_SDK taskbarList->SetTabOrder( hwndChild, hwndInsertBefore ); -#endif } void MainFrame::InvalidateBitmap( HWND hwndChild ) { -#ifdef HAVE_WINDOWS_7_SDK taskbarList->InvalidateIconicBitmaps( hwndChild ); -#endif }