Changeset 778 in dev

Timestamp:

Jan 24, 2011, 2:01:54 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

XP以前対応途中（Win98でabdevが起動するところまで）

Location:

branches/egtra/ab5.0/abdev

Files:

• OldWindowsHelper.asm (added)
• OldWindowsHelperImpl.cpp (added)
• ab_common/ab_common.vcxproj (modified) (2 diffs)
• abdev/DrawBuffer.cpp (modified) (2 diffs)
• abdev/TextEditor_EventProc.cpp (modified) (1 diff)
• abdev/abdev.vcxproj (modified) (9 diffs)
• abdev/abdev.vcxproj.filters (modified) (2 diffs)
• abdev/include/MainFrame.h (modified) (5 diffs)
• abdev/src/MainFrame.cpp (modified) (6 diffs)

branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj

@@ -49 +49 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -222 +221 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp

@@ -273 +273 @@
 };
 
+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 +319 @@
         OnePage_CharHeight,
         iLineNumberTextCount,
-        drawDirectly || GetSystemMetrics(SM_REMOTESESSION));
+        drawDirectly || IsRemoteSession());
 
 

branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp

@@ -29 +29 @@
 int hide_caret_switch;
 
+const UINT WM_IME_REQUEST = 0x0288;
 LRESULT CALLBACK TextEditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;

branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj

@@ -50 +50 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -101 +102 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -115 +116 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -158 +159 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -186 +187 @@
       <Optimization>MinSpace</Optimization>
       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -198 +199 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -242 +243 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>PSAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -273 +274 @@
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\OldWindowsHelperImpl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\WindowComponents\PartialManager\TextEditPartialManager.cpp" />
     <ClCompile Include="src\WindowComponents\CodeEditor\Syntax.cpp" />
@@ -682 +687 @@
     <None Include="main.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\OldWindowsHelper.asm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </MASM>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>

branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters

@@ -336 +336 @@
       <Filter>Source Files\ProjectManager</Filter>
     </ClCompile>
+    <ClCompile Include="..\OldWindowsHelperImpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -506 +509 @@
     <None Include="main.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\OldWindowsHelper.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
+  </ItemGroup>
 </Project>

branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h

@@ -17 +17 @@
 #define WM_DESTROYDEBUGGERVIEW  WM_USER+76  //デバッガウィンドウが表示されたとき
 
-#ifdef HAVE_WINDOWS_7_SDK
 class TaskbarList;
-#endif
 
 namespace ActiveBasic{ namespace IDE{
@@ -29 +27 @@
     WindowAreaManager wam;
     UINT TaskbarButtonCreated;
-#ifdef HAVE_WINDOWS_7_SDK
-    boost::shared_ptr<TaskbarList> taskbarList;
-#endif
+    std::shared_ptr<TaskbarList> taskbarList;
 
 public:
@@ -90 +86 @@
     ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled );
 
-#ifdef HAVE_WINDOWS_7_SDK
     // タスクバーボタンが生成された
     ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam);
@@ -108 +103 @@
     // サムネイル画像が古くなった（ので更新したい）
     void InvalidateBitmap( HWND hwndChild );
-#endif
 
     // 「新規作成」メニューがクリックされた
@@ -301 +295 @@
         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 )

branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -28 +28 @@
 }
 
-#ifdef HAVE_WINDOWS_7_SDK
-
 #define MSGFLT_ADD 1
 
@@ -57 +55 @@
         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 +311 @@
     WindowMap windowMap;
 };
-#endif HAVE_WINDOWS_7_SDK
-
-#ifdef HAVE_WINDOWS_7_SDK
+
 MainFrame::MainFrame() :
     TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) )
@@ -330 +328 @@
     }
 }
-#else
-MainFrame::MainFrame() {}
-#endif
 
 void MainFrame::Resized()
@@ -925 +920 @@
 ::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 +929 @@
 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
 }