Skip to content

Fix crash when compiled with /O2 on Windows #4

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

Closed
Zeex wants to merge 2 commits into from
Closed

Fix crash when compiled with /O2 on Windows #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
074d764
Enable /O2 in Release configuration
Zeex Oct 15, 2014
acaef82
Fix missing terminator in RedirectedNatives
Zeex Oct 15, 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
330 changes: 165 additions & 165 deletions YSF.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,166 +1,166 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0843F08F-F40F-4B9B-1D29-394309558029}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>YSF</RootNamespace>
<ProjectName>YSF</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>bin\win32\Release\</OutDir>
<IntDir>obj\win32\Release\</IntDir>
<TargetName>YSF</TargetName>
<TargetExt>.dll</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>bin\win32\Debug\</OutDir>
<IntDir>obj\win32\Debug\</IntDir>
<TargetName>YSF</TargetName>
<TargetExt>.dll</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
<StringPooling>false</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<OmitFramePointers>false</OmitFramePointers>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;NDEBUG;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>bin\win32\Release\YSF.lib</ImportLibrary>
<ModuleDefinitionFile>YSF.def</ModuleDefinitionFile>
<OutputFile>C:\Users\Ati\Desktop\SERVER\plugins\YSF.dll</OutputFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)YSF.pdb</ProgramDataBaseFileName>
<Optimization>Disabled</Optimization>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>bin\win32\Debug\YSF.lib</ImportLibrary>
<ModuleDefinitionFile>YSF.def</ModuleDefinitionFile>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="lib\raknet\BitStream.cpp" />
<ClCompile Include="lib\sdk\amxplugin.cpp" />
<ClCompile Include="lib\subhook\subhook.c" />
<ClCompile Include="src\Addresses.cpp" />
<ClCompile Include="src\amxfunctions.cpp" />
<ClCompile Include="src\CCallbackManager.cpp" />
<ClCompile Include="src\CGangZonePool.cpp" />
<ClCompile Include="src\CModelSizes.cpp" />
<ClCompile Include="src\CPickupPool.cpp" />
<ClCompile Include="src\CPlayerData.cpp" />
<ClCompile Include="src\CServer.cpp" />
<ClCompile Include="src\Functions.cpp" />
<ClCompile Include="src\Hooks.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\RPCs.cpp" />
<ClCompile Include="src\Scripting.cpp" />
<ClCompile Include="src\Utils.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="YSF.def" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="YSF.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="lib\raknet\BitStream.h" />
<ClInclude Include="lib\subhook\subhook.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="src\Addresses.h" />
<ClInclude Include="src\amxfunctions.h" />
<ClInclude Include="src\CCallbackManager.h" />
<ClInclude Include="src\CGangZonePool.h" />
<ClInclude Include="src\CModelSizes.h" />
<ClInclude Include="src\CPickupPool.h" />
<ClInclude Include="src\CPlayerData.h" />
<ClInclude Include="src\CServer.h" />
<ClInclude Include="src\CTypes.h" />
<ClInclude Include="src\CVector.h" />
<ClInclude Include="src\Functions.h" />
<ClInclude Include="src\Hooks.h" />
<ClInclude Include="src\main.h" />
<ClInclude Include="src\RPCs.h" />
<ClInclude Include="src\Scripting.h" />
<ClInclude Include="src\Structs.h" />
<ClInclude Include="src\Utils.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0843F08F-F40F-4B9B-1D29-394309558029}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>YSF</RootNamespace>
<ProjectName>YSF</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>bin\win32\Release\</OutDir>
<IntDir>obj\win32\Release\</IntDir>
<TargetName>YSF</TargetName>
<TargetExt>.dll</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>bin\win32\Debug\</OutDir>
<IntDir>obj\win32\Debug\</IntDir>
<TargetName>YSF</TargetName>
<TargetExt>.dll</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
<StringPooling>false</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<OmitFramePointers>false</OmitFramePointers>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;NDEBUG;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>bin\win32\Release\YSF.lib</ImportLibrary>
<ModuleDefinitionFile>YSF.def</ModuleDefinitionFile>
<OutputFile>C:\Users\Ati\Desktop\SERVER\plugins\YSF.dll</OutputFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)YSF.pdb</ProgramDataBaseFileName>
<Optimization>Disabled</Optimization>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BOOST_ALL_NO_LIB;BOOST_CHRONO_HEADER_ONLY;_CRT_SECURE_NO_WARNINGS;SAMPGDK_AMALGAMATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>bin\win32\Debug\YSF.lib</ImportLibrary>
<ModuleDefinitionFile>YSF.def</ModuleDefinitionFile>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="lib\raknet\BitStream.cpp" />
<ClCompile Include="lib\sdk\amxplugin.cpp" />
<ClCompile Include="lib\subhook\subhook.c" />
<ClCompile Include="src\Addresses.cpp" />
<ClCompile Include="src\amxfunctions.cpp" />
<ClCompile Include="src\CCallbackManager.cpp" />
<ClCompile Include="src\CGangZonePool.cpp" />
<ClCompile Include="src\CModelSizes.cpp" />
<ClCompile Include="src\CPickupPool.cpp" />
<ClCompile Include="src\CPlayerData.cpp" />
<ClCompile Include="src\CServer.cpp" />
<ClCompile Include="src\Functions.cpp" />
<ClCompile Include="src\Hooks.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\RPCs.cpp" />
<ClCompile Include="src\Scripting.cpp" />
<ClCompile Include="src\Utils.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="YSF.def" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="YSF.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="lib\raknet\BitStream.h" />
<ClInclude Include="lib\subhook\subhook.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="src\Addresses.h" />
<ClInclude Include="src\amxfunctions.h" />
<ClInclude Include="src\CCallbackManager.h" />
<ClInclude Include="src\CGangZonePool.h" />
<ClInclude Include="src\CModelSizes.h" />
<ClInclude Include="src\CPickupPool.h" />
<ClInclude Include="src\CPlayerData.h" />
<ClInclude Include="src\CServer.h" />
<ClInclude Include="src\CTypes.h" />
<ClInclude Include="src\CVector.h" />
<ClInclude Include="src\Functions.h" />
<ClInclude Include="src\Hooks.h" />
<ClInclude Include="src\main.h" />
<ClInclude Include="src\RPCs.h" />
<ClInclude Include="src\Scripting.h" />
<ClInclude Include="src\Structs.h" />
<ClInclude Include="src\Utils.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
4 changes: 3 additions & 1 deletion src/Scripting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5339,7 +5339,9 @@ AMX_NATIVE_INFO RedirecedtNatives[] =
{ "AddStaticPickup", Natives::CreatePickup },
{ "DestroyPickup", Natives::DestroyPickup },

{ "GetWeaponName", Natives::FIXED_GetWeaponName }
{ "GetWeaponName", Natives::FIXED_GetWeaponName },

{ 0, 0 }
};

int InitScripting(AMX *amx)
Expand Down