diff options
| -rw-r--r-- | src/common/windows/pdb_source_line_writer.cc | 9 | ||||
| -rw-r--r-- | src/tools/windows/binaries/symupload.exe | bin | 122880 -> 82432 bytes | |||
| -rw-r--r-- | src/tools/windows/refresh_binaries.bat | 3 | ||||
| -rw-r--r-- | src/tools/windows/symupload/symupload.vcproj | 18 |
4 files changed, 18 insertions, 12 deletions
diff --git a/src/common/windows/pdb_source_line_writer.cc b/src/common/windows/pdb_source_line_writer.cc index c0415d00..74a8a70c 100644 --- a/src/common/windows/pdb_source_line_writer.cc +++ b/src/common/windows/pdb_source_line_writer.cc @@ -79,8 +79,13 @@ bool PDBSourceLineWriter::Open(const wstring &file, FileFormat format) { CComPtr<IDiaDataSource> data_source; if (FAILED(data_source.CoCreateInstance(CLSID_DiaSource))) { - fprintf(stderr, "CoCreateInstance CLSID_DiaSource failed " - "(msdia80.dll unregistered?)\n"); + const int kGuidSize = 64; + wchar_t classid[kGuidSize] = {0}; + StringFromGUID2(CLSID_DiaSource, classid, kGuidSize); + // vc80 uses bce36434-2c24-499e-bf49-8bd99b0eeb68. + // vc90 uses 4C41678E-887B-4365-A09E-925D28DB33C2. + fprintf(stderr, "CoCreateInstance CLSID_DiaSource %S failed " + "(msdia*.dll unregistered?)\n", classid); return false; } diff --git a/src/tools/windows/binaries/symupload.exe b/src/tools/windows/binaries/symupload.exe Binary files differindex c78299ef..6aa1f45b 100644 --- a/src/tools/windows/binaries/symupload.exe +++ b/src/tools/windows/binaries/symupload.exe diff --git a/src/tools/windows/refresh_binaries.bat b/src/tools/windows/refresh_binaries.bat index f10ccbae..374f89f9 100644 --- a/src/tools/windows/refresh_binaries.bat +++ b/src/tools/windows/refresh_binaries.bat @@ -11,7 +11,7 @@ REM README.binaries file to contain REM the revision number, and builds the tools. You must run 'svn commit' to
REM commit the pending edits to the repository.
-cd ..\..\
+pushd %~dp0\..\..\
call svn update --accept postpone
cd tools\windows
devenv symupload\symupload.vcproj /rebuild Release
@@ -24,3 +24,4 @@ echo Repository information (output of 'svn info') follows: >> %TEMP%\checkin.tx call svn info >> %TEMP%\checkin.txt
echo Done!
echo type 'svn commit -F %%TEMP%%\checkin.txt' to commit.
+popd
\ No newline at end of file diff --git a/src/tools/windows/symupload/symupload.vcproj b/src/tools/windows/symupload/symupload.vcproj index d6d07f1e..8177c830 100644 --- a/src/tools/windows/symupload/symupload.vcproj +++ b/src/tools/windows/symupload/symupload.vcproj @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="9.00" Name="symupload" ProjectGUID="{E156ED87-9DE9-47C8-94EC-A5A9CDD65E18}" + RootNamespace="symupload" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -60,10 +62,12 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies=""$(VSInstallDir)\DIA SDK\lib\diaguids.lib" wininet.lib version.lib" + AdditionalDependencies=""$(VSInstallDir)\DIA SDK\lib\diaguids.lib" wininet.lib version.lib imagehlp.lib" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -85,9 +89,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -134,12 +135,14 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies=""$(VSInstallDir)\DIA SDK\lib\diaguids.lib" wininet.lib version.lib" + AdditionalDependencies=""$(VSInstallDir)\DIA SDK\lib\diaguids.lib" wininet.lib version.lib imagehlp.lib" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -161,9 +164,6 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> |