Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed path bugs

Browse source 
svn path=/trunk/; revision=1080
This commit is contained in:
Eric Kohl 2000-03-18 19:55:53 +00:00
parent c4ecfc894c
commit 56132bfb44
1 changed files with 19 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

89
reactos/lib/kernel32/process/create.c
View file

@ -1,4 +1,4 @@
/* $Id: create.c,v 1.23 2000/03/16 01:14:37 ekohl Exp $ /* $Id: create.c,v 1.24 2000/03/18 19:55:53 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -11,14 +11,12 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#define WIN32_NO_PEHDR
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <windows.h> #include <windows.h>
#include <kernel32/proc.h> #include <kernel32/proc.h>
#include <kernel32/thread.h> #include <kernel32/thread.h>
#include <wchar.h> #include <wchar.h>
#include <string.h> #include <string.h>
#include <pe.h>
#include <internal/i386/segment.h> #include <internal/i386/segment.h>
#include <ntdll/ldr.h> #include <ntdll/ldr.h>
#include <internal/teb.h> #include <internal/teb.h>
@ -203,63 +201,27 @@ HANDLE STDCALL KlCreateFirstThread(HANDLE ProcessHandle,
HANDLE KlMapFile(LPCWSTR lpApplicationName, HANDLE KlMapFile(LPCWSTR lpApplicationName,
LPCWSTR lpCommandLine) LPCWSTR lpCommandLine)
{ {
WCHAR TempApplicationName[256];
WCHAR TempFileName[256];
HANDLE hFile; HANDLE hFile;
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
ULONG i;
WCHAR TempDirectoryName[256];
UNICODE_STRING ApplicationNameString; UNICODE_STRING ApplicationNameString;
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL;
NTSTATUS Status; NTSTATUS Status;
HANDLE hSection; HANDLE hSection;
DWORD len = 0;
hFile = NULL; hFile = NULL;
/* /*
* Find the application name * Find the application name
*/ */
TempApplicationName[0] = '\\';
TempApplicationName[1] = '?';
TempApplicationName[2] = '?';
TempApplicationName[3] = '\\';
TempApplicationName[4] = 0;
DPRINT("TempApplicationName '%w'\n",TempApplicationName);
if (lpApplicationName != NULL) if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpApplicationName,
{ &ApplicationNameString,
wcscpy(TempFileName, lpApplicationName); NULL,
NULL))
DPRINT("TempFileName '%w'\n",TempFileName); return NULL;
}
else
{
wcscpy(TempFileName, lpCommandLine);
DPRINT("TempFileName '%w'\n",TempFileName);
for (i=0; TempFileName[i]!=' ' && TempFileName[i] != 0; i++);
TempFileName[i]=0;
}
if (TempFileName[1] != ':')
{
len = GetCurrentDirectoryW(MAX_PATH,TempDirectoryName);
if (TempDirectoryName[len - 1] != L'\\')
{
TempDirectoryName[len] = L'\\';
TempDirectoryName[len + 1] = 0;
}
wcscat(TempApplicationName,TempDirectoryName);
}
wcscat(TempApplicationName,TempFileName);
RtlInitUnicodeString(&ApplicationNameString, TempApplicationName); DPRINT("ApplicationName %S\n",ApplicationNameString.Buffer);
DPRINT("ApplicationName %w\n",ApplicationNameString.Buffer);
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&ApplicationNameString, &ApplicationNameString,
@ -278,6 +240,8 @@ HANDLE KlMapFile(LPCWSTR lpApplicationName,
FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_SHARE_DELETE|FILE_SHARE_READ,
FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE);
RtlFreeUnicodeString (&ApplicationNameString);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastError(RtlNtStatusToDosError(Status));
@ -415,51 +379,36 @@ WINBOOL STDCALL CreateProcessW(LPCWSTR lpApplicationName,
NTSTATUS Status; NTSTATUS Status;
LPTHREAD_START_ROUTINE lpStartAddress = NULL; LPTHREAD_START_ROUTINE lpStartAddress = NULL;
WCHAR TempCommandLine[256]; WCHAR TempCommandLine[256];
// PVOID BaseAddress;
// LARGE_INTEGER SectionOffset;
// IMAGE_NT_HEADERS Headers;
// IMAGE_DOS_HEADER DosHeader;
// HANDLE NTDllSection;
// ULONG InitialViewSize;
PROCESS_BASIC_INFORMATION ProcessBasicInfo; PROCESS_BASIC_INFORMATION ProcessBasicInfo;
ULONG retlen; ULONG retlen;
DWORD len = 0;
PRTL_USER_PROCESS_PARAMETERS Ppb; PRTL_USER_PROCESS_PARAMETERS Ppb;
UNICODE_STRING CommandLine_U; UNICODE_STRING CommandLine_U;
DPRINT("CreateProcessW(lpApplicationName '%w', lpCommandLine '%w')\n", DPRINT("CreateProcessW(lpApplicationName '%S', lpCommandLine '%S')\n",
lpApplicationName,lpCommandLine); lpApplicationName,lpCommandLine);
/* /*
* Process the application name and command line * Process the application name and command line
*/ */
if (lpApplicationName[1] != ':') RtlGetFullPathName_U ((LPWSTR)lpApplicationName,
{ 256 * sizeof(WCHAR),
len = GetCurrentDirectoryW(MAX_PATH,TempCommandLine); TempCommandLine,
if (TempCommandLine[len - 1] != L'\\') NULL);
{
TempCommandLine[len] = L'\\';
TempCommandLine[len + 1] = 0;
}
wcscat(TempCommandLine,lpApplicationName);
}
else
wcscpy(TempCommandLine, lpApplicationName);
if (lpCommandLine != NULL) if (lpCommandLine != NULL)
{ {
wcscat(TempCommandLine, L" "); wcscat(TempCommandLine, L" ");
wcscat(TempCommandLine, lpCommandLine); wcscat(TempCommandLine, lpCommandLine);
} }
/* /*
* Create the PPB * Create the PPB
*/ */
RtlInitUnicodeString(&CommandLine_U, TempCommandLine); RtlInitUnicodeString(&CommandLine_U, TempCommandLine);
DPRINT("CommandLine_U %w\n", CommandLine_U.Buffer); DPRINT("CommandLine_U %S\n", CommandLine_U.Buffer);
RtlCreateProcessParameters(&Ppb, RtlCreateProcessParameters(&Ppb,
&CommandLine_U, &CommandLine_U,