From efdbb2fc42925c85957ead199ce14e5bc6e8570f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 12 Jan 2010 17:11:17 +0000 Subject: [PATCH] some things to come in the near future ;) --- shmserver/shms-windows.cpp | 3 --- shmserver/shms.h | 12 +++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/shmserver/shms-windows.cpp b/shmserver/shms-windows.cpp index f9a867cdc..1885b33cd 100644 --- a/shmserver/shms-windows.cpp +++ b/shmserver/shms-windows.cpp @@ -28,9 +28,6 @@ distribution. * using hacks like this sucks even more */ -#define _WIN32_WINNT 0x0501 // needed for INPUT struct -#define WINVER 0x0501 // OpenThread(), PSAPI, Toolhelp32 -#define WIN32_LEAN_AND_MEAN #include #include diff --git a/shmserver/shms.h b/shmserver/shms.h index bf547a338..01f59a9d6 100644 --- a/shmserver/shms.h +++ b/shmserver/shms.h @@ -80,9 +80,15 @@ enum DF_PINGPONG DFPP_SUSPEND, // client notifies server to wait for commands (server is stalled in busy wait) DFPP_SUSPENDED, // response to WAIT, server is stalled in busy wait - // similar to DFPP_WRITE, writes to a local buffer, writes the same back to shm, sends DFPP_RET_DATA - // used for benchmarking - DFPP_BOUNCE, + // all strings capped at 1MB + DFPP_READ_STL_STRING,// client requests contents of STL string at address + DFPP_READ_C_STRING,// client requests contents of a C string at address, max length (0 means zero terminated) + DFPP_RET_STRING, // sv -> cl length + string contents + DFPP_WRITE_STL_STRING,// client wants to set STL string at address to something + + // vector elements > 1MB are not supported because they don't fit into the shared memory + DFPP_READ_ENTIRE_VECTOR, // read an entire vector (parameters are address of vector object and size of items) + DFPP_RET_VECTOR_BODY, // a part of a vector is returned - no. of elements returned, no. of elements total, elements NUM_DFPP };