From ff0ad6c8cbc0907c43f065a1b1426a4f9eca7a2d Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 4 Apr 2005 03:55:43 +0000
Subject: [PATCH] Compile with w32api...gift for Steven

svn path=/trunk/; revision=14486
---
 reactos/lib/psapi/makefile | 2 +-
 reactos/lib/psapi/psapi.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/psapi/makefile b/reactos/lib/psapi/makefile
index bf0eeea1d58..5544321c859 100644
--- a/reactos/lib/psapi/makefile
+++ b/reactos/lib/psapi/makefile
@@ -11,7 +11,7 @@ TARGET_SDKLIBS = pseh.a epsapi.a ntdll.a kernel32.a
 TARGET_CFLAGS = -I./include -Wall -Werror
 
 # require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS -D_SEH_NO_NATIVE_NLG
+TARGET_CFLAGS += -D_DISABLE_TIDENTS -D_SEH_NO_NATIVE_NLG -D__USE_W32API
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 
diff --git a/reactos/lib/psapi/psapi.c b/reactos/lib/psapi/psapi.c
index 34b79d10fb6..ff2464c6db0 100644
--- a/reactos/lib/psapi/psapi.c
+++ b/reactos/lib/psapi/psapi.c
@@ -282,7 +282,7 @@ InternalGetMappedFileName(BOOLEAN bUnicode,
   }
 
   /* allocate the memory */
-  pmsnName = PsaiMalloc(nBufSize + offsetof(MEMORY_SECTION_NAME, NameBuffer));
+  pmsnName = PsaiMalloc(nBufSize + sizeof(MEMORY_SECTION_NAME));
 
   if(pmsnName == NULL)
   {
@@ -315,7 +315,7 @@ InternalGetMappedFileName(BOOLEAN bUnicode,
    if(bUnicode)
    {
      /* destination is an Unicode string: direct copy */
-     memcpy((LPWSTR)lpName, pmsnName->NameBuffer, pmsnName->SectionFileName.Length);
+     memcpy((LPWSTR)lpName, pmsnName + 1, pmsnName->SectionFileName.Length);
 
      PsaiFree(pmsnName);