[jbossnative-commits] JBoss Native SVN: r983 - trunk/sight/native/os/windows.

[jbossnative-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2007-09-06 11:51:07 -0400 (Thu, 06 Sep 2007)
New Revision: 983

Modified:
   trunk/sight/native/os/windows/process.c
Log:
Fix union names for str

Modified: trunk/sight/native/os/windows/process.c
===================================================================
--- trunk/sight/native/os/windows/process.c	2007-09-06 13:55:19 UTC (rev 982)
+++ trunk/sight/native/os/windows/process.c	2007-09-06 15:51:07 UTC (rev 983)
@@ -247,30 +247,30 @@
 
     for (i = 0; i < 2; i++) {
         pages[i].len = 0;
-        pages[i].w   = NULL;
+        pages[i].str.w   = NULL;
         if (!VirtualQueryEx(hProcess, PEB_ADDRESS(i), &mbi, sizeof(mbi)))
             continue;
         nrd = mbi.RegionSize;
         rdd = 0;
         if (nrd > 8192)
             continue;
-        pages[i].w = apr_palloc(pool, nrd);
-        if (!pages[i].w)
+        pages[i].str.w = apr_palloc(pool, nrd);
+        if (!pages[i].str.w)
             continue;
         
         if (!ReadProcessMemory(hProcess,
                                PEB_ADDRESS(i),
-                               pages[i].w,
+                               pages[i].str.w,
                                nrd,
                                &rdd)) {
-            pages[i].w   = NULL;
-            pages[i].len = 0;
+            pages[i].str.w = NULL;
+            pages[i].len   = 0;
         }
         else {
             pages[i].len = (jsize)(rdd / 2);
             /* Make sure we always have double zero at the end */
-            pages[i].w[pages[i].len - 1] = 0;
-            pages[i].w[pages[i].len - 2] = 0;
+            pages[i].str.w[pages[i].len - 1] = 0;
+            pages[i].str.w[pages[i].len - 2] = 0;
         }
     }
 }
@@ -438,11 +438,11 @@
      */
     if (pid != (jint)GetCurrentProcessId()) {
         read_proc_pages(pid, hProcess, &ppages[0], no->pool);
-        if (ppages[0].w && (*ppages[0].w > 0x003C && *ppages[0].w < 0x007F)) {
-            SET_IFIELD_O(0004, thiz, sight_mw_to_sa(_E, ppages[0].w));
+        if (ppages[0].str.w && (*ppages[0].str.w > 0x003C && *ppages[0].str.w < 0x007F)) {
+            SET_IFIELD_O(0004, thiz, sight_mw_to_sa(_E, ppages[0].str.w));
         }
-        if (ppages[1].w) {
-            mproc = ppages[spage+1].w;
+        if (ppages[1].str.w) {
+            mproc = ppages[spage+1].str.w;
             mpnrd = ppages[spage+1].len;
         }
         if (mproc && mpnrd) {