Changeset 1505

Timestamp:

01/13/08 16:40:07 (8 months ago)

Author:

common

Message:

libemu

• emu_profile introduces an api for storing function calls and parameters
  storing return values is todo, as well as dumping/rereading the profiles
  

Files:

• libemu/trunk/include/emu/Makefile.am (modified) (1 diff)
• libemu/trunk/include/emu/emu_stack.h (added)
• libemu/trunk/include/emu/environment/Makefile.am (modified) (1 diff)
• libemu/trunk/include/emu/environment/emu_profile.h (added)
• libemu/trunk/include/emu/environment/win32/emu_env_w32.h (modified) (2 diffs)
• libemu/trunk/src/Makefile.am (modified) (2 diffs)
• libemu/trunk/src/emu_stack.c (added)
• libemu/trunk/src/environment/emu_profile.c (added)
• libemu/trunk/src/environment/win32/emu_env_w32.c (modified) (2 diffs)
• libemu/trunk/src/environment/win32/env_w32_dll_export_kernel32_hooks.c (modified) (16 diffs)
• libemu/trunk/src/environment/win32/env_w32_dll_export_urlmon_hooks.c (modified) (2 diffs)
• libemu/trunk/src/environment/win32/env_w32_dll_export_ws2_32_hooks.c (modified) (10 diffs)

libemu/trunk/include/emu/Makefile.am

@@ -25 +25 @@
-include_HEADERS += emu_shellcode.h
-include_HEADERS += emu_source.h
+include_HEADERS += emu_stack.h
-include_HEADERS += emu_string.h
-include_HEADERS += emu_track.h

libemu/trunk/include/emu/environment/Makefile.am

@@ -4 +4 @@
-
-SUBDIRS = win32 linux
+include_HEADERS = emu_profile.h
-

libemu/trunk/include/emu/environment/win32/emu_env_w32.h

@@ -31 +31 @@
-struct emu_env_w32_dll;
-struct emu_env_w32_dll_export;
+struct emu_profile;
-
-/**
@@ -51 +52 @@
-         */
-        uint32_t        baseaddr;
+
+        struct emu_profile *profile;
-};
-

libemu/trunk/src/Makefile.am

@@ -24 +24 @@
-libemu_la_SOURCES += emu_list.c
-libemu_la_SOURCES += emu_queue.c
+libemu_la_SOURCES += emu_stack.c
-libemu_la_SOURCES += emu_shellcode.c
-libemu_la_SOURCES += emu_source.c
@@ -78 +79 @@
-libemu_la_SOURCES += libdasm.c libdasm.h opcode_tables.h
-
+libemu_la_SOURCES += environment/emu_profile.c
-libemu_la_SOURCES += environment/win32/emu_env_w32.c
-libemu_la_SOURCES += environment/win32/emu_env_w32_dll.c

libemu/trunk/src/environment/win32/emu_env_w32.c

@@ -34 +34 @@
-#include "emu/emu_memory.h"
-#include "emu/emu_hashtable.h"
+#include "emu/environment/emu_profile.h"
-#include "emu/environment/win32/emu_env_w32.h"
-#include "emu/environment/win32/emu_env_w32_dll.h"
@@ -151 +152 @@
-        struct emu_env_w32 *env = (struct emu_env_w32 *)malloc(sizeof(struct emu_env_w32));
-        memset(env,0,sizeof(struct emu_env_w32));
+        env->profile = emu_profile_new();
-        env->emu = e;
-        // write TEB and linklist

libemu/trunk/src/environment/win32/env_w32_dll_export_kernel32_hooks.c

