kc3-lang/dlfcn-win32

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 972ffb4..1dbec48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ if (BUILD_SHARED_LIBS)
 endif (BUILD_SHARED_LIBS)
 
 add_library(dl ${sources})
+target_link_libraries(dl psapi)
 
 install (TARGETS dl RUNTIME DESTINATION bin
                     LIBRARY DESTINATION lib${LIB_SUFFIX}
diff --git a/Makefile b/Makefile
index 0f32932..aec9ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@
 # dlfcn-win32 Makefile
 #
 include config.mak
-CFLAGS=-Wall -O3 -fomit-frame-pointer
+CFLAGS = -Wall -O3 -fomit-frame-pointer
+LIBS  += -lpsapi
 
 ifeq ($(BUILD_SHARED),yes)
 	TARGETS += libdl.dll
@@ -33,7 +34,7 @@ libdl.a: $(LIB_OBJS)
 	$(RANLIB) libdl.a
 
 libdl.dll: $(LIB_OBJS)
-	$(CC) $(SHFLAGS) -shared -o $@ $^
+	$(CC) $(SHFLAGS) -shared -o $@ $^ $(LIBS)
 
 libdl.lib: libdl.dll
 	$(LIBCMD) /machine:i386 /def:libdl.def
@@ -60,7 +61,7 @@ lib-install: $(LIBS)
 install: $(INSTALL)
 
 test.exe: test.o $(TARGETS)
-	$(CC) -o $@ $< -L. -ldl
+	$(CC) -o $@ $< -L. -ldl $(LIBS)
 
 testdll.dll: testdll.c
 	$(CC) -shared -o $@ $^
diff --git a/dlfcn.c b/dlfcn.c
index add1f4f..324fafc 100644
--- a/dlfcn.c
+++ b/dlfcn.c
@@ -22,7 +22,9 @@
 #include <stdlib.h>
 #include <crtdbg.h>
 #endif
+#define PSAPI_VERSION 1
 #include <windows.h>
+#include <psapi.h>
 #include <stdio.h>
 
 #define DLFCN_WIN32_EXPORTS
@@ -40,23 +42,25 @@ typedef struct global_object {
 } global_object;
 
 static global_object first_object;
+static global_object first_automatic_object;
+static int auto_ref_count = 0;
 
 /* These functions implement a double linked list for the global objects. */
-static global_object *global_search( HMODULE hModule )
+static global_object *global_search( global_object *start, HMODULE hModule )
 {
     global_object *pobject;
 
     if( hModule == NULL )
         return NULL;
 
-    for( pobject = &first_object; pobject ; pobject = pobject->next )
+    for( pobject = start; pobject; pobject = pobject->next )
         if( pobject->hModule == hModule )
             return pobject;
 
     return NULL;
 }
 
-static void global_add( HMODULE hModule )
+static void global_add( global_object *start, HMODULE hModule )
 {
     global_object *pobject;
     global_object *nobject;
@@ -64,15 +68,22 @@ static void global_add( HMODULE hModule )
     if( hModule == NULL )
         return;
 
-    pobject = global_search( hModule );
+    pobject = global_search( start, hModule );
 
     /* Do not add object again if it's already on the list */
     if( pobject )
         return;
 
-    for( pobject = &first_object; pobject->next ; pobject = pobject->next );
+    if( start == &first_automatic_object )
+    {
+        pobject = global_search( &first_object, hModule );
+        if( pobject )
+            return;
+    }
+
+    for( pobject = start; pobject->next; pobject = pobject->next );
 
-    nobject = malloc( sizeof(global_object) );
+    nobject = malloc( sizeof( global_object ) );
 
     /* Should this be enough to fail global_add, and therefore also fail
      * dlopen?
@@ -86,14 +97,14 @@ static void global_add( HMODULE hModule )
     nobject->hModule = hModule;
 }
 
-static void global_rem( HMODULE hModule )
+static void global_rem( global_object *start, HMODULE hModule )
 {
     global_object *pobject;
 
     if( hModule == NULL )
         return;
 
-    pobject = global_search( hModule );
+    pobject = global_search( start, hModule );
 
     if( !pobject )
         return;
@@ -185,18 +196,40 @@ void *dlopen( const char *file, int mode )
 
     if( file == 0 )
     {
+        HMODULE hAddtnlMods[1024]; // Already loaded modules
+        HANDLE hCurrentProc = GetCurrentProcess( );
+        DWORD cbNeeded;
+
         /* POSIX says that if the value of file is 0, a handle on a global
          * symbol object must be provided. That object must be able to access
          * all symbols from the original program file, and any objects loaded
          * with the RTLD_GLOBAL flag.
          * The return value from GetModuleHandle( ) allows us to retrieve
          * symbols only from the original program file. For objects loaded with
-         * the RTLD_GLOBAL flag, we create our own list later on.
+         * the RTLD_GLOBAL flag, we create our own list later on. For objects
+         * outside of the program file but already loaded (e.g. linked DLLs)
+         * they are added below.
          */
         hModule = GetModuleHandle( NULL );
 
         if( !hModule )
             save_err_ptr_str( file );
+
+
+        /* GetModuleHandle( NULL ) only returns the current program file. So
+	 * if we want to get ALL loaded module including those in linked DLLs,
+	 * we have to use EnumProcessModules( ).
+         */
+        if( EnumProcessModules( hCurrentProc, hAddtnlMods,
+                                sizeof( hAddtnlMods ), &cbNeeded ) != 0 )
+        {
+            DWORD i;
+            for( i = 0; i < cbNeeded / sizeof( HMODULE ); i++ )
+            {
+                global_add( &first_automatic_object, hAddtnlMods[i] );
+            }
+        }
+        auto_ref_count++;
     }
     else
     {
@@ -233,7 +266,7 @@ void *dlopen( const char *file, int mode )
         if( !hModule )
             save_err_str( lpFileName );
         else if( (mode & RTLD_GLOBAL) )
-            global_add( hModule );
+            global_add( &first_object, hModule );
     }
 
     /* Return to previous state of the error-mode bit flags. */
@@ -242,6 +275,21 @@ void *dlopen( const char *file, int mode )
     return (void *) hModule;
 }
 
