[cwittich] 36184: fix some more kernel32_module winetests

Author: cwittich
Date: Sat Sep 13 06:35:01 2008
New Revision: 36184

URL: http://svn.reactos.org/svn/reactos?rev=36184&view=rev
Log:
fix some more kernel32_module winetests

Modified:
    trunk/reactos/dll/win32/kernel32/misc/ldr.c

Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ldr...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Sat Sep 13 06:35:01 2008
@@ -38,6 +38,7 @@
    PWCHAR EnvironmentBufferW = NULL;
    LPCWSTR lpModuleEnd = NULL;
    UNICODE_STRING ModuleName;
+	DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */

if (lpModule != NULL)
    {
@@ -89,6 +90,7 @@
    Pos += GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos);
    EnvironmentBufferW[Pos] = 0;

+	SetLastError(LastError);
    return EnvironmentBufferW;
 }

@@ -175,6 +177,7 @@
    NTSTATUS Status;
    PWSTR SearchPath;
     ULONG DllCharacteristics;
+	BOOL FreeString = FALSE;

(void)hFile;

@@ -197,6 +200,17 @@
      dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL);

RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName);
+	if (DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
+	{
+		RtlCreateUnicodeString(&DllName, (LPWSTR)lpLibFileName);
+		while (DllName.Length > sizeof(WCHAR) &&
+				DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
+		{
+			DllName.Length -= sizeof(WCHAR);
+		}
+		DllName.Buffer[DllName.Length/sizeof(WCHAR)] = UNICODE_NULL;
+		FreeString = TRUE;
+	}
     if (InWindows)
     {
         /* Call the API Properly */
@@ -211,6 +225,8 @@
         Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst);
     }
    RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath);
+	if (FreeString)
+		RtlFreeUnicodeString(&DllName);
    if ( !NT_SUCCESS(Status))
    {
    	SetLastErrorByStatus (Status);