From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 22 Feb 2013 09:40:30 +0000 (+0000)
Subject: inject: Add define to use environment var instead of shared memory.
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=1405a3ec37cb483cd1a1473568dd737b71ed2dea

inject: Add define to use environment var instead of shared memory.
---

diff --git a/inject/inject.h b/inject/inject.h
index 058ada6..e915e4f 100644
--- a/inject/inject.h
+++ b/inject/inject.h
@@ -91,6 +91,11 @@ getModuleName(char *szModuleName, size_t n, const char *szFilename) {
 }
 
 
+#define USE_SHARED_MEM 1
+
+
+#if USE_SHARED_MEM
+
 #define SHARED_MEM_SIZE 4096
 
 static LPVOID pSharedMem = NULL;
@@ -179,3 +184,5 @@ GetSharedMem(LPSTR lpszDst, size_t n) {
     *lpszDst = '\0';
 }
 
+
+#endif /* USE_SHARED_MEM */
diff --git a/inject/injectee.cpp b/inject/injectee.cpp
index 86992b8..57c82db 100644
--- a/inject/injectee.cpp
+++ b/inject/injectee.cpp
@@ -513,7 +513,7 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
          * - http://msdn.microsoft.com/en-us/library/ms682583
          */
 
-#if 0
+#if !USE_SHARED_MEM
         szNewDllName = getenv("INJECT_DLL");
         if (!szNewDllName) {
             debugPrintf("warning: INJECT_DLL not set\n");
diff --git a/inject/injector.cpp b/inject/injector.cpp
index 04e0959..5c62a72 100644
--- a/inject/injector.cpp
+++ b/inject/injector.cpp
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
     }
 
     const char *szDll = argv[1];
-#if 0
+#if !USE_SHARED_MEM
     SetEnvironmentVariableA("INJECT_DLL", szDll);
 #else
     SetSharedMem(szDll);