diff options
| -rw-r--r-- | protocols/EmLanProto/amdproto_10.vcxproj | 43 | ||||
| -rw-r--r-- | protocols/EmLanProto/amdproto_10.vcxproj.filters | 20 | ||||
| -rw-r--r-- | protocols/EmLanProto/amdproto_11.vcxproj | 43 | ||||
| -rw-r--r-- | protocols/EmLanProto/amdproto_11.vcxproj.filters | 20 | ||||
| -rw-r--r-- | protocols/EmLanProto/res/Version.rc | 38 | ||||
| -rw-r--r-- | protocols/EmLanProto/res/amdproto.rc | 58 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/Version.h | 14 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/amdproto.cpp | 18 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/get_time.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/lan.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/lan.h | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/mlan.cpp | 4 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/mlan.h | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/packet.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/packet.h | 14 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/resource.h | 3 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/stdafx.h | 25 |
17 files changed, 129 insertions, 181 deletions
diff --git a/protocols/EmLanProto/amdproto_10.vcxproj b/protocols/EmLanProto/amdproto_10.vcxproj index 5b19abb0af..19fb0ceb93 100644 --- a/protocols/EmLanProto/amdproto_10.vcxproj +++ b/protocols/EmLanProto/amdproto_10.vcxproj @@ -21,7 +21,6 @@ <PropertyGroup Label="Globals">
<ProjectName>EmLanProto</ProjectName>
<ProjectGuid>{2115FEBC-1EC4-4F95-A058-A523ED5295A4}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -64,20 +63,17 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -88,43 +84,41 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ShowProgress>NotSet</ShowProgress>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ShowProgress>NotSet</ShowProgress>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -132,10 +126,8 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -143,19 +135,19 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -163,10 +155,8 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -174,7 +164,6 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -183,9 +172,11 @@ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -203,15 +194,11 @@ <ClInclude Include="src\mlan.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\amdproto.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="res\icon1.ico" />
- <None Include="res\icon2.ico" />
- <None Include="res\icon_off.ico" />
- <None Include="res\icon_onl.ico" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/EmLanProto/amdproto_10.vcxproj.filters b/protocols/EmLanProto/amdproto_10.vcxproj.filters index 92fdc52433..f923c15b51 100644 --- a/protocols/EmLanProto/amdproto_10.vcxproj.filters +++ b/protocols/EmLanProto/amdproto_10.vcxproj.filters @@ -18,6 +18,9 @@ <ResourceCompile Include="res\amdproto.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\amdproto.cpp">
@@ -52,19 +55,8 @@ <ClInclude Include="src\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\icon1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon_off.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon_onl.ico">
- <Filter>Resource Files</Filter>
- </None>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/EmLanProto/amdproto_11.vcxproj b/protocols/EmLanProto/amdproto_11.vcxproj index 7daa089af5..9146d52f3b 100644 --- a/protocols/EmLanProto/amdproto_11.vcxproj +++ b/protocols/EmLanProto/amdproto_11.vcxproj @@ -21,7 +21,6 @@ <PropertyGroup Label="Globals">
<ProjectName>EmLanProto</ProjectName>
<ProjectGuid>{2115FEBC-1EC4-4F95-A058-A523ED5295A4}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -68,20 +67,17 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -92,43 +88,41 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ShowProgress>NotSet</ShowProgress>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ShowProgress>NotSet</ShowProgress>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,10 +130,8 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -147,19 +139,19 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<BaseAddress>0x22000000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,10 +159,8 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;AMDPROTO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -178,7 +168,6 @@ </ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -187,9 +176,11 @@ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -207,15 +198,11 @@ <ClInclude Include="src\mlan.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\amdproto.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="res\icon1.ico" />
- <None Include="res\icon2.ico" />
- <None Include="res\icon_off.ico" />
- <None Include="res\icon_onl.ico" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/EmLanProto/amdproto_11.vcxproj.filters b/protocols/EmLanProto/amdproto_11.vcxproj.filters index 92fdc52433..f923c15b51 100644 --- a/protocols/EmLanProto/amdproto_11.vcxproj.filters +++ b/protocols/EmLanProto/amdproto_11.vcxproj.filters @@ -18,6 +18,9 @@ <ResourceCompile Include="res\amdproto.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\amdproto.cpp">
@@ -52,19 +55,8 @@ <ClInclude Include="src\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\icon1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon_off.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon_onl.ico">
- <Filter>Resource Files</Filter>
- </None>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/EmLanProto/res/Version.rc b/protocols/EmLanProto/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/protocols/EmLanProto/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "afxres.h"
+#include "..\src\version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
diff --git a/protocols/EmLanProto/res/amdproto.rc b/protocols/EmLanProto/res/amdproto.rc index 4795110dd0..3a6a31767a 100644 --- a/protocols/EmLanProto/res/amdproto.rc +++ b/protocols/EmLanProto/res/amdproto.rc @@ -36,30 +36,22 @@ IDI_ICON_OFFLINE ICON "icon_off.ico" // Dialog
//
-IDD_DIALOG1 DIALOGEX 0, 0, 327, 191
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
-CAPTION "EmLan protocol - donate author please"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
+IDD_EMP_FORM_OPT DIALOGEX 0, 0, 200, 63
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,277,177,50,14
- EDITTEXT IDC_EDIT1,0,0,327,176,ES_MULTILINE | ES_READONLY |
- WS_VSCROLL
- LTEXT "This window is shown only once",IDC_STATIC,2,179,274,11
+ LISTBOX IDC_LIST_IP,5,23,94,34,LBS_USETABSTOPS |
+ LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ CTEXT "Select your IP address",IDC_STATIC,7,12,92,8
+ GROUPBOX "LAN Settings",IDC_STATIC,2,2,196,58
+ CONTROL "Use computer name",IDC_RADIO_USECOMPNAME,"Button",
+ BS_AUTORADIOBUTTON,101,24,79,10
+ CONTROL "Your name",IDC_RADIO_USEOWN,"Button",BS_AUTORADIOBUTTON,
+ 101,34,50,10
+ EDITTEXT IDC_EDIT_NAME,101,44,93,12,ES_AUTOHSCROLL
+ CTEXT "Select your name",IDC_STATIC,99,13,92,8
END
-#endif // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -89,28 +81,6 @@ END /////////////////////////////////////////////////////////////////////////////
//
-// Dialog
-//
-
-IDD_EMP_FORM_OPT DIALOGEX 0, 0, 200, 63
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
- LISTBOX IDC_LIST_IP,5,23,94,34,LBS_USETABSTOPS |
- LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- CTEXT "Select your IP address",IDC_STATIC,7,12,92,8
- GROUPBOX "LAN Settings",IDC_STATIC,2,2,196,58
- CONTROL "Use computer name",IDC_RADIO_USECOMPNAME,"Button",
- BS_AUTORADIOBUTTON,101,24,79,10
- CONTROL "Your name",IDC_RADIO_USEOWN,"Button",BS_AUTORADIOBUTTON,
- 101,34,50,10
- EDITTEXT IDC_EDIT_NAME,101,44,93,12,ES_AUTOHSCROLL
- CTEXT "Select your name",IDC_STATIC,99,13,92,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
// DESIGNINFO
//
@@ -127,7 +97,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // English (U.S.) resources
+#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/EmLanProto/src/Version.h b/protocols/EmLanProto/src/Version.h new file mode 100644 index 0000000000..b9f5045e42 --- /dev/null +++ b/protocols/EmLanProto/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 0
+#define __RELEASE_NUM 1
+#define __BUILD_NUM 1
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "E-mage LAN protocol"
+#define __FILENAME "EmLanProto.dll"
+#define __DESCRIPTION "E-mage LAN protocol support for Miranda NG."
+#define __AUTHOR "kva"
+#define __AUTHOREMAIL "kva@fromru.com"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© Viktor Kuzmin"
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index f014d8670a..ada5f38202 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -2,20 +2,18 @@ // AMD local protocol main file
#include "stdafx.h"
-#include "mlan.h"
-#include "resource.h"
//////////////////////////////////////////////////////////////////////////
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- "E-mage LAN Protocol",
- VER,
- "E-mage LAN protocol support for Miranda NG.",
- "kva",
- "kva@fromru.com",
- "Viktor Kuzmin of e-mage",
- "",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
// {E08CE7C4-9EEB-4272-B544-0D32E18D90DE}
{0xe08ce7c4, 0x9eeb, 0x4272, {0xb5, 0x44, 0xd, 0x32, 0xe1, 0x8d, 0x90, 0xde}}
@@ -44,7 +42,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCO //////////////////////////////////////////////////////////////////////////
-BOOL APIENTRY DllMain( HINSTANCE hInstDLL,DWORD reason,LPVOID )
+BOOL APIENTRY DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID)
{
g_hInstance = hInstDLL;
if (reason == DLL_PROCESS_ATTACH) {
diff --git a/protocols/EmLanProto/src/get_time.cpp b/protocols/EmLanProto/src/get_time.cpp index 5f918a8037..76ad065fdf 100644 --- a/protocols/EmLanProto/src/get_time.cpp +++ b/protocols/EmLanProto/src/get_time.cpp @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "stdafx.h"
-#include <basetsd.h>
-#include "get_time.h"
static int daysInMonth[]={31,28,31,30,31,30,31,31,30,31,30,31};
diff --git a/protocols/EmLanProto/src/lan.cpp b/protocols/EmLanProto/src/lan.cpp index f1b27d3a99..cf10fecf66 100644 --- a/protocols/EmLanProto/src/lan.cpp +++ b/protocols/EmLanProto/src/lan.cpp @@ -3,8 +3,6 @@ #include "stdafx.h"
-#include "lan.h"
-
CLan::CLan()
{
m_income = INVALID_SOCKET;
diff --git a/protocols/EmLanProto/src/lan.h b/protocols/EmLanProto/src/lan.h index e1a897cc20..24db5f9886 100644 --- a/protocols/EmLanProto/src/lan.h +++ b/protocols/EmLanProto/src/lan.h @@ -9,8 +9,6 @@ #define MAX_INTERNAL_IP 32
#define PORT_NUMBER MAKE_PORT(34074)
-#include "winsock2.h"
-
//! Class for operating with LAN
class CLan
{
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 76769f472d..cd9ea200e0 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -2,8 +2,6 @@ // Miranda lan functions
#include "stdafx.h"
-#include "mlan.h"
-#include "get_time.h"
#define MCODE_SND_STATUS 1
#define MCODE_SND_NAME 2
@@ -682,7 +680,7 @@ u_char* CMLan::CreatePacket(TPacket& pak, int* pBufLen) int len = 1;
if (pak.idVersion != -1)
- pak.idVersion = VER;
+ pak.idVersion = __FILEVERSION_STRING;
else
pak.idVersion = 0;
if (pak.idStatus != -1)
diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h index 21471cdc2f..4ec8993b23 100644 --- a/protocols/EmLanProto/src/mlan.h +++ b/protocols/EmLanProto/src/mlan.h @@ -4,8 +4,6 @@ #ifndef __mlan_h__
#define __mlan_h__
-#include "lan.h"
-
#define MLAN_TIMEOUT 5
#define MLAN_CHECK 50
#define MLAN_SLEEP 400
diff --git a/protocols/EmLanProto/src/packet.cpp b/protocols/EmLanProto/src/packet.cpp deleted file mode 100644 index be767bbbd4..0000000000 --- a/protocols/EmLanProto/src/packet.cpp +++ /dev/null @@ -1,2 +0,0 @@ -//////////////////////////////////////////////////////////////////////////
-// Packets parsing for the E-mage lan protocol
diff --git a/protocols/EmLanProto/src/packet.h b/protocols/EmLanProto/src/packet.h deleted file mode 100644 index b4fcd2dc2c..0000000000 --- a/protocols/EmLanProto/src/packet.h +++ /dev/null @@ -1,14 +0,0 @@ -//////////////////////////////////////////////////////////////////////////
-// Packets parsing for the E-mage lan protocol
-
-#ifndef __packet_h__
-#define __packet_h__
-
-class CPacket
-{
-public:
- CPacket();
- ~CPacket();
-};
-
-#endif //__packet_h__
diff --git a/protocols/EmLanProto/src/resource.h b/protocols/EmLanProto/src/resource.h index 25a47d65eb..472138e5f5 100644 --- a/protocols/EmLanProto/src/resource.h +++ b/protocols/EmLanProto/src/resource.h @@ -3,15 +3,12 @@ // Used by amdproto.rc
//
#define IDI_ICON_ONLINE 101
-#define IDD_DIALOG1 102
#define IDI_ICON_OFFLINE 103
#define IDD_EMP_FORM_OPT 104
#define IDC_LIST_IP 1001
#define IDC_RADIO_USECOMPNAME 1004
#define IDC_RADIO_USEOWN 1005
-#define IDC_EDIT2 1006
#define IDC_EDIT_NAME 1006
-#define IDC_EDIT1 1007
// Next default values for new objects
//
diff --git a/protocols/EmLanProto/src/stdafx.h b/protocols/EmLanProto/src/stdafx.h index f6c9db86be..db054e03c0 100644 --- a/protocols/EmLanProto/src/stdafx.h +++ b/protocols/EmLanProto/src/stdafx.h @@ -7,25 +7,24 @@ #define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
+
#include <windows.h>
#include <winsock2.h>
+#include <prsht.h>
-#include "newpluginapi.h"
-
-#include "m_options.h"
-#include "m_system.h"
+#include <newpluginapi.h>
+#include <m_options.h>
+#include <m_database.h>
+#include <m_protomod.h>
+#include <m_langpack.h>
-#include "m_database.h"
-#include "m_protomod.h"
-#include "statusmodes.h"
-#include "m_protosvc.h"
-#include "m_options.h"
-#include "m_langpack.h"
-#include <prsht.h>
+#include "resource.h"
+#include "Version.h"
+#include "get_time.h"
+#include "lan.h"
+#include "mlan.h"
#define PROTONAME "EM_LAN_PROTO"
-#define VER PLUGIN_MAKE_VERSION(0, 0, 1, 1)
//#define ME_ICQ_STATUSMSGREQ "ICQ/StatusMsgReq"
//
|