Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[gdalsnes] 13364: msvcrt: fix incorrect export

by gdalsnes＠svn.reactos.com

msvcrt: fix incorrect export misc Modified: trunk/reactos/lib/crt/stdio/vfscanf.c Modified: trunk/reactos/lib/crtdll/makefile Modified: trunk/reactos/lib/msvcrt/Makefile Modified: trunk/reactos/lib/msvcrt/msvcrt.def _____ Modified: trunk/reactos/lib/crt/stdio/vfscanf.c --- trunk/reactos/lib/crt/stdio/vfscanf.c 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/crt/stdio/vfscanf.c 2005-01-29 22:36:52 UTC (rev 13364) @@ -32,7 +32,6 @@ #include <msvcrt/mbstring.h> #include <msvcrt/internal/stdio.h> -#define CHECKPOINT1 do{ char a[30]; sprintf(a,"%i\n",__LINE__); OutputDebugStringA(a); } while(0) #ifdef __USE_W32API int __set_errno(int err); @@ -81,7 +80,6 @@ } while (0) # define conv_error() do { \ funlockfile (s); \ - CHECKPOINT1; \ return done; \ } while (0) # define input_error() do { \ @@ -899,18 +897,14 @@ if (flags & (LONG|LONGDBL)) { double d = __strtod_internal (wp, &tw, flags & GROUP); - CHECKPOINT1; if (!(flags & SUPPRESS) && tw != wp){ - CHECKPOINT1; *ARG (double *) = negative ? -d : d; } } else { float d = __strtof_internal (wp, &tw, flags & GROUP); - CHECKPOINT1; if (!(flags & SUPPRESS) && tw != wp){ - CHECKPOINT1; *ARG (float *) = negative ? -d : d; } } _____ Modified: trunk/reactos/lib/crtdll/makefile --- trunk/reactos/lib/crtdll/makefile 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/crtdll/makefile 2005-01-29 22:36:52 UTC (rev 13364) @@ -15,7 +15,7 @@ # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no -TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup +TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a @@ -33,21 +33,10 @@ -DUSE_MSVCRT_PREFIX \ -D_MT -TARGET_OBJECTS = $(TARGET_NAME).o +TARGET_OBJECTS = dllmain.o -TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk - - - -OBJECTS = dllmain.o - -$(TARGET_NAME).o: $(OBJECTS) - $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o - - # EOF _____ Modified: trunk/reactos/lib/msvcrt/Makefile --- trunk/reactos/lib/msvcrt/Makefile 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/msvcrt/Makefile 2005-01-29 22:36:52 UTC (rev 13364) @@ -15,7 +15,7 @@ # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no -TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup +TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a @@ -33,21 +33,10 @@ -DUSE_MSVCRT_PREFIX \ -D_MT -TARGET_OBJECTS = $(TARGET_NAME).o +TARGET_OBJECTS = dllmain.o -TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk - - - -OBJECTS = dllmain.o - -$(TARGET_NAME).o: $(OBJECTS) - $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o - - # EOF _____ Modified: trunk/reactos/lib/msvcrt/msvcrt.def --- trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-29 22:36:52 UTC (rev 13364) @@ -481,7 +481,7 @@ ;_scprintf ;_scwprintf _searchenv -_seh_longjmp_unwind@4 +_seh_longjmp_unwind=_seh_longjmp_unwind@4 ;_set_error_mode ;_set_SSE2_enable ;_set_sbh_threshold

19 years, 10 months

[sedwards] 13363: Allow IntEngExtEscape stub to return something.

by sedwards＠svn.reactos.com

Allow IntEngExtEscape stub to return something. Modified: trunk/reactos/subsys/win32k/objects/print.c _____ Modified: trunk/reactos/subsys/win32k/objects/print.c --- trunk/reactos/subsys/win32k/objects/print.c 2005-01-29 17:39:09 UTC (rev 13362) +++ trunk/reactos/subsys/win32k/objects/print.c 2005-01-29 20:16:48 UTC (rev 13363) @@ -93,7 +93,7 @@ if (Escape == 0x1101) return 0; - UNIMPLEMENTED; + DPRINT1("IntEngExtEscape is nimplemented. - Keep going and have a nice day\n"); return -1; }

19 years, 10 months

[mf] 13362: border for address bar

by mf＠svn.reactos.com

