infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use _WIN32 instead of __WIN32__ to be consistent 

git-svn-id: file:///home/svn/framework3/trunk@7290 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2009-10-27 01:13:35 +00:00
parent 6dcffd0373
commit 276a3f8052
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
external/source/meterpreter/source/extensions/stdapi/server/fs/dir.c vendored
View File

@ -1,7 +1,7 @@
#include "../precomp.h"
#include <sys/stat.h>
#ifndef __WIN32__
#ifndef _WIN32
#include <dirent.h>
#endif
@ -30,7 +30,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
result = ERROR_INVALID_PARAMETER;
else
{
#ifdef __WIN32__
#ifdef _WIN32
WIN32_FIND_DATA data;
HANDLE ctx = NULL;
#else
@ -40,7 +40,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
BOOLEAN freeDirectory = FALSE;
LPSTR tempDirectory = (LPSTR)directory;
#ifdef __WIN32__
#ifdef _WIN32
// If there is not wildcard mask on the directory, create a version of the
// directory with a mask appended
if (!strrchr(directory, '*'))
@ -154,7 +154,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
packet_add_tlv_raw(response, TLV_TYPE_STAT_BUF, &buf,
sizeof(buf));
#ifdef __WIN32__
#ifdef _WIN32
} while (FindNextFile(ctx, &data));
#else
} while (data = readdir(ctx));
@ -165,7 +165,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
if (freeDirectory)
free(tempDirectory);
if (ctx)
#ifdef __WIN32__
#ifdef _WIN32
FindClose(ctx);
#else
closedir(ctx);
@ -209,7 +209,7 @@ again:
memset(directory, 0, directorySize);
#ifdef __WIN32__
#ifdef _WIN32
if (!(realSize = GetCurrentDirectory(directorySize, directory)))
#else
if (!(realSize = getcwd(directory, directorySize)))
@ -261,7 +261,7 @@ DWORD request_fs_chdir(Remote *remote, Packet *packet)
if (!directory)
result = ERROR_INVALID_PARAMETER;
#ifdef __WIN32__
#ifdef _WIN32
else if (!SetCurrentDirectory(directory))
#else
else if (!chdir(directory))
@ -292,7 +292,7 @@ DWORD request_fs_mkdir(Remote *remote, Packet *packet)
if (!directory)
result = ERROR_INVALID_PARAMETER;
#ifdef __WIN32__
#ifdef _WIN32
else if (!CreateDirectory(directory, NULL))
#else
else if (!mkdir(directory, 777))
@ -323,7 +323,7 @@ DWORD request_fs_delete_dir(Remote *remote, Packet *packet)
if (!directory)
result = ERROR_INVALID_PARAMETER;
#ifdef __WIN32__
#ifdef _WIN32
else if (!RemoveDirectory(directory))
#else
else if (!rmdir(directory))

2
external/source/meterpreter/source/extensions/stdapi/server/fs/fs_util.c vendored
View File

@ -5,7 +5,7 @@
*/
LPSTR fs_expand_path(LPCSTR regular)
{
#ifdef __WIN32__
#ifdef _WIN32
DWORD expandedFilePathSize = 32768;
LPSTR expandedFilePath = NULL;

2
external/source/meterpreter/source/extensions/stdapi/server/net/net.h vendored
View File

@ -8,7 +8,7 @@ typedef struct _SocketContext
{
Remote *remote;
Channel *channel;
#ifdef __WIN32__
#ifdef _WIN32
WSAEVENT notify;
#else
int notify;

4
external/source/meterpreter/source/extensions/stdapi/server/precomp.h vendored
View File

@ -1,7 +1,7 @@
#ifndef METERPRETER_SOURCE_EXTENSION_STDAPI_SERVER_PRECOMP_H
#define METERPRETER_SOURCE_EXTENSION_STDAPI_SERVER_PRECOMP_H
#ifdef __WIN32__
#ifdef _WIN32
// sf: Compatability fix for a broken sdk? We get errors in Iphlpapi.h using the latest Windows SDK if we dont do this.
#define _WIN32_WINNT _WIN32_WINNT_WIN2K
@ -21,7 +21,7 @@
#include "net/net.h"
#include "ui/ui.h"
#ifdef __WIN32__
#ifdef _WIN32
#include "../../../ReflectiveDLLInjection/DelayLoadMetSrv.h"
#include "../../../ReflectiveDLLInjection/GetProcAddressR.h"
#include "../../../ReflectiveDLLInjection/ReflectiveLoader.h"

6
external/source/meterpreter/source/extensions/stdapi/server/stdapi.c vendored
View File

@ -7,7 +7,7 @@
// 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.
#ifdef __WIN32__
#ifdef _WIN32
#include "../../../ReflectiveDLLInjection/ReflectiveLoader.c"
#endif
// NOTE: _CRT_SECURE_NO_WARNINGS has been added to Configuration->C/C++->Preprocessor->Preprocessor
@ -322,14 +322,14 @@ Command customCommands[] =
/*
* Initialize the server extension
*/
#ifdef __WIN32__
#ifdef _WIN32
DWORD __declspec(dllexport) InitServerExtension(Remote *remote)
#else
DWORD InitServerExtension(Remote *remote)
#endif
{
DWORD index;
#ifdef __WIN32__
#ifdef _WIN32
hMetSrv = remote->hMetSrv;
#endif
for (index = 0;