Changeset 618 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp
- Timestamp:
- May 19, 2008, 5:10:15 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/ProjectControl.cpp
r617 r618 133 133 if(pobj_ClassTreeView->pProcInfo[i].hTreeItem==hTreeItem){ 134 134 135 if( ProjectInfo.name[0] ){135 if( projectInfo.name[0] ){ 136 136 // 対象ファイルを開く 137 137 lstrcpy(temporary, 138 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->m_path);139 GetFullPath(temporary, ProjectInfo.dir);138 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->m_path); 139 GetFullPath(temporary,projectInfo.dir); 140 140 hChild=OpenFileWithExtension(temporary); 141 141 } … … 179 179 case IDM_MATERIALTREE_OPEN: 180 180 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 181 for(i=0;i<static_cast<int>( ProjectInfo.windowInfos.size());i++){182 if( ProjectInfo.windowInfos[i]->hTreeItem==hTreeItem){183 NewRadWindow( * ProjectInfo.windowInfos[i] );181 for(i=0;i<static_cast<int>(projectInfo.windowInfos.size());i++){ 182 if(projectInfo.windowInfos[i]->hTreeItem==hTreeItem){ 183 NewRadWindow( *projectInfo.windowInfos[i] ); 184 184 break; 185 185 } 186 186 } 187 for(i=0;i< ProjectInfo.NumberOfMenu;i++){188 if( ProjectInfo.pMenuInfo[i].hTreeItem==hTreeItem){189 NewMenuWindow(& ProjectInfo.pMenuInfo[i]);187 for(i=0;i<projectInfo.NumberOfMenu;i++){ 188 if(projectInfo.pMenuInfo[i].hTreeItem==hTreeItem){ 189 NewMenuWindow(&projectInfo.pMenuInfo[i]); 190 190 break; 191 191 } 192 192 } 193 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){194 if( ProjectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){195 lstrcpy(temporary, ProjectInfo.res.pIconResInfo[i].path);196 GetFullPath(temporary, ProjectInfo.dir);193 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 194 if(projectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){ 195 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path); 196 GetFullPath(temporary,projectInfo.dir); 197 197 NewIconEditWindow(temporary); 198 198 break; … … 202 202 case IDM_MATERIALTREE_DELETE: 203 203 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 204 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++){205 if( ProjectInfo.res.pCursorResInfo[i].hTreeItem==hTreeItem){204 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++){ 205 if(projectInfo.res.pCursorResInfo[i].hTreeItem==hTreeItem){ 206 206 207 207 //"%s カーソルをプロジェクトから削除します。よろしいですか?" 208 sprintf(str,STRING_PJ_CHECK_DELETECURSOR, ProjectInfo.res.pCursorResInfo[i].IdName);208 sprintf(str,STRING_PJ_CHECK_DELETECURSOR,projectInfo.res.pCursorResInfo[i].IdName); 209 209 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 210 210 … … 213 213 } 214 214 } 215 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++){216 if( ProjectInfo.res.pBitmapResInfo[i].hTreeItem==hTreeItem){215 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++){ 216 if(projectInfo.res.pBitmapResInfo[i].hTreeItem==hTreeItem){ 217 217 218 218 //"%s ビットマップをプロジェクトから削除します。よろしいですか?" 219 sprintf(str,STRING_PJ_CHECK_DELETEBITMAP, ProjectInfo.res.pBitmapResInfo[i].IdName);219 sprintf(str,STRING_PJ_CHECK_DELETEBITMAP,projectInfo.res.pBitmapResInfo[i].IdName); 220 220 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 221 221 … … 224 224 } 225 225 } 226 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){227 if( ProjectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){226 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 227 if(projectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){ 228 228 229 229 //"%s アイコンをプロジェクトから削除します。よろしいですか?" 230 sprintf(str,STRING_PJ_CHECK_DELETEICON, ProjectInfo.res.pIconResInfo[i].IdName);230 sprintf(str,STRING_PJ_CHECK_DELETEICON,projectInfo.res.pIconResInfo[i].IdName); 231 231 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 232 232 … … 235 235 } 236 236 } 237 for(i=0;i< ProjectInfo.NumberOfMenu;i++){238 if( ProjectInfo.pMenuInfo[i].hTreeItem==hTreeItem){237 for(i=0;i<projectInfo.NumberOfMenu;i++){ 238 if(projectInfo.pMenuInfo[i].hTreeItem==hTreeItem){ 239 239 240 240 //"%s メニューをプロジェクトから削除します。よろしいですか?" 241 sprintf(str,STRING_PJ_CHECK_DELETEMENU, ProjectInfo.pMenuInfo[i].IdName);241 sprintf(str,STRING_PJ_CHECK_DELETEMENU,projectInfo.pMenuInfo[i].IdName); 242 242 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 243 243 … … 246 246 } 247 247 } 248 for(i=0;i<static_cast<int>( ProjectInfo.windowInfos.size());i++){249 if( ProjectInfo.windowInfos[i]->hTreeItem==hTreeItem){248 for(i=0;i<static_cast<int>(projectInfo.windowInfos.size());i++){ 249 if(projectInfo.windowInfos[i]->hTreeItem==hTreeItem){ 250 250 251 251 //"%s ウィンドウをプロジェクトから削除します。よろしいですか?" 252 sprintf(str,STRING_PJ_CHECK_DELETEWINDOW, ProjectInfo.windowInfos[i]->GetName().c_str());252 sprintf(str,STRING_PJ_CHECK_DELETEWINDOW,projectInfo.windowInfos[i]->GetName().c_str()); 253 253 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 254 254 … … 261 261 extern char NewIdName[MAX_PATH]; 262 262 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 263 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++){264 if( ProjectInfo.res.pCursorResInfo[i].hTreeItem==hTreeItem){263 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++){ 264 if(projectInfo.res.pCursorResInfo[i].hTreeItem==hTreeItem){ 265 265 Project_Cursor_RenameID(i); 266 266 break; 267 267 } 268 268 } 269 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++){270 if( ProjectInfo.res.pBitmapResInfo[i].hTreeItem==hTreeItem){269 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++){ 270 if(projectInfo.res.pBitmapResInfo[i].hTreeItem==hTreeItem){ 271 271 Project_Bitmap_RenameID(i); 272 272 break; 273 273 } 274 274 } 275 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){276 if( ProjectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){275 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 276 if(projectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){ 277 277 Project_Icon_RenameID(i); 278 278 } 279 279 } 280 for(i=0;i< ProjectInfo.NumberOfMenu;i++){281 if( ProjectInfo.pMenuInfo[i].hTreeItem==hTreeItem){282 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,(long) ProjectInfo.pMenuInfo[i].IdName)) break;280 for(i=0;i<projectInfo.NumberOfMenu;i++){ 281 if(projectInfo.pMenuInfo[i].hTreeItem==hTreeItem){ 282 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,(long)projectInfo.pMenuInfo[i].IdName)) break; 283 283 284 284 //重複チェック 285 for(i2=0;i2< ProjectInfo.NumberOfMenu;i2++){285 for(i2=0;i2<projectInfo.NumberOfMenu;i2++){ 286 286 if(i2==i) continue; 287 if(lstrcmp(NewIdName, ProjectInfo.pMenuInfo[i2].IdName)==0){287 if(lstrcmp(NewIdName,projectInfo.pMenuInfo[i2].IdName)==0){ 288 288 //"ID \"%s\" は既にプロジェクト内に存在します。" 289 289 sprintf(temporary,STRING_DUPLICATIONERROR_ID_IN_PROJECT,NewIdName); … … 293 293 } 294 294 295 HeapDefaultFree( ProjectInfo.pMenuInfo[i].IdName);296 ProjectInfo.pMenuInfo[i].IdName=(char *)HeapAlloc(hHeap,0,lstrlen(NewIdName)+1);297 lstrcpy( ProjectInfo.pMenuInfo[i].IdName,NewIdName);295 HeapDefaultFree(projectInfo.pMenuInfo[i].IdName); 296 projectInfo.pMenuInfo[i].IdName=(char *)HeapAlloc(hHeap,0,lstrlen(NewIdName)+1); 297 lstrcpy(projectInfo.pMenuInfo[i].IdName,NewIdName); 298 298 299 299 tvItem.hItem=hTreeItem; 300 300 tvItem.mask=TVIF_TEXT; 301 tvItem.pszText= ProjectInfo.pMenuInfo[i].IdName;302 tvItem.cchTextMax=lstrlen( ProjectInfo.pMenuInfo[i].IdName)+1;301 tvItem.pszText=projectInfo.pMenuInfo[i].IdName; 302 tvItem.cchTextMax=lstrlen(projectInfo.pMenuInfo[i].IdName)+1; 303 303 TreeView_SetItem(hMaterialTreeView,&tvItem); 304 304 305 ProjectInfo.ModifyOfMaterial=1;305 projectInfo.ModifyOfMaterial=1; 306 306 307 307 TreeView_SortChildren(hMaterialTreeView, … … 315 315 RESITEMINFO TempIconResInfo; 316 316 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 317 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){318 if( ProjectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){317 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 318 if(projectInfo.res.pIconResInfo[i].hTreeItem==hTreeItem){ 319 319 if(i==0) break; 320 320 321 TempIconResInfo= ProjectInfo.res.pIconResInfo[i];321 TempIconResInfo=projectInfo.res.pIconResInfo[i]; 322 322 for(;i>0;i--) 323 ProjectInfo.res.pIconResInfo[i]=ProjectInfo.res.pIconResInfo[i-1];324 ProjectInfo.res.pIconResInfo[0]=TempIconResInfo;325 326 tvItem.hItem= ProjectInfo.res.pIconResInfo[1].hTreeItem;323 projectInfo.res.pIconResInfo[i]=projectInfo.res.pIconResInfo[i-1]; 324 projectInfo.res.pIconResInfo[0]=TempIconResInfo; 325 326 tvItem.hItem=projectInfo.res.pIconResInfo[1].hTreeItem; 327 327 tvItem.mask=TVIF_TEXT; 328 tvItem.pszText= ProjectInfo.res.pIconResInfo[1].IdName;329 tvItem.cchTextMax=lstrlen( ProjectInfo.res.pIconResInfo[1].IdName)+1;328 tvItem.pszText=projectInfo.res.pIconResInfo[1].IdName; 329 tvItem.cchTextMax=lstrlen(projectInfo.res.pIconResInfo[1].IdName)+1; 330 330 TreeView_SetItem(hMaterialTreeView,&tvItem); 331 331 332 tvItem.hItem= ProjectInfo.res.pIconResInfo[0].hTreeItem;332 tvItem.hItem=projectInfo.res.pIconResInfo[0].hTreeItem; 333 333 tvItem.mask=TVIF_TEXT; 334 sprintf(temporary,"%s (Main)", ProjectInfo.res.pIconResInfo[0].IdName);334 sprintf(temporary,"%s (Main)",projectInfo.res.pIconResInfo[0].IdName); 335 335 tvItem.pszText=temporary; 336 336 tvItem.cchTextMax=lstrlen(temporary)+1; 337 337 TreeView_SetItem(hMaterialTreeView,&tvItem); 338 338 339 ProjectInfo.ModifuOfResource=1;339 projectInfo.ModifuOfResource=1; 340 340 break; 341 341 } … … 559 559 560 560 hOldFont=(HFONT)SelectObject(hdc,hStatusFont); 561 if( ProjectInfo.name[0] ){562 sprintf(temporary,"%s \'%s\'",STRING_PROJECT, ProjectInfo.name);561 if( projectInfo.name[0] ){ 562 sprintf(temporary,"%s \'%s\'",STRING_PROJECT,projectInfo.name); 563 563 } 564 564 else{ … … 649 649 char temporary[MAX_PATH],temp2[MAX_PATH]; 650 650 651 GetRelationalPath(path, ProjectInfo.dir);651 GetRelationalPath(path,projectInfo.dir); 652 652 653 653 //重複チェック 654 if( ProjectInfo.pobj_DBFileInfo->dupli_check(path)){654 if(projectInfo.pobj_DBFileInfo->dupli_check(path)){ 655 655 //"\"%s\" ファイルは既にプロジェクト内に存在します。" 656 656 sprintf(temporary,STRING_DUPLICATIONERROR_FILE_IN_PROJECT,path); … … 668 668 669 669 670 // ProjectInfo.ppobj_DBFileInfoオブジェクトに追加671 ProjectInfo.pobj_DBFileInfo->add(path,hTreeItem);672 673 674 ProjectInfo.modify=1;670 //projectInfo.ppobj_DBFileInfoオブジェクトに追加 671 projectInfo.pobj_DBFileInfo->add(path,hTreeItem); 672 673 674 projectInfo.modify=1; 675 675 676 676 //ファイル操作によるクラスビューの再表示 … … 680 680 extern HANDLE hHeap; 681 681 682 if( ProjectInfo.pobj_DBFileInfo->IsMainFile(hTreeItem)){682 if(projectInfo.pobj_DBFileInfo->IsMainFile(hTreeItem)){ 683 683 //"このファイルはプロジェクトのメイン ファイルです。プロジェクト内から削除することはできません。" 684 684 MessageBox(hOwner,STRING_ERROR_CANT_MAINFILE,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); … … 689 689 TreeView_DeleteItem(pobj_FileTree->hTree,hTreeItem); 690 690 691 // ProjectInfo.pobj_DBFileInfoオブジェクトから削除692 ProjectInfo.pobj_DBFileInfo->del(hTreeItem);693 694 ProjectInfo.modify=1;691 //projectInfo.pobj_DBFileInfoオブジェクトから削除 692 projectInfo.pobj_DBFileInfo->del(hTreeItem); 693 694 projectInfo.modify=1; 695 695 696 696 //ファイル操作によるクラスビューの再表示 … … 707 707 708 708 //既にプロジェクトが開かれている場合は閉じる 709 if( ProjectInfo.name[0]){709 if(projectInfo.name[0]){ 710 710 if(!CloseProject()) return; 711 711 } … … 1078 1078 sprintf(temporary,"%s%s.wnd",dir,NewProjectInfo.name); 1079 1079 1080 ProjectInfo.NumberOfMenu=0;1080 projectInfo.NumberOfMenu=0; 1081 1081 SaveWindowFile( temporary, windowInfos ); 1082 1082 … … 1119 1119 TV_INSERTSTRUCT tv; 1120 1120 1121 sprintf(temporary,"%s ", ProjectInfo.name);1121 sprintf(temporary,"%s ",projectInfo.name); 1122 1122 lstrcat(temporary,STRING_PROJECT); 1123 1123 SetWindowText(hProjectView,temporary); … … 1127 1127 1128 1128 //ファイル ツリー 1129 ProjectInfo.pobj_DBFileInfo->ResetTree();1129 projectInfo.pobj_DBFileInfo->ResetTree(); 1130 1130 1131 1131 //関数ツリー … … 1142 1142 tv.item.pszText=temporary; 1143 1143 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1144 ProjectInfo.res.hCursorTreeItem=tv.hParent;1145 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++){1144 projectInfo.res.hCursorTreeItem=tv.hParent; 1145 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++){ 1146 1146 tv.item.iImage=6; 1147 1147 tv.item.iSelectedImage=6; 1148 tv.item.pszText= ProjectInfo.res.pCursorResInfo[i].IdName;1149 ProjectInfo.res.pCursorResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1148 tv.item.pszText=projectInfo.res.pCursorResInfo[i].IdName; 1149 projectInfo.res.pCursorResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1150 1150 } 1151 1151 … … 1157 1157 tv.item.pszText=temporary; 1158 1158 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1159 ProjectInfo.res.hBitmapTreeItem=tv.hParent;1160 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++){1159 projectInfo.res.hBitmapTreeItem=tv.hParent; 1160 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++){ 1161 1161 tv.item.iImage=5; 1162 1162 tv.item.iSelectedImage=5; 1163 tv.item.pszText= ProjectInfo.res.pBitmapResInfo[i].IdName;1164 ProjectInfo.res.pBitmapResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1163 tv.item.pszText=projectInfo.res.pBitmapResInfo[i].IdName; 1164 projectInfo.res.pBitmapResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1165 1165 } 1166 1166 … … 1172 1172 tv.item.pszText=temporary; 1173 1173 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1174 ProjectInfo.res.hIconTreeItem=tv.hParent;1175 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){1174 projectInfo.res.hIconTreeItem=tv.hParent; 1175 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 1176 1176 tv.item.iImage=4; 1177 1177 tv.item.iSelectedImage=4; 1178 1178 if(i==0){ 1179 sprintf(temporary,"%s (Main)", ProjectInfo.res.pIconResInfo[i].IdName);1179 sprintf(temporary,"%s (Main)",projectInfo.res.pIconResInfo[i].IdName); 1180 1180 tv.item.pszText=temporary; 1181 1181 } 1182 else tv.item.pszText= ProjectInfo.res.pIconResInfo[i].IdName;1183 ProjectInfo.res.pIconResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1182 else tv.item.pszText=projectInfo.res.pIconResInfo[i].IdName; 1183 projectInfo.res.pIconResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1184 1184 } 1185 1185 … … 1190 1190 tv.item.pszText="Menu"; 1191 1191 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1192 ProjectInfo.hMenuTreeItem=tv.hParent;1193 for(i=0;i< ProjectInfo.NumberOfMenu;i++){1192 projectInfo.hMenuTreeItem=tv.hParent; 1193 for(i=0;i<projectInfo.NumberOfMenu;i++){ 1194 1194 tv.item.iImage=3; 1195 1195 tv.item.iSelectedImage=3; 1196 tv.item.pszText= ProjectInfo.pMenuInfo[i].IdName;1197 ProjectInfo.pMenuInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1196 tv.item.pszText=projectInfo.pMenuInfo[i].IdName; 1197 projectInfo.pMenuInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1198 1198 } 1199 1199 … … 1204 1204 tv.item.pszText="Window"; 1205 1205 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1206 ProjectInfo.hWindowTreeItem=tv.hParent;1207 BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )1206 projectInfo.hWindowTreeItem=tv.hParent; 1207 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1208 1208 { 1209 1209 tv.item.iImage=2; … … 1221 1221 1222 1222 //既にプロジェクトが開かれている場合は閉じる 1223 if( ProjectInfo.name[0]){1223 if(projectInfo.name[0]){ 1224 1224 if(!CloseProject()) return; 1225 1225 } 1226 memset(&ProjectInfo,0,sizeof(PROJECTINFO));1226 //memset(&projectInfo,0,sizeof(PROJECTINFO)); 1227 1227 1228 1228 //プロジェクトの作業ディレクトリを取得 1229 _splitpath(path, ProjectInfo.dir,temporary,0,0);1230 lstrcat( ProjectInfo.dir,temporary);1229 _splitpath(path,projectInfo.dir,temporary,0,0); 1230 lstrcat(projectInfo.dir,temporary); 1231 1231 1232 1232 //ファイルを開く、保存の初期ディレクトリをセット 1233 lstrcpy(pobj_nv->DefSaveDir, ProjectInfo.dir);1233 lstrcpy(pobj_nv->DefSaveDir,projectInfo.dir); 1234 1234 1235 1235 1236 1236 ////////////////////////////////////////// 1237 1237 // リソースデータ用領域を確保 1238 ProjectInfo.res.pCursorResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);1239 ProjectInfo.res.NumberOfCursorRes=0;1240 ProjectInfo.res.pBitmapResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);1241 ProjectInfo.res.NumberOfBitmapRes=0;1242 ProjectInfo.res.pIconResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);1243 ProjectInfo.res.NumberOfIconRes=0;1238 projectInfo.res.pCursorResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1); 1239 projectInfo.res.NumberOfCursorRes=0; 1240 projectInfo.res.pBitmapResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1); 1241 projectInfo.res.NumberOfBitmapRes=0; 1242 projectInfo.res.pIconResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1); 1243 projectInfo.res.NumberOfIconRes=0; 1244 1244 1245 1245 … … 1250 1250 1251 1251 //解析 1252 ProjectInfo.pobj_DBFileInfo=new CDBFileInfo();1252 projectInfo.pobj_DBFileInfo=new CDBFileInfo(); 1253 1253 bool isUseWindow = false; 1254 1254 for(i=0;;i++){ … … 1271 1271 temporary[i2]=buffer[i]; 1272 1272 } 1273 ProjectInfo.dwVersion=GetValue(temporary);1273 projectInfo.dwVersion=GetValue(temporary); 1274 1274 } 1275 1275 else if(lstrcmpi(temporary,"MODULETYPE")==0&&buffer[i]=='='){ … … 1282 1282 temporary[i2]=buffer[i]; 1283 1283 } 1284 ProjectInfo.dwModuleType=atoi(temporary);1284 projectInfo.dwModuleType=atoi(temporary); 1285 1285 } 1286 1286 else if(lstrcmpi(temporary,"NAME")==0&&buffer[i]=='='){ 1287 1287 for(i++,i2=0;;i++,i2++){ 1288 1288 if((buffer[i]=='\r'&&buffer[i+1]=='\n')||buffer[i]=='\0'){ 1289 ProjectInfo.name[i2]=0;1289 projectInfo.name[i2]=0; 1290 1290 break; 1291 1291 } 1292 ProjectInfo.name[i2]=buffer[i];1292 projectInfo.name[i2]=buffer[i]; 1293 1293 } 1294 1294 } … … 1337 1337 temporary[i2]=buffer[i]; 1338 1338 } 1339 ProjectInfo.dwOption=GetValue(temporary);1339 projectInfo.dwOption=GetValue(temporary); 1340 1340 } 1341 1341 else if(lstrcmpi(temporary,"OUTPUT_RELEASE")==0&&buffer[i]=='='){ … … 1348 1348 temporary[i2]=buffer[i]; 1349 1349 } 1350 lstrcpy( ProjectInfo.lpszOutput_Release,temporary);1350 lstrcpy(projectInfo.lpszOutput_Release,temporary); 1351 1351 } 1352 1352 else if(lstrcmpi(temporary,"OUTPUT_DEBUG")==0&&buffer[i]=='='){ … … 1359 1359 temporary[i2]=buffer[i]; 1360 1360 } 1361 lstrcpy( ProjectInfo.lpszOutput_Debug,temporary);1361 lstrcpy(projectInfo.lpszOutput_Debug,temporary); 1362 1362 } 1363 1363 else if(lstrcmpi(temporary,"MANIFEST")==0&&buffer[i]=='='){ … … 1370 1370 temporary[i2]=buffer[i]; 1371 1371 } 1372 lstrcpy( ProjectInfo.szManifestPath,temporary);1372 lstrcpy(projectInfo.szManifestPath,temporary); 1373 1373 } 1374 1374 else if(lstrcmpi(temporary,"DEBUG_CMD_LINE")==0&&buffer[i]=='='){ … … 1381 1381 temporary[i2]=buffer[i]; 1382 1382 } 1383 lstrcpy( ProjectInfo.szCmdLine,temporary);1383 lstrcpy(projectInfo.szCmdLine,temporary); 1384 1384 } 1385 1385 else if(lstrcmpi(temporary,"DEBUG_EXE_PATH")==0&&buffer[i]=='='){ … … 1392 1392 temporary[i2]=buffer[i]; 1393 1393 } 1394 lstrcpy( ProjectInfo.szExePath,temporary);1394 lstrcpy(projectInfo.szExePath,temporary); 1395 1395 } 1396 1396 else if(lstrcmpi(temporary,"RESOURCE")==0&&buffer[i]=='='){ … … 1404 1404 } 1405 1405 if(temporary[0]!='\0'&&(!(temporary[0]=='0'&&temporary[1]=='\0'))){ 1406 lstrcpy( ProjectInfo.ResourceFileName,temporary);1406 lstrcpy(projectInfo.ResourceFileName,temporary); 1407 1407 GetResourceData(); 1408 1408 } 1409 1409 else{ 1410 sprintf( ProjectInfo.ResourceFileName,"%s.rc",ProjectInfo.name);1410 sprintf(projectInfo.ResourceFileName,"%s.rc",projectInfo.name); 1411 1411 } 1412 1412 } … … 1421 1421 } 1422 1422 if(temporary[0]=='\0') break; 1423 ProjectInfo.pobj_DBFileInfo->add(temporary,0);1423 projectInfo.pobj_DBFileInfo->add(temporary,0); 1424 1424 1425 1425 if(buffer[i]=='\0') break; … … 1441 1441 1442 1442 //古いバージョンファイルを考慮 1443 if( ProjectInfo.dwVersion<=4){1444 if( ProjectInfo.dwModuleType==MT_DLL)1445 sprintf( ProjectInfo.lpszOutput_Release,".\\%s.dll",ProjectInfo.name);1446 else sprintf( ProjectInfo.lpszOutput_Release,".\\%s.exe",ProjectInfo.name);1447 sprintf( ProjectInfo.lpszOutput_Debug,".\\%s_debug.exe",ProjectInfo.name);1443 if(projectInfo.dwVersion<=4){ 1444 if(projectInfo.dwModuleType==MT_DLL) 1445 sprintf(projectInfo.lpszOutput_Release,".\\%s.dll",projectInfo.name); 1446 else sprintf(projectInfo.lpszOutput_Release,".\\%s.exe",projectInfo.name); 1447 sprintf(projectInfo.lpszOutput_Debug,".\\%s_debug.exe",projectInfo.name); 1448 1448 } 1449 1449 1450 1450 //ブレークポイントを初期化 1451 ProjectInfo.pobj_DBBreakPoint=new CDBBreakPoint();1451 projectInfo.pobj_DBBreakPoint=new CDBBreakPoint(); 1452 1452 1453 1453 … … 1456 1456 ///////////////////////////////////////////// 1457 1457 //ウィンドウ定義ファイル(*.wnd)をオープン 1458 sprintf(temp2,"%s%s.wnd", ProjectInfo.dir,ProjectInfo.name);1458 sprintf(temp2,"%s%s.wnd",projectInfo.dir,projectInfo.name); 1459 1459 if(!OpenWindowFile(temp2)) return; 1460 1460 } 1461 1461 else{ 1462 ProjectInfo.windowInfos.Clear();1463 1464 ProjectInfo.NumberOfMenu=0;1465 ProjectInfo.pMenuInfo=(MENU_INFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);1462 projectInfo.windowInfos.Clear(); 1463 1464 projectInfo.NumberOfMenu=0; 1465 projectInfo.pMenuInfo=(MENU_INFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1); 1466 1466 } 1467 1467 … … 1485 1485 HWND hChild; 1486 1486 int WndNum; 1487 sprintf(temp2,"%s%s.wrk", ProjectInfo.dir,ProjectInfo.name);1487 sprintf(temp2,"%s%s.wrk",projectInfo.dir,projectInfo.name); 1488 1488 hFind=FindFirstFile(temp2,&wfd); 1489 1489 if(hFind!=INVALID_HANDLE_VALUE){ … … 1520 1520 temporary[i3]=temp2[i2]; 1521 1521 } 1522 GetFullPath(temporary, ProjectInfo.dir);1522 GetFullPath(temporary,projectInfo.dir); 1523 1523 hChild=OpenFileWithExtension(temporary); 1524 1524 WndNum=GetWndNum(hChild); … … 1584 1584 } 1585 1585 else if(lstrcmpi(temporary,"rad")==0){ 1586 for(i3=0;i3<static_cast<int>( ProjectInfo.windowInfos.size());i3++){1587 if(lstrcmpi( ProjectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){1588 NewRadWindow( * ProjectInfo.windowInfos[i3] );1586 for(i3=0;i3<static_cast<int>(projectInfo.windowInfos.size());i3++){ 1587 if(lstrcmpi(projectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){ 1588 NewRadWindow( *projectInfo.windowInfos[i3] ); 1589 1589 break; 1590 1590 } … … 1592 1592 } 1593 1593 else if(lstrcmpi(temporary,"menu")==0){ 1594 for(i3=0;i3< ProjectInfo.NumberOfMenu;i3++){1595 if(lstrcmpi( ProjectInfo.pMenuInfo[i3].IdName,temp2)==0){1596 NewMenuWindow(& ProjectInfo.pMenuInfo[i3]);1594 for(i3=0;i3<projectInfo.NumberOfMenu;i3++){ 1595 if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,temp2)==0){ 1596 NewMenuWindow(&projectInfo.pMenuInfo[i3]); 1597 1597 break; 1598 1598 } … … 1600 1600 } 1601 1601 else if(lstrcmpi(temporary,"icon")==0){ 1602 for(i3=0;i3< ProjectInfo.res.NumberOfIconRes;i3++){1603 if(lstrcmpi( ProjectInfo.res.pIconResInfo[i3].path,temp2)==0){1604 GetFullPath(temp2, ProjectInfo.dir);1602 for(i3=0;i3<projectInfo.res.NumberOfIconRes;i3++){ 1603 if(lstrcmpi(projectInfo.res.pIconResInfo[i3].path,temp2)==0){ 1604 GetFullPath(temp2,projectInfo.dir); 1605 1605 NewIconEditWindow(temp2); 1606 1606 break; … … 1695 1695 lstrcpy(temporary,temp2+i3+1); 1696 1696 temp2[i3]=0; 1697 GetFullPath(temporary, ProjectInfo.dir);1697 GetFullPath(temporary,projectInfo.dir); 1698 1698 sscanf(temp2,"%d",&i3); 1699 1699 … … 1706 1706 } 1707 1707 else if(lstrcmpi(temporary,"rad")==0){ 1708 for(i3=0;i3<static_cast<int>( ProjectInfo.windowInfos.size());i3++){1709 if(lstrcmpi( ProjectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){1710 NewRadWindow( * ProjectInfo.windowInfos[i3] );1708 for(i3=0;i3<static_cast<int>(projectInfo.windowInfos.size());i3++){ 1709 if(lstrcmpi(projectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){ 1710 NewRadWindow( *projectInfo.windowInfos[i3] ); 1711 1711 break; 1712 1712 } … … 1714 1714 } 1715 1715 else if(lstrcmpi(temporary,"menu")==0){ 1716 for(i3=0;i3< ProjectInfo.NumberOfMenu;i3++){1717 if(lstrcmpi( ProjectInfo.pMenuInfo[i3].IdName,temp2)==0){1718 NewMenuWindow(& ProjectInfo.pMenuInfo[i3]);1716 for(i3=0;i3<projectInfo.NumberOfMenu;i3++){ 1717 if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,temp2)==0){ 1718 NewMenuWindow(&projectInfo.pMenuInfo[i3]); 1719 1719 break; 1720 1720 } … … 1722 1722 } 1723 1723 else if(lstrcmpi(temporary,"icon")==0){ 1724 for(i3=0;i3< ProjectInfo.res.NumberOfIconRes;i3++){1725 if(lstrcmpi( ProjectInfo.res.pIconResInfo[i3].path,temp2)==0){1726 GetFullPath(temp2, ProjectInfo.dir);1724 for(i3=0;i3<projectInfo.res.NumberOfIconRes;i3++){ 1725 if(lstrcmpi(projectInfo.res.pIconResInfo[i3].path,temp2)==0){ 1726 GetFullPath(temp2,projectInfo.dir); 1727 1727 NewIconEditWindow(temp2); 1728 1728 break; … … 1802 1802 1803 1803 //ウィンドウ タイトルを変更 1804 sprintf(temporary,"%s - %s", ProjectInfo.name,APPLICATION_NAME);1804 sprintf(temporary,"%s - %s",projectInfo.name,APPLICATION_NAME); 1805 1805 SetWindowText(hOwner,temporary); 1806 1806 1807 1807 1808 ProjectInfo.modify=0;1809 ProjectInfo.ModifyOfMaterial=0;1810 ProjectInfo.ModifuOfResource=0;1808 projectInfo.modify=0; 1809 projectInfo.ModifyOfMaterial=0; 1810 projectInfo.ModifuOfResource=0; 1811 1811 } 1812 1812 BOOL ProjectModifyCheck(BOOL bRun){ … … 1815 1815 HWND hChild; 1816 1816 char temporary[MAX_PATH]; 1817 if( ProjectInfo.modify||ProjectInfo.ModifyOfMaterial||ProjectInfo.ModifuOfResource){1817 if(projectInfo.modify||projectInfo.ModifyOfMaterial||projectInfo.ModifuOfResource){ 1818 1818 if(bRun==0||pobj_nv->bSaveCheckProject){ 1819 1819 //"\"%s\" プロジェクトは変更されています。保存しますか?" 1820 sprintf(temporary,STRING_MODIFYCHECK_PROJECT, ProjectInfo.name);1820 sprintf(temporary,STRING_MODIFYCHECK_PROJECT,projectInfo.name); 1821 1821 i=MessageBox(hOwner,temporary,APPLICATION_NAME,MB_YESNOCANCEL|MB_ICONEXCLAMATION); 1822 1822 … … 1833 1833 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){ 1834 1834 if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ){ 1835 for(i=0;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){1836 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);1835 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 1836 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary); 1837 1837 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1; 1838 1838 } … … 1841 1841 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1842 1842 if(MdiInfo[WndNum].MdiIconEditInfo->bModify){ 1843 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){1844 lstrcpy(temporary, ProjectInfo.res.pIconResInfo[i].path);1845 GetFullPath(temporary, ProjectInfo.dir);1843 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 1844 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path); 1845 GetFullPath(temporary,projectInfo.dir); 1846 1846 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1; 1847 1847 } … … 1852 1852 if(bRun==0||pobj_nv->bSaveCheckProject){ 1853 1853 //"\"%s\" プロジェクトは変更されています。保存しますか?" 1854 sprintf(temporary,STRING_MODIFYCHECK_PROJECT, ProjectInfo.name);1854 sprintf(temporary,STRING_MODIFYCHECK_PROJECT,projectInfo.name); 1855 1855 i=MessageBox(hOwner,temporary,APPLICATION_NAME,MB_YESNOCANCEL|MB_ICONEXCLAMATION); 1856 1856 … … 1885 1885 WndNum=GetWndNum(hCloseChild); 1886 1886 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){ 1887 for(i=0;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){1888 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);1887 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 1888 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary); 1889 1889 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 1890 1890 … … 1898 1898 } 1899 1899 else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){ 1900 BOOST_FOREACH( const WindowInfo *pWindowInfo, ProjectInfo.windowInfos )1900 BOOST_FOREACH( const WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1901 1901 { 1902 1902 if( pWindowInfo->GetName() == MdiInfo[WndNum].path ){ … … 1907 1907 } 1908 1908 else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){ 1909 for(i=0;i< ProjectInfo.NumberOfMenu;i++){1910 if(lstrcmp(MdiInfo[WndNum].path, ProjectInfo.pMenuInfo[i].IdName)==0){1909 for(i=0;i<projectInfo.NumberOfMenu;i++){ 1910 if(lstrcmp(MdiInfo[WndNum].path,projectInfo.pMenuInfo[i].IdName)==0){ 1911 1911 SendMessage(hCloseChild,WM_CLOSE,0,0); 1912 1912 break; … … 1915 1915 } 1916 1916 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1917 for(i=0; ProjectInfo.res.NumberOfIconRes;i++){1918 lstrcpy(temporary, ProjectInfo.res.pIconResInfo[i].path);1919 GetFullPath(temporary, ProjectInfo.dir);1917 for(i=0;projectInfo.res.NumberOfIconRes;i++){ 1918 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path); 1919 GetFullPath(temporary,projectInfo.dir); 1920 1920 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 1921 1921 SendMessage(hCloseChild,WM_CLOSE,0,0); … … 1927 1927 1928 1928 //ファイル情報のメモリを解放 1929 delete ProjectInfo.pobj_DBFileInfo;1929 delete projectInfo.pobj_DBFileInfo; 1930 1930 1931 1931 //ブレークポイントのオブジェクトを解放 1932 delete ProjectInfo.pobj_DBBreakPoint;1932 delete projectInfo.pobj_DBBreakPoint; 1933 1933 1934 1934 //ウィンドウ情報のメモリを解放 1935 BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )1935 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1936 1936 { 1937 1937 HeapDefaultFree(pWindowInfo->caption); … … 1957 1957 pWindowInfo->childWindowInfos.clear(); 1958 1958 } 1959 ProjectInfo.windowInfos.Clear();1959 projectInfo.windowInfos.Clear(); 1960 1960 1961 1961 //メニュー情報のメモリを解放 1962 HeapMenuDataFree( ProjectInfo.pMenuInfo,ProjectInfo.NumberOfMenu,0);1963 HeapDefaultFree( ProjectInfo.pMenuInfo);1962 HeapMenuDataFree(projectInfo.pMenuInfo,projectInfo.NumberOfMenu,0); 1963 HeapDefaultFree(projectInfo.pMenuInfo); 1964 1964 1965 1965 //リソースのメモリを解放 1966 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++){1967 HeapDefaultFree( ProjectInfo.res.pCursorResInfo[i].IdName);1968 HeapDefaultFree( ProjectInfo.res.pCursorResInfo[i].path);1969 } 1970 HeapDefaultFree( ProjectInfo.res.pCursorResInfo);1971 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++){1972 HeapDefaultFree( ProjectInfo.res.pBitmapResInfo[i].IdName);1973 HeapDefaultFree( ProjectInfo.res.pBitmapResInfo[i].path);1974 } 1975 HeapDefaultFree( ProjectInfo.res.pBitmapResInfo);1976 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){1977 HeapDefaultFree( ProjectInfo.res.pIconResInfo[i].IdName);1978 HeapDefaultFree( ProjectInfo.res.pIconResInfo[i].path);1979 } 1980 HeapDefaultFree( ProjectInfo.res.pIconResInfo);1966 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++){ 1967 HeapDefaultFree(projectInfo.res.pCursorResInfo[i].IdName); 1968 HeapDefaultFree(projectInfo.res.pCursorResInfo[i].path); 1969 } 1970 HeapDefaultFree(projectInfo.res.pCursorResInfo); 1971 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++){ 1972 HeapDefaultFree(projectInfo.res.pBitmapResInfo[i].IdName); 1973 HeapDefaultFree(projectInfo.res.pBitmapResInfo[i].path); 1974 } 1975 HeapDefaultFree(projectInfo.res.pBitmapResInfo); 1976 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 1977 HeapDefaultFree(projectInfo.res.pIconResInfo[i].IdName); 1978 HeapDefaultFree(projectInfo.res.pIconResInfo[i].path); 1979 } 1980 HeapDefaultFree(projectInfo.res.pIconResInfo); 1981 1981 1982 1982 //プロジェクト ビューを非表示にする … … 1992 1992 SetWindowText(hOwner,APPLICATION_NAME); 1993 1993 1994 ProjectInfo.name[0]=0;1994 projectInfo.name[0]=0; 1995 1995 1996 1996 //メニュー状態を設定 … … 2017 2017 WndNum=GetWndNum(hChild); 2018 2018 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){ 2019 for(i=0;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){2020 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);2019 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 2020 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary); 2021 2021 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 2022 2022 TextEdit_GetSel(WndNum,&CharRange); … … 2032 2032 2033 2033 sprintf(buffer+i2,"text,\"%s\",%d,%d,%d,%d\r\n", 2034 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path,2034 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path, 2035 2035 pos.x, 2036 2036 pos.y, … … 2043 2043 } 2044 2044 else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){ 2045 BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )2045 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos ) 2046 2046 { 2047 2047 if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){ … … 2053 2053 } 2054 2054 else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){ 2055 for(i=0;i< ProjectInfo.NumberOfMenu;i++){2056 if(lstrcmpi(MdiInfo[WndNum].path, ProjectInfo.pMenuInfo[i].IdName)==0){2055 for(i=0;i<projectInfo.NumberOfMenu;i++){ 2056 if(lstrcmpi(MdiInfo[WndNum].path,projectInfo.pMenuInfo[i].IdName)==0){ 2057 2057 sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path); 2058 2058 i2+=lstrlen(buffer+i2); … … 2062 2062 } 2063 2063 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 2064 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){2065 lstrcpy(temporary, ProjectInfo.res.pIconResInfo[i].path);2066 GetFullPath(temporary, ProjectInfo.dir);2064 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 2065 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path); 2066 GetFullPath(temporary,projectInfo.dir); 2067 2067 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 2068 sprintf(buffer+i2,"icon,%s\r\n", ProjectInfo.res.pIconResInfo[i].path);2068 sprintf(buffer+i2,"icon,%s\r\n",projectInfo.res.pIconResInfo[i].path); 2069 2069 i2+=lstrlen(buffer+i2); 2070 2070 break; … … 2116 2116 2117 2117 //保存 2118 sprintf(temporary,"%s%s.wrk", ProjectInfo.dir,ProjectInfo.name);2118 sprintf(temporary,"%s%s.wrk",projectInfo.dir,projectInfo.name); 2119 2119 WriteBuffer(temporary,buffer,i2); 2120 2120 } … … 2129 2129 2130 2130 //プロジェクトファイルのバージョンを設定 2131 ProjectInfo.dwVersion=PROJECT_VERSION;2131 projectInfo.dwVersion=PROJECT_VERSION; 2132 2132 2133 2133 hChild=GetWindow(hClient,GW_CHILD); … … 2136 2136 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){ 2137 2137 if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ){ 2138 for(i=0;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){2139 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);2138 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 2139 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary); 2140 2140 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 2141 2141 SaveDocument(hChild,NULL); … … 2147 2147 if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 2148 2148 if(MdiInfo[WndNum].MdiIconEditInfo->bModify){ 2149 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){2150 lstrcpy(temporary, ProjectInfo.res.pIconResInfo[i].path);2151 GetFullPath(temporary, ProjectInfo.dir);2149 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 2150 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path); 2151 GetFullPath(temporary,projectInfo.dir); 2152 2152 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 2153 2153 SaveDocument(hChild,NULL); … … 2165 2165 lstrcpy(buffer,"\' ActiveBasic Project file.\r\n\r\n"); 2166 2166 i2=lstrlen(buffer); 2167 sprintf(buffer+i2,"#VERSION=%d\r\n\r\n", ProjectInfo.dwVersion);2167 sprintf(buffer+i2,"#VERSION=%d\r\n\r\n",projectInfo.dwVersion); 2168 2168 i2+=lstrlen(buffer+i2); 2169 sprintf(buffer+i2,"#MODULETYPE=%d\r\n\r\n", ProjectInfo.dwModuleType);2169 sprintf(buffer+i2,"#MODULETYPE=%d\r\n\r\n",projectInfo.dwModuleType); 2170 2170 i2+=lstrlen(buffer+i2); 2171 sprintf(buffer+i2,"#NAME=%s\r\n\r\n", ProjectInfo.name);2171 sprintf(buffer+i2,"#NAME=%s\r\n\r\n",projectInfo.name); 2172 2172 i2+=lstrlen(buffer+i2); 2173 2173 extern HWND hSelectCompilerCombo; 2174 2174 if(SendMessage(hSelectCompilerCombo,CB_GETCURSEL,0,0)==0){ 2175 sprintf(buffer+i2,"#PLATFORM=32\r\n\r\n", ProjectInfo.name);2175 sprintf(buffer+i2,"#PLATFORM=32\r\n\r\n",projectInfo.name); 2176 2176 i2+=lstrlen(buffer+i2); 2177 2177 } 2178 2178 else{ 2179 sprintf(buffer+i2,"#PLATFORM=64\r\n\r\n", ProjectInfo.name);2179 sprintf(buffer+i2,"#PLATFORM=64\r\n\r\n",projectInfo.name); 2180 2180 i2+=lstrlen(buffer+i2); 2181 2181 } 2182 sprintf(buffer+i2,"#USEWINDOW=%d\r\n\r\n", ProjectInfo.windowInfos.size());2182 sprintf(buffer+i2,"#USEWINDOW=%d\r\n\r\n",projectInfo.windowInfos.size()); 2183 2183 i2+=lstrlen(buffer+i2); 2184 sprintf(buffer+i2,"#OPTION=&H%08x\r\n\r\n", ProjectInfo.dwOption);2184 sprintf(buffer+i2,"#OPTION=&H%08x\r\n\r\n",projectInfo.dwOption); 2185 2185 i2+=lstrlen(buffer+i2); 2186 sprintf(buffer+i2,"#OUTPUT_RELEASE=%s\r\n\r\n", ProjectInfo.lpszOutput_Release);2186 sprintf(buffer+i2,"#OUTPUT_RELEASE=%s\r\n\r\n",projectInfo.lpszOutput_Release); 2187 2187 i2+=lstrlen(buffer+i2); 2188 sprintf(buffer+i2,"#OUTPUT_DEBUG=%s\r\n\r\n", ProjectInfo.lpszOutput_Debug);2188 sprintf(buffer+i2,"#OUTPUT_DEBUG=%s\r\n\r\n",projectInfo.lpszOutput_Debug); 2189 2189 i2+=lstrlen(buffer+i2); 2190 sprintf(buffer+i2,"#MANIFEST=%s\r\n\r\n", ProjectInfo.szManifestPath);2190 sprintf(buffer+i2,"#MANIFEST=%s\r\n\r\n",projectInfo.szManifestPath); 2191 2191 i2+=lstrlen(buffer+i2); 2192 sprintf(buffer+i2,"#DEBUG_CMD_LINE=%s\r\n\r\n", ProjectInfo.szCmdLine);2192 sprintf(buffer+i2,"#DEBUG_CMD_LINE=%s\r\n\r\n",projectInfo.szCmdLine); 2193 2193 i2+=lstrlen(buffer+i2); 2194 sprintf(buffer+i2,"#DEBUG_EXE_PATH=%s\r\n\r\n", ProjectInfo.szExePath);2194 sprintf(buffer+i2,"#DEBUG_EXE_PATH=%s\r\n\r\n",projectInfo.szExePath); 2195 2195 i2+=lstrlen(buffer+i2); 2196 if( ProjectInfo.ResourceFileName[0]){2197 sprintf(buffer+i2,"#RESOURCE=%s\r\n\r\n", ProjectInfo.ResourceFileName);2196 if(projectInfo.ResourceFileName[0]){ 2197 sprintf(buffer+i2,"#RESOURCE=%s\r\n\r\n",projectInfo.ResourceFileName); 2198 2198 i2+=lstrlen(buffer+i2); 2199 2199 } … … 2204 2204 sprintf(buffer+i2,"#SOURCE\r\n"); 2205 2205 i2+=lstrlen(buffer+i2); 2206 for(i=0;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){2207 sprintf(buffer+i2,"%s\r\n", ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path);2206 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 2207 sprintf(buffer+i2,"%s\r\n",projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path); 2208 2208 i2+=lstrlen(buffer+i2); 2209 2209 } 2210 2210 2211 2211 //保存 2212 sprintf(temporary,"%s%s.pj", ProjectInfo.dir,ProjectInfo.name);2212 sprintf(temporary,"%s%s.pj",projectInfo.dir,projectInfo.name); 2213 2213 WriteBuffer(temporary,buffer,i2); 2214 2214 … … 2216 2216 ////////////////////////////////// 2217 2217 // リソースファイル(*.rc、resource.ab)を作成 2218 if( ProjectInfo.ResourceFileName[0]){2218 if(projectInfo.ResourceFileName[0]){ 2219 2219 i2=0; 2220 2220 i3=101; 2221 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++,i3++){2221 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++,i3++){ 2222 2222 sprintf(buffer+i2,"Const %s=%d\r\n", 2223 ProjectInfo.res.pCursorResInfo[i].IdName,2223 projectInfo.res.pCursorResInfo[i].IdName, 2224 2224 i3); 2225 2225 i2+=lstrlen(buffer+i2); 2226 2226 } 2227 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++,i3++){2227 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++,i3++){ 2228 2228 sprintf(buffer+i2,"Const %s=%d\r\n", 2229 ProjectInfo.res.pBitmapResInfo[i].IdName,2229 projectInfo.res.pBitmapResInfo[i].IdName, 2230 2230 i3); 2231 2231 i2+=lstrlen(buffer+i2); 2232 2232 } 2233 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++,i3++){2233 for(i=0;i<projectInfo.res.NumberOfIconRes;i++,i3++){ 2234 2234 sprintf(buffer+i2,"Const %s=%d\r\n", 2235 ProjectInfo.res.pIconResInfo[i].IdName,2235 projectInfo.res.pIconResInfo[i].IdName, 2236 2236 i3); 2237 2237 i2+=lstrlen(buffer+i2); … … 2240 2240 //保存(resource.ab) 2241 2241 lstrcpy(temporary,"resource.ab"); 2242 GetFullPath(temporary, ProjectInfo.dir);2242 GetFullPath(temporary,projectInfo.dir); 2243 2243 WriteBuffer(temporary,buffer,i2); 2244 2244 2245 2245 i2=0; 2246 for(i=0;i< ProjectInfo.res.NumberOfCursorRes;i++){2246 for(i=0;i<projectInfo.res.NumberOfCursorRes;i++){ 2247 2247 sprintf(buffer+i2,"%s CURSOR \"%s\"\r\n", 2248 ProjectInfo.res.pCursorResInfo[i].IdName,2249 ProjectInfo.res.pCursorResInfo[i].path);2248 projectInfo.res.pCursorResInfo[i].IdName, 2249 projectInfo.res.pCursorResInfo[i].path); 2250 2250 i2+=lstrlen(buffer+i2); 2251 2251 } 2252 for(i=0;i< ProjectInfo.res.NumberOfBitmapRes;i++){2252 for(i=0;i<projectInfo.res.NumberOfBitmapRes;i++){ 2253 2253 sprintf(buffer+i2,"%s BITMAP \"%s\"\r\n", 2254 ProjectInfo.res.pBitmapResInfo[i].IdName,2255 ProjectInfo.res.pBitmapResInfo[i].path);2254 projectInfo.res.pBitmapResInfo[i].IdName, 2255 projectInfo.res.pBitmapResInfo[i].path); 2256 2256 i2+=lstrlen(buffer+i2); 2257 2257 } 2258 for(i=0;i< ProjectInfo.res.NumberOfIconRes;i++){2258 for(i=0;i<projectInfo.res.NumberOfIconRes;i++){ 2259 2259 sprintf(buffer+i2,"%s ICON \"%s\"\r\n", 2260 ProjectInfo.res.pIconResInfo[i].IdName,2261 ProjectInfo.res.pIconResInfo[i].path);2260 projectInfo.res.pIconResInfo[i].IdName, 2261 projectInfo.res.pIconResInfo[i].path); 2262 2262 i2+=lstrlen(buffer+i2); 2263 2263 } 2264 2264 2265 2265 //マニフェスト 2266 if( ProjectInfo.dwOption&PJ_OP_RC_MANIFEST){2266 if(projectInfo.dwOption&PJ_OP_RC_MANIFEST){ 2267 2267 sprintf(buffer+i2,"CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST \"%s\"\r\n", 2268 ProjectInfo.szManifestPath);2268 projectInfo.szManifestPath); 2269 2269 i2+=lstrlen(buffer+i2); 2270 2270 } 2271 2271 2272 2272 //保存 2273 lstrcpy(temporary, ProjectInfo.ResourceFileName);2274 GetFullPath(temporary, ProjectInfo.dir);2273 lstrcpy(temporary,projectInfo.ResourceFileName); 2274 GetFullPath(temporary,projectInfo.dir); 2275 2275 WriteBuffer(temporary,buffer,i2); 2276 2276 } … … 2282 2282 lstrcpy(buffer,"' インデックス プログラム\r\n"); 2283 2283 i2=lstrlen(buffer); 2284 if( ProjectInfo.dwOption&PJ_OP_SOURCE_MASK){2285 if( ProjectInfo.dwOption&PJ_OP_STRICT){2284 if(projectInfo.dwOption&PJ_OP_SOURCE_MASK){ 2285 if(projectInfo.dwOption&PJ_OP_STRICT){ 2286 2286 /* #strictディレクティブは今は使われていない 2287 2287 lstrcpy(buffer+i2,"\r\n"); … … 2297 2297 lstrcpy(buffer+i2,"'Win32APIの定義ファイル\r\n"); 2298 2298 i2+=lstrlen(buffer+i2); 2299 if( ProjectInfo.dwOption&PJ_OP_MMSYSTEM){2299 if(projectInfo.dwOption&PJ_OP_MMSYSTEM){ 2300 2300 lstrcpy(buffer+i2,"#include <api_mmsys.sbp>\r\n"); 2301 2301 i2+=lstrlen(buffer+i2); 2302 2302 } 2303 if( ProjectInfo.dwOption&PJ_OP_COMMCTRL){2303 if(projectInfo.dwOption&PJ_OP_COMMCTRL){ 2304 2304 lstrcpy(buffer+i2,"#include <api_commctrl.sbp>\r\n"); 2305 2305 i2+=lstrlen(buffer+i2); 2306 2306 } 2307 if( ProjectInfo.dwOption&PJ_OP_RICHEDIT){2307 if(projectInfo.dwOption&PJ_OP_RICHEDIT){ 2308 2308 lstrcpy(buffer+i2,"#include <api_richedit.sbp>\r\n"); 2309 2309 i2+=lstrlen(buffer+i2); 2310 2310 } 2311 if( ProjectInfo.dwOption&PJ_OP_WINSOCK){2311 if(projectInfo.dwOption&PJ_OP_WINSOCK){ 2312 2312 lstrcpy(buffer+i2,"#include <api_winsock2.sbp>\r\n"); 2313 2313 i2+=lstrlen(buffer+i2); 2314 2314 } 2315 2315 } 2316 if( ! ProjectInfo.windowInfos.empty() )2316 if( !projectInfo.windowInfos.empty() ) 2317 2317 { 2318 2318 lstrcpy(buffer+i2,"\r\n"); … … 2323 2323 i2+=lstrlen(buffer+i2); 2324 2324 } 2325 if( ProjectInfo.pobj_DBFileInfo->iNum>1){2325 if(projectInfo.pobj_DBFileInfo->iNum>1){ 2326 2326 lstrcpy(buffer+i2,"\r\n"); 2327 2327 i2+=lstrlen(buffer+i2); 2328 2328 lstrcpy(buffer+i2,"'プロジェクト内のプログラム ファイル\r\n"); 2329 2329 i2+=lstrlen(buffer+i2); 2330 for(i=1;i< ProjectInfo.pobj_DBFileInfo->iNum;i++){2330 for(i=1;i<projectInfo.pobj_DBFileInfo->iNum;i++){ 2331 2331 //メインファイルは含まない 2332 sprintf(buffer+i2,"#include \"%s\"\r\n", ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path);2332 sprintf(buffer+i2,"#include \"%s\"\r\n",projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path); 2333 2333 i2+=lstrlen(buffer+i2); 2334 2334 lstrcpy(buffer+i2,"_ClearNamespaceImported\r\n"); … … 2336 2336 } 2337 2337 } 2338 if( ! ProjectInfo.windowInfos.empty() )2338 if( !projectInfo.windowInfos.empty() ) 2339 2339 { 2340 2340 lstrcpy(buffer+i2,"\r\n"); … … 2345 2345 i2+=lstrlen(buffer+i2); 2346 2346 } 2347 if( ProjectInfo.ResourceFileName[0]){2347 if(projectInfo.ResourceFileName[0]){ 2348 2348 //リソースファイルが含まれる場合 2349 2349 lstrcpy(buffer+i2,"\r\n"); … … 2353 2353 lstrcpy(buffer+i2,"#include \"resource.ab\"\r\n"); 2354 2354 i2+=lstrlen(buffer+i2); 2355 sprintf(buffer+i2,"#resource \"%s.rc\"\r\n", ProjectInfo.name);2355 sprintf(buffer+i2,"#resource \"%s.rc\"\r\n",projectInfo.name); 2356 2356 i2+=lstrlen(buffer+i2); 2357 2357 } 2358 2358 2359 2359 //保存 2360 sprintf(temporary,"%s%s.idx", ProjectInfo.dir,ProjectInfo.name);2360 sprintf(temporary,"%s%s.idx",projectInfo.dir,projectInfo.name); 2361 2361 WriteBuffer(temporary,buffer,i2); 2362 2362 2363 2363 2364 if( ! ProjectInfo.windowInfos.empty() )2364 if( !projectInfo.windowInfos.empty() ) 2365 2365 { 2366 2366 ///////////////////////////////////////////////////// 2367 2367 //ウィンドウ関連ファイル(*.wnd)を作成、保存 2368 if( ProjectInfo.ModifyOfMaterial){2369 sprintf(temporary,"%s%s.wnd", ProjectInfo.dir,ProjectInfo.name);2370 SaveWindowFile( temporary, ProjectInfo.windowInfos );2368 if(projectInfo.ModifyOfMaterial){ 2369 sprintf(temporary,"%s%s.wnd",projectInfo.dir,projectInfo.name); 2370 SaveWindowFile( temporary, projectInfo.windowInfos ); 2371 2371 } 2372 2372 … … 2380 2380 SetStatusText(""); 2381 2381 2382 ProjectInfo.modify=0;2383 ProjectInfo.ModifuOfResource=0;2382 projectInfo.modify=0; 2383 projectInfo.ModifuOfResource=0; 2384 2384 } 2385 2385 … … 2388 2388 WIN32_FIND_DATA wfd; 2389 2389 2390 if( ProjectInfo.pobj_DBFileInfo->iNum==0){2390 if(projectInfo.pobj_DBFileInfo->iNum==0){ 2391 2391 //"プログラム ファイルがプロジェクトに存在しません。" 2392 2392 MessageBox(hOwner,STRING_ERROR_NOFILE,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); … … 2404 2404 2405 2405 //プロジェクト構造のバージョンが違う時は、再保存する 2406 if( ProjectInfo.dwVersion<PROJECT_VERSION)2407 ProjectInfo.ModifyOfMaterial=1;2406 if(projectInfo.dwVersion<PROJECT_VERSION) 2407 projectInfo.ModifyOfMaterial=1; 2408 2408 2409 2409 //保存確認 … … 2419 2419 FILETIME SourceTime,ExeTime; 2420 2420 2421 if(bDebug) lstrcpy(temporary, ProjectInfo.lpszOutput_Debug);2422 else lstrcpy(temporary, ProjectInfo.lpszOutput_Release);2423 GetFullPath(temporary, ProjectInfo.dir);2421 if(bDebug) lstrcpy(temporary,projectInfo.lpszOutput_Debug); 2422 else lstrcpy(temporary,projectInfo.lpszOutput_Release); 2423 GetFullPath(temporary,projectInfo.dir); 2424 2424 2425 2425 hFind=FindFirstFile(temporary,&wfd); … … 2431 2431 CloseHandle(hFile); 2432 2432 2433 for(i2=0;i2< ProjectInfo.pobj_DBFileInfo->iNum;i2++){2434 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i2]->GetFullPath(temporary);2433 for(i2=0;i2<projectInfo.pobj_DBFileInfo->iNum;i2++){ 2434 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i2]->GetFullPath(temporary); 2435 2435 hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 2436 2436 GetFileTime(hFile,NULL,NULL,&SourceTime); … … 2441 2441 SourceTime.dwLowDateTime>ExeTime.dwLowDateTime) return 1; 2442 2442 } 2443 if( ! ProjectInfo.windowInfos.empty() )2443 if( !projectInfo.windowInfos.empty() ) 2444 2444 { 2445 2445 //CallBack.wbp 2446 2446 lstrcpy(temporary,"CallBack.wbp"); 2447 GetFullPath(temporary, ProjectInfo.dir);2447 GetFullPath(temporary,projectInfo.dir); 2448 2448 hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 2449 2449 GetFileTime(hFile,NULL,NULL,&SourceTime); … … 2455 2455 //MakeWindow.wbp 2456 2456 lstrcpy(temporary,"MakeWindow.wbp"); 2457 GetFullPath(temporary, ProjectInfo.dir);2457 GetFullPath(temporary,projectInfo.dir); 2458 2458 hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 2459 2459 GetFileTime(hFile,NULL,NULL,&SourceTime);
Note:
See TracChangeset
for help on using the changeset viewer.