Changeset 455 in dev
- Timestamp:
- Mar 22, 2008, 9:47:59 PM (17 years ago)
- Location:
- trunk/ab5.0/abdev
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj
r445 r455 76 76 <Tool 77 77 Name="VCLinkerTool" 78 AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib imagehlp.lib "78 AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib imagehlp.lib shlwapi.lib" 79 79 OutputFile="../ActiveBasic/BasicCompiler32.exe" 80 80 LinkIncremental="2" … … 83 83 GenerateDebugInformation="true" 84 84 ProgramDatabaseFile=".\Debug/BasicCompiler32.pdb" 85 SubSystem=" 2"85 SubSystem="1" 86 86 StackReserveSize="4194304" 87 87 TargetMachine="1" … … 180 180 <Tool 181 181 Name="VCLinkerTool" 182 AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib imagehlp.lib "182 AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib imagehlp.lib shlwapi.lib" 183 183 OutputFile="../ActiveBasic/BasicCompiler32.exe" 184 184 LinkIncremental="1" … … 186 186 AdditionalLibraryDirectories="..\..\jenga\lib\x86;..\lib\x86" 187 187 ProgramDatabaseFile=".\Release/BasicCompiler32.pdb" 188 SubSystem=" 2"188 SubSystem="1" 189 189 TargetMachine="1" 190 190 /> … … 1539 1539 </File> 1540 1540 <File 1541 RelativePath="..\BasicCompiler_Common\include\Program.h"1542 >1543 </File>1544 <File1545 1541 RelativePath="..\BasicCompiler_Common\include\Prototype.h" 1546 1542 > … … 1571 1567 </File> 1572 1568 </Filter> 1569 </Filter> 1570 <Filter 1571 Name="Application Classes" 1572 > 1573 <File 1574 RelativePath="..\BasicCompiler_Common\include\Program.h" 1575 > 1576 </File> 1573 1577 </Filter> 1574 1578 </Filter> -
trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
r378 r455 1 1 #include "stdafx.h" 2 3 #include <shlwapi.h> 2 4 3 5 #include <jenga/include/common/Path.h> … … 573 575 } 574 576 575 int PASCAL WinMain(HINSTANCE hThisInst,HINSTANCE hPrevInst,LPSTR lpCmdLine,int nShowCmd){ 577 int main() 578 { 576 579 int i,i2; 577 580 char temporary[1024],temp2[MAX_PATH]; 581 582 hInst = GetModuleHandle( NULL ); 583 LPSTR lpCmdLine = PathGetArgs( GetCommandLine() ); 578 584 579 585 //_Test(); … … 588 594 ScreenX=GetSystemMetrics(SM_CXSCREEN); 589 595 ScreenY=GetSystemMetrics(SM_CYSCREEN); 590 591 hInst=hThisInst;592 596 593 597 //不揮発性データを取得 … … 919 923 trace("Complete ActiveBasic Compiler!"); 920 924 925 ExitProcess( 0 ); 921 926 922 927 return 0; -
trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp
r357 r455 464 464 if( !compiler.IsDll() ){ 465 465 //EXEファイルをデバッグ 466 CreateProcess(OutputFileName,szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS ,NULL,NULL,&si,&pi);466 CreateProcess(OutputFileName,szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS|CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi); 467 467 } 468 468 else{ 469 469 //DLLファイルをデバッグ 470 CreateProcess(ExeFilePathForDll,szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS ,NULL,NULL,&si,&pi);470 CreateProcess(ExeFilePathForDll,szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS|CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi); 471 471 } 472 472 -
trunk/ab5.0/abdev/BasicCompiler_Common/error.cpp
r448 r455 1 1 #include "stdafx.h" 2 3 #include <iostream> 2 4 3 5 #include <Program.h> … … 377 379 SendDlgItemMessage(hMainDlg,IDC_ERRORLIST,EM_REPLACESEL,0,(LPARAM)temp2); 378 380 379 381 std::string msg = temp2; 380 382 if(num==-2){ 381 383 //コンパイルメッセージ … … 385 387 } 386 388 else{ 389 msg = (num>-100) ? "error - " : "warning - "; 390 msg += temp2; 387 391 if(num>-100){ 388 392 //警告ではなく、エラーの場合はエラーチェックフラグを立てる 389 393 extern BOOL bError; 390 394 bError=1; 391 392 // ログに出力393 trace( "error - " << temp2 );394 395 } 395 396 else{ 396 397 extern int WarningNum; 397 398 WarningNum++; 398 399 // ログに出力 400 trace( "warning - " << temp2 ); 401 } 402 } 399 } 400 401 // ログに出力 402 trace( msg ); 403 } 404 405 std::cout << msg << endl; 406 403 407 404 408 ErrorNum++; -
trunk/ab5.0/abdev/ProjectEditor/DialogBoxes.cpp
r302 r455 1109 1109 1110 1110 //SideWebウィンドウを再表示 1111 delete pobj_SideWeb;1112 pobj_SideWeb=new CSideWeb(hOwner);1113 ResizeOwnerWnd();1111 //delete pobj_SideWeb; 1112 //pobj_SideWeb=new CSideWeb(hOwner); 1113 //ResizeOwnerWnd(); 1114 1114 } 1115 1115 return; -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp
r302 r455 86 86 #endif 87 87 88 89 void CreateProcessWithStdHandle( const char *appPath, const char *cmdLine) 90 { 91 std::string argsStr = (std::string)"\"" + appPath + "\" " + cmdLine; 92 STARTUPINFO si; 93 PROCESS_INFORMATION pi; 94 memset(&si,0,sizeof(STARTUPINFO)); 95 si.cb=sizeof(STARTUPINFO); 96 si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; 97 si.wShowWindow = SW_HIDE; 98 si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); 99 si.hStdInput = GetStdHandle(STD_INPUT_HANDLE); 100 si.hStdError = GetStdHandle(STD_ERROR_HANDLE); 101 102 char args[8192]; 103 lstrcpy( args, argsStr.c_str() ); 104 105 CreateProcess( NULL, args, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi ); 106 } 88 107 89 108 void ToBigChar(char str[]){ … … 1288 1307 1289 1308 int width_SideWeb=0; 1290 if(pobj_SideWeb->bShow){ 1291 width_SideWeb=pobj_nv->width_WebSearchView+LEVER_THICK; 1309 if( pobj_SideWeb ) 1310 { 1311 if(pobj_SideWeb->bShow){ 1312 width_SideWeb=pobj_nv->width_WebSearchView+LEVER_THICK; 1313 } 1292 1314 } 1293 1315 … … 1323 1345 1); 1324 1346 1325 if(pobj_SideWeb->bShow){ 1326 //SideWeb 1327 pobj_SideWeb->resize( 1328 width_owner - pobj_nv->width_WebSearchView, 1329 height_Rebar, 1330 pobj_nv->width_WebSearchView, 1331 height_MdiClient); 1332 } 1333 else pobj_SideWeb->resize(0,0,0,0); 1347 if( pobj_SideWeb ) 1348 { 1349 if(pobj_SideWeb->bShow){ 1350 //SideWeb 1351 pobj_SideWeb->resize( 1352 width_owner - pobj_nv->width_WebSearchView, 1353 height_Rebar, 1354 pobj_nv->width_WebSearchView, 1355 height_MdiClient); 1356 } 1357 else pobj_SideWeb->resize(0,0,0,0); 1358 } 1334 1359 1335 1360 if(width_pjv){ … … 1459 1484 1460 1485 case WM_DRAWITEM: 1461 DRAWITEMSTRUCT *pdis; 1462 pdis=(DRAWITEMSTRUCT *)lParam; 1463 1464 if(pdis->CtlType==ODT_MENU){ 1465 if(!pobj_MainMenu) return 0; 1466 1467 CMenuItemData *pobj_MenuItemData; 1468 pobj_MenuItemData=(CMenuItemData *)pdis->itemData; 1469 if(pobj_MainMenu->hMenu==pobj_MenuItemData->pobj_ThisMenu->hMenu){ 1470 //メインメニューの親アイテム 1471 pobj_MainMenu->OwnerDrawMenu(pdis->hDC, 1472 &pdis->rcItem, 1473 (pdis->itemState&ODS_SELECTED)!=0, 1474 pobj_MenuItemData->item_index); 1486 { 1487 DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; 1488 1489 if(pdis->CtlType==ODT_MENU){ 1490 if(!pobj_MainMenu) return 0; 1491 1492 CMenuItemData *pobj_MenuItemData; 1493 pobj_MenuItemData=(CMenuItemData *)pdis->itemData; 1494 if(pobj_MainMenu->hMenu==pobj_MenuItemData->pobj_ThisMenu->hMenu){ 1495 //メインメニューの親アイテム 1496 pobj_MainMenu->OwnerDrawMenu(pdis->hDC, 1497 &pdis->rcItem, 1498 (pdis->itemState&ODS_SELECTED)!=0, 1499 pobj_MenuItemData->item_index); 1500 } 1501 else{ 1502 //メインメニューにぶらさがるサブメニュー 1503 pobj_MainMenu->OwnerDrawSubMenu(pobj_MenuItemData->pobj_ThisMenu->hMenu, 1504 pdis->hDC, 1505 &pdis->rcItem, 1506 (pdis->itemState&ODS_SELECTED)!=0, 1507 pobj_MenuItemData->item_index); 1508 } 1475 1509 } 1476 else{ 1477 //メインメニューにぶらさがるサブメニュー 1478 pobj_MainMenu->OwnerDrawSubMenu(pobj_MenuItemData->pobj_ThisMenu->hMenu, 1479 pdis->hDC, 1480 &pdis->rcItem, 1481 (pdis->itemState&ODS_SELECTED)!=0, 1482 pobj_MenuItemData->item_index); 1483 } 1484 } 1485 return 0; 1510 1511 return 0; 1512 } 1486 1513 1487 1514 case WM_NOTIFY: … … 2054 2081 2055 2082 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2056 ShellExecute(hwnd,"open",str,temporary,NULL,SW_SHOWNORMAL); 2083 2084 CreateProcessWithStdHandle( str, temporary ); 2085 2057 2086 return 0; 2058 2087 case IDM_DEBUGCOMPILE: … … 2104 2133 2105 2134 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2106 ShellExecute(hwnd,"open",str,temporary,NULL,SW_SHOWNORMAL); 2135 2136 CreateProcessWithStdHandle( str, temporary ); 2107 2137 2108 2138 return 0; … … 2140 2170 sprintf(str,"%s%s",pj_editor_Dir,WIN64_COMPILER_NAME); 2141 2171 2142 ShellExecute(hwnd,"open",str,temporary,NULL,SW_SHOWNORMAL); 2172 CreateProcessWithStdHandle( str, temporary ); 2173 2143 2174 return 0; 2144 2175 case IDM_RELEASECOMPILE: … … 2190 2221 2191 2222 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2192 ShellExecute(hwnd,"open",str,temporary,NULL,SW_SHOWNORMAL); 2223 2224 CreateProcessWithStdHandle( str, temporary ); 2225 2193 2226 return 0; 2194 2227 case IDM_RELEASERUN: … … 2721 2754 } 2722 2755 #endif 2723 if(pobj_SideWeb->bShow){ 2724 //SideWebとMDIクライアントの境目のサイズ変更ライン 2725 pobj_SideWeb->GetRect(&rect); 2726 ClientToScreen(hwnd,&rect); 2727 if(rect.top<=pos.y&&pos.y<=rect.bottom&& 2728 rect.left-LEVER_THICK<=pos.x&&pos.x<=rect.left){ 2729 SetCursor(LoadCursor(0,IDC_SIZEWE)); 2756 if( pobj_SideWeb ) 2757 { 2758 if(pobj_SideWeb->bShow){ 2759 //SideWebとMDIクライアントの境目のサイズ変更ライン 2760 pobj_SideWeb->GetRect(&rect); 2761 ClientToScreen(hwnd,&rect); 2762 if(rect.top<=pos.y&&pos.y<=rect.bottom&& 2763 rect.left-LEVER_THICK<=pos.x&&pos.x<=rect.left){ 2764 SetCursor(LoadCursor(0,IDC_SIZEWE)); 2765 } 2730 2766 } 2731 2767 } -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj
r123 r455 143 143 Name="VCCLCompilerTool" 144 144 Optimization="0" 145 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;THETEXT;SHAREWARE "145 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;THETEXT;SHAREWARE;WINVER=0x0501;_WIN32_WINNT=0x0501" 146 146 MinimalRebuild="true" 147 147 BasicRuntimeChecks="3" … … 241 241 Optimization="2" 242 242 InlineFunctionExpansion="1" 243 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT "243 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;WINVER=0x0501;_WIN32_WINNT=0x0501" 244 244 StringPooling="true" 245 245 RuntimeLibrary="0" … … 336 336 Name="VCCLCompilerTool" 337 337 Optimization="0" 338 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN "338 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501" 339 339 MinimalRebuild="true" 340 340 BasicRuntimeChecks="3" … … 434 434 Optimization="2" 435 435 InlineFunctionExpansion="1" 436 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;SHAREWARE "436 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;SHAREWARE;WINVER=0x0501;_WIN32_WINNT=0x0501" 437 437 StringPooling="true" 438 438 RuntimeLibrary="0" … … 530 530 Optimization="2" 531 531 InlineFunctionExpansion="1" 532 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN "532 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501" 533 533 StringPooling="true" 534 534 RuntimeLibrary="0" … … 555 555 <Tool 556 556 Name="VCLinkerTool" 557 AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib imm32.lib htmlhelp.lib rpcrt4.lib libcp.lib"557 AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib imm32.lib htmlhelp.lib rpcrt4.lib" 558 558 OutputFile="../ActiveBasic/abdev.exe" 559 559 LinkIncremental="1" … … 625 625 Name="VCCLCompilerTool" 626 626 Optimization="0" 627 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;THETEXT "627 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;THETEXT;WINVER=0x0501;_WIN32_WINNT=0x0501" 628 628 MinimalRebuild="true" 629 629 BasicRuntimeChecks="3" -
trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp
r446 r455 482 482 if(lstrcmpi(str,"Declare")==0) return COM_DECLARE; 483 483 if(lstrcmpi(str,"Def")==0) return COM_DEF; 484 if(lstrcmpi(str,"Delegate")==0) return -1; 484 485 if(lstrcmpi(str,"Delete")==0) return -1; 485 486 if(lstrcmpi(str,"DelWnd")==0) return COM_DELWND; … … 1057 1058 //メニューフォント 1058 1059 NONCLIENTMETRICS NCMetrics; 1059 NCMetrics.cbSize = sizeof( NONCLIENTMETRICS ); 1060 SystemParametersInfo( SPI_GETNONCLIENTMETRICS, sizeof( NONCLIENTMETRICS ), &NCMetrics, 0 ); 1060 int sizeof_NONCLIENTMETRICS = sizeof( NONCLIENTMETRICS ); 1061 #if WINVER >= 0x0600 1062 sizeof_NONCLIENTMETRICS -= sizeof(int); 1063 #endif 1064 NCMetrics.cbSize = sizeof_NONCLIENTMETRICS; 1065 SystemParametersInfo( SPI_GETNONCLIENTMETRICS, sizeof_NONCLIENTMETRICS, &NCMetrics, 0 ); 1061 1066 hMenuFont=CreateFontIndirect(&NCMetrics.lfMenuFont); 1062 1067 … … 1463 1468 1464 1469 //SideWebを生成 1465 pobj_SideWeb=new CSideWeb(hwnd);1470 //pobj_SideWeb=new CSideWeb(hwnd); 1466 1471 } 1467 1472 -
trunk/ab5.0/abdev/ProjectEditor/menu.cpp
r84 r455 172 172 char temporary[MAX_PATH]; 173 173 MENUITEMINFO mii; 174 memset(&mii,0,sizeof(MENUITEMINFO)); 174 175 mii.cbSize=sizeof(MENUITEMINFO); 175 176 mii.fMask=MIIM_TYPE|MIIM_ID|MIIM_SUBMENU|MIIM_DATA;
Note:
See TracChangeset
for help on using the changeset viewer.