@@ -49 +49 @@
-#include "emu/emu_hashtable.h"
-#include "emu/emu_string.h"
+#include "emu/environment/emu_profile.h"
-#include "emu/environment/win32/emu_env_w32.h"
-#include "emu/environment/win32/emu_env_w32_dll.h"
@@ -66 +67 @@
-        POP_DWORD(c, &eip_save);
-
+        
+        
-/*
-BOOL CloseHandle(
@@ -71 +74 @@
-);
-*/
+        emu_profile_function_add(env->profile, "CloseHandle");
-
-        uint32_t object;
-        POP_DWORD(c, &object);
+        emu_profile_argument_add_int(env->profile, "Handle", "hObject", object);
-
-        emu_cpu_eip_set(c, eip_save);
@@ -102 +107 @@
-);
-*/
+        emu_profile_function_add(env->profile, "CreateFile");
-
-        uint32_t filename;
-        POP_DWORD(c, &filename);
+        emu_profile_argument_add_ref(env->profile, "LPCTSTR", "lpFileName", filename);
+        emu_profile_argument_add_string(env->profile, "", "", "");
+
-
-        uint32_t desiredaccess;
-        POP_DWORD(c, &desiredaccess);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwDesiredAccess", desiredaccess);
-
-        uint32_t sharemode;
-        POP_DWORD(c, &sharemode);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwShareMode", sharemode);
-
-        uint32_t securityattr;
-        POP_DWORD(c, &securityattr);
-
-
+
+
+
+
-        POP_DWORD(c, &createdisp);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwCreationDisposition", createdisp);
-
-        uint32_t flagsandattr;
-        POP_DWORD(c, &flagsandattr);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwFlagsAndAttributes", flagsandattr);
-
-        uint32_t templatefile;
-        POP_DWORD(c, &templatefile);
+        emu_profile_argument_add_int(env->profile, "Handle", "hTemplateFile", templatefile);
-
-        emu_cpu_eip_set(c, eip_save);
@@ -135 +151 @@
-
-        struct emu_cpu *c = emu_cpu_get(env->emu);
+        struct emu_memory *m = emu_memory_get(env->emu);
-
-        uint32_t eip_save;
@@ -153 +170 @@
-);*/
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        uint32_t inherithandles;
-        POP_DWORD(c, &inherithandles);
+        emu_profile_argument_add_int(env->profile, "BOOL", "fInheritHandles", inherithandles);
+
-
-        uint32_t create;
-        POP_DWORD(c, &create);
+        emu_profile_argument_add_int(env->profile, "DWORD", "fdwCreate", create);
-
-        uint32_t environment;
-        POP_DWORD(c, &environment);
+        emu_profile_argument_add_ref(env->profile, "LPVOID", "pvEnvironment", environment);
+        emu_profile_argument_add_string(env->profile, "", "", "");
+
-
-        uint32_t cwd;
-        POP_DWORD(c, &cwd);
+        emu_profile_argument_add_ref(env->profile, "LPWSTR", "pszCurDir", cwd);
+        emu_profile_argument_add_string(env->profile, "", "", "");
+
-
-        uint32_t p_startinfo;
-        POP_DWORD(c, &p_startinfo);
+        emu_profile_argument_add_ref(env->profile, "LPSTARTUPINFOW", "psiStartInfo", p_startinfo);
+
+        STARTUPINFO *si = malloc(sizeof(STARTUPINFO));
+        emu_memory_read_block(m, p_startinfo, si, sizeof(STARTUPINFO));
+
+        emu_profile_argument_start(env->profile, "", "");
+        emu_profile_argument_add_int(env->profile, "DWORD",  "cb"                               , si->cb);                                                   
+        emu_profile_argument_add_int(env->profile, "LPTSTR", "lpReserved"               , (unsigned int)si->lpReserved);
+        emu_profile_argument_add_int(env->profile, "LPTSTR", "lpDesktop"                , (unsigned int)si->lpDesktop);
+        emu_profile_argument_add_int(env->profile, "LPTSTR", "lpTitle"                  , (unsigned int)si->lpTitle);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwX"                              , si->dwX);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwY"                              , si->dwY);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwXSize"                  , si->dwXSize);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwYSize"                  , si->dwYSize);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwXCountChars"    , si->dwXCountChars);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwYCountChars"    , si->dwYCountChars);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwFillAttribute"  , si->dwFillAttribute);
+        emu_profile_argument_add_int(env->profile, "DWORD",  "dwFlags"                  , si->dwFlags);
+        emu_profile_argument_add_int(env->profile, "WORD",   "wShowWindow"              , si->wShowWindow);
+        emu_profile_argument_add_int(env->profile, "WORD",   "cbReserved2"              , si->cbReserved2);
+        emu_profile_argument_add_int(env->profile, "LPBYTE", "lpReserved2"              , (unsigned int)si->lpReserved2);
+        emu_profile_argument_add_int(env->profile, "HANDLE", "hStdInput"                , si->hStdInput);                                            
+        emu_profile_argument_add_int(env->profile, "HANDLE", "hStdOutput"               , si->hStdOutput);                                           
+        emu_profile_argument_add_int(env->profile, "HANDLE", "hStdError"                , si->hStdError);                                           
+        emu_profile_argument_end(env->profile);
+        
-
-        uint32_t p_procinfo;
-        POP_DWORD(c, &p_procinfo);
+        emu_profile_argument_add_ref(env->profile, "PROCESS_INFORMATION", "pProcInfo",0x52f74c);
+
+        PROCESS_INFORMATION *pi = malloc(sizeof(PROCESS_INFORMATION));
+        emu_memory_read_block(m, p_procinfo, pi, sizeof(PROCESS_INFORMATION));
+
+        emu_profile_argument_start(env->profile, "", "");
+        emu_profile_argument_add_int(env->profile, "DWORD", "hProcess"          ,pi->dwProcessId);
+        emu_profile_argument_add_int(env->profile, "DWORD", "hThread"                   ,pi->dwThreadId);
+        emu_profile_argument_add_int(env->profile, "HANDLE", "dwProcessId"              ,pi->hProcess);
+        emu_profile_argument_add_int(env->profile, "HANDLE", "dwThreadId"               ,pi->hThread);
+        emu_profile_argument_end(env->profile);
+
-
-
@@ -187 +268 @@
-        emu_cpu_reg32_set(c, eax, 0);
-
-
-
-
+
-
-        pi->dwProcessId = 4711;
@@ -198 +277 @@
-        emu_memory_write_block(m, p_procinfo, pi, sizeof(PROCESS_INFORMATION));
-
-        STARTUPINFO *si = malloc(sizeof(STARTUPINFO));
-        emu_memory_read_block(m, p_startinfo, si, sizeof(STARTUPINFO));
-
-        printf("CreateProcess(pszImageName=%x, pszCmdLine=%x, psaProcess=%x, psaThread=%x, fInheritHandles=%i, fdwCreate=%i, pvEnvironment=%x, pszCurDir=%x, psiStartInfo=%x, pProcInfo=%x)\n", 
-                   imagename, cmdline, process, thread, inherithandles, create, environment, cwd, p_startinfo, p_procinfo);
-
-        printf("PROCESS_INFORMATION\n"
-                   "{\n"
-                   "\tHANDLE hProcess=%i;\n"
-                   "\tHANDLE hThread=%i;\n"
-                   "\tDWORD dwProcessId=%i;\n"
-                   "\tDWORD dwThreadId=%i;\n"
-                   "}\n",
-                   pi->dwProcessId, 
-                   pi->dwThreadId, 
-                   pi->hProcess, 
-                   pi->hThread);
-
-
-        printf("STARTUPINFO {\n"
-                   "\tDWORD cb=%i;\n"
-                   "\tLPTSTR lpReserved=0x%08x;\n"
-                   "\tLPTSTR lpDesktop=0x%08x;\n"
-                   "\tLPTSTR lpTitle=0x%08x;\n"
-                   "\tDWORD dwX=%i;\n"
-                   "\tDWORD dwY=%i;\n"
-                   "\tDWORD dwXSize=%i;\n"
-                   "\tDWORD dwYSize=%i;\n"
-                   "\tDWORD dwXCountChars=%i;\n"
-                   "\tDWORD dwYCountChars=%i;\n"
-                   "\tDWORD dwFillAttribute=%i;\n"
-                   "\tDWORD dwFlags=%i;\n"
-                   "\tWORD wShowWindow=%i;\n"
-                   "\tWORD cbReserved2=%i;\n"
-                   "\tLPBYTE lpReserved2=0x08%x;\n"
-                   "\tHANDLE hStdInput=%i;\n"
-                   "\tHANDLE hStdOutput=%i;\n"
-                   "\tHANDLE hStdError=%i;\n"
-                   "}\n",
-                   si->cb,
-                   (unsigned int)si->lpReserved,
-                   (unsigned int)si->lpDesktop,
-                   (unsigned int)si->lpTitle,
-                   si->dwX,
-                   si->dwY,
-                   si->dwXSize,
-                   si->dwYSize,
-                   si->dwXCountChars,
-                   si->dwYCountChars,
-                   si->dwFillAttribute,
-                   si->dwFlags,
-                   si->wShowWindow,
-                   si->cbReserved2,
-                   (unsigned int)si->lpReserved2,
-                   si->hStdInput,
-                   si->hStdOutput,
-                   si->hStdError);
-
-        fflush(NULL);
-
-#ifdef HAVE_INTERACTIVE_HOOKS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-#endif
-
+
+
+
-        emu_cpu_eip_set(c, eip_save);
-        return 0;
@@ -298 +326 @@
-
-*/
+        emu_profile_function_add(env->profile, "DeleteFile");
-        uint32_t filename;
-        POP_DWORD(c, &filename);
+        emu_profile_argument_add_ref(env->profile, "LPCTSTR", "lpFileName", filename);
+        emu_profile_argument_add_string(env->profile, "", "", "");
-
-        emu_cpu_eip_set(c, eip_save);
@@ -457 +488 @@
-int32_t env_w32_hook_GetProcAddress(struct emu_env_w32 *env, struct emu_env_w32_dll_export *ex)
-{
-
-
-
-
+
+
-
-        uint32_t eip_save;
@@ -471 +500 @@
-);
-*/
-
+
+
-
-        uint32_t module;// = emu_cpu_reg32_get(c, esp);
-        POP_DWORD(c, &module);
-
-
+
+
+
-
-        uint32_t p_procname;
-        POP_DWORD(c, &p_procname);
+        emu_profile_argument_add_ref(env->profile, "LPCSTR", "lpProcName", p_procname);
+        
-
-        struct emu_string *procname = emu_string_new();
-        struct emu_memory *mem = emu_memory_get(env->emu);
-        emu_memory_read_string(mem, p_procname, procname, 256);
-
+
-
-        printf("procname name is '%s'\n", emu_string_char(procname));
@@ -537 +569 @@
-);
-*/
+        emu_profile_function_add(env->profile, "GetSystemDirectory");
+
-        uint32_t p_buffer;
-        POP_DWORD(c, &p_buffer);
+        emu_profile_argument_add_ref(env->profile, "LPTSTR", "lpBuffer", p_buffer);
+        emu_profile_argument_add_string(env->profile, "", "", "");
-
-        uint32_t size;
-        POP_DWORD(c, &size);
+        emu_profile_argument_add_int(env->profile, "UINT", "uSize", size);
+
-
-        emu_memory_write_block(emu_memory_get(env->emu), p_buffer, "c:\\WINDOWS\\system32\x00", 20);
@@ -658 +696 @@
-int32_t env_w32_hook_LoadLibrayA(struct emu_env_w32 *env, struct emu_env_w32_dll_export *ex)
-{
-
-
+
+
+
+
+
+
+
-
-/* HMODULE WINAPI LoadLibrary(LPCTSTR lpFileName); */
-
-
-
-
-
+
-
-        uint32_t dllname_ptr;// = emu_cpu_reg32_get(c, esp);
-
-
+
+
+
-
-    struct emu_string *dllstr = emu_string_new();
@@ -676 +717 @@
-    emu_memory_read_string(mem, dllname_ptr, dllstr, 256);
-
+
-        char *dllname = emu_string_char(dllstr);
+        emu_profile_argument_add_string(env->profile, "", "", dllname);
+
-
-        int i;
@@ -827 +871 @@
-);
-*/
+        emu_profile_function_add(env->profile, "WaitForSingleObject");
-
-        uint32_t handle;
-        POP_DWORD(c, &handle);
+        emu_profile_argument_add_int(env->profile, "HANDLE", "hHandle", handle);
-
-        uint32_t msecs;
-        POP_DWORD(c, &msecs);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwMilliseconds", msecs);
-
-        printf("WaitForSingleObject(hHandle=%i,  dwMilliseconds=%i)\n", handle, msecs);
@@ -870 +917 @@
-);
-*/
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        uint32_t show;
-        POP_DWORD(c, &show);
-
-
-
-
-
-
+
+
+
+
-
-        emu_cpu_reg32_set(c, eax, 32);

