Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 62972: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process).
by aandrejevic＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: aandrejevic Date: Sat Apr 26 08:57:17 2014 New Revision: 62972 URL: http://svn.reactos.org/svn/reactos?rev=62972&view=rev Log: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process). Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -383,15 +383,13 @@ Mcb->OwnerPsp = NewOwner; } - - -static WORD DosCopyEnvironmentBlock(WORD SourceSegment, LPCSTR ProgramName) -{ - PCHAR Ptr, SourceBuffer, DestBuffer = NULL; +static WORD DosCopyEnvironmentBlock(LPCVOID Environment, LPCSTR ProgramName) +{ + PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; WORD DestSegment; - Ptr = SourceBuffer = (PCHAR)SEG_OFF_TO_PTR(SourceSegment, 0); + Ptr = (PCHAR)Environment; /* Calculate the size of the environment block */ while (*Ptr) @@ -408,7 +406,7 @@ DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); if (!DestSegment) return 0; - Ptr = SourceBuffer; + Ptr = (PCHAR)Environment; DestBuffer = (PCHAR)SEG_OFF_TO_PTR(DestSegment, 0); while (*Ptr) @@ -1042,57 +1040,51 @@ PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; } -BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock) -{ - BOOLEAN Success = FALSE, AllocatedEnvBlock = FALSE; +DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN LPCSTR CommandLine, + IN PVOID Environment, + OUT PDWORD StackLocation OPTIONAL, + OUT PDWORD EntryPoint OPTIONAL) +{ + DWORD Result = ERROR_SUCCESS; HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; LPBYTE Address = NULL; - LPSTR ProgramFilePath, Parameters[256]; - CHAR CommandLineCopy[DOS_CMDLINE_LENGTH]; - CHAR ParamString[DOS_CMDLINE_LENGTH]; - DWORD ParamCount = 0; WORD Segment = 0; + WORD EnvBlock = 0; WORD MaxAllocSize; DWORD i, FileSize, ExeSize; PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; - DPRINT("DosCreateProcess: CommandLine \"%s\", EnvBlock 0x%04X\n", - CommandLine, - EnvBlock); - - /* Save a copy of the command line */ - strcpy(CommandLineCopy, CommandLine); - - /* Get the file name of the executable */ - ProgramFilePath = strtok(CommandLineCopy, " \t"); - - /* Load the parameters in the local array */ - while ((ParamCount < sizeof(Parameters)/sizeof(Parameters[0])) - && ((Parameters[ParamCount] = strtok(NULL, " \t")) != NULL)) - { - ParamCount++; - } - - ZeroMemory(ParamString, sizeof(ParamString)); - - /* Store the parameters in a string */ - for (i = 0; i < ParamCount; i++) - { - strncat(ParamString, Parameters[i], DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); - strncat(ParamString, " ", DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); + DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", + LoadType, + ExecutablePath, + CommandLine, + Environment, + StackLocation, + EntryPoint); + + if (LoadType == DOS_LOAD_OVERLAY) + { + DPRINT1("Overlay loading is not supported yet.\n"); + return ERROR_NOT_SUPPORTED; } /* Open a handle to the executable */ - FileHandle = CreateFileA(ProgramFilePath, + FileHandle = CreateFileA(ExecutablePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (FileHandle == INVALID_HANDLE_VALUE) goto Cleanup; + if (FileHandle == INVALID_HANDLE_VALUE) + { + Result = GetLastError(); + goto Cleanup; + } /* Get the file size */ FileSize = GetFileSize(FileHandle, NULL); @@ -1104,23 +1096,26 @@ 0, 0, NULL); - if (FileMapping == NULL) goto Cleanup; + if (FileMapping == NULL) + { + Result = GetLastError(); + goto Cleanup; + } /* Map the file into memory */ Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); - if (Address == NULL) goto Cleanup; - - /* Did we get an environment segment? */ - if (!EnvBlock) - { - /* Set a flag to know if the environment block was allocated here */ - AllocatedEnvBlock = TRUE; - - /* No, copy the one from the parent */ - EnvBlock = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) - ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock - : SYSTEM_ENV_BLOCK, - ProgramFilePath); + if (Address == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Copy the environment block to DOS memory */ + EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); + if (EnvBlock == 0) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } /* Check if this is an EXE file or a COM file */ @@ -1152,11 +1147,15 @@ } /* Check if at least the lowest allocation was successful */ - if (Segment == 0) goto Cleanup; + if (Segment == 0) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } /* Initialize the PSP */ DosInitializePsp(Segment, - ParamString, + CommandLine, (WORD)ExeSize, EnvBlock); @@ -1184,21 +1183,22 @@ *RelocWord += Segment + (sizeof(DOS_PSP) >> 4); } - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the location from the header */ - EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, - Header->e_sp); - - /* Execute */ - CurrentPsp = Segment; - DiskTransferArea = MAKELONG(0x80, Segment); - EmulatorExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), - Header->e_ip); - - Success = TRUE; + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack to the location from the header */ + EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, + Header->e_sp); + + /* Execute */ + CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); + EmulatorExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), + Header->e_ip); + } } else { @@ -1208,11 +1208,19 @@ DosAllocateMemory(0xFFFF, &MaxAllocSize); /* Make sure it's enough for the whole program and the PSP */ - if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) goto Cleanup; + if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } /* Allocate all of it */ Segment = DosAllocateMemory(MaxAllocSize, NULL); - if (Segment == 0) goto Cleanup; + if (Segment == 0) + { + Result = ERROR_ARENA_TRASHED; + goto Cleanup; + } /* The process owns its own memory */ DosChangeMemoryOwner(Segment, Segment); @@ -1225,36 +1233,37 @@ /* Initialize the PSP */ DosInitializePsp(Segment, - ParamString, + CommandLine, MaxAllocSize, EnvBlock); - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the last word of the segment */ - EmulatorSetStack(Segment, 0xFFFE); - - /* - * Set the value on the stack to 0, so that a near return - * jumps to PSP:0000 which has the exit code. - */ - *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; - - /* Execute */ - CurrentPsp = Segment; - DiskTransferArea = MAKELONG(0x80, Segment); - EmulatorExecute(Segment, 0x100); - - Success = TRUE; + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack to the last word of the segment */ + EmulatorSetStack(Segment, 0xFFFE); + + /* + * Set the value on the stack to 0, so that a near return + * jumps to PSP:0000 which has the exit code. + */ + *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; + + /* Execute */ + CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); + EmulatorExecute(Segment, 0x100); + } } Cleanup: - if (!Success) + if (Result != ERROR_SUCCESS) { /* It was not successful, cleanup the DOS memory */ - if (AllocatedEnvBlock) DosFreeMemory(EnvBlock); + if (EnvBlock) DosFreeMemory(EnvBlock); if (Segment) DosFreeMemory(Segment); } @@ -1267,7 +1276,118 @@ /* Close the file handle */ if (FileHandle != INVALID_HANDLE_VALUE) CloseHandle(FileHandle); - return Success; + return Result; +} + +WORD DosCreateProcess(DOS_EXEC_TYPE LoadType, + LPCSTR ProgramName, + PDOS_EXEC_PARAM_BLOCK Parameters) +{ + DWORD BinaryType; + LPVOID Environment = NULL; + VDM_COMMAND_INFO CommandInfo; + CHAR CmdLine[MAX_PATH]; + CHAR AppName[MAX_PATH]; + CHAR PifFile[MAX_PATH]; + CHAR Desktop[MAX_PATH]; + CHAR Title[MAX_PATH]; + CHAR Env[MAX_PATH]; + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInfo; + + /* Get the binary type */ + if (!GetBinaryTypeA(ProgramName, &BinaryType)) return GetLastError(); + + /* Did the caller specify an environment segment? */ + if (Parameters->Environment) + { + /* Yes, use it instead of the parent one */ + Environment = SEG_OFF_TO_PTR(Parameters->Environment, 0); + } + + /* Set up the startup info structure */ + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOA)); + StartupInfo.cb = sizeof(STARTUPINFOA); + + /* Create the process */ + if (!CreateProcessA(ProgramName, + FAR_POINTER(Parameters->CommandLine), + NULL, + NULL, + FALSE, + 0, + Environment, + NULL, + &StartupInfo, + &ProcessInfo)) + { + return GetLastError(); + } + + /* Check the type of the program */ + switch (BinaryType) + { + /* These are handled by NTVDM */ + case SCS_DOS_BINARY: + case SCS_WOW_BINARY: + { + /* Clear the structure */ + ZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Initialize the structure members */ + CommandInfo.VDMState = VDM_NOT_READY; + CommandInfo.CmdLine = CmdLine; + CommandInfo.CmdLen = sizeof(CmdLine); + CommandInfo.AppName = AppName; + CommandInfo.AppLen = sizeof(AppName); + CommandInfo.PifFile = PifFile; + CommandInfo.PifLen = sizeof(PifFile); + CommandInfo.Desktop = Desktop; + CommandInfo.DesktopLen = sizeof(Desktop); + CommandInfo.Title = Title; + CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = sizeof(Env); + + /* Get the VDM command information */ + if (!GetNextVDMCommand(&CommandInfo)) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + + /* Increment the re-entry count */ + CommandInfo.VDMState = VDM_INC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + + /* Load the executable */ + if (DosLoadExecutable(LoadType, + AppName, + CmdLine, + Env, + &Parameters->StackLocation, + &Parameters->EntryPoint) != ERROR_SUCCESS) + { + DisplayMessage(L"Could not load '%S'", AppName); + break; + } + + break; + } + + /* Not handled by NTVDM */ + default: + { + /* Wait for the process to finish executing */ + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + } + } + + /* Close the handles */ + CloseHandle(ProcessInfo.hProcess); + CloseHandle(ProcessInfo.hThread); + + return ERROR_SUCCESS; } VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode) @@ -2345,6 +2465,27 @@ break; } + /* Execute */ + case 0x4B: + { + DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)getAL(); + LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); + PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); + WORD ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock); + + if (ErrorCode == ERROR_SUCCESS) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ErrorCode); + } + + break; + } + /* Terminate With Return Code */ case 0x4C: { Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -52,6 +52,13 @@ DOS_ALLOC_BEST_FIT, DOS_ALLOC_LAST_FIT }; + +typedef enum +{ + DOS_LOAD_AND_EXECUTE = 0x00, + DOS_LOAD_ONLY = 0x01, + DOS_LOAD_OVERLAY = 0x03 +} DOS_EXEC_TYPE; #pragma pack(push, 1) @@ -136,6 +143,19 @@ CHAR FileName[13]; } DOS_FIND_FILE_BLOCK, *PDOS_FIND_FILE_BLOCK; +typedef struct _DOS_EXEC_PARAM_BLOCK +{ + /* Input variables */ + WORD Environment; + DWORD CommandLine; + DWORD FirstFcb; + DWORD SecondFcb; + + /* Output variables */ + DWORD StackLocation; + DWORD EntryPoint; +} DOS_EXEC_PARAM_BLOCK, *PDOS_EXEC_PARAM_BLOCK; + #pragma pack(pop) /* FUNCTIONS ******************************************************************/ @@ -169,7 +189,19 @@ WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); -BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); +DWORD DosLoadExecutable( + IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN LPCSTR CommandLine, + IN PVOID Environment, + OUT PDWORD StackLocation OPTIONAL, + OUT PDWORD EntryPoint OPTIONAL +); +WORD DosCreateProcess( + DOS_EXEC_TYPE LoadType, + LPCSTR ProgramName, + PDOS_EXEC_PARAM_BLOCK Parameters +); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -385,6 +385,7 @@ CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; + CHAR Env[MAX_PATH]; UNREFERENCED_PARAMETER(Parameter); @@ -405,13 +406,20 @@ CommandInfo.DesktopLen = sizeof(Desktop); CommandInfo.Title = Title; CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = sizeof(Env); /* Wait for the next available VDM */ if (!GetNextVDMCommand(&CommandInfo)) break; /* Start the process from the command line */ DPRINT1("Starting '%s'...\n", AppName); - if (!DosCreateProcess(AppName, 0)) + if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, + AppName, + CmdLine, + Env, + NULL, + NULL) != ERROR_SUCCESS) { DisplayMessage(L"Could not start '%S'", AppName); break; @@ -430,17 +438,20 @@ INT wmain(INT argc, WCHAR *argv[]) { #ifdef STANDALONE - + CHAR ApplicationName[MAX_PATH]; CHAR CommandLine[DOS_CMDLINE_LENGTH]; - if (argc == 2 && argv[1] != NULL) - { - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + if (argc >= 2) + { + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); + + if (argc >= 3) WideCharToMultiByte(CP_ACP, 0, argv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + else strcpy(CommandLine, ""); } else { wprintf(L"\nReactOS Virtual DOS Machine\n\n" - L"Usage: NTVDM <executable>\n"); + L"Usage: NTVDM <executable> [<parameters>]\n"); return 0; } @@ -496,9 +507,14 @@ /* Start the process from the command line */ DPRINT1("Starting '%s'...\n", CommandLine); - if (!DosCreateProcess(CommandLine, 0)) - { - DisplayMessage(L"Could not start '%S'", CommandLine); + if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, + ApplicationName, + CommandLine, + GetEnvironmentStrings(), + NULL, + NULL) != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'", ApplicationName); goto Cleanup; }