+static void free_auto( )
+{
+    global_object *pobject = first_automatic_object.next;
+    if( pobject )
+    {
+        global_object *next;
+        for ( ; pobject; pobject = next )
+        {
+            next = pobject->next;
+            free( pobject );
+        }
+        first_automatic_object.next = NULL;
+    }
+}
+
 int dlclose( void *handle )
 {
     HMODULE hModule = (HMODULE) handle;
@@ -255,7 +303,18 @@ int dlclose( void *handle )
      * objects.
      */
     if( ret )
-        global_rem( hModule );
+    {
+        HMODULE cur = GetModuleHandle( NULL );
+        global_rem( &first_object, hModule );
+        if( hModule == cur )
+        {
+            auto_ref_count--;
+            if( auto_ref_count < 0 )
+                auto_ref_count = 0;
+            if( !auto_ref_count )
+                free_auto( );
+        }
+    }
     else
         save_err_ptr_str( handle );
 
@@ -268,37 +327,47 @@ int dlclose( void *handle )
 void *dlsym( void *handle, const char *name )
 {
     FARPROC symbol;
+    HMODULE hModule;
 
     current_error = NULL;
 
     symbol = GetProcAddress( handle, name );
 
-    if( symbol == NULL )
-    {
-        HMODULE hModule;
+    if( symbol != NULL )
+        goto end;
 
-        /* If the handle for the original program file is passed, also search
-         * in all globally loaded objects.
-         */
+    /* If the handle for the original program file is passed, also search
+     * in all globally loaded objects.
+     */
 
-        hModule = GetModuleHandle( NULL );
+    hModule = GetModuleHandle( NULL );
 
-        if( hModule == handle )
+    if( hModule == handle )
+    {
+        global_object *pobject;
+
+        for( pobject = &first_object; pobject; pobject = pobject->next )
         {
-            global_object *pobject;
+            if( pobject->hModule )
+            {
+                symbol = GetProcAddress( pobject->hModule, name );
+                if( symbol != NULL )
+                    goto end;
+            }
+        }
 
-            for( pobject = &first_object; pobject ; pobject = pobject->next )
+        for( pobject = &first_automatic_object; pobject; pobject = pobject->next )
+        {
+            if( pobject->hModule )
             {
-                if( pobject->hModule )
-                {
-                    symbol = GetProcAddress( pobject->hModule, name );
-                    if( symbol != NULL )
-                        break;
-                }
+                symbol = GetProcAddress( pobject->hModule, name );
+                if( symbol != NULL )
+                    goto end;
             }
         }
     }
 
+end:
     if( symbol == NULL )
         save_err_str( name );
 
@@ -316,3 +385,22 @@ char *dlerror( void )
 
     return error_pointer;
 }
+
+#ifdef SHARED
+BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
+{
+    /*
+     * https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583(v=vs.85).aspx 
+     *
+     *     When handling DLL_PROCESS_DETACH, a DLL should free resources such as heap
+     *     memory only if the DLL is being unloaded dynamically (the lpReserved
+     *     parameter is NULL).
+     */
+    if( fdwReason == DLL_PROCESS_DETACH && !lpvReserved )
+    {
+        auto_ref_count = 0;
+        free_auto( );
+    }
+    return TRUE;
+}
+#endif
diff --git a/test.c b/test.c
index d6280e4..878694e 100644
--- a/test.c
+++ b/test.c
@@ -31,7 +31,8 @@
 #define CLOSE_LIB    dlclose( library )
 #define CLOSE_GLOBAL dlclose( global  )
 
-#define RETURN_ERROR return 1
+#define RETURN_ERROR printf("From line %d\n", __LINE__); return 1
+
 #define RUNFUNC do { \
                     ret = function (); \
                     if( ret != 0) {    \
@@ -73,6 +74,7 @@ int main()
     void *library;
     char *error;
     int (*function)( void );
+    int (*printf_local)( const char * );
     int (*nonexistentfunction)( void );
     int ret;
 
@@ -106,6 +108,20 @@ int main()
     else
         printf( "SUCCESS\tGot global handle: %p\n", global );
 
+    printf_local = dlsym(global, "printf");
+    if (!printf_local)
+    {
+        error = dlerror();
+        printf("ERROR\tCould not get symbol from global handle: %s\n",
+            error ? error : "");
+        CLOSE_LIB;
+        CLOSE_GLOBAL;
+        RETURN_ERROR;
+    }
+    else
+        printf("SUCCESS\tGot symbol from global handle: %p\n", printf_local);
+    printf_local("Hello world from local printf!\n");
+
     function = dlsym( library, "function" );
     if( !function )
     {
@@ -288,6 +304,19 @@ int main()
                 error ? error : "" );
     }
 
+    function = dlsym(global, "printf");
+    if (!function)
+    {
+        error = dlerror();
+        printf("ERROR\tCould not get symbol from global handle: %s\n",
+            error ? error : "");
+        CLOSE_LIB;
+        CLOSE_GLOBAL;
+        RETURN_ERROR;
+    }
+    else
+        printf("SUCCESS\tGot symbol from global handle: %p\n", function);
+
     ret = dlclose( library );
     if( ret )
     {
diff --git a/visual-studio/12/dl/dl.vcxproj b/visual-studio/12/dl/dl.vcxproj
index cea69bd..45f87e7 100644
--- a/visual-studio/12/dl/dl.vcxproj
+++ b/visual-studio/12/dl/dl.vcxproj
@@ -129,6 +129,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">
@@ -149,6 +150,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">
@@ -174,6 +176,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -203,6 +206,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
diff --git a/visual-studio/12/dlfcn-win32.sln b/visual-studio/12/dlfcn-win32.sln
index d64cbdb..952a69c 100644
--- a/visual-studio/12/dlfcn-win32.sln
+++ b/visual-studio/12/dlfcn-win32.sln
@@ -30,62 +30,74 @@ Global
 		ReleaseStatic|x64 = ReleaseStatic|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|ARM.ActiveCfg = Debug|Win32
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|ARM.ActiveCfg = ReleaseStatic|x64
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|ARM.Build.0 = ReleaseStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|Win32.Build.0 = Debug|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|x64.ActiveCfg = Debug|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Debug|x64.Build.0 = Debug|x64
-		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|ARM.ActiveCfg = DebugStatic|Win32
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|ARM.Build.0 = ReleaseStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|x64.ActiveCfg = DebugStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.DebugStatic|x64.Build.0 = DebugStatic|x64
-		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|ARM.ActiveCfg = Release|Win32
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|ARM.ActiveCfg = ReleaseStatic|x64
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|ARM.Build.0 = ReleaseStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|Win32.ActiveCfg = Release|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|Win32.Build.0 = Release|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|x64.ActiveCfg = Release|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.Release|x64.Build.0 = Release|x64
-		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Win32
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
 		{36E45DAF-D2EC-4660-B84F-3BC72664643E}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|ARM.ActiveCfg = Debug|Win32
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|ARM.ActiveCfg = ReleaseStatic|x64
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|ARM.Build.0 = ReleaseStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|Win32.Build.0 = Debug|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|x64.ActiveCfg = Debug|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Debug|x64.Build.0 = Debug|x64
-		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|ARM.ActiveCfg = DebugStatic|Win32
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|ARM.Build.0 = ReleaseStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|x64.ActiveCfg = DebugStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.DebugStatic|x64.Build.0 = DebugStatic|x64
-		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|ARM.ActiveCfg = Release|Win32
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|ARM.ActiveCfg = ReleaseStatic|x64
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|ARM.Build.0 = ReleaseStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|Win32.ActiveCfg = Release|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|Win32.Build.0 = Release|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|x64.ActiveCfg = Release|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.Release|x64.Build.0 = Release|x64
-		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Win32
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
 		{583AA2B8-B981-4DE9-A374-47EC9F817C5E}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|ARM.ActiveCfg = Debug|Win32
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|ARM.ActiveCfg = ReleaseStatic|x64
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|ARM.Build.0 = ReleaseStatic|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|Win32.Build.0 = Debug|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|x64.ActiveCfg = Debug|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Debug|x64.Build.0 = Debug|x64
-		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|ARM.ActiveCfg = DebugStatic|Win32
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|ARM.Build.0 = ReleaseStatic|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|x64.ActiveCfg = DebugStatic|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.DebugStatic|x64.Build.0 = DebugStatic|x64
-		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|ARM.ActiveCfg = Release|Win32
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|ARM.ActiveCfg = ReleaseStatic|x64
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|ARM.Build.0 = ReleaseStatic|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|Win32.ActiveCfg = Release|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|Win32.Build.0 = Release|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|x64.ActiveCfg = Release|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.Release|x64.Build.0 = Release|x64
-		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Win32
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|x64
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32
 		{2AEB7143-35F8-488A-9414-CA4B0B45D16E}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
diff --git a/visual-studio/12/test/test.vcxproj b/visual-studio/12/test/test.vcxproj
index 8773e07..6866897 100644
--- a/visual-studio/12/test/test.vcxproj
+++ b/visual-studio/12/test/test.vcxproj
@@ -128,6 +128,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">
@@ -138,6 +139,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -148,6 +150,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">
@@ -158,6 +161,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -172,6 +176,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -186,6 +191,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -200,6 +206,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -214,6 +221,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>