libemu/trunk/src/environment/win32/env_w32_dll_export_urlmon_hooks.c

@@ -41 +41 @@
-#include "emu/emu_hashtable.h"
-#include "emu/emu_string.h"
+#include "emu/environment/emu_profile.h"
-#include "emu/environment/win32/emu_env_w32.h"
-#include "emu/environment/win32/emu_env_w32_dll.h"
@@ -66 +67 @@
-);
-*/
+        emu_profile_function_add(env->profile, "URLDownloadToFile");
+
-        uint32_t p_caller;
-        POP_DWORD(c, &p_caller);
+        emu_profile_argument_add_ref(env->profile, "LPUNKNOWN", "pCaller", p_caller);
+        emu_profile_argument_add_string(env->profile, "", "", ""); 
-
-        uint32_t p_url;
-        POP_DWORD(c, &p_url);
+        emu_profile_argument_add_ref(env->profile, "LPCTSTR", "szURL", p_url);
+
+    struct emu_string *url = emu_string_new();
+        emu_memory_read_string(c->mem, p_url, url, 512);
+        emu_profile_argument_add_string(env->profile, "", "", emu_string_char(url)); 
+
-
-        uint32_t p_filename;
-        POP_DWORD(c, &p_filename);
+        emu_profile_argument_add_ref(env->profile, "LPCTSTR", "szFileName", p_filename);
+
+        struct emu_string *filename = emu_string_new();
+        emu_memory_read_string(c->mem, p_filename, filename, 512);
+        emu_profile_argument_add_string(env->profile, "", "", emu_string_char(filename)); 
-
-        uint32_t reserved;
-        POP_DWORD(c, &reserved);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwReserved", reserved);
-
-        uint32_t statuscallbackfn;
-        POP_DWORD(c, &statuscallbackfn);
+        emu_profile_argument_add_int(env->profile, "LPBINDSTATUSCALLBACK", "lpfnCB", statuscallbackfn);
-
-
-
-        struct emu_string *url = emu_string_new();
-        emu_memory_read_string(c->mem, p_url, url, 512);
-
-        struct emu_string *filename = emu_string_new();
-        emu_memory_read_string(c->mem, p_filename, filename, 512);
-
-
-
+
+
-
-        emu_string_free(url);

libemu/trunk/src/environment/win32/env_w32_dll_export_ws2_32_hooks.c

@@ -48 +48 @@
-#include "emu/emu_hashtable.h"
-#include "emu/emu_string.h"
+#include "emu/environment/emu_profile.h"
-#include "emu/environment/win32/emu_env_w32.h"
-#include "emu/environment/win32/emu_env_w32_dll.h"
@@ -55 +56 @@
-int32_t env_w32_hook_accept(struct emu_env_w32 *env, struct emu_env_w32_dll_export *ex)
-{
-        printf("Hook me Captain Cook!\n");
-        printf("%s:%i %s\n",__FILE__,__LINE__,__FUNCTION__);
-
-        struct emu_cpu *c = emu_cpu_get(env->emu);
-
@@ -70 +68 @@
-);*/
-
-
-
+
+
+
+
+
-
-        uint32_t addr;
-        POP_DWORD(c, &addr);
+        emu_profile_argument_add_ref(env->profile, "sockaddr *", "addr", addr);
+        emu_profile_argument_start(env->profile, "", "");
+        emu_profile_argument_end(env->profile);
-
-        uint32_t addrlen;
-        POP_DWORD(c, &addrlen);
+        emu_profile_argument_add_ref(env->profile, "int", "addrlen", addrlen);
+        emu_profile_argument_add_int(env->profile, "", "", 0);
-
-        printf("accept(s=%i, addr=%x, addrlen=%i);\n", s, addr, addrlen);
@@ -98 +104 @@
-int32_t env_w32_hook_bind(struct emu_env_w32 *env, struct emu_env_w32_dll_export *ex)
-{
-        printf("Hook me Captain Cook!\n");
-        printf("%s:%i %s\n",__FILE__,__LINE__,__FUNCTION__);
-
-        struct emu_cpu *c = emu_cpu_get(env->emu);
-
@@ -112 +115 @@
-  const struct sockaddr* name,
-  int namelen
-
-
-
-
+
+
+
+
+
+
+
-
-        uint32_t name;
-        POP_DWORD(c, &name);
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        struct sockaddr sa;
+        
-        emu_memory_read_block(emu_memory_get(env->emu), name, &sa, sizeof(struct sockaddr));
-        if (sa.sa_family == AF_INET)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+
+
+
+        uint32_t namelen;
+        POP_DWORD(c, &namelen);
+
+        printf("bind(s=%i, name=%x, namelen=%i\n", s, name, namelen);
+
-
-        int retval = 0;
@@ -162 +198 @@
-);
-*/
-
-
+
+
+
+
-
-#ifdef HAVE_INTERACTIVE_HOOKS
@@ -194 +232 @@
-)
-*/
-
-
+
+
+
+
-
-        uint32_t name;
-        POP_DWORD(c, &name);
+        struct sockaddr sa;
+
+        emu_memory_read_block(emu_memory_get(env->emu), name, &sa, sizeof(struct sockaddr));
+        if (sa.sa_family == AF_INET)
+        {
+                struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+                emu_profile_argument_add_ref(env->profile, "sockaddr_in *", "name", name);
+                emu_profile_argument_start(env->profile, "", "");
+                emu_profile_argument_add_int(env->profile, "short", "sin_family", si->sin_family);
+                emu_profile_argument_add_port(env->profile, "unsigned short", "sin_port", si->sin_port);
+                emu_profile_argument_start(env->profile, "in_addr", "sin_addr");
+                emu_profile_argument_add_ip(env->profile, "unsigned long", "s_addr", si->sin_addr.s_addr);
+                emu_profile_argument_end(env->profile);
+                emu_profile_argument_add_string(env->profile, "char", "sin_zero", "       ");
+                emu_profile_argument_end(env->profile);
+
+        }else
+        {
+                emu_profile_argument_start(env->profile, "sockaddr *", "name");
+                emu_profile_argument_end(env->profile);
+        }
-
-        uint32_t namelen;
-        POP_DWORD(c, &namelen);
-
-
-
-
-
-
-
+
-
-        int retval = 0;
@@ -242 +297 @@
-);
-*/
-
-
-
+
+
+
+
+
+
-
-        uint32_t backlog;
-        POP_DWORD(c, &backlog);
+        emu_profile_argument_add_int(env->profile, "int", "backlog", backlog);
-
-        printf("listen(s=%i,  backlog=%i)\n", s,  backlog);
@@ -477 +536 @@
-); */
-
+        emu_profile_function_add(env->profile, "WSASocket");
+
-        uint32_t af;
-        POP_DWORD(c, &af);
+        emu_profile_argument_add_int(env->profile, "int", "af", af);
+
+
-
-        uint32_t type;
-        POP_DWORD(c, &type);
+        emu_profile_argument_add_int(env->profile, "int", "type", type);
-
-        uint32_t protocol;
-        POP_DWORD(c, &protocol);
+        emu_profile_argument_add_int(env->profile, "int", "protocol", protocol);
-
-        uint32_t protocolinfo;
-        POP_DWORD(c, &protocolinfo);
+        emu_profile_argument_add_int(env->profile, "LPWSAPROTOCOL_INFO", "lpProtocolInfo", protocolinfo);
+
-
-        uint32_t group;
-        POP_DWORD(c, &group);
+        emu_profile_argument_add_int(env->profile, "GROUP", "g", group);
+
-
-        uint32_t flags;
-        POP_DWORD(c, &flags);
+        emu_profile_argument_add_int(env->profile, "DWORD", "dwFlags", flags);
+
-
-        printf("SOCKET WSASocket(af=%i, type=%i, protocol=%i, lpProtocolInfo=%x, group=%i, dwFlags=%i);\n",
@@ -529 +601 @@
-);
-*/
-
+
+
-        uint32_t wsaversionreq;
-        POP_DWORD(c, &wsaversionreq);
-        printf("WSAStartup version %x\n", wsaversionreq);
+        emu_profile_argument_add_int(env->profile, "WORD", "wVersionRequested", wsaversionreq);
-
-        uint32_t wsadata;
-        POP_DWORD(c, &wsadata);
+        emu_profile_argument_add_int(env->profile, "LPWSADATA", "lpWSAData", wsadata);
-
-