Moved implementation of GetModuleBaseName from ascii to unicode, added

some tests for GetModuleBaseNameA.

configure.ac

@@ -1599,6 +1599,7 @@ dlls/olepro32/Makefile
 dlls/olesvr/Makefile
 dlls/opengl32/Makefile
 dlls/psapi/Makefile
+dlls/psapi/tests/Makefile
 dlls/qcap/Makefile
 dlls/quartz/Makefile
 dlls/rasapi32/Makefile

dlls/psapi/Makefile.in

@@ -8,6 +8,8 @@ IMPORTS   = kernel32 ntdll
 C_SRCS = \
 	psapi_main.c
 
+SUBDIRS = tests
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/psapi/psapi_main.c

@@ -25,6 +25,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/server.h"
+#include "wine/unicode.h"
 #include "wine/debug.h"
 #include "winnls.h"
 #include "psapi.h"
@@ -291,15 +292,24 @@ DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename,
 DWORD WINAPI GetModuleBaseNameA(HANDLE hProcess, HMODULE hModule, 
                                 LPSTR lpBaseName, DWORD nSize)
 {
-    char        tmp[MAX_PATH];
+    WCHAR *lpBaseNameW;
-    char*       ptr;
+    DWORD buflenW, ret = 0;
 
-    if (!GetModuleFileNameExA(hProcess, hModule, tmp, sizeof(tmp)))
+    if(!lpBaseName || !nSize) {
+        SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
-    if ((ptr = strrchr(tmp, '\\')) != NULL) ptr++; else ptr = tmp;
+    }
-    strncpy(lpBaseName, ptr, nSize);
+    lpBaseNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nSize);
-    lpBaseName[nSize - 1] = '\0';
+    buflenW = GetModuleBaseNameW(hProcess, hModule, lpBaseNameW, nSize);
-    return strlen(lpBaseName);
+    TRACE("%ld, %s\n", buflenW, debugstr_w(lpBaseNameW));
+    if (buflenW)
+    {
+        ret = WideCharToMultiByte(CP_ACP, 0, lpBaseNameW, buflenW,
+                                  lpBaseName, nSize, NULL, NULL);
+        if (ret < nSize) lpBaseName[ret] = 0;
+    }
+    HeapFree(GetProcessHeap(), 0, lpBaseNameW);
+    return ret;
 }
 
 /***********************************************************************
@@ -308,30 +318,21 @@ DWORD WINAPI GetModuleBaseNameA(HANDLE hProcess, HMODULE hModule,
 DWORD WINAPI GetModuleBaseNameW(HANDLE hProcess, HMODULE hModule, 
                                 LPWSTR lpBaseName, DWORD nSize)
 {
-    char*       ptr;
+    WCHAR  tmp[MAX_PATH];
-    DWORD       len;
+    WCHAR* ptr;
 
-    TRACE("(hProcess=%p, hModule=%p, %p, %ld)\n",
+    if(!lpBaseName || !nSize) {
-          hProcess, hModule, lpBaseName, nSize);
+        SetLastError(ERROR_INVALID_PARAMETER);
-   
+        return 0;
-    if (!lpBaseName || !nSize) return 0;
-
-    ptr = HeapAlloc(GetProcessHeap(), 0, nSize / 2);
-    if (!ptr) return 0;
-
-    len = GetModuleBaseNameA(hProcess, hModule, ptr, nSize / 2);
-    if (len == 0)
-    {
-        lpBaseName[0] = '\0';
-    }
-    else
-    {
-        if (!MultiByteToWideChar( CP_ACP, 0, ptr, -1, lpBaseName, nSize / 2 ))
-            lpBaseName[nSize / 2 - 1] = 0;
     }
 
-    HeapFree(GetProcessHeap(), 0, ptr);
+    if (!GetModuleFileNameExW(hProcess, hModule, tmp,
-    return len;
+                              sizeof(tmp)/sizeof(WCHAR)))
+        return 0;
+    TRACE("%s\n", debugstr_w(tmp));
+    if ((ptr = strrchrW(tmp, '\\')) != NULL) ptr++; else ptr = tmp;
+    strncpyW(lpBaseName, ptr, nSize);
+    return min(strlenW(ptr), nSize);
 }
 
 /***********************************************************************
@@ -387,6 +388,7 @@ DWORD WINAPI GetModuleFileNameExW(HANDLE hProcess, HMODULE hModule,
     {
         DWORD len = GetModuleFileNameW( hModule, lpFileName, nSize );
         if (nSize) lpFileName[nSize - 1] = '\0';
+        TRACE("return (cur) %s (%lu)\n", debugstr_w(lpFileName), len);
         return len;
     }
 

dlls/psapi/tests/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+module.ok
+testlist.c

dlls/psapi/tests/Makefile.in

@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = psapi.dll
+IMPORTS   = psapi kernel32
+
+CTESTS = \
+	module.c
+
+@MAKE_TEST_RULES@
+
+### Dependencies:

dlls/psapi/tests/module.c

@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2004 Stefan Leichter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdarg.h>
+
+#include "wine/test.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "psapi.h"
+
+/* Function ptrs */
+static HMODULE dll;
+static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HANDLE, LPSTR, DWORD);
+
+static void test_module_base_name(void)
+{   DWORD retval;
+    char buffer[MAX_PATH];
+    HMODULE self, modself;
+    DWORD exact;
+
+    if (!pGetModuleBaseNameA) return;
+
+    self = OpenProcess( PROCESS_QUERY_INFORMATION|PROCESS_VM_READ,
+			FALSE, GetCurrentProcessId());
+    if (!self) {
+	ok(0, "OpenProcess() failed\n");
+	return;
+    }
+    modself = GetModuleHandle(NULL);
+    if (!modself) {
+	ok(0, "GetModuleHandle() failed\n");
+	return;
+    }
+    exact = pGetModuleBaseNameA( self, modself, buffer, MAX_PATH);
+    if (!exact) {
+	ok(0, "GetModuleBaseNameA failed unexpected with error 0x%08lx\n",
+		GetLastError());
+	return;
+    }
+
+    SetLastError(ERROR_SUCCESS);
+    retval = pGetModuleBaseNameA( NULL, NULL, NULL, 0);
+    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
+    ok(ERROR_INVALID_PARAMETER == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_INVALID_PARAMETER\n",
+	GetLastError());
+
+    SetLastError(ERROR_SUCCESS);
+    retval = pGetModuleBaseNameA( NULL, NULL, NULL, MAX_PATH);
+    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
+    ok(ERROR_INVALID_PARAMETER == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_INVALID_PARAMETER\n",
+	GetLastError());
+
+    SetLastError(ERROR_SUCCESS);
+    retval = pGetModuleBaseNameA( NULL, NULL, buffer, 0);
+    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
+    ok(ERROR_INVALID_PARAMETER == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_INVALID_PARAMETER\n",
+	GetLastError());
+
+    memset(buffer, 0, sizeof(buffer));
+    SetLastError(ERROR_SUCCESS);
+    retval = pGetModuleBaseNameA( NULL, NULL, buffer, 1);
+    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
+    ok(ERROR_INVALID_HANDLE == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_INVALID_HANDLE\n",
+	GetLastError());
+
+    memset(buffer, 0, sizeof(buffer));
+    SetLastError(ERROR_SUCCESS);
+    /* GetModuleFileNameEx may need to be fixed first ? */
+    retval = pGetModuleBaseNameA( self, NULL, buffer, 1);
+    todo_wine ok(retval == 1, "function result wrong, got %ld expected 1\n", retval);
+    todo_wine ok(ERROR_SUCCESS == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_SUCCESS\n",
+	GetLastError());
+    todo_wine ok(1 == strlen(buffer),
+	"buffer content length wrong, got %d(%s) expected 1\n",
+	strlen(buffer), buffer);
+
+    memset(buffer, 0, sizeof(buffer));
+    SetLastError(ERROR_SUCCESS);
+    retval = pGetModuleBaseNameA( self, modself, buffer, 1);
+    ok(retval == 1, "function result wrong, got %ld expected 1\n", retval);
+    ok(ERROR_SUCCESS == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_SUCCESS\n",
+	GetLastError());
+    ok(1 == strlen(buffer),
+	"buffer content length wrong, got %d(%s) expected 1\n",
+	strlen(buffer), buffer);
+
+    SetLastError(ERROR_SUCCESS);
+    memset(buffer, 0, sizeof(buffer));
+    retval = pGetModuleBaseNameA( self, NULL, buffer, exact);
+    /* GetModuleFileNameEx may need to be fixed first ? */
+    todo_wine ok(retval == exact, 
+	"function result wrong, got %ld expected %ld\n", retval, exact);
+    todo_wine ok(ERROR_SUCCESS == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_SUCCESS\n",
+	GetLastError());
+    todo_wine ok(exact == strlen(buffer),
+	"buffer content length wrong, got %d(%s) expected %ld\n",
+	strlen(buffer), buffer, exact);
+
+    SetLastError(ERROR_SUCCESS);
+    memset(buffer, 0, sizeof(buffer));
+    retval = pGetModuleBaseNameA( self, modself, buffer, exact);
+    ok(retval == exact, 
+	"function result wrong, got %ld expected %ld\n", retval, exact);
+    ok(ERROR_SUCCESS == GetLastError(),
+	"last error wrong, got 0x%08lx expected ERROR_SUCCESS\n",
+	GetLastError());
+    ok(exact == strlen(buffer),
+	"buffer content length wrong, got %d(%s) expected %ld\n",
+	strlen(buffer), buffer, exact);
+}
+
+START_TEST(module)
+{
+    dll = LoadLibrary("psapi.dll");
+    ok(dll != 0, "LoadLibraryA failed\n");
+    if (!dll) return;
+
+    pGetModuleBaseNameA = (void*) GetProcAddress(dll, "GetModuleBaseNameA");
+
+    test_module_base_name();
+
+    FreeLibrary(dll);
+}