border for address bar Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-29 15:29:20 UTC (rev 13361) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-29 17:39:09 UTC (rev 13362) @@ -102,7 +102,7 @@ DrawText(canvas, TEXT("My"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT); HFONT hfont = GetStockFont(DEFAULT_GUI_FONT); - _haddressedit = CreateWindow(TEXT("EDIT"), NULL, WS_CHILD|WS_VISIBLE, 0, 0, 0, rect.bottom, + _haddressedit = CreateWindow(TEXT("EDIT"), NULL, WS_CHILD|WS_VISIBLE|WS_BORDER, 0, 0, 0, rect.bottom, hwnd, (HMENU)IDW_ADDRESSBAR, g_hInstance, 0); SetWindowFont(_haddressedit, hfont, FALSE); new EditController(_haddressedit);

19 years, 10 months

[weiden] 13361: fixed compiling with optimizations

by weiden＠svn.reactos.com

fixed compiling with optimizations Modified: trunk/reactos/lib/rosky/libskygi/libskygi.c _____ Modified: trunk/reactos/lib/rosky/libskygi/libskygi.c --- trunk/reactos/lib/rosky/libskygi/libskygi.c 2005-01-29 12:24:15 UTC (rev 13360) +++ trunk/reactos/lib/rosky/libskygi/libskygi.c 2005-01-29 15:29:20 UTC (rev 13361) @@ -900,7 +900,7 @@ { int Result; HDC hSrcDC; - HBITMAP hOldBitmap; + HBITMAP hOldBitmap = NULL; DBG("GC_blit_from_DIB(0x%x, 0x%x, 0x%x, 0x%x)\n", Gc, Dib, X, Y); @@ -1165,7 +1165,7 @@ MbFlags = MB_YESNOCANCEL; else if (Flags & WGF_MB_YESNO) MbFlags = MB_YESNO; - else if (Flags & WGF_MB_OK) + else /* if (Flags & WGF_MB_OK) */ MbFlags = MB_OK; MbFlags |= (Flags & WGF_MB_ICON_INFO) ? MB_ICONASTERISK : 0; MbFlags |= (Flags & WGF_MB_ICON_ASK) ? MB_ICONQUESTION : 0;

19 years, 10 months

[weiden] 13360: securely access buffers in NtSetContextThread() and NtGetContextThread()

by weiden＠svn.reactos.com

securely access buffers in NtSetContextThread() and NtGetContextThread() Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-01-29 03:15:05 UTC (rev 13359) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-01-29 12:24:15 UTC (rev 13360) @@ -186,44 +186,57 @@ OUT PCONTEXT ThreadContext) { PETHREAD Thread; - NTSTATUS Status; CONTEXT Context; KAPC Apc; KEVENT Event; - NTSTATUS AStatus; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); - Status = MmCopyFromCaller(&Context, ThreadContext, sizeof(CONTEXT)); - if (! NT_SUCCESS(Status)) + if(PreviousMode != KernelMode) + { + _SEH_TRY { + ProbeForWrite(ThreadContext, + sizeof(CONTEXT), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { return Status; } + } + Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_GET_CONTEXT, PsThreadType, - UserMode, + PreviousMode, (PVOID*)&Thread, NULL); - if (! NT_SUCCESS(Status)) + if(NT_SUCCESS(Status)) + { + if(Thread == PsGetCurrentThread()) { - return Status; - } - if (Thread == PsGetCurrentThread()) - { /* * I don't know if trying to get your own context makes much * sense but we can handle it more efficently. */ KeTrapFrameToContext(Thread->Tcb.TrapFrame, &Context); - Status = STATUS_SUCCESS; } - else + else { KeInitializeEvent(&Event, NotificationEvent, - FALSE); - AStatus = STATUS_SUCCESS; - + FALSE); + KeInitializeApc(&Apc, &Thread->Tcb, OriginalApcEnvironment, @@ -234,7 +247,7 @@ (PVOID)&Context); if (!KeInsertQueueApc(&Apc, (PVOID)&Event, - (PVOID)&AStatus, + (PVOID)&Status, IO_NO_INCREMENT)) { Status = STATUS_THREAD_IS_TERMINATING; @@ -243,21 +256,27 @@ { Status = KeWaitForSingleObject(&Event, 0, - UserMode, + KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status) && !NT_SUCCESS(AStatus)) - { - Status = AStatus; - } } } - if (NT_SUCCESS(Status)) + ObDereferenceObject(Thread); + + if(NT_SUCCESS(Status)) { - Status = MmCopyToCaller(ThreadContext, &Context, sizeof(Context)); + _SEH_TRY + { + *ThreadContext = Context; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - - ObDereferenceObject(Thread); + } + return Status; } @@ -291,44 +310,58 @@ IN PCONTEXT ThreadContext) { PETHREAD Thread; - NTSTATUS Status; KAPC Apc; KEVENT Event; - NTSTATUS AStatus; CONTEXT Context; - - Status = MmCopyFromCaller(&Context, ThreadContext, sizeof(CONTEXT)); - if (! NT_SUCCESS(Status)) + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY { + ProbeForRead(ThreadContext, + sizeof(CONTEXT), + sizeof(ULONG)); + Context = *ThreadContext; + ThreadContext = &Context; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { return Status; } + } + Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_SET_CONTEXT, PsThreadType, - UserMode, + PreviousMode, (PVOID*)&Thread, NULL); - if (!NT_SUCCESS(Status)) + if(NT_SUCCESS(Status)) + { + if (Thread == PsGetCurrentThread()) { - return Status; - } - - if (Thread == PsGetCurrentThread()) - { /* * I don't know if trying to set your own context makes much * sense but we can handle it more efficently. */ KeContextToTrapFrame(&Context, Thread->Tcb.TrapFrame); - Status = STATUS_SUCCESS; } - else + else { KeInitializeEvent(&Event, NotificationEvent, FALSE); - AStatus = STATUS_SUCCESS; KeInitializeApc(&Apc, &Thread->Tcb, @@ -340,7 +373,7 @@ (PVOID)&Context); if (!KeInsertQueueApc(&Apc, (PVOID)&Event, - (PVOID)&AStatus, + (PVOID)&Status, IO_NO_INCREMENT)) { Status = STATUS_THREAD_IS_TERMINATING; @@ -349,17 +382,14 @@ { Status = KeWaitForSingleObject(&Event, 0, - UserMode, + KernelMode, FALSE, - NULL); - if (NT_SUCCESS(Status) && !NT_SUCCESS(AStatus)) - { - Status = AStatus; - } + NULL); } } - - ObDereferenceObject(Thread); + ObDereferenceObject(Thread); + } + return Status; }

19 years, 10 months

[ekohl] 13350: Use the service contol pipe to send a start command in order to start a service thread.

by ekohl＠svn.reactos.com

Use the service contol pipe to send a start command in order to start a service thread. Added: trunk/reactos/include/services/ Added: trunk/reactos/include/services/services.h Modified: trunk/reactos/lib/advapi32/service/sctrl.c Modified: trunk/reactos/subsys/system/services/database.c _____ Added: trunk/reactos/include/services/services.h --- trunk/reactos/include/services/services.h 2005-01-28 12:12:42 UTC (rev 13349) +++ trunk/reactos/include/services/services.h 2005-01-28 13:28:56 UTC (rev 13350) @@ -0,0 +1,24 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/services/services.h + * PURPOSE: Private interface between SERVICES.EXE and ADVAPI32.DLL + * PROGRAMMER: Eric Kohl + */ + +#ifndef __SERVICES_SERVICES_H__ +#define __SERVICES_SERVICES_H__ + +#define SCM_START_COMMAND 1 + +typedef struct _SCM_START_PACKET +{ + ULONG Command; + ULONG Size; + WCHAR Arguments[1]; +} SCM_START_PACKET, *PSCM_START_PACKET; + +#endif /* __SERVICES_SERVICES_H__ */ + +/* EOF */ _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-01-28 12:12:42 UTC (rev 13349) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-01-28 13:28:56 UTC (rev 13350) @@ -13,6 +13,8 @@ /* INCLUDES ******************************************************************/ #include "advapi32.h" +#include <services/services.h> + #define NDEBUG #include <debug.h> @@ -23,9 +25,15 @@ { DWORD ThreadId; UNICODE_STRING ServiceName; - LPSERVICE_MAIN_FUNCTIONW MainFunction; + union + { + LPSERVICE_MAIN_FUNCTIONA lpFuncA; + LPSERVICE_MAIN_FUNCTIONW lpFuncW; + } Main; LPHANDLER_FUNCTION HandlerFunction; SERVICE_STATUS ServiceStatus; + BOOL bUnicode; + LPWSTR Arguments; } ACTIVE_SERVICE, *PACTIVE_SERVICE; @@ -33,7 +41,6 @@ static DWORD dwActiveServiceCount = 0; static PACTIVE_SERVICE lpActiveServices = NULL; -/* static PHANDLE ActiveServicesThreadHandles; */ /* uncomment when in use */ /* FUNCTIONS *****************************************************************/ @@ -80,16 +87,54 @@ ScServiceMainStub(LPVOID Context) { PACTIVE_SERVICE lpService; + DWORD dwArgCount = 0; + DWORD dwLength = 0; lpService = (PACTIVE_SERVICE)Context; DPRINT("ScServiceMainStub() called\n"); - /* FIXME: Send argc and argv (from command line) as arguments */ + /* Count arguments */ + while (lpService->Arguments[dwLength]) + { + dwLength += wcslen(&lpService->Arguments[dwLength]) + 1; + dwArgCount++; + } + /* Build the argument vector and call the main service routine */ + if (lpService->bUnicode) + { + LPWSTR *lpArgVector; + LPWSTR Ptr; - (lpService->MainFunction)(0, NULL); + lpArgVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (dwArgCount + 1) * sizeof(LPWSTR)); + if (lpArgVector == NULL) + return ERROR_OUTOFMEMORY; + dwArgCount = 0; + Ptr = lpService->Arguments; + while (*Ptr) + { + lpArgVector[dwArgCount] = Ptr; + + dwArgCount++; + Ptr += (wcslen(Ptr) + 1); + } + lpArgVector[dwArgCount] = NULL; + + (lpService->Main.lpFuncW)(dwArgCount, lpArgVector); + + HeapFree(GetProcessHeap(), + 0, + lpArgVector); + } + else + { + (lpService->Main.lpFuncA)(0, NULL); + } + return ERROR_SUCCESS; } @@ -141,18 +186,30 @@ } -static BOOL -ScServiceDispatcher(HANDLE hPipe, - PUCHAR lpBuffer, - DWORD dwBufferSize) + +static DWORD +ScStartService(PSCM_START_PACKET StartPacket) { PACTIVE_SERVICE lpService; HANDLE ThreadHandle; - DPRINT("ScDispatcherLoop() called\n"); + DPRINT("Size: %lu\n", StartPacket->Size); + DPRINT("Service: %S\n", &StartPacket->Arguments[0]); - lpService = &lpActiveServices[0]; + lpService = ScLookupServiceByServiceName(&StartPacket->Arguments[0]); + if (lpService == NULL) + return ERROR_SERVICE_DOES_NOT_EXIST; + lpService->Arguments = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + StartPacket->Size); + if (lpService->Arguments == NULL) + return ERROR_OUTOFMEMORY; + + memcpy(lpService->Arguments, + StartPacket->Arguments, + StartPacket->Size * sizeof(WCHAR)); + ThreadHandle = CreateThread(NULL, 0, ScServiceMainStub, @@ -160,22 +217,64 @@ CREATE_SUSPENDED, &lpService->ThreadId); if (ThreadHandle == NULL) - return FALSE; + return ERROR_SERVICE_NO_THREAD; ResumeThread(ThreadHandle); - CloseHandle(ThreadHandle); -#if 0 + return ERROR_SUCCESS; +} + + +static BOOL +ScServiceDispatcher(HANDLE hPipe, + PUCHAR lpBuffer, + DWORD dwBufferSize) +{ + LPDWORD Buffer; + DWORD Count; + BOOL bResult; + + DPRINT("ScDispatcherLoop() called\n"); + + Buffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + 1024); + if (Buffer == NULL) + return FALSE; + while (TRUE) { /* Read command from the control pipe */ + bResult = ReadFile(hPipe, + Buffer, + 1024, + &Count, + NULL); + if (bResult == FALSE) + { + DPRINT1("Pipe read failed\n"); + return FALSE; + } /* Execute command */ + switch (Buffer[0]) + { + case SCM_START_COMMAND: + DPRINT("Start command\n"); + ScStartService((PSCM_START_PACKET)Buffer); + break; + default: + DPRINT1("Unknown command %lu", Buffer[0]); + break; + } } -#endif + HeapFree(GetProcessHeap(), + 0, + Buffer); + return TRUE; } @@ -324,7 +423,8 @@ { RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].MainFunction = (LPSERVICE_MAIN_FUNCTIONW)lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].bUnicode = FALSE; } dwError = ScConnectControlPipe(&hPipe); @@ -400,7 +500,8 @@ { RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].MainFunction = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].bUnicode = TRUE; } dwError = ScConnectControlPipe(&hPipe); _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-01-28 12:12:42 UTC (rev 13349) +++ trunk/reactos/subsys/system/services/database.c 2005-01-28 13:28:56 UTC (rev 13350) @@ -32,6 +32,7 @@ #include <windows.h> #include <tchar.h> +#include <services/services.h> #include "services.h" #define NDEBUG @@ -521,9 +522,73 @@ static NTSTATUS -ScmStartService(PSERVICE Service, - PSERVICE_GROUP Group) +ScmSendStartCommand(PSERVICE Service, LPWSTR Arguments) { + PSCM_START_PACKET StartPacket; + DWORD TotalLength; +#if 0 + DWORD Length; +#endif + PWSTR Ptr; + DWORD Count; + + DPRINT("ScmSendStartCommand() called\n"); + + /* Calculate the total length of the start command line */ + TotalLength = wcslen(Service->ServiceName.Buffer) + 1; +#if 0 + if (Arguments != NULL) + { + Ptr = Arguments; + while (*Ptr) + { + Length = wcslen(Ptr) + 1; + TotalLength += Length; + Ptr += Length; + } + } +#endif + TotalLength++; + + /* Allocate start command packet */ + StartPacket = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SCM_START_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); + if (StartPacket == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + StartPacket->Command = SCM_START_COMMAND; + StartPacket->Size = TotalLength; + Ptr = &StartPacket->Arguments[0]; + wcscpy(Ptr, Service->ServiceName.Buffer); + Ptr += (wcslen(Service->ServiceName.Buffer) + 1); + + /* FIXME: Copy argument list */ + + *Ptr = 0; + + /* Send the start command */ + WriteFile(Service->ControlPipeHandle, + StartPacket, + sizeof(SCM_START_PACKET) + (TotalLength - 1) * sizeof(WCHAR), + &Count, + NULL); + + /* FIXME: Read the reply */ + + HeapFree(GetProcessHeap(), + 0, + StartPacket); + + DPRINT("ScmSendStartCommand() done\n"); + + return STATUS_SUCCESS; +} + + +static NTSTATUS +ScmStartUserModeService(PSERVICE Service) +{ RTL_QUERY_REGISTRY_TABLE QueryTable[3]; PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; @@ -532,153 +597,168 @@ BOOL Result; NTSTATUS Status; - DPRINT("ScmStartService() called\n"); + RtlInitUnicodeString(&ImagePath, NULL); - Service->ControlPipeHandle = INVALID_HANDLE_VALUE; - DPRINT("Service->Type: %u\n", Service->Type); + /* Get service data */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); - if (Service->Type == SERVICE_KERNEL_DRIVER || - Service->Type == SERVICE_FILE_SYSTEM_DRIVER || - Service->Type == SERVICE_RECOGNIZER_DRIVER) + QueryTable[0].Name = L"Type"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &Type; + + QueryTable[1].Name = L"ImagePath"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[1].EntryContext = &ImagePath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + Service->ServiceName.Buffer, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) { - /* Load driver */ - DPRINT(" Path: %wZ\n", &Service->RegistryPath); - Status = NtLoadDriver(&Service->RegistryPath); + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return Status; } - else + DPRINT("ImagePath: '%S'\n", ImagePath.Buffer); + DPRINT("Type: %lx\n", Type); + + /* Create '\\.\pipe\net\NtControlPipe' instance */ + Service->ControlPipeHandle = CreateNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", + PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 100, + 8000, + 4, + 30000, + NULL); + DPRINT("CreateNamedPipeW() done\n"); + if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { - RtlInitUnicodeString(&ImagePath, NULL); + DPRINT1("Failed to create control pipe!\n"); + return STATUS_UNSUCCESSFUL; + } - /* Get service data */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; - QueryTable[0].Name = L"Type"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Type; + Result = CreateProcessW(ImagePath.Buffer, + NULL, + NULL, + NULL, + FALSE, + DETACHED_PROCESS | CREATE_SUSPENDED, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + RtlFreeUnicodeString(&ImagePath); - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].EntryContext = &ImagePath; + if (!Result) + { + /* Close control pipe */ + CloseHandle(Service->ControlPipeHandle); + Service->ControlPipeHandle = INVALID_HANDLE_VALUE; - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - Service->ServiceName.Buffer, - QueryTable, - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - DPRINT("ImagePath: '%S'\n", ImagePath.Buffer); - DPRINT("Type: %lx\n", Type); + DPRINT1("Starting '%S' failed!\n", Service->ServiceName.Buffer); + return STATUS_UNSUCCESSFUL; + } - /* FIXME: create '\\.\pipe\net\NtControlPipe' instance */ - Service->ControlPipeHandle = CreateNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", - PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, - 100, - 8000, - 4, - 30000, - NULL); - DPRINT("CreateNamedPipeW() done\n"); - if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) - { - DPRINT1("Failed to create control pipe!\n"); - Status = STATUS_UNSUCCESSFUL; - goto Done; - } + DPRINT("Process Id: %lu Handle %lx\n", + ProcessInformation.dwProcessId, + ProcessInformation.hProcess); + DPRINT("Thread Id: %lu Handle %lx\n", + ProcessInformation.dwThreadId, + ProcessInformation.hThread); - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; + /* Get process and thread ids */ + Service->ProcessId = ProcessInformation.dwProcessId; + Service->ThreadId = ProcessInformation.dwThreadId; - Result = CreateProcessW(ImagePath.Buffer, - NULL, - NULL, - NULL, - FALSE, - DETACHED_PROCESS | CREATE_SUSPENDED, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - RtlFreeUnicodeString(&ImagePath); + /* Resume Thread */ + ResumeThread(ProcessInformation.hThread); - if (!Result) - { - /* Close control pipe */ - CloseHandle(Service->ControlPipeHandle); - Service->ControlPipeHandle = INVALID_HANDLE_VALUE; + /* Connect control pipe */ + if (ConnectNamedPipe(Service->ControlPipeHandle, NULL)) + { + DWORD dwProcessId = 0; + DWORD dwRead = 0; - DPRINT1("Starting '%S' failed!\n", Service->ServiceName.Buffer); - Status = STATUS_UNSUCCESSFUL; - } - else - { - DPRINT("Process Id: %lu Handle %lx\n", - ProcessInformation.dwProcessId, - ProcessInformation.hProcess); - DPRINT("Thread Id: %lu Handle %lx\n", - ProcessInformation.dwThreadId, - ProcessInformation.hThread); + DPRINT("Control pipe connected!\n"); - /* Get process and thread ids */ - Service->ProcessId = ProcessInformation.dwProcessId; - Service->ThreadId = ProcessInformation.dwThreadId; + /* Read thread id from pipe */ + if (!ReadFile(Service->ControlPipeHandle, + (LPVOID)&dwProcessId, + sizeof(DWORD), + &dwRead, + NULL)) + { + DPRINT1("Reading the service control pipe failed (Error %lu)\n", + GetLastError()); + Status = STATUS_UNSUCCESSFUL; + } + else + { + DPRINT("Received process id %lu\n", dwProcessId); - /* Resume Thread */ - ResumeThread(ProcessInformation.hThread); + /* FIXME: Send start command */ - /* Connect control pipe */ - if (ConnectNamedPipe(Service->ControlPipeHandle, NULL)) - { - DWORD dwProcessId = 0; - DWORD dwRead = 0; + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT("Connecting control pipe failed!\n"); - DPRINT("Control pipe connected!\n"); + /* Close control pipe */ + CloseHandle(Service->ControlPipeHandle); + Service->ControlPipeHandle = INVALID_HANDLE_VALUE; + Service->ProcessId = 0; + Service->ThreadId = 0; + Status = STATUS_UNSUCCESSFUL; + } - /* FIXME: Read thread id from pipe */ - if (!ReadFile(Service->ControlPipeHandle, - (LPVOID)&dwProcessId, - sizeof(DWORD), - &dwRead, - NULL)) - { - DPRINT1("Reading the service control pipe failed (Error %lu)\n", GetLastError()); - } - else - { - DPRINT("Received process id %lu\n", dwProcessId); + ScmSendStartCommand(Service, NULL); - /* FIXME: Send start command */ + /* Close process and thread handle */ + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); - Status = STATUS_SUCCESS; - } - } - else - { - DPRINT("Connecting control pipe failed!\n"); + return Status; +} - /* Close control pipe */ - CloseHandle(Service->ControlPipeHandle); - Service->ControlPipeHandle = INVALID_HANDLE_VALUE; - Service->ProcessId = 0; - Service->ThreadId = 0; - Status = STATUS_UNSUCCESSFUL; - } - /* Close process and thread handle */ - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); - } - } +static NTSTATUS +ScmStartService(PSERVICE Service, + PSERVICE_GROUP Group) +{ + NTSTATUS Status; + + DPRINT("ScmStartService() called\n"); + + Service->ControlPipeHandle = INVALID_HANDLE_VALUE; + DPRINT("Service->Type: %u\n", Service->Type); + + if (Service->Type == SERVICE_KERNEL_DRIVER || + Service->Type == SERVICE_FILE_SYSTEM_DRIVER || + Service->Type == SERVICE_RECOGNIZER_DRIVER) + { + /* Load driver */ + DPRINT(" Path: %wZ\n", &Service->RegistryPath); + Status = NtLoadDriver(&Service->RegistryPath); } + else + { + /* Start user-mode service */ + Status = ScmStartUserModeService(Service); + } -Done: DPRINT("ScmStartService() done (Status %lx)\n", Status); if (NT_SUCCESS(Status))

19 years, 10 months

[royce] 13359: remove eol whitespace

by royce＠svn.reactos.com

remove eol whitespace Modified: trunk/reactos/ntoskrnl/mm/marea.c _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-28 22:43:13 UTC (rev 13358) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-29 03:15:05 UTC (rev 13359) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -60,13 +60,13 @@ else { PMEMORY_AREA TempNode = NULL; - + do { /* Check if we're at the end of tree. */ if (Node->Parent == NULL) return NULL; - + TempNode = Node; Node = Node->Parent; } @@ -113,13 +113,13 @@ else { PMEMORY_AREA TempNode = NULL; - + do { /* Check if we're at the end of tree. */ if (Node->Parent == NULL) return NULL; - + TempNode = Node; Node = Node->Parent; } @@ -134,7 +134,7 @@ PMEMORY_AREA Node; ASSERT(AddressSpace != NULL); - + /* Special case for empty tree. */ if (AddressSpace->MemoryAreaRoot == NULL) return; @@ -152,7 +152,7 @@ } } #else -#define MmVerifyMemoryAreas(x) +#define MmVerifyMemoryAreas(x) #endif VOID STDCALL @@ -161,7 +161,7 @@ PMEMORY_AREA Node; DbgPrint("MmDumpMemoryAreas()\n"); - + /* Special case for empty tree. */ if (AddressSpace->MemoryAreaRoot == NULL) return; @@ -268,13 +268,13 @@ * @name MmCompressHelper * * This is helper of MmRebalanceTree. Performs a compression transformation - * count times, starting at root. + * count times, starting at root. */ static VOID MmCompressHelper( PMADDRESS_SPACE AddressSpace, - ULONG Count) + ULONG Count) { PMEMORY_AREA Root = NULL; PMEMORY_AREA Red = AddressSpace->MemoryAreaRoot; @@ -328,13 +328,13 @@ CurrentNode = AddressSpace->MemoryAreaRoot; while (CurrentNode != NULL) { - if (CurrentNode->RightChild == NULL) + if (CurrentNode->RightChild == NULL) { PreviousNode = CurrentNode; CurrentNode = CurrentNode->LeftChild; NodeCount++; } - else + else { TempNode = CurrentNode->RightChild; @@ -358,7 +358,7 @@ /* Transform Vine back into a balanced tree. */ Leaves = NodeCount + 1; - for (;;) + for (;;) { ULONG Next = Leaves & (Leaves - 1); if (Next == 0) @@ -371,7 +371,7 @@ Vine = NodeCount - Leaves; Height = 1 + (Leaves > 0); - while (Vine > 1) + while (Vine > 1) { MmCompressHelper(AddressSpace, Vine / 2); Vine /= 2; @@ -407,14 +407,14 @@ ASSERT(marea->EndingAddress <= Node->StartingAddress || marea->StartingAddress >= Node->EndingAddress); ASSERT(marea->StartingAddress != Node->StartingAddress); - + PreviousNode = Node; - + if (marea->StartingAddress < Node->StartingAddress) Node = Node->LeftChild; else Node = Node->RightChild; - + if (Node) { Depth++; @@ -569,7 +569,7 @@ /* Check for overflow. */ if (AlignedAddress > PreviousNode->StartingAddress) return NULL; - + if (Node->EndingAddress <= AlignedAddress) { DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); @@ -689,7 +689,7 @@ * * Free an existing memory area. * - * @param AddressSpace + * @param AddressSpace * Address space to free the area from. * @param MemoryArea * Memory area we're about to free. @@ -721,7 +721,7 @@ KeAttachProcess(&AddressSpace->Process->Pcb); } - EndAddress = MM_ROUND_UP(MemoryArea->EndingAddress, PAGE_SIZE); + EndAddress = MM_ROUND_UP(MemoryArea->EndingAddress, PAGE_SIZE); for (Address = (ULONG_PTR)MemoryArea->StartingAddress; Address < (ULONG_PTR)EndAddress; Address += PAGE_SIZE) @@ -758,7 +758,7 @@ KeDetachProcess(); } - /* Remove the tree item. */ + /* Remove the tree item. */ { if (MemoryArea->Parent != NULL) { @@ -824,7 +824,7 @@ * * Free an existing memory area given a pointer inside it. * - * @param AddressSpace + * @param AddressSpace * Address space to free the area from. * @param BaseAddress * Address in the memory area we're about to free. @@ -875,7 +875,7 @@ * * Create a memory area. * - * @param AddressSpace + * @param AddressSpace * Address space to create the area in. * @param Type * Type of the memory area. @@ -1000,7 +1000,7 @@ PLIST_ENTRY Entry; PMM_REGION Region; BOOLEAN Reserved; - + MmVerifyMemoryAreas(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);

19 years, 10 months

[weiden] 13358: added buffer checks to NtCreateThread()

by weiden＠svn.reactos.com

added buffer checks to NtCreateThread() Modified: trunk/reactos/ntoskrnl/ps/create.c _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-01-28 21:17:11 UTC (rev 13357) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-01-28 22:43:13 UTC (rev 13358) @@ -421,7 +421,7 @@ Status = ObCreateObject(UserMode, PsThreadType, ThreadAttributes, - UserMode, + KernelMode, NULL, sizeof(ETHREAD), 0, @@ -443,19 +443,6 @@ } Thread->ThreadsProcess = Process; Thread->Cid.UniqueProcess = (HANDLE)Thread->ThreadsProcess->UniqueProcessId; - - Status = ObInsertObject ((PVOID)Thread, - NULL, - DesiredAccess, - 0, - NULL, - ThreadHandle); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (Thread); - ObDereferenceObject (Process); - return Status; - } DPRINT("Thread = %x\n",Thread); @@ -488,8 +475,14 @@ KeReleaseDispatcherDatabaseLock(oldIrql); *ThreadPtr = Thread; - - return(STATUS_SUCCESS); + + Status = ObInsertObject((PVOID)Thread, + NULL, + DesiredAccess, + 0, + NULL, + ThreadHandle); + return(Status); } @@ -663,25 +656,72 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN HANDLE ProcessHandle, - OUT PCLIENT_ID Client, + OUT PCLIENT_ID ClientId, IN PCONTEXT ThreadContext, IN PINITIAL_TEB InitialTeb, IN BOOLEAN CreateSuspended) { + HANDLE hThread; + CONTEXT SafeContext; + INITIAL_TEB SafeInitialTeb; PEPROCESS Process; PETHREAD Thread; PTEB TebBase; - NTSTATUS Status; PKAPC LdrInitApc; KIRQL oldIrql; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + if(ThreadContext == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + PreviousMode = ExGetPreviousMode(); + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(ThreadHandle, + sizeof(HANDLE), + sizeof(ULONG)); + if(ClientId != NULL) + { + ProbeForWrite(ClientId, + sizeof(CLIENT_ID), + sizeof(ULONG)); + } + ProbeForRead(ThreadContext, + sizeof(CONTEXT), + sizeof(ULONG)); + SafeContext = *ThreadContext; + ThreadContext = &SafeContext; + ProbeForRead(InitialTeb, + sizeof(INITIAL_TEB), + sizeof(ULONG)); + SafeInitialTeb = *InitialTeb; + InitialTeb = &SafeInitialTeb; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + DPRINT("NtCreateThread(ThreadHandle %x, PCONTEXT %x)\n", ThreadHandle,ThreadContext); Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_CREATE_THREAD, PsProcessType, - UserMode, + PreviousMode, (PVOID*)&Process, NULL); if(!NT_SUCCESS(Status)) @@ -691,7 +731,7 @@ Status = PsInitializeThread(Process, &Thread, - ThreadHandle, + &hThread, DesiredAccess, ObjectAttributes, FALSE); @@ -721,11 +761,6 @@ Thread->StartAddress = NULL; - if (Client != NULL) - { - *Client = Thread->Cid; - } - /* * Maybe send a message to the process's debugger */ @@ -767,8 +802,21 @@ PsUnblockThread(Thread, NULL, 0); KeReleaseDispatcherDatabaseLock(oldIrql); + _SEH_TRY + { + if(ClientId != NULL) + { + *ClientId = Thread->Cid; + } + *ThreadHandle = hThread; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - return(STATUS_SUCCESS); + return Status; }

19 years, 10 months

[navaraf] 13357: Hervé Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Hervé Poussineau <poussine(a)freesurf.fr> Use fast mutexes instead of spin locks because the file system callbacks shouldn't be called at DISPATCH_LEVEL. Modified: trunk/reactos/ntoskrnl/io/fs.c _____ Modified: trunk/reactos/ntoskrnl/io/fs.c --- trunk/reactos/ntoskrnl/io/fs.c 2005-01-28 21:04:12 UTC (rev 13356) +++ trunk/reactos/ntoskrnl/io/fs.c 2005-01-28 21:17:11 UTC (rev 13357) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -35,7 +35,7 @@ static ERESOURCE FileSystemListLock; static LIST_ENTRY FileSystemListHead; -static KSPIN_LOCK FsChangeNotifyListLock; +static FAST_MUTEX FsChangeNotifyListLock; static LIST_ENTRY FsChangeNotifyListHead; #define TAG_FILE_SYSTEM TAG('F', 'S', 'Y', 'S') @@ -178,7 +178,7 @@ ExInitializeResourceLite(&FileSystemListLock); InitializeListHead(&FsChangeNotifyListHead); - KeInitializeSpinLock(&FsChangeNotifyListLock); + ExInitializeFastMutex(&FsChangeNotifyListLock); } @@ -709,9 +709,8 @@ { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; PLIST_ENTRY Entry; - KIRQL oldlvl; - KeAcquireSpinLock(&FsChangeNotifyListLock,&oldlvl); + ExAcquireFastMutex(&FsChangeNotifyListLock); Entry = FsChangeNotifyListHead.Flink; while (Entry != &FsChangeNotifyListHead) { @@ -721,7 +720,7 @@ Entry = Entry->Flink; } - KeReleaseSpinLock(&FsChangeNotifyListLock,oldlvl); + ExReleaseFastMutex(&FsChangeNotifyListLock); } @@ -743,9 +742,10 @@ Entry->DriverObject = DriverObject; Entry->FSDNotificationProc = FSDNotificationProc; - ExInterlockedInsertHeadList(&FsChangeNotifyListHead, - &Entry->FsChangeNotifyList, - &FsChangeNotifyListLock); + ExAcquireFastMutex(&FsChangeNotifyListLock); + InsertHeadList(&FsChangeNotifyListHead, + &Entry->FsChangeNotifyList); + ExReleaseFastMutex(&FsChangeNotifyListLock); return(STATUS_SUCCESS); } @@ -760,7 +760,6 @@ { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; PLIST_ENTRY Entry; - KIRQL oldlvl; Entry = FsChangeNotifyListHead.Flink; while (Entry != &FsChangeNotifyListHead) @@ -769,9 +768,9 @@ if (ChangeEntry->DriverObject == DriverObject && ChangeEntry->FSDNotificationProc == FSDNotificationProc) { - KeAcquireSpinLock(&FsChangeNotifyListLock,&oldlvl); + ExAcquireFastMutex(&FsChangeNotifyListLock); RemoveEntryList(Entry); - KeReleaseSpinLock(&FsChangeNotifyListLock,oldlvl); + ExReleaseFastMutex(&FsChangeNotifyListLock); ExFreePool(Entry); return;

19 years, 10 months

[sedwards] 13356: setupapi was sync'd to winehq.

by sedwards＠svn.reactos.com

setupapi was sync'd to winehq. Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-01-28 20:48:43 UTC (rev 13355) +++ trunk/reactos/doc/README.WINE 2005-01-28 21:04:12 UTC (rev 13356) @@ -55,7 +55,7 @@ reactos/lib/olepro32 # Synced to Wine-20050111 reactos/lib/richedit # Synced to Wine-20050111 reactos/lib/rpcrt4 # Synced to Wine-20050111 -reactos/lib/setupapi # Out of sync +reactos/lib/setupapi # Synced to Wine-20050125 # CVS reactos/lib/shell32 # Synced to Wine-20050111 reactos/lib/shdocvw # Synced to Wine-20050111 reactos/lib/shlwapi # Synced to Wine-20050111 @@ -100,5 +100,3 @@ reactos/lib/user32/misc/wsprintf.c # Out of sync reactos/lib/user32/windows/mdi.c # Out of sync - - ` \ No newline at end of file

19 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005