Changeset 769 in dev for trunk

Timestamp:

Mar 28, 2009, 12:12:58 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

読み取りのみのファイル操作の場合、CreateFileでFILE_SHARE_READ指定を追加。コンパイラを同時起動しても正常動作させるための修正。

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/RSrcSection.cpp (modified) (7 diffs)
• abdev/ab_common/src/Lexical/Source.cpp (modified) (1 diff)
• abdev/ab_common/src/ResourceManager/ResourceManager.cpp (modified) (1 diff)
• abdev/abdev/DocumentAdvice.cpp (modified) (1 diff)
• abdev/compiler_x64/MakePeHdr.cpp (modified) (1 diff)
• jenga/include/common/File.h (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/RSrcSection.cpp

@@ -98 +98 @@
     foreach( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.cursorResources )
     {
-        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
@@ -118 +118 @@
     foreach( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.bitmapResources )
     {
-        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
@@ -130 +130 @@
     foreach( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.iconResources )
     {
-        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
@@ -661 +661 @@
     //カーソルリソース
     for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){
-        hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,compiler.resourceManager.cursorResources[i3].filepath.c_str(),-1);
@@ -741 +741 @@
     //ビットマップリソース
     for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){
-        hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,compiler.resourceManager.bitmapResources[i3].filepath.c_str(),-1);
@@ -769 +769 @@
     //アイコンリソース
     for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){
-        hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(23,compiler.resourceManager.iconResources[i3].filepath.c_str(),-1);
@@ -852 +852 @@
     if( !compiler.resourceManager.manifestFilePath.empty() )
     {
-        hFile=CreateFile(compiler.resourceManager.manifestFilePath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(compiler.resourceManager.manifestFilePath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
             compiler.errorMessenger.Output(59,compiler.resourceManager.manifestFilePath.c_str(),-1);

trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

@@ -320 +320 @@
 bool Text::ReadFile( const std::string &filePath ){
     //ファイルオープン
-    HANDLE hFile=CreateFile(filePath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    HANDLE hFile=CreateFile(filePath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
-        return false;
+        DebugBreak(); return false;
     }
 

trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp

@@ -22 +22 @@
     HANDLE hFile;
 
-    hFile=CreateFile(resourceFilePath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(resourceFilePath.c_str(),GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE)
     {

trunk/ab5.0/abdev/abdev/DocumentAdvice.cpp

@@ -186 +186 @@
             if(i3==MdiInfo.size()){
                 //ファイルから開く
-                ATL::CHandle fh(CreateFile(temporary,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+                ATL::CHandle fh(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
                 if(fh==INVALID_HANDLE_VALUE){
                     fh.Detach();

trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

@@ -1131 +1131 @@
     hFile=CreateFile(
         ( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dosstub.pgm" ).c_str(),
-        GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
         MessageBox(hOwnerEditor,"dosstub.pgmの読み込みに失敗","error",MB_OK);

trunk/ab5.0/jenga/include/common/File.h

@@ -18 +18 @@
     std::string Read()
     {
-        HANDLE hFile = CreateFile( filePath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+        HANDLE hFile = CreateFile( filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
         if( hFile == INVALID_HANDLE_VALUE )
         {
@@ -38 +38 @@
     bool ReadBinary( Binary &binary )
     {
-        HANDLE hFile = CreateFile( filePath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+        HANDLE hFile = CreateFile( filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
         if( hFile == INVALID_HANDLE_VALUE )
         {