Skip to content

Commit b7a2a24

Browse files
dledda-r7dledda-r7
committed
fix: include preprocessor definition on r7-releases for stdapi extensions
1 parent 0ec39dc commit b7a2a24

File tree

8 files changed

+30
-23
lines changed

8 files changed

+30
-23
lines changed

‎c/meterpreter/workspace/ext_server_stdapi/ext_server_stdapi.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
266266
<Optimization>MinSpace</Optimization>
267267
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
268268
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
269+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;STDAPI_NAMESPACE_FS;STDAPI_NAMESPACE_NET;STDAPI_NAMESPACE_RAILGUN;STDAPI_NAMESPACE_SYS;STDAPI_NAMESPACE_UI;STDAPI_NAMESPACE_WEBCAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
270270
<StringPooling>true</StringPooling>
271271
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
272272
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -469,7 +469,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
469469
<Optimization>MaxSpeed</Optimization>
470470
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
471471
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
472-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;STDAPI_NAMESPACE_FS;STDAPI_NAMESPACE_NET;STDAPI_NAMESPACE_RAILGUN;STDAPI_NAMESPACE_SYS;STDAPI_NAMESPACE_UI;STDAPI_NAMESPACE_WEBCAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
473473
<StringPooling>true</StringPooling>
474474
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
475475
<FunctionLevelLinking>false</FunctionLevelLinking>

‎c/meterpreter/workspace/ext_server_stdapi_audio/ext_server_stdapi_audio.vcxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<Optimization>MinSpace</Optimization>
130130
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
131131
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132133
<StringPooling>true</StringPooling>
133134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134135
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -144,7 +145,6 @@
144145
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
145146
<TreatWarningAsError>true</TreatWarningAsError>
146147
<MultiProcessorCompilation>true</MultiProcessorCompilation>
147-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
</ClCompile>
149149
<ResourceCompile>
150150
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -197,6 +197,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
197197
<Optimization>MinSpace</Optimization>
198198
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
199199
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200+
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200201
<StringPooling>true</StringPooling>
201202
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
202203
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -212,7 +213,6 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
212213
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
213214
<TreatWarningAsError>true</TreatWarningAsError>
214215
<MultiProcessorCompilation>true</MultiProcessorCompilation>
215-
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
216216
</ClCompile>
217217
<ResourceCompile>
218218
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -266,6 +266,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
266266
<Optimization>MinSpace</Optimization>
267267
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
268268
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
269270
<StringPooling>true</StringPooling>
270271
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
271272
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -468,7 +469,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
468469
<Optimization>MaxSpeed</Optimization>
469470
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
470471
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
471-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_AUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472473
<StringPooling>true</StringPooling>
473474
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
474475
<FunctionLevelLinking>false</FunctionLevelLinking>

‎c/meterpreter/workspace/ext_server_stdapi_fs/ext_server_stdapi_fs.vcxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<Optimization>MinSpace</Optimization>
130130
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
131131
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132133
<StringPooling>true</StringPooling>
133134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134135
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -144,7 +145,6 @@
144145
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
145146
<TreatWarningAsError>true</TreatWarningAsError>
146147
<MultiProcessorCompilation>true</MultiProcessorCompilation>
147-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
</ClCompile>
149149
<ResourceCompile>
150150
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -197,6 +197,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
197197
<Optimization>MinSpace</Optimization>
198198
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
199199
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200+
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200201
<StringPooling>true</StringPooling>
201202
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
202203
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -212,7 +213,6 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
212213
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
213214
<TreatWarningAsError>true</TreatWarningAsError>
214215
<MultiProcessorCompilation>true</MultiProcessorCompilation>
215-
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
216216
</ClCompile>
217217
<ResourceCompile>
218218
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -266,6 +266,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
266266
<Optimization>MinSpace</Optimization>
267267
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
268268
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
269270
<StringPooling>true</StringPooling>
270271
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
271272
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -468,7 +469,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
468469
<Optimization>MaxSpeed</Optimization>
469470
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
470471
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
471-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_FS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472473
<StringPooling>true</StringPooling>
473474
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
474475
<FunctionLevelLinking>false</FunctionLevelLinking>

‎c/meterpreter/workspace/ext_server_stdapi_net/ext_server_stdapi_net.vcxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<Optimization>MinSpace</Optimization>
130130
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
131131
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132133
<StringPooling>true</StringPooling>
133134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134135
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -144,7 +145,6 @@
144145
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
145146
<TreatWarningAsError>true</TreatWarningAsError>
146147
<MultiProcessorCompilation>true</MultiProcessorCompilation>
147-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
</ClCompile>
149149
<ResourceCompile>
150150
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -197,6 +197,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
197197
<Optimization>MinSpace</Optimization>
198198
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
199199
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200+
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200201
<StringPooling>true</StringPooling>
201202
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
202203
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -212,7 +213,6 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\"</Command>
212213
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
213214
<TreatWarningAsError>true</TreatWarningAsError>
214215
<MultiProcessorCompilation>true</MultiProcessorCompilation>
215-
<PreprocessorDefinitions>DEBUGTRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
216216
</ClCompile>
217217
<ResourceCompile>
218218
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -266,6 +266,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
266266
<Optimization>MinSpace</Optimization>
267267
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
268268
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
269270
<StringPooling>true</StringPooling>
270271
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
271272
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -468,7 +469,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(TargetName)
468469
<Optimization>MaxSpeed</Optimization>
469470
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
470471
<AdditionalIncludeDirectories>..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\stdapi\server;..\..\source\jpeg-8;..\..\source\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
471-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS;STDAPI_NAMESPACE_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
472473
<StringPooling>true</StringPooling>
473474
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
474475
<FunctionLevelLinking>false</FunctionLevelLinking>

0 commit comments

Comments
 (0)