Changeset 697 in dev for trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

Timestamp:

Jul 19, 2008, 9:03:01 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

エディタの2重オープンチェックの厳密化。abdevからコンパイラへのHWNDの受け渡しを64ビット対応へ。

File:

• trunk/ab5.0/abdev/abdev/src/MainFrame.cpp (modified) (13 diffs)

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -171 +171 @@
 }
 
-::LRESULT MainFrame::OnCreate( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled )
+::LRESULT MainFrame::OnCreate( ::CREATESTRUCT const* )
 {
     // ウィンドウエリアマネージャに親ウィンドウを登録
@@ -207 +207 @@
     extern WNDPROC oldMainFrameWndProc;
     oldMainFrameWndProc = (WNDPROC)::GetWindowLong( hOwner, GWL_WNDPROC );
-    ::SetWindowLong( hOwner, GWL_WNDPROC, (LONG)WindowFunc );
+    ::SetWindowLongPtr( hOwner, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(WindowFunc) );
 
     SetupWindow(hOwner);
@@ -517 +517 @@
 void MainFrame::OnDropFiles( HDROP hDropInfo )
 {
-    int max = DragQueryFile(hDropInfo,-1,0,0);
+    int max = DragQueryFile(hDropInfo,static_cast<DWORD>(-1),0,0);
     for(int i=0;i<max;i++){
         char temporary[1024];
@@ -526 +526 @@
 }
 
-void MainFrame::OnPaint( HDC dummy )
+void MainFrame::OnPaint( HDC )
 {
     PAINTSTRUCT ps;
@@ -1096 +1096 @@
 void CreateProcessWithStdHandle( const std::string &appPath, const std::string &cmdLine)
 {
-    std::string argsStr = (std::string)"\"" + appPath + "\" " + cmdLine;
+    std::string argsStr = "\"" + appPath + "\" " + cmdLine;
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
@@ -1143 +1143 @@
 
         if(IsNeedCompileForProject(1))
-            sprintf(temporary,"\"%s\" \"%s\" /debug /run /wnd:%08x",temp2,temp3,m_hWnd);
+            sprintf(temporary,"\"%s\" \"%s\" /debug /run /wnd:%p",temp2,temp3,m_hWnd);
         else
-            sprintf(temporary,"\"%s\" \"%s\" /run /wnd:%08x",temp2,temp3,m_hWnd);
+            sprintf(temporary,"\"%s\" \"%s\" /run /wnd:%p",temp2,temp3,m_hWnd);
 
         // DLLオプション
@@ -1169 +1169 @@
         if(!SetRunning(hChild)) return;
         if(IsNeedCompile(MdiInfo[GetWndNum(hChild)]->path,1))
-            sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
+            sprintf(temporary,"\"%s\" /debug /run /wnd:%p",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
         else
-            sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
+            sprintf(temporary,"\"%s\" /run /wnd:%p",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
 
         //ブレークポイントをセーブ
@@ -1220 +1220 @@
         lstrcpy( temp3, projectInfo.GetWorkDir().GetFullPath( temp3 ).c_str() );
 
-        sprintf(temporary,"\"%s\" \"%s\" /debug /wnd:%08x",temp2,temp3,m_hWnd);
+        sprintf(temporary,"\"%s\" \"%s\" /debug /wnd:%p",temp2,temp3,m_hWnd);
 
         //DLLオプション
@@ -1240 +1240 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
+        sprintf(temporary,"\"%s\" /debug /wnd:%p",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
     }
 
@@ -1282 +1282 @@
     if(idProcess==0) return;
 
-    sprintf(temporary,"/attach:%08x /wnd:%08x",idProcess,m_hWnd);
+    sprintf(temporary,"/attach:%08x /wnd:%p",idProcess,m_hWnd);
 
     //コンパイルビューをクリップするかどうか
@@ -1340 +1340 @@
         lstrcpy( temp3, projectInfo.GetWorkDir().GetFullPath( temp3 ).c_str() );
 
-        sprintf(temporary,"\"%s\" \"%s\" /wnd:%08x",temp2,temp3,m_hWnd);
+        sprintf(temporary,"\"%s\" \"%s\" /wnd:%p",temp2,temp3,m_hWnd);
 
         //DLLオプション
@@ -1360 +1360 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
+        sprintf(temporary,"\"%s\" /wnd:%p",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
     }
 
@@ -1707 +1707 @@
         {
             HWND hChild=::GetWindow(hClient,GW_CHILD);
-            int WndNum=GetWndNum(hChild);
 
             TC_ITEM tcItem;