Changeset 798 in dev for branches/egtra


Ignore:
Timestamp:
Feb 5, 2011, 11:43:01 PM (14 years ago)
Author:
イグトランス (egtra)
Message:

PSAPIを使用している箇所について、Toolhelp32と選択するよう修正

Location:
branches/egtra/ab5.0/abdev
Files:
7 added
15 edited

Legend:

Unmodified
Added
Removed

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp

    r773 r798  
    377377BOOL CALLBACK DlgCompile(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
    378378    extern HANDLE hDebugProcess;
     379    extern DWORD processIdDebug;
    379380    char temporary[MAX_PATH];
    380381    RECT rect;
    … …  
    444445                            TerminateProcess(hDebugProcess,0);
    445446                            hDebugProcess=0;
     447                            processIdDebug = 0;
    446448
    447449                            //デバッグダイアログを終了
    … …  
    475477                        TerminateProcess(hDebugProcess,0);
    476478                        hDebugProcess=0;
     479                        processIdDebug = 0;
    477480
    478481                        //デバッグダイアログを終了

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp

    r741 r798  
    44#include "DebugSection.h"
    55
     6#include <ProcessAndModule.h>
    67
    78//デバッグ用
    … …  
    1011
    1112extern HANDLE hDebugProcess;
     13extern DWORD processIdDebug;
    1214extern DebugSectionCollection debugSectionCollection;
    1315
    … …  
    6769
    6870    //マッピングされているモジュールのイメージベースを取得
    69     HMODULE array_hModule[1024];
    70     DWORD cbReturned;
    71     if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
     71    //HMODULE array_hModule[1024];
     72    //DWORD cbReturned;
     73    //if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
     74    auto modules = ActiveBasic::Common::GetModules(processIdDebug);
    7275
    73     int i;
    7476    HMODULE hTargetModule=0;
    75     for(i=0;i<(int)(cbReturned/sizeof(HMODULE));i++){
    76         if((LONG_PTR)array_hModule[i]<=(LONG_PTR)EIP_RIP(Context)){
    77             if(hTargetModule<array_hModule[i]) hTargetModule=array_hModule[i];
     77    for (std::size_t i = 0; i < modules.size(); ++i)
     78    {
     79        if ((LONG_PTR)modules[i]<=(LONG_PTR)EIP_RIP(Context))
     80        {
     81            if (hTargetModule<modules[i])
     82            {
     83                hTargetModule=modules[i];
     84            }
    7885        }
    7986    }
    … …  
    8188    extern DWORD ImageBase;
    8289    if((HMODULE)(ULONG_PTR)ImageBase!=hTargetModule){
    83         for(i=0;i<debugSectionCollection.debugSections.size();i++){
     90        for(std::size_t i=0;i<debugSectionCollection.debugSections.size();i++){
    8491            if((HMODULE)(ULONG_PTR)debugSectionCollection.debugSections[i]->dwImageBase==hTargetModule){
    8592                debugSectionCollection.choice(i);

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

    r750 r798  
    99#include "../BasicCompiler_Common/debug.h"
    1010
     11#include <Path.h>
     12#include <ProcessAndModule.h>
     13
    1114char *OpBuffer;
    1215
    … …  
    1417
    1518HANDLE hDebugProcess;
     19DWORD processIdDebug;
    1620
    1721DWORD _DebugSys_dwThreadID[MAX_DEBUG_THREAD];
    … …  
    155159    TerminateProcess(hDebugProcess,0);
    156160    hDebugProcess=0;
     161    processIdDebug = 0;
    157162
    158163    //デバッグダイアログを終了
    … …  
    435440    if( program.IsAttach() )
    436441    {
    437         //プロセスIDを元にハンドルを取得
    438         HANDLE hProcess;
    439         hProcess=OpenProcess(PROCESS_ALL_ACCESS,0, program.GetAttachProcessId() );
    440         if(!hProcess) goto AttachError;
    441 
    442         //そのプロセスにおける実行モジュールのインスタンスハンドルを取得
    443         HINSTANCE hModule;
    444         DWORD cbReturned;
    445         if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned )) goto AttachError;
     442        ////プロセスIDを元にハンドルを取得
     443        //HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS,0, program.GetAttachProcessId() );
     444        //if(!hProcess)
     445        //{
     446        //  DebugMessage("アタッチに失敗しました。");
     447        //  return;
     448        //}
     449
     450        ////そのプロセスにおける実行モジュールのインスタンスハンドルを取得
     451        //HINSTANCE hModule;
     452        //DWORD cbReturned;
     453        //if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned ))
     454        //{
     455        //  DebugMessage("アタッチに失敗しました。");
     456        //  return;
     457        //}
    446458
    447459        //実行ファイル名を取得
    448         char tempOutputFileName[MAX_PATH];
    449         GetModuleFileNameEx(hProcess,hModule,tempOutputFileName,MAX_PATH);
    450         program.SetOutputFilePath( tempOutputFileName );
    451 
    452         CloseHandle(hProcess);
     460        auto tempOutputFilePath = ActiveBasic::Common::GetExecutableModulePath(program.GetAttachProcessId());
     461        program.SetOutputFilePath( tempOutputFilePath.string().c_str() );
     462
     463        //CloseHandle(hProcess);
    453464
    454465/*
    … …  
    456467        pobj_DebugSection->load(program.GetOutputFilePath().c_str());*/
    457468
    458         if(!DebugActiveProcess( program.GetAttachProcessId() )){
    459 AttachError:
     469        if(!DebugActiveProcess( program.GetAttachProcessId() ))
     470        {
    460471            DebugMessage("アタッチに失敗しました。");
    461472            return;
    … …  
    532543            else{
    533544Attach_DllLoad:
    534                 //アタッチした場合
    535                 GetModuleFileNameEx(hDebugProcess,(HINSTANCE)de.u.LoadDll.lpBaseOfDll,temporary,MAX_PATH);
     545                {
     546                    //アタッチした場合
     547                    auto path = ActiveBasic::Common::GetModuleFilePath(hDebugProcess, reinterpret_cast<HINSTANCE>(de.u.LoadDll.lpBaseOfDll));
     548                    strncpy_s(temporary, path.string().c_str(), _TRUNCATE);
     549                }
    536550            }
    537551
    … …  
    562576            hDebugProcess=de.u.CreateProcessInfo.hProcess;
    563577            hMainThread=de.u.CreateProcessInfo.hThread;
     578            processIdDebug = de.dwProcessId;
    564579
    565580            if(debugSectionCollection.add((HMODULE)de.u.CreateProcessInfo.lpBaseOfImage)){

  • branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp

    r787 r798  
    11#include "stdafx.h"
    2 
    3 static OSVERSIONINFO GetVersionEx2()
    4 {
    5     OSVERSIONINFO vi = {sizeof vi};
    6     GetVersionEx(&vi);
    7     return vi;
    8 }
    9 
    10 static OSVERSIONINFO const vi = GetVersionEx2();
    11 
    12 
     2#include "OSVersion.h"
    133
    144static HMODULE hmodKernel;
    … …  
    146136            if (InitializeCriticalSectionAndSpinCount_Real != nullptr)
    147137            {
    148                 OSVERSIONINFO vi = {sizeof vi};
    149                 ::GetVersionEx(&vi);
    150138                BOOL ret = InitializeCriticalSectionAndSpinCount_Real(lpcs, spinCount);
    151                 return vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS
     139                return ActiveBasic::Common::Is9x()
    152140                    ? TRUE
    153141                    : ret;

  • branches/egtra/ab5.0/abdev/ab-common-32.props

    r781 r798  
    77    <ClCompile>
    88      <PreprocessorDefinitions>WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     9      <EnablePREfast>true</EnablePREfast>
    910    </ClCompile>
     11    <Link>
     12      <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     13    </Link>
    1014  </ItemDefinitionGroup>
    1115  <ItemGroup />

  • branches/egtra/ab5.0/abdev/ab-common.props

    r788 r798  
    44  <PropertyGroup Label="UserMacros" />
    55  <PropertyGroup>
    6     <OutDir>$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
     6    <OutDir>$(SolutionDir)out\$(Configuration)-$(Platform)\</OutDir>
    77  </PropertyGroup>
    88  <PropertyGroup>
    9     <IntDir>$(Configuration)-$(Platform)\</IntDir>
     9    <IntDir>$(SolutionDir)int\$(ProjectName)\$(Configuration)-$(Platform)\</IntDir>
    1010  </PropertyGroup>
    1111  <ItemDefinitionGroup>
    1212    <ClCompile>
    13       <AdditionalIncludeDirectories>..\..;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;$(SolutionDir)abdev-impl;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     13      <AdditionalIncludeDirectories>$(SolutionDir)ab_common\include;$(SolutionDir)..;$(SolutionDir)..\cpplibs;$(SolutionDir)..\cpplibs\boost;$(SolutionDir)..\cpplibs\WTL80\include;$(SolutionDir)abdev-impl;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1414    </ClCompile>
    1515  </ItemDefinitionGroup>
    … …  
    2020      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    2121      <ExceptionHandling>Async</ExceptionHandling>
     22      <PreprocessorDefinitions>WIN32;_SECURE_ATL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2223    </ClCompile>
     24    <Link>
     25      <GenerateDebugInformation>true</GenerateDebugInformation>
     26    </Link>
    2327  </ItemDefinitionGroup>
    2428  <ItemGroup />

  • branches/egtra/ab5.0/abdev/ab-test/ab-test.vcxproj

    r782 r798  
    5252  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    5353    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     54    <Import Project="..\ab-common.props" />
    5455    <Import Project="..\ab-common-32.props" />
    55     <Import Project="..\ab-common.props" />
    5656  </ImportGroup>
    5757  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5858    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5959    <Import Project="..\ab-common.props" />
     60    <Import Project="..\ab-common-64.props" />
    6061  </ImportGroup>
    6162  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    6263    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     64    <Import Project="..\ab-common.props" />
    6365    <Import Project="..\ab-common-32.props" />
    64     <Import Project="..\ab-common.props" />
    6566  </ImportGroup>
    6667  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6768    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6869    <Import Project="..\ab-common.props" />
     70    <Import Project="..\ab-common-64.props" />
    6971  </ImportGroup>
    7072  <PropertyGroup Label="UserMacros" />
    … …  
    9092    <Link>
    9193      <SubSystem>Console</SubSystem>
    92       <GenerateDebugInformation>true</GenerateDebugInformation>
    9394      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
    9495    </Link>
    … …  
    103104    <Link>
    104105      <SubSystem>Console</SubSystem>
    105       <GenerateDebugInformation>true</GenerateDebugInformation>
    106106      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
    107107    </Link>
    … …  
    118118    <Link>
    119119      <SubSystem>Console</SubSystem>
    120       <GenerateDebugInformation>true</GenerateDebugInformation>
    121120      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    122121      <OptimizeReferences>true</OptimizeReferences>
    … …  
    135134    <Link>
    136135      <SubSystem>Console</SubSystem>
    137       <GenerateDebugInformation>true</GenerateDebugInformation>
    138136      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    139137      <OptimizeReferences>true</OptimizeReferences>

  • branches/egtra/ab5.0/abdev/ab-test/stdafx.h

    r781 r798  
    44
    55#define BOOST_FILESYSTEM_VERSION 3
     6#define BOOST_FILESYSTEM_NO_DEPRECATED
    67
    78#include <memory>

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

    r781 r798  
    5252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5353    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     54    <Import Project="..\ab-common.props" />
     55    <Import Project="..\ab-common-32.props" />
    5456  </ImportGroup>
    5557  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5658    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     59    <Import Project="..\ab-common.props" />
     60    <Import Project="..\ab-common-32.props" />
    5761  </ImportGroup>
    5862  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5963    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     64    <Import Project="..\ab-common.props" />
     65    <Import Project="..\ab-common-64.props" />
    6066  </ImportGroup>
    6167  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6268    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     69    <Import Project="..\ab-common.props" />
     70    <Import Project="..\ab-common-64.props" />
    6371  </ImportGroup>
    6472  <PropertyGroup Label="UserMacros" />
    6573  <PropertyGroup>
    6674    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    67     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    68     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</IntDir>
    69     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    70     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</IntDir>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</IntDir>
    73     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
    74     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</IntDir>
    7575  </PropertyGroup>
    7676  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    7979      <Optimization>Disabled</Optimization>
    8080      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs\boost;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    81       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     81      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8282      <MinimalRebuild>false</MinimalRebuild>
    8383      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    … …  
    9696      <Optimization>Disabled</Optimization>
    9797      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs\boost;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    98       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     98      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9999      <MinimalRebuild>false</MinimalRebuild>
    100100      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    … …  
    109109      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    110110      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs\boost;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    111       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     111      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    112112      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    113113      <PrecompiledHeader>Use</PrecompiledHeader>
    … …  
    123123      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    124124      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs\boost;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    125       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     125      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    126126      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    127127      <PrecompiledHeader>Use</PrecompiledHeader>
    … …  
    149149      </PrecompiledHeader>
    150150    </ClCompile>
     151    <ClCompile Include="src\OSVersion.cpp" />
     152    <ClCompile Include="src\Path.cpp" />
     153    <ClCompile Include="src\ProcessAndModule.cpp" />
    151154    <ClCompile Include="stdafx.cpp">
    152155      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
    … …  
    193196    <ClInclude Include="include\Environment.h" />
    194197    <ClInclude Include="include\libs.h" />
     198    <ClInclude Include="include\OSVersion.h" />
     199    <ClInclude Include="include\Path.h" />
     200    <ClInclude Include="include\ProcessAndModule.h" />
    195201    <ClInclude Include="stdafx.h" />
    196202    <ClInclude Include="include\Lexical\Class.h" />

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

    r777 r798  
    100100      <Filter>Source Files\ResourceManager</Filter>
    101101    </ClCompile>
     102    <ClCompile Include="src\Path.cpp">
     103      <Filter>Source Files</Filter>
     104    </ClCompile>
     105    <ClCompile Include="src\ProcessAndModule.cpp">
     106      <Filter>Source Files</Filter>
     107    </ClCompile>
     108    <ClCompile Include="src\OSVersion.cpp">
     109      <Filter>Source Files</Filter>
     110    </ClCompile>
    102111  </ItemGroup>
    103112  <ItemGroup>
    … …  
    192201      <Filter>Header Files\ResourceManager</Filter>
    193202    </ClInclude>
     203    <ClInclude Include="include\Path.h">
     204      <Filter>Header Files</Filter>
     205    </ClInclude>
     206    <ClInclude Include="include\ProcessAndModule.h">
     207      <Filter>Header Files</Filter>
     208    </ClInclude>
     209    <ClInclude Include="include\OSVersion.h">
     210      <Filter>Header Files</Filter>
     211    </ClInclude>
    194212  </ItemGroup>
    195213</Project>

  • branches/egtra/ab5.0/abdev/ab_common/src/Environment.cpp

    r773 r798  
    11#include "stdafx.h"
    22#include <uxtheme.h>
     3
     4DWORD const PROCESS_DEP_ENABLE = 0x00000001;
    35
    46std::string ActiveBasic::Common::Environment::rootPath;

  • branches/egtra/ab5.0/abdev/abdev-impl/abdev-impl.vcxproj

    r781 r798  
    5656  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    5757    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     58    <Import Project="..\ab-common.props" />
    5859    <Import Project="..\ab-common-32.props" />
    59     <Import Project="..\ab-common.props" />
    6060  </ImportGroup>
    6161  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6262    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6363    <Import Project="..\ab-common.props" />
     64    <Import Project="..\ab-common-64.props" />
    6465  </ImportGroup>
    6566  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    6667    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     68    <Import Project="..\ab-common.props" />
    6769    <Import Project="..\ab-common-32.props" />
    68     <Import Project="..\ab-common.props" />
    6970  </ImportGroup>
    7071  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    7172    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7273    <Import Project="..\ab-common.props" />
     74    <Import Project="..\ab-common-64.props" />
    7375  </ImportGroup>
    7476  <PropertyGroup Label="UserMacros" />

  • branches/egtra/ab5.0/abdev/abdev/Attach.cpp

    r763 r798  
    44
    55#include "common.h"
     6#include <abdev/ab_common/include/Path.h>
     7#include <abdev/ab_common/include/ProcessAndModule.h>
    68#include <psapi.h>
    79#include <tlhelp32.h>
    … …  
    3739}
    3840
    39 void InsertProcess_ToListView(HWND hListView,char *lpszAppPath,int id,char *lpszPlatform,char *lpszTitle){
     41void InsertProcess_ToListView(HWND hListView,char const* lpszAppPath,int id,char const* lpszPlatform,char const * lpszTitle){
    4042    char szAppName[MAX_PATH],temp2[MAX_PATH];
    4143    _splitpath(lpszAppPath,NULL,NULL,szAppName,temp2);
    … …  
    7577    ListView_SetItem(hListView,&item);
    7678
    77     item.pszText=lpszPlatform;
     79    item.pszText=const_cast<LPSTR>(lpszPlatform);
    7880    item.iSubItem++;
    7981    ListView_SetItem(hListView,&item);
    8082
    81     item.pszText=lpszTitle;
     83    item.pszText=const_cast<LPSTR>(lpszTitle);
    8284    item.iSubItem++;
    8385    ListView_SetItem(hListView,&item);
    … …  
    159161BOOL CALLBACK FindWindowProc(HWND hwnd, LPARAM lParam)
    160162{
    161     HWND* pphWnd = (HWND*)lParam;
    162     *pphWnd = hwnd;
    163     return FALSE; /* 列挙を中断 */
     163    auto pProcessIdAndHWnd = reinterpret_cast<std::pair<DWORD, HWND>*>(lParam);
     164    DWORD processId = 0;
     165    ::GetWindowThreadProcessId(hwnd, &processId);
     166    if (processId == pProcessIdAndHWnd->first)
     167    {
     168        pProcessIdAndHWnd->second = hwnd;
     169        return FALSE;
     170    }
     171    else
     172    {
     173        return TRUE;
     174    }
    164175}
    165176void ListupProcesses(HWND hListView){
    166     char temporary[MAX_PATH];
    167 
    168177    ListView_DeleteAllItems(hListView);
    169178
    170     DWORD *pdwProcessId;
    171     pdwProcessId=(DWORD *)HeapAlloc(hHeap,0,8192*sizeof(DWORD));
    172 
    173179    //プロセスを列挙
    174     DWORD cbNeeded;
    175     EnumProcesses(pdwProcessId,8192*sizeof(DWORD),&cbNeeded);
    176 
    177     char szMyAppPath[MAX_PATH];
    178     GetModuleFileName(GetModuleHandle(0),szMyAppPath,MAX_PATH);
    179 
    180     int i;
    181     for(i=0;i<(int)(cbNeeded/sizeof(DWORD));i++){
    182 
    183         //プロセスIDを元にハンドルを取得
    184         HANDLE hProcess;
    185         hProcess=OpenProcess(PROCESS_ALL_ACCESS,0,pdwProcessId[i]);
    186         if(!hProcess) continue;
    187 
     180    auto processIds = ActiveBasic::Common::GetProcesses();
     181
     182    char szMyAppPath[MAX_PATH] = {};
     183    GetModuleFileName(nullptr, szMyAppPath, MAX_PATH);
     184
     185    BOOST_FOREACH(DWORD processId, processIds)
     186    {
    188187        //そのプロセスにおける実行モジュールのインスタンスハンドルを取得
    189         HINSTANCE hModule;
    190         DWORD cbReturned;
    191         if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned ))
    192             continue;
    193 
    194         //実行ファイル名を取得
    195         GetModuleFileNameEx(hProcess,hModule,temporary,MAX_PATH);
    196 
     188        auto executablePath = ActiveBasic::Common::GetExecutableModulePath(processId);
    197189
    198190        //////////////////////////////
    … …  
    200192        //////////////////////////////
    201193
    202         //スナップショットを取得
    203         HANDLE hSnapshot;
    204         hSnapshot=CreateToolhelp32Snapshot(TH32CS_SNAPALL,0);
    205 
    206         THREADENTRY32 te;
    207         memset(&te,0,sizeof(THREADENTRY32));
    208         te.dwSize=sizeof(THREADENTRY32);
    209         if(Thread32First(hSnapshot,&te)){
    210             do{
    211                 if(te.th32OwnerProcessID==pdwProcessId[i]){
    212                     break;
    213                 }
    214             }while(Thread32Next(hSnapshot,&te));
    215         }
    216 
    217         HWND hwnd;
    218         hwnd=0;
    219         EnumThreadWindows(te.th32ThreadID,FindWindowProc,(LPARAM)&hwnd);
    220 
    221         while(GetParent(hwnd)) hwnd=GetParent(hwnd);
    222 
    223         char szWndTitle[1024];
    224         szWndTitle[0]=0;
    225         if(hwnd) GetWindowText(hwnd,szWndTitle,1024);
    226 
    227         CloseHandle(hSnapshot);
    228 
    229 
    230 
    231         CloseHandle(hProcess);
    232 
    233         if(lstrcmpi(szMyAppPath,temporary)==0){
     194        std::pair<DWORD, HWND> processIdAndHWnd(processId, nullptr);
     195        EnumWindows(FindWindowProc, reinterpret_cast<LPARAM>(&processIdAndHWnd));
     196        HWND hwnd = processIdAndHWnd.second;
     197
     198        TCHAR szWndTitle[1024] = {};
     199        if(hwnd) GetWindowText(hwnd, szWndTitle, 1024);
     200
     201        if (ActiveBasic::Common::IsPathEqual(Jenga::Common::ToWString(szMyAppPath).c_str(), executablePath.wstring().c_str()))
     202        {
    234203            //自分自身（ProjectEditor.exe）は無視
    235204            continue;
    … …  
    237206
    238207        //リストビューへ追加
    239         InsertProcess_ToListView(hListView,temporary,pdwProcessId[i],"Win32",szWndTitle);
    240     }
    241 
    242     HeapDefaultFree(pdwProcessId);
     208        InsertProcess_ToListView(hListView,executablePath.string().c_str(),processId,"Win32",szWndTitle);
     209    }
    243210}
    244211

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

    r788 r798  
    5353    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5454    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     55    <Import Project="..\ab-common.props" />
    5556    <Import Project="..\ab-common-32.props" />
    56     <Import Project="..\ab-common.props" />
    5757  </ImportGroup>
    5858  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5959    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6060    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     61    <Import Project="..\ab-common.props" />
    6162    <Import Project="..\ab-common-32.props" />
    62     <Import Project="..\ab-common.props" />
    6363  </ImportGroup>
    6464  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    … …  
    6666    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    6767    <Import Project="..\ab-common.props" />
     68    <Import Project="..\ab-common-64.props" />
    6869  </ImportGroup>
    6970  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    … …  
    7172    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    7273    <Import Project="..\ab-common.props" />
     74    <Import Project="..\ab-common-64.props" />
    7375  </ImportGroup>
    7476  <PropertyGroup Label="UserMacros" />
    … …  
    7678    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    7779    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\build\$(Configuration)\</OutDir>
    78     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    7980    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    8081    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</OutDir>
    81     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    8282    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    8383    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\build\$(Configuration)\</OutDir>
    84     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    8584    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    8685    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</OutDir>
    87     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)-$(Platform)\</IntDir>
    8886    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8987  </PropertyGroup>
    … …  
    10199      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    102100      <Optimization>Disabled</Optimization>
    103       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     101      <PreprocessorDefinitions>_DEBUG;_WINDOWS;JPN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104102      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    105103      <PrecompiledHeader>Use</PrecompiledHeader>
    … …  
    114112    <Link>
    115113      <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    116       <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    117114      <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
    118       <GenerateDebugInformation>true</GenerateDebugInformation>
    119115      <SubSystem>Windows</SubSystem>
    120116      <TargetMachine>MachineX86</TargetMachine>
    … …  
    141137      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    142138      <Optimization>Disabled</Optimization>
    143       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     139      <PreprocessorDefinitions>_DEBUG;_WINDOWS;JPN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    144140      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    145141      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    … …  
    154150    <Link>
    155151      <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
    156       <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    157       <GenerateDebugInformation>true</GenerateDebugInformation>
    158152      <SubSystem>Windows</SubSystem>
    159153      <TargetMachine>MachineX64</TargetMachine>
    … …  
    180174      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    181175      <Optimization>MinSpace</Optimization>
    182       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     176      <PreprocessorDefinitions>NDEBUG;_WINDOWS;JPN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    183177      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    184178      <PrecompiledHeader>Use</PrecompiledHeader>
    … …  
    192186    <Link>
    193187      <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    194       <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    195188      <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
    196       <GenerateDebugInformation>true</GenerateDebugInformation>
    197189      <GenerateMapFile>true</GenerateMapFile>
    198190      <SubSystem>Windows</SubSystem>
    … …  
    222214      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    223215      <Optimization>MinSpace</Optimization>
    224       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     216      <PreprocessorDefinitions>NDEBUG;_WINDOWS;JPN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    225217      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    226218      <PrecompiledHeader>Use</PrecompiledHeader>
    … …  
    234226    <Link>
    235227      <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
    236       <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    237228      <DelayLoadDLLs>PSAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
    238       <GenerateDebugInformation>true</GenerateDebugInformation>
    239229      <GenerateMapFile>true</GenerateMapFile>
    240230      <SubSystem>Windows</SubSystem>

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

    r781 r798  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <UseOfMfc>false</UseOfMfc>
    29     <CharacterSet>MultiByte</CharacterSet>
    30     <WholeProgramOptimization>false</WholeProgramOptimization>
    3128    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    3229  </PropertyGroup>
    3330  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3431    <ConfigurationType>Application</ConfigurationType>
    35     <UseOfMfc>false</UseOfMfc>
    3632    <CharacterSet>MultiByte</CharacterSet>
    3733    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    … …  
    3935  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    4036    <ConfigurationType>Application</ConfigurationType>
    41     <UseOfMfc>false</UseOfMfc>
    4237    <CharacterSet>MultiByte</CharacterSet>
    4338    <WholeProgramOptimization>false</WholeProgramOptimization>
    … …  
    4641  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4742    <ConfigurationType>Application</ConfigurationType>
    48     <UseOfMfc>false</UseOfMfc>
    4943    <CharacterSet>MultiByte</CharacterSet>
    5044    <PlatformToolset>Windows7.1SDK</PlatformToolset>
    … …  
    5549  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5650    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     51    <Import Project="ab-common.props" />
     52    <Import Project="ab-common-32.props" />
    5753  </ImportGroup>
    5854  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5955    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     56    <Import Project="ab-common.props" />
     57    <Import Project="ab-common-32.props" />
    6058  </ImportGroup>
    6159  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6260    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6361    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     62    <Import Project="ab-common.props" />
     63    <Import Project="ab-common-64.props" />
    6464  </ImportGroup>
    6565  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6666    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6767    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     68    <Import Project="ab-common.props" />
     69    <Import Project="ab-common-64.props" />
    6870  </ImportGroup>
    6971  <PropertyGroup Label="UserMacros" />
    … …  
    7173    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    7274    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\build\$(Configuration)\bin\x86\</OutDir>
    73     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</IntDir>
    7475    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    7576    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\build\$(Configuration)\bin\x64\</OutDir>
    76     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</IntDir>
    7777    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7878    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\build\$(Configuration)\bin\x86\</OutDir>
    79     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</IntDir>
    8079    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    8180    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\build\$(Configuration)\bin\x64\</OutDir>
    82     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</IntDir>
    8381    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8482    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">abc</TargetName>
    … …  
    9997    <ClCompile>
    10098      <Optimization>Disabled</Optimization>
    101       <AdditionalIncludeDirectories>..\;..\cpplibs\boost;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     99      <AdditionalIncludeDirectories>..\;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     100      <PreprocessorDefinitions>_DEBUG;_WINDOWS;JPN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    103101      <MinimalRebuild>false</MinimalRebuild>
    104102      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    … …  
    106104      <PrecompiledHeader>Use</PrecompiledHeader>
    107105      <WarningLevel>Level3</WarningLevel>
    108       <SuppressStartupBanner>true</SuppressStartupBanner>
    109106      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    110       <MultiProcessorCompilation>true</MultiProcessorCompilation>
    111107    </ClCompile>
    112108    <ResourceCompile>
    … …  
    141137    <ClCompile>
    142138      <Optimization>Disabled</Optimization>
    143       <AdditionalIncludeDirectories>..\;..\cpplibs\boost;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    144       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     139      <AdditionalIncludeDirectories>..\;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     140      <PreprocessorDefinitions>_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    145141      <MinimalRebuild>false</MinimalRebuild>
    146142      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    … …  
    149145      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    150146      <WarningLevel>Level3</WarningLevel>
    151       <SuppressStartupBanner>true</SuppressStartupBanner>
    152       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    153       <MultiProcessorCompilation>true</MultiProcessorCompilation>
    154147    </ClCompile>
    155148    <ResourceCompile>
    … …  
    185178    <ClCompile>
    186179      <Optimization>MaxSpeed</Optimization>
    187       <AdditionalIncludeDirectories>..\;..\cpplibs\boost;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    188       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     180      <AdditionalIncludeDirectories>..\;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     181      <PreprocessorDefinitions>NDEBUG;_WINDOWS;JPN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    189182      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    190183      <PrecompiledHeader>Use</PrecompiledHeader>
    191184      <WarningLevel>Level3</WarningLevel>
    192       <SuppressStartupBanner>true</SuppressStartupBanner>
    193       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    194       <MultiProcessorCompilation>true</MultiProcessorCompilation>
    195185    </ClCompile>
    196186    <ResourceCompile>
    … …  
    228218    <ClCompile>
    229219      <Optimization>MaxSpeed</Optimization>
    230       <AdditionalIncludeDirectories>..\;..\cpplibs\boost;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    231       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     220      <AdditionalIncludeDirectories>..\;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     221      <PreprocessorDefinitions>NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    232222      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    233223      <PrecompiledHeader>Use</PrecompiledHeader>
    234224      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    235225      <WarningLevel>Level3</WarningLevel>
    236       <SuppressStartupBanner>true</SuppressStartupBanner>
    237       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    238       <MultiProcessorCompilation>true</MultiProcessorCompilation>
    239226    </ClCompile>
    240227    <ResourceCompile>
Note: See TracChangeset for help on using the changeset viewer.