Compilation fixes

This commit is contained in:
Alberto Ortega 2014-12-30 16:53:10 +01:00
parent 9816ed8eaa
commit 6912bb1565
6 changed files with 76 additions and 86 deletions

View File

@ -1,70 +1,55 @@
# Project: pafish
# Compiler: Default GCC compiler
# Compiler Type: MingW 3
# Makefile created by wxDev-C++ IDE 7.4.2.569 on 01/01/14 13:37
WXLIBNAME = wxmsw29u
CPP = g++.exe
CC = gcc.exe
WINDRES = "windres.exe"
OBJ = Objects/MingW/main.o Objects/MingW/common.o Objects/MingW/debuggers.o Objects/MingW/sandboxie.o Objects/MingW/vbox.o Objects/MingW/gensandbox.o Objects/MingW/wine.o Objects/MingW/vmware.o Objects/MingW/qemu.o Objects/MingW/hooks.o Objects/MingW/pafish_private.res
LINKOBJ = "Objects/MingW/main.o" "Objects/MingW/common.o" "Objects/MingW/debuggers.o" "Objects/MingW/sandboxie.o" "Objects/MingW/vbox.o" "Objects/MingW/gensandbox.o" "Objects/MingW/wine.o" "Objects/MingW/vmware.o" "Objects/MingW/qemu.o" "Objects/MingW/hooks.o" Objects/MingW/pafish_private.res
LIBS = -L"C:/Program Files (x86)/Dev-Cpp/lib/wx/gcc_lib" -L"C:/Program Files (x86)/Dev-Cpp/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW32/lib" -s
INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include"
CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"C:/Program Files (x86)/Dev-Cpp/" -I"C:/Program Files (x86)/Dev-Cpp/include/common"
RCINCS = --include-dir "C:/PROGRA~2/Dev-Cpp/include/common"
BIN = Output/MingW/pafish.exe
DEFINES =
CXXFLAGS = $(CXXINCS) $(DEFINES) -fexpensive-optimizations -O1
CFLAGS = $(INCS) $(DEFINES) -fexpensive-optimizations -O1
GPROF = gprof.exe
ifeq ($(OS),Windows_NT)
RM = del /Q
FixPath = $(subst /,\,$1)
else
RM = rm -f
FixPath = $1
endif
LINK = g++.exe
.PHONY: all all-before all-after clean clean-custom
all: all-before $(BIN) all-after
clean: clean-custom
$(RM) $(call FixPath,$(LINKOBJ)) "$(call FixPath,$(BIN))"
$(BIN): $(OBJ)
$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
Objects/MingW/main.o: $(GLOBALDEPS) main.c
$(CC) -c main.c -o Objects/MingW/main.o $(CFLAGS)
Objects/MingW/common.o: $(GLOBALDEPS) common.c
$(CC) -c common.c -o Objects/MingW/common.o $(CFLAGS)
Objects/MingW/debuggers.o: $(GLOBALDEPS) debuggers.c
$(CC) -c debuggers.c -o Objects/MingW/debuggers.o $(CFLAGS)
Objects/MingW/sandboxie.o: $(GLOBALDEPS) sandboxie.c
$(CC) -c sandboxie.c -o Objects/MingW/sandboxie.o $(CFLAGS)
Objects/MingW/vbox.o: $(GLOBALDEPS) vbox.c
$(CC) -c vbox.c -o Objects/MingW/vbox.o $(CFLAGS)
Objects/MingW/gensandbox.o: $(GLOBALDEPS) gensandbox.c
$(CC) -c gensandbox.c -o Objects/MingW/gensandbox.o $(CFLAGS)
Objects/MingW/wine.o: $(GLOBALDEPS) wine.c
$(CC) -c wine.c -o Objects/MingW/wine.o $(CFLAGS)
Objects/MingW/vmware.o: $(GLOBALDEPS) vmware.c
$(CC) -c vmware.c -o Objects/MingW/vmware.o $(CFLAGS)
Objects/MingW/qemu.o: $(GLOBALDEPS) qemu.c
$(CC) -c qemu.c -o Objects/MingW/qemu.o $(CFLAGS)
Objects/MingW/hooks.o: $(GLOBALDEPS) hooks.c
$(CC) -c hooks.c -o Objects/MingW/hooks.o $(CFLAGS)
Objects/MingW/pafish_private.res: Objects/MingW/pafish_private.rc
$(WINDRES) --input-format=rc -o Objects/MingW/pafish_private.res $(RCINCS) Objects/MingW/PAFISH~1.RC -O coff

CC = gcc.exe
LINK = gcc.exe
WINDRES = windres.exe
OBJ = Objects/MingW/main.o Objects/MingW/common.o Objects/MingW/debuggers.o Objects/MingW/sandboxie.o \
Objects/MingW/vbox.o Objects/MingW/gensandbox.o Objects/MingW/wine.o Objects/MingW/vmware.o \
Objects/MingW/qemu.o Objects/MingW/hooks.o Objects/MingW/pafish_private.res
LINKOBJ = $(OBJ)
LIBS = -L"C:/MinGW32/lib" -lwsock32 -liphlpapi -lsetupapi -lmpr -s
INCS = -I"C:/MinGW32/include"
BIN = Output/MingW/pafish.exe
CFLAGS = $(INCS) $(DEFINES) -O0
all: $(BIN)
clean:
del /Q Objects\MingW\*.o
del /Q Objects\MingW\*.res
del /Q Output\MingW\*.exe
$(BIN): $(OBJ)
$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
Objects/MingW/main.o: $(GLOBALDEPS) main.c
$(CC) -c main.c -o Objects/MingW/main.o $(CFLAGS)
Objects/MingW/common.o: $(GLOBALDEPS) common.c
$(CC) -c common.c -o Objects/MingW/common.o $(CFLAGS)
Objects/MingW/debuggers.o: $(GLOBALDEPS) debuggers.c
$(CC) -c debuggers.c -o Objects/MingW/debuggers.o $(CFLAGS)
Objects/MingW/sandboxie.o: $(GLOBALDEPS) sandboxie.c
$(CC) -c sandboxie.c -o Objects/MingW/sandboxie.o $(CFLAGS)
Objects/MingW/vbox.o: $(GLOBALDEPS) vbox.c
$(CC) -c vbox.c -o Objects/MingW/vbox.o $(CFLAGS)
Objects/MingW/gensandbox.o: $(GLOBALDEPS) gensandbox.c
$(CC) -c gensandbox.c -o Objects/MingW/gensandbox.o $(CFLAGS)
Objects/MingW/wine.o: $(GLOBALDEPS) wine.c
$(CC) -c wine.c -o Objects/MingW/wine.o $(CFLAGS)
Objects/MingW/vmware.o: $(GLOBALDEPS) vmware.c
$(CC) -c vmware.c -o Objects/MingW/vmware.o $(CFLAGS)
Objects/MingW/qemu.o: $(GLOBALDEPS) qemu.c
$(CC) -c qemu.c -o Objects/MingW/qemu.o $(CFLAGS)
Objects/MingW/hooks.o: $(GLOBALDEPS) hooks.c
$(CC) -c hooks.c -o Objects/MingW/hooks.o $(CFLAGS)
Objects/MingW/pafish_private.res: Objects/MingW/pafish_private.rc
$(WINDRES) Objects/MingW/pafish_private.rc --input-format=rc -o Objects/MingW/pafish_private.res -O coff

View File

@ -1,8 +1,4 @@
/*
This file will be overwritten by wxDev-C++ at every compile.
Do not edit this file as your changes will be lost.
You can, however, include this file and use the defines.
*/
#ifndef PAFISH_PRIVATE_H
#define PAFISH_PRIVATE_H

View File

@ -1,12 +1,8 @@
// This file is automatically generated by wxDev-C++.
// All changes to this file will be lost when the project is recompiled.
#include <windows.h>
#include <windows.h>
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "pafish.ico"
// This section contains the executable version information. Go to
// Project > Project Options to edit these values.
1 VERSIONINFO
FILEVERSION 0,3,0,1
PRODUCTVERSION 0,3,0,1
@ -32,4 +28,3 @@ BEGIN
VALUE "Translation", 0x0409, 1252
END
END

View File

@ -14,7 +14,7 @@ int debug_isdebuggerpresent() {
}
}
/* This function is not used because it isn't realiable in
/* This function is not used because it isn't reliable in
some new environments */
int debug_checkremotedebuggerpresent() {
BOOL isdebug = FALSE;

View File

@ -214,6 +214,7 @@ int main(int argc, char *argv[])
printf("[*] Reg key (HKLM\\SYSTEM\\CurrentControlSet\\Enum\\IDE ... ");
if (vbox_reg_key6() == 0) {
print_traced();
}
else {
print_not_traced();
@ -241,18 +242,21 @@ int main(int argc, char *argv[])
printf("[*] Reg key (HKLM\\SYSTEM\\ControlSet001\\Services\\VBox* ... ");
if (vbox_reg_key9() == 0) {
print_traced();
}
else {
print_not_traced();
}
if (vbox_sysfile1() == 0) {
print_traced();
}
else {
print_not_traced();
}
if (vbox_sysfile2() == 0) {
print_traced();
}
else {
print_not_traced();
@ -260,6 +264,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for MAC ");
if (vbox_mac() == 0) {
print_traced();
}
else {
print_not_traced();
@ -267,6 +272,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for pseudo device ");
if (vbox_pseudodev() == 0) {
print_traced();
}
else {
print_not_traced();
@ -274,6 +280,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for pipe ");
if (vbox_pipe() == 0) {
print_traced();
}
else {
print_not_traced();
@ -281,6 +288,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for VBox tray tool window ");
if (vbox_traywindow() == 0) {
print_traced();
}
else {
print_not_traced();
@ -288,6 +296,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for VBox network share ");
if (vbox_network_share() == 0) {
print_traced();
}
else {
print_not_traced();
@ -295,6 +304,7 @@ int main(int argc, char *argv[])
printf("[*] Looking for VBox processes ");
if (vbox_processes() == 0) {
print_traced();
}
else {
print_not_traced();
@ -302,9 +312,12 @@ int main(int argc, char *argv[])
printf("[*] Looking for guest tools ");
if (vbox_guest_tools() == 0) {
print_traced();
}
printf("[*] Looking for VBox devices ");
if (vbox_devices() == 0) {
print_traced();
}
else {
print_not_traced();
@ -376,8 +389,7 @@ int main(int argc, char *argv[])
write_log("End");
fflush(stdin);
if (argc != 2 || strncmp(argv[1], "-q", 2) != 0) {
getchar();
}
return analysis_result;
getchar();
return 0;
}

View File

@ -1,4 +1,6 @@
#define _WIN32_WINNT 0x0501 /* _WIN32_WINNT_WINXP */
#include <winsock2.h>
#include <windows.h>
#include <winnetwk.h>