Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed crash of 64-bit WebKit #7

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fixed crash of 64-bit WebKit #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b4d894
fixed crash of 64-bit WebKit
Mar 20, 2014
4b9e663
Fixed 64-bit https
Jul 2, 2014
daee50a
64-bit fix from Alexei Bykov
Jul 10, 2014
9ab282b
removed references to C:\Development, fixed pixman PlatformToolset ba…
Jul 10, 2014
eef223c
more stuff from Mirko Günther
Jul 10, 2014
a65e9be
build curl
Jul 10, 2014
0f82293
fixed threading crash in pixman when delay loading dlls on winxp and …
Jul 12, 2014
7dc2116
fixed some compiler settings
Jul 12, 2014
bf2b073
Merge branch 'master' of https://github.com/achristensen07/WinCairoRe…
Sep 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,175 changes: 2,609 additions & 2,566 deletions WinCairo.sln
View file
Open in desktop

Large diffs are not rendered by default.

96 changes: 48 additions & 48 deletions props/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<LinkIncremental>false</LinkIncremental>
<OutputPath>$(SolutionDir)..\bin32\$(Configuration)\</OutputPath>
<OutDir>$(SolutionDir)bin32\</OutDir>
<IntDir>$(SolutionDir)Build\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)lib32;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Bscmake>
<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<ClCompile>
<AdditionalOptions>/wd4251 /w44265 /wd4275 /w44289 /w44302 /w44431 /w44640 /w44905 /w44906 /w44946 %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions>WIN32;_WINDOWS;_BIND_TO_CURRENT_VCLIBS_VERSION;_MT;SS_NO_CONVERSION;WINVER=0x502;_WIN32_WINNT=0x502;_WIN32_IE=0x603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<OpenMPSupport>false</OpenMPSupport>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<AdditionalIncludeDirectories>$(ProjectDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>false</GenerateMapFile>
<MapExports>false</MapExports>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<DataExecutionPrevention>true</DataExecutionPrevention>
<ImportLibrary>$(SolutionDir)lib32/$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
<FixedBaseAddress>false</FixedBaseAddress>
</Link>
<ResourceCompile>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
</ItemDefinitionGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<LinkIncremental>false</LinkIncremental>
<OutputPath>$(SolutionDir)..\bin$(PlatformArchitecture)\$(Configuration)\</OutputPath>
<OutDir>$(SolutionDir)bin$(PlatformArchitecture)\</OutDir>
<IntDir>$(SolutionDir)Build\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)lib$(PlatformArchitecture);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Bscmake>
<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<ClCompile>
<AdditionalOptions>/wd4251 /w44265 /wd4275 /w44289 /w44302 /w44431 /w44640 /w44905 /w44906 /w44946 %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions>WIN32;_WINDOWS;_BIND_TO_CURRENT_VCLIBS_VERSION;_MT;SS_NO_CONVERSION;WINVER=0x502;_WIN32_WINNT=0x502;_WIN32_IE=0x603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<OpenMPSupport>false</OpenMPSupport>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<AdditionalIncludeDirectories>$(ProjectDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)lib$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>false</GenerateMapFile>
<MapExports>false</MapExports>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<DataExecutionPrevention>true</DataExecutionPrevention>
<ImportLibrary>$(SolutionDir)lib$(PlatformArchitecture)/$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
<FixedBaseAddress>false</FixedBaseAddress>
</Link>
<ResourceCompile>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
</ItemDefinitionGroup>
</Project>
30 changes: 15 additions & 15 deletions props/lib.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir>$(SolutionDir)lib32\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<OutputFile>$(SolutionDir)lib32/$(TargetName)$(TargetExt)</OutputFile>
</Lib>
</ItemDefinitionGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir>$(SolutionDir)lib$(PlatformArchitecture)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<OutputFile>$(SolutionDir)lib$(PlatformArchitecture)/$(TargetName)$(TargetExt)</OutputFile>
</Lib>
</ItemDefinitionGroup>
</Project>
3 changes: 1 addition & 2 deletions src/cairo/pixman/pixman/pixman-compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,9 @@
# define PIXMAN_GET_THREAD_LOCAL(name) \
(&name)

#elif defined(__MINGW32__)
#elif defined(__MINGW32__) || defined(_MSC_VER)

# define _NO_W32_PSEUDO_MODIFIERS
# include <windows.h>

# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
static volatile int tls_ ## name ## _initialized = 0; \
Expand Down
4 changes: 4 additions & 0 deletions src/cairo/pixman/pixman/pixman-implementation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ typedef struct
} cache [N_CACHED_FAST_PATHS];
} cache_t;

#if defined(_MSC_VER)
# include <windows.h>
#endif

PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);

pixman_bool_t
Expand Down
Loading