Skip to content

Commit

Permalink
Removed '#define WINSOCK_API_LINKAGE EXPORT'.
Browse files Browse the repository at this point in the history 
But that caused some warnings; ignore.
  • Loading branch information
@gvanem
gvanem committed Jan 17, 2025
1 parent 1849f5d commit f23f21c
Show file tree
Hide file tree
Showing 3 changed files with 178 additions and 192 deletions.
38 changes: 19 additions & 19 deletions src/Wsock-trace.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-x86.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile />
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<CustomBuildStep>
Expand All @@ -158,14 +158,14 @@
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-arm.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile>
</ManifestFile>
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<CustomBuildStep>
Expand All @@ -182,14 +182,14 @@
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-arm64.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile>
</ManifestFile>
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
Expand All @@ -204,16 +204,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Link>
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ModuleDefinitionFile>wsock_trace-x86.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-x86.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile />
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<CustomBuildStep>
Expand All @@ -230,14 +230,14 @@
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-arm.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile>
</ManifestFile>
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<CustomBuildStep>
Expand All @@ -254,14 +254,14 @@
<ModuleDefinitionFile>wsock_trace.def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(TargetName).pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib;LuaJit\lib\luajit_static-arm64.lib</AdditionalDependencies>
<AdditionalDependencies>advapi32.lib;ole32.lib;dnsapi.lib;winmm.lib</AdditionalDependencies>
<ManifestFile>
</ManifestFile>
<EnableUAC>false</EnableUAC>
</Link>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;USE_DEF_FILE;USE_LUAJIT;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4146 /wd4267 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;WIN32;_WIN32_WINNT=0x0600;LIBLOC_PRIVATE;ENABLE_DEBUG;USE_TRACE;USE_WSOCK_TRACE;_CRT_NONSTDC_NO_WARNINGS;DISABLE_WinHTTP%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4018 /wd4146 /wd4267 /wd4273 /I. /I./LuaJIT/src /I./Geo-IP/IPFire/src /I./Geo-IP/IPFire/src/libloc/windows /I./Geo-IP/IPFire/src/fake-OpenSSL</AdditionalOptions>
<WarningLevel>Level3</WarningLevel>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
Expand Down
9 changes: 0 additions & 9 deletions src/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,10 @@

#include "wsock_defs.h"

/*
* Because I had problems exporting "__WSAFDIsSet@8" to wsock_trace-*.dll,
* I was forced to use a .def-file to export all functions.
*/
#define EXPORT

#if defined(IN_WSOCK_TRACE_C) && (defined(UNICODE) || defined(_UNICODE))
#error "Compiling this as UNICODE breaks in countless ways."
#endif

#undef WINSOCK_API_LINKAGE
#define WINSOCK_API_LINKAGE EXPORT

#include <winsock2.h>
#include <ws2tcpip.h>
#include <objbase.h>
Expand Down
Loading

0 comments on commit f23f21c

Please sign in to comment.