1 0

26 Apr '14

1 0

26 Apr '14

1 0

26 Apr '14

1 0

[tfaber] 62971: [CRT] - Import commit 638c8e38 (Don't overwrite unmatched string in scanf) from Wine. Fixes crash in msvcrt_winetest:scanf
by tfaber＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: tfaber Date: Fri Apr 25 22:02:26 2014 New Revision: 62971 URL: http://svn.reactos.org/svn/reactos?rev=62971&view=rev Log: [CRT] - Import commit 638c8e38 (Don't overwrite unmatched string in scanf) from Wine. Fixes crash in msvcrt_winetest:scanf Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Fri Apr 25 22:02:26 2014 @@ -359,7 +359,7 @@ if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; widecharstring: { /* read a word into a wchar_t* */ @@ -375,7 +375,7 @@ if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described

1 0

[fireball] 62970: [WIN32K] - Indeed Win32kProcessCallout may be called for a process with an already created Win32 Process Info. Handle it like in trunk. Found and fixed by Kamil Hornicek.
by fireball＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: fireball Date: Fri Apr 25 21:36:32 2014 New Revision: 62970 URL: http://svn.reactos.org/svn/reactos?rev=62970&view=rev Log: [WIN32K] - Indeed Win32kProcessCallout may be called for a process with an already created Win32 Process Info. Handle it like in trunk. Found and fixed by Kamil Hornicek. Modified: branches/arwinss/arwinss/server/main/init.c Modified: branches/arwinss/arwinss/server/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/ini… ============================================================================== --- branches/arwinss/arwinss/server/main/init.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/init.c [iso-8859-1] Fri Apr 25 21:36:32 2014 @@ -113,14 +113,20 @@ PPROCESSINFO Win32Process; NTSTATUS Status; - DPRINT("Enter Win32kProcessCallback\n"); - /* Get the Win32 Process */ Win32Process = PsGetProcessWin32Process(Process); - DPRINT("Win32Process %p, Create %d\n", Win32Process, Create); - if (Create && !Win32Process) + DPRINT("Win32kProcessCallback(): Win32Process %p, Create %d\n", Win32Process, Create); + if (Create) { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + + /* We might be called with an already allocated win32 process */ + if (Win32Process) + { + /* There is no more to do for us (this is a success code!) */ + Status = STATUS_ALREADY_WIN32; + return Status; + } /* Allocate one if needed */ /* FIXME - lock the process */ @@ -189,7 +195,6 @@ UserLeave(); } - DPRINT("Leave Win32kProcessCallback\n"); return STATUS_SUCCESS; }

1 0

[fireball] 62969: [USER32] - Make a proper stub for RegisterUserApiHook(), as it's actually being called.
by fireball＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: fireball Date: Fri Apr 25 21:28:22 2014 New Revision: 62969 URL: http://svn.reactos.org/svn/reactos?rev=62969&view=rev Log: [USER32] - Make a proper stub for RegisterUserApiHook(), as it's actually being called. Modified: branches/arwinss/arwinss/client/user32/user32.spec branches/arwinss/arwinss/client/user32/user_main.c Modified: branches/arwinss/arwinss/client/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] Fri Apr 25 21:28:22 2014 @@ -571,7 +571,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) -@ stub RegisterUserApiHook +@ stdcall RegisterUserApiHook(ptr) @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() Modified: branches/arwinss/arwinss/client/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] Fri Apr 25 21:28:22 2014 @@ -370,5 +370,12 @@ BOOL WINAPI UnregisterUserApiHook(VOID) { + TRACE(": stub\n"); return TRUE; } + +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah) +{ + TRACE(": stub\n"); + return TRUE; +}

1 0

[tfaber] 62968: [SHELL32] - Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole
by tfaber＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: tfaber Date: Fri Apr 25 21:24:53 2014 New Revision: 62968 URL: http://svn.reactos.org/svn/reactos?rev=62968&view=rev Log: [SHELL32] - Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole Modified: trunk/reactos/dll/win32/shell32/shellole.cpp trunk/reactos/dll/win32/shell32/stubs.cpp trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -710,3 +710,14 @@ hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); return hres; } + +/************************************************************************* + * SHCreateQueryCancelAutoPlayMoniker [SHELL32.@] + */ +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) +{ + TRACE("%p\n", moniker); + + if (!moniker) return E_INVALIDARG; + return CreateClassMoniker(CLSID_QueryCancelAutoPlay, moniker); +} Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -668,17 +668,6 @@ /* * Unimplemented */ -EXTERN_C HRESULT -WINAPI -SHCreateQueryCancelAutoPlayMoniker(IMoniker **ppmoniker) -{ - FIXME("SHCreateQueryCancelAutoPlayMoniker() stub\n"); - return E_FAIL; -} - -/* - * Unimplemented - */ EXTERN_C BOOL WINAPI SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi) @@ -692,9 +681,9 @@ */ EXTERN_C BOOL WINAPI -SHChangeNotifySuspendResume(BOOL bSuspend, - LPITEMIDLIST pidl, - BOOL bRecursive, +SHChangeNotifySuspendResume(BOOL bSuspend, + LPITEMIDLIST pidl, + BOOL bRecursive, DWORD dwReserved) { FIXME("SHChangeNotifySuspendResume() stub\n"); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -101,6 +101,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(_In_ HKEY, _In_opt_ LPCWSTR, UINT); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker**); HRESULT WINAPI

1 0

[tfaber] 62967: [CRT] - Sync get_this_pointer with Wine. Fixes crash in msvcrt_winetest:cpp - Sync undname.c with Wine. Fixes assertion failure in msvcrt_winetest:cpp
by tfaber＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: tfaber Date: Fri Apr 25 20:01:08 2014 New Revision: 62967 URL: http://svn.reactos.org/svn/reactos?rev=62967&view=rev Log: [CRT] - Sync get_this_pointer with Wine. Fixes crash in msvcrt_winetest:cpp - Sync undname.c with Wine. Fixes assertion failure in msvcrt_winetest:cpp Modified: trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -604,7 +604,7 @@ * Is this '.' really part of the mangled name, or has it some other meaning ? */ char* name = __unDName(0, _this->mangled + 1, 0, - MSVCRT_malloc, MSVCRT_free, 0x2800); + MSVCRT_malloc, MSVCRT_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE); if (name) { size_t len = strlen(name); Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -164,20 +164,21 @@ /* compute the this pointer for a base class of a given type */ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object ) { - void *this_ptr; - int *offset_ptr; + if (!object) return NULL; - if (!object) return NULL; - this_ptr = (char *)object + off->this_offset; if (off->vbase_descr >= 0) { + int *offset_ptr; + /* move this ptr to vbase descriptor */ - this_ptr = (char *)this_ptr + off->vbase_descr; + object = (char *)object + off->vbase_descr; /* and fetch additional offset from vbase descriptor */ - offset_ptr = (int *)(*(char **)this_ptr + off->vbase_offset); - this_ptr = (char *)this_ptr + *offset_ptr; + offset_ptr = (int *)(*(char **)object + off->vbase_offset); + object = (char *)object + *offset_ptr; } - return this_ptr; + + object = (char *)object + off->this_offset; + return object; } #endif /* __MSVCRT_CPPEXCEPT_H */ Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -81,9 +81,6 @@ typedef void* (__cdecl *malloc_func_t)(size_t); typedef void (__cdecl *free_func_t)(void*); -extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); -extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); - /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void); extern void msvcrt_free_mt_locks(void); @@ -119,6 +116,28 @@ #define MSVCRT__OUT_TO_MSGBOX 2 #define MSVCRT__REPORT_ERRMODE 3 +extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); + +/* __unDName/__unDNameEx flags */ +#define UNDNAME_COMPLETE (0x0000) +#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ +#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ +#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ +#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) +#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) +#define UNDNAME_NO_MS_THISTYPE (0x0020) +#define UNDNAME_NO_CV_THISTYPE (0x0040) +#define UNDNAME_NO_THISTYPE (0x0060) +#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ +#define UNDNAME_NO_THROW_SIGNATURES (0x0100) +#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ +#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) +#define UNDNAME_32_BIT_DECODE (0x0800) +#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ +#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ +#define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define UNDNAME_NO_COMPLEX_TYPE (0x8000) + typedef void (*float_handler)(int, int); void _default_handler(int signal); typedef struct _sig_element Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -33,25 +33,6 @@ * - back-port this new code into tools/winedump/msmangle.c */ -#define UNDNAME_COMPLETE (0x0000) -#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ -#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ -#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ -#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) -#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) -#define UNDNAME_NO_MS_THISTYPE (0x0020) -#define UNDNAME_NO_CV_THISTYPE (0x0040) -#define UNDNAME_NO_THISTYPE (0x0060) -#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ -#define UNDNAME_NO_THROW_SIGNATURES (0x0100) -#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ -#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) -#define UNDNAME_32_BIT_DECODE (0x0800) -#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ -#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ -#define UNDNAME_NO_SPECIAL_SYMS (0x4000) -#define UNDNAME_NO_COMPLEX_TYPE (0x8000) - /* How data types modifiers are stored: * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows @@ -267,7 +248,7 @@ { case 's': t = va_arg(args, char*); if (t) len += (int)strlen(t); break; case 'c': (void)va_arg(args, int); len++; break; - default: i--; /* fall thru */ + default: i--; /* fall through */ case '%': len++; break; } } @@ -294,7 +275,7 @@ case 'c': *p++ = (char)va_arg(args, int); break; - default: i--; /* fall thru */ + default: i--; /* fall through */ case '%': *p++ = '%'; break; } } @@ -348,7 +329,7 @@ if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%d", sgn ? "-" : "", ret); + sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL; @@ -423,7 +404,12 @@ *ptr_modif = NULL; if (*sym->current == 'E') { - *ptr_modif = "__ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + *ptr_modif = "__ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + *ptr_modif = *ptr_modif + 2; + } sym->current++; } switch (*sym->current++) @@ -446,7 +432,13 @@ if (*sym->current == 'E') { - ptr_modif = " __ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + ptr_modif = " ptr64"; + else + ptr_modif = " __ptr64"; + } sym->current++; } @@ -556,8 +548,10 @@ struct array array_pmt; sym->names.start = sym->names.num; - if (!(name = get_literal_string(sym))) + if (!(name = get_literal_string(sym))) { + sym->names.start = start_mark; return FALSE; + } str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args != NULL) @@ -1082,6 +1076,7 @@ { char accmem; const char* access = NULL; + int access_id = -1; const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; @@ -1089,7 +1084,7 @@ const char* exported; const char* args_str = NULL; const char* name = NULL; - BOOL ret = FALSE; + BOOL ret = FALSE, has_args = TRUE, has_ret = TRUE; unsigned mark; struct array array_pmt; @@ -1120,50 +1115,104 @@ * 'X' public: thunk * 'Y' * 'Z' + * "$0" private: thunk vtordisp + * "$1" private: thunk vtordisp + * "$2" protected: thunk vtordisp + * "$3" protected: thunk vtordisp + * "$4" public: thunk vtordisp + * "$5" public: thunk vtordisp + * "$B" vcall thunk + * "$R" thunk vtordispex */ accmem = *sym->current++; - if (accmem < 'A' || accmem > 'Z') goto done; - - if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) - { - switch ((accmem - 'A') / 8) - { - case 0: access = "private: "; break; - case 1: access = "protected: "; break; - case 2: access = "public: "; break; - } - } - if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) - { - if (accmem <= 'X') - { - switch ((accmem - 'A') % 8) - { - case 2: case 3: member_type = "static "; break; - case 4: case 5: member_type = "virtual "; break; - case 6: case 7: - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - break; - } - } - } + if (accmem == '$') + { + if (*sym->current >= '0' && *sym->current <= '5') + access_id = (*sym->current - '0') / 2; + else if (*sym->current == 'R') + access_id = (sym->current[1] - '0') / 2; + else if (*sym->current != 'B') + goto done; + } + else if (accmem >= 'A' && accmem <= 'Z') + access_id = (accmem - 'A') / 8; + else + goto done; + + switch (access_id) + { + case 0: access = "private: "; break; + case 1: access = "protected: "; break; + case 2: access = "public: "; break; + } + if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) + access = str_printf(sym, "[thunk]:%s", access ? access : " "); + + if (accmem == '$' && *sym->current != 'B') + member_type = "virtual "; + else if (accmem <= 'X') + { + switch ((accmem - 'A') % 8) + { + case 2: case 3: member_type = "static "; break; + case 4: case 5: case 6: case 7: member_type = "virtual "; break; + } + } + + if (sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS) + access = NULL; + if (sym->flags & UNDNAME_NO_MEMBER_TYPE) + member_type = NULL; name = get_class_string(sym, 0); - if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + if (accmem == '$' && *sym->current == 'B') /* vcall thunk */ + { + const char *n; + + sym->current++; + n = get_number(sym); + + if(!n || *sym->current++ != 'A') goto done; + name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); + has_args = FALSE; + has_ret = FALSE; + } + else if (accmem == '$' && *sym->current == 'R') /* vtordispex thunk */ + { + const char *n1, *n2, *n3, *n4; + + sym->current += 2; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + + if(!n1 || !n2 || !n3 || !n4) goto done; + name = str_printf(sym, "%s`vtordispex{%s,%s,%s,%s}' ", name, n1, n2, n3, n4); + } + else if (accmem == '$') /* vtordisp thunk */ + { + const char *n1, *n2; + + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); + + if (!n1 || !n2) goto done; + name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2); + } + else if ((accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) /* a thunk */ name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); - if (accmem <= 'X') - { - if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) - { - const char *ptr_modif; - /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; - if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - } + if (has_args && (accmem == '$' || + (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) + { + const char *ptr_modif; + /* Implicit 'this' pointer */ + /* If there is an implicit this pointer, const modifier follows */ + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1173,18 +1222,18 @@ str_array_init(&array_pmt); /* Return type, or @ if 'void' */ - if (*sym->current == '@') + if (has_ret && *sym->current == '@') { ct_ret.left = "void"; ct_ret.right = NULL; sym->current++; } - else + else if (has_ret) { if (!demangle_datatype(sym, &ct_ret, &array_pmt, FALSE)) goto done; } - if (sym->flags & UNDNAME_NO_FUNCTION_RETURNS) + if (!has_ret || sym->flags & UNDNAME_NO_FUNCTION_RETURNS) ct_ret.left = ct_ret.right = NULL; if (cast_op) { @@ -1193,8 +1242,9 @@ } mark = sym->stack.num; - if (!(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; + if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; if (sym->flags & UNDNAME_NAME_ONLY) args_str = modifier = NULL; + if (sym->flags & UNDNAME_NO_THISTYPE) modifier = NULL; sym->stack.num = mark; /* Note: '()' after 'Z' means 'throws', but we don't care here @@ -1208,23 +1258,6 @@ ret = TRUE; done: return ret; -} - -/****************************************************************** - * handle_template - * Does the final parsing and handling for a name with templates - */ -static BOOL handle_template(struct parsed_symbol* sym) -{ - const char* name; - const char* args; - - assert(*sym->current == '$'); - sym->current++; - if (!(name = get_literal_string(sym))) return FALSE; - if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; - sym->result = str_printf(sym, "%s%s", name, args); - return TRUE; } /******************************************************************* @@ -1460,10 +1493,8 @@ /* Function/Data type and access level */ if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); - else if (*sym->current >= 'A' && *sym->current <= 'Z') + else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') ret = handle_method(sym, do_after == 3); - else if (*sym->current == '$') - ret = handle_template(sym); else ret = FALSE; done: if (ret) assert(sym->result);

1 0

[cwittich] 62966: [fastfat] fix typo in comment
by cwittich＠svn.reactos.org 25 Apr '14

25 Apr '14

Author: cwittich Date: Fri Apr 25 17:09:37 2014 New Revision: 62966 URL: http://svn.reactos.org/svn/reactos?rev=62966&view=rev Log: [fastfat] fix typo in comment Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Apr 25 17:09:37 2014 @@ -550,7 +550,7 @@ if (!NT_SUCCESS(Status) && ParentFcb == NULL) { - DPRINT1("VfatOpenFile faild for '%wZ', status %x\n", &PathNameU, Status); + DPRINT1("VfatOpenFile failed for '%wZ', status %x\n", &PathNameU, Status); return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs