Fixed message about unregistered msdia*dll. Builds with different DiaSDK need different dll.

Rebuilt with Visual Studio 2008.
Slightly improved refresh_binaries.bat.

BUG=none
TEST=none
Review URL: http://breakpad.appspot.com/281001

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@787 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
vitalybuka@chromium.org 2011-04-26 20:52:48 +00:00
parent fd557e4a97
commit 04023b1f6a
4 changed files with 18 additions and 12 deletions

View file

@ -79,8 +79,13 @@ bool PDBSourceLineWriter::Open(const wstring &file, FileFormat format) {
CComPtr<IDiaDataSource> data_source; CComPtr<IDiaDataSource> data_source;
if (FAILED(data_source.CoCreateInstance(CLSID_DiaSource))) { if (FAILED(data_source.CoCreateInstance(CLSID_DiaSource))) {
fprintf(stderr, "CoCreateInstance CLSID_DiaSource failed " const int kGuidSize = 64;
"(msdia80.dll unregistered?)\n"); 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; return false;
} }

View file

@ -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 the revision number, and builds the tools. You must run 'svn commit' to
REM commit the pending edits to the repository. REM commit the pending edits to the repository.
cd ..\..\ pushd %~dp0\..\..\
call svn update --accept postpone call svn update --accept postpone
cd tools\windows cd tools\windows
devenv symupload\symupload.vcproj /rebuild Release 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 call svn info >> %TEMP%\checkin.txt
echo Done! echo Done!
echo type 'svn commit -F %%TEMP%%\checkin.txt' to commit. echo type 'svn commit -F %%TEMP%%\checkin.txt' to commit.
popd

View file

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9.00"
Name="symupload" Name="symupload"
ProjectGUID="{E156ED87-9DE9-47C8-94EC-A5A9CDD65E18}" ProjectGUID="{E156ED87-9DE9-47C8-94EC-A5A9CDD65E18}"
RootNamespace="symupload"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -60,10 +62,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(VSInstallDir)\DIA SDK\lib\diaguids.lib&quot; wininet.lib version.lib" AdditionalDependencies="&quot;$(VSInstallDir)\DIA SDK\lib\diaguids.lib&quot; wininet.lib version.lib imagehlp.lib"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -84,9 +88,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -134,12 +135,14 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(VSInstallDir)\DIA SDK\lib\diaguids.lib&quot; wininet.lib version.lib" AdditionalDependencies="&quot;$(VSInstallDir)\DIA SDK\lib\diaguids.lib&quot; wininet.lib version.lib imagehlp.lib"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -160,9 +163,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />