From 635c599d6be1bc8bb4039caf7520d5f02e914298 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 18 May 2007 02:11:42 +0000
Subject: * ruby.c (DllMain, ruby_init_loadpath): use DLL instance handle given
   to DllMain instead of VirtualQuery so that loadpath becomes relative   from
 the DLL on WinCE too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index 045697c89a..6dec7a2c8c 100644
--- a/ruby.c
+++ b/ruby.c
@@ -259,6 +259,18 @@ translate_char(char *p, int from, int to)
 }
 #endif
 
+#if defined _WIN32 || defined __CYGWIN__
+static HMODULE libruby;
+
+BOOL WINAPI
+DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
+{
+    if (reason == DLL_PROCESS_ATTACH)
+	libruby = dll;
+    return TRUE;
+}
+#endif
+
 void
 ruby_init_loadpath(void)
 {
@@ -266,16 +278,8 @@ ruby_init_loadpath(void)
     char libpath[MAXPATHLEN + 1];
     char *p;
     int rest;
+
 #if defined _WIN32 || defined __CYGWIN__
-    HMODULE libruby = NULL;
-    MEMORY_BASIC_INFORMATION m;
-
-#ifndef _WIN32_WCE
-    memset(&m, 0, sizeof(m));
-    if (VirtualQuery(ruby_init_loadpath, &m, sizeof(m))
-	&& m.State == MEM_COMMIT)
-	libruby = (HMODULE) m.AllocationBase;
-#endif
     GetModuleFileName(libruby, libpath, sizeof libpath);
 #elif defined(DJGPP)
     extern char *__dos_argv0;
-- 
cgit v1.2.3