Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13144: 1. implemented the ProcessDebugPort class for NtQueryInformationProcess()
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

1. implemented the ProcessDebugPort class for NtQueryInformationProcess() 2. Probe user mode pointers in NtQueryInformationProcess() and NtSetInformationProcess() Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 22:47:26 UTC (rev 13143) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 23:38:06 UTC (rev 13144) @@ -1135,7 +1135,37 @@ KPROCESSOR_MODE PreviousMode; PreviousMode = ExGetPreviousMode(); + + /* check for valid buffers */ + if(PreviousMode == UserMode) + { + _SEH_TRY + { + /* probe with 32bit alignment */ + ProbeForWrite(ProcessInformation, + ProcessInformationLength, + sizeof(ULONG)); + if(ReturnLength) + { + ProbeForWrite(ReturnLength, + sizeof(ULONG), + 1); + } + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + /* * TODO: Here we should probably check that ProcessInformationLength * bytes indeed are writable at address ProcessInformation. @@ -1223,6 +1253,31 @@ break; case ProcessDebugPort: + { + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + _SEH_TRY + { + + *(PHANDLE)ProcessInformation = (Process->DebugPort != NULL ? (HANDLE)-1 : NULL); + if (ReturnLength) + { + *ReturnLength = sizeof(HANDLE); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + break; + } + case ProcessLdtInformation: case ProcessWorkingSetWatch: case ProcessWx86Information: @@ -1458,7 +1513,7 @@ _SEH_TRY { DstPath->Length = ProcParams->ImagePathName.Length; - DstPath->MaximumLength = DstPath->Length + sizeof(WCHAR); + DstPath->MaximumLength = ProcParams->ImagePathName.Length + sizeof(WCHAR); DstPath->Buffer = (PWSTR)(DstPath + 1); RtlCopyMemory(DstPath->Buffer, ProcParams->ImagePathName.Buffer, ProcParams->ImagePathName.Length); @@ -1551,6 +1606,29 @@ PreviousMode = ExGetPreviousMode(); + /* check for valid buffers */ + if(PreviousMode == UserMode) + { + _SEH_TRY + { + /* probe with 32bit alignment */ + ProbeForRead(ProcessInformation, + ProcessInformationLength, + sizeof(ULONG)); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_SET_INFORMATION, PsProcessType,

1 0

[weiden] 13143: secure access to buffers in NtQueryInformationProcess() and NtSetInformationProcess()
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

secure access to buffers in NtQueryInformationProcess() and NtSetInformationProcess() Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 22:45:14 UTC (rev 13142) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 22:47:26 UTC (rev 13143) @@ -1147,7 +1147,7 @@ PreviousMode, (PVOID*)&Process, NULL); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return(Status); } @@ -1161,22 +1161,31 @@ } else { - PPROCESS_BASIC_INFORMATION ProcessBasicInformationP = + PPROCESS_BASIC_INFORMATION ProcessBasicInformationP = (PPROCESS_BASIC_INFORMATION)ProcessInformation; - ProcessBasicInformationP->ExitStatus = Process->ExitStatus; - ProcessBasicInformationP->PebBaseAddress = Process->Peb; - ProcessBasicInformationP->AffinityMask = Process->Pcb.Affinity; - ProcessBasicInformationP->UniqueProcessId = - Process->UniqueProcessId; - ProcessBasicInformationP->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; - ProcessBasicInformationP->BasePriority = - Process->Pcb.BasePriority; - - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_BASIC_INFORMATION); - } + + _SEH_TRY + { + ProcessBasicInformationP->ExitStatus = Process->ExitStatus; + ProcessBasicInformationP->PebBaseAddress = Process->Peb; + ProcessBasicInformationP->AffinityMask = Process->Pcb.Affinity; + ProcessBasicInformationP->UniqueProcessId = + Process->UniqueProcessId; + ProcessBasicInformationP->InheritedFromUniqueProcessId = + (ULONG)Process->InheritedFromUniqueProcessId; + ProcessBasicInformationP->BasePriority = + Process->Pcb.BasePriority; + + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_BASIC_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1192,18 +1201,24 @@ } else { - PKERNEL_USER_TIMES ProcessTimeP = - (PKERNEL_USER_TIMES)ProcessInformation; + PKERNEL_USER_TIMES ProcessTimeP = (PKERNEL_USER_TIMES)ProcessInformation; + _SEH_TRY + { + ProcessTimeP->CreateTime = Process->CreateTime; + ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; + ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; + ProcessTimeP->ExitTime = Process->ExitTime; - ProcessTimeP->CreateTime = Process->CreateTime; - ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; - ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; - ProcessTimeP->ExitTime = Process->ExitTime; - - if (ReturnLength) - { - *ReturnLength = sizeof(KERNEL_USER_TIMES); - } + if (ReturnLength) + { + *ReturnLength = sizeof(KERNEL_USER_TIMES); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1221,12 +1236,21 @@ } else { - PULONG HandleCount = (PULONG)ProcessInformation; - *HandleCount = ObpGetHandleCountByHandleTable(&Process->HandleTable); - if (ReturnLength) + ULONG HandleCount = ObpGetHandleCountByHandleTable(&Process->HandleTable); + + _SEH_TRY { - *ReturnLength = sizeof(ULONG); + *(PULONG)ProcessInformation = HandleCount; + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1247,7 +1271,6 @@ { *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); } - Status = STATUS_SUCCESS; } _SEH_HANDLE { @@ -1271,27 +1294,36 @@ else { PVM_COUNTERS pOut = (PVM_COUNTERS)ProcessInformation; - pOut->PeakVirtualSize = Process->PeakVirtualSize; - /* - * Here we should probably use VirtualSize.LowPart, but due to - * incompatibilities in current headers (no unnamed union), - * I opted for cast. - */ - pOut->VirtualSize = (ULONG)Process->VirtualSize.QuadPart; - pOut->PageFaultCount = Process->Vm.PageFaultCount; - pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - pOut->WorkingSetSize = Process->Vm.WorkingSetSize; - pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeakPoolUsage[0]; // TODO: Verify! - pOut->QuotaPagedPoolUsage = Process->QuotaPoolUsage[0]; // TODO: Verify! - pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeakPoolUsage[1]; // TODO: Verify! - pOut->QuotaNonPagedPoolUsage = Process->QuotaPoolUsage[1]; // TODO: Verify! - pOut->PagefileUsage = Process->PagefileUsage; - pOut->PeakPagefileUsage = Process->PeakPagefileUsage; + + _SEH_TRY + { + pOut->PeakVirtualSize = Process->PeakVirtualSize; + /* + * Here we should probably use VirtualSize.LowPart, but due to + * incompatibilities in current headers (no unnamed union), + * I opted for cast. + */ + pOut->VirtualSize = (ULONG)Process->VirtualSize.QuadPart; + pOut->PageFaultCount = Process->Vm.PageFaultCount; + pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + pOut->WorkingSetSize = Process->Vm.WorkingSetSize; + pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeakPoolUsage[0]; // TODO: Verify! + pOut->QuotaPagedPoolUsage = Process->QuotaPoolUsage[0]; // TODO: Verify! + pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeakPoolUsage[1]; // TODO: Verify! + pOut->QuotaNonPagedPoolUsage = Process->QuotaPoolUsage[1]; // TODO: Verify! + pOut->PagefileUsage = Process->PagefileUsage; + pOut->PeakPagefileUsage = Process->PeakPagefileUsage; - if (ReturnLength) - { - *ReturnLength = sizeof(VM_COUNTERS); - } + if (ReturnLength) + { + *ReturnLength = sizeof(VM_COUNTERS); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1310,8 +1342,6 @@ { *ReturnLength = sizeof(ULONG); } - - Status = STATUS_SUCCESS; } _SEH_HANDLE { @@ -1329,12 +1359,21 @@ else { PULONG BoostEnabled = (PULONG)ProcessInformation; - *BoostEnabled = Process->Pcb.DisableBoost ? FALSE : TRUE; + + _SEH_TRY + { + *BoostEnabled = Process->Pcb.DisableBoost ? FALSE : TRUE; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1345,11 +1384,23 @@ } else { - ObQueryDeviceMapInformation(Process, (PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation); - if (ReturnLength) + PROCESS_DEVICEMAP_INFORMATION DeviceMap; + + ObQueryDeviceMapInformation(Process, &DeviceMap); + + _SEH_TRY { - *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION); - } + *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1361,12 +1412,21 @@ else { PUSHORT Priority = (PUSHORT)ProcessInformation; - *Priority = Process->PriorityClass; + + _SEH_TRY + { + *Priority = Process->PriorityClass; - if (ReturnLength) - { - *ReturnLength = sizeof(USHORT); - } + if (ReturnLength) + { + *ReturnLength = sizeof(USHORT); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } break; @@ -1377,23 +1437,51 @@ * Propably if we can't find a PEB or ProcessParameters structure for the * process! */ - PRTL_USER_PROCESS_PARAMETERS ProcParams; - ASSERT(Process->Peb); - ASSERT(Process->Peb->ProcessParameters); - ProcParams = Process->Peb->ProcessParameters; - if(ProcessInformationLength < sizeof(UNICODE_STRING) + ProcParams->ImagePathName.Length + sizeof(WCHAR)) + if(Process->Peb != NULL) { - Status = STATUS_INFO_LENGTH_MISMATCH; + PRTL_USER_PROCESS_PARAMETERS ProcParams; + + /* we need to attach to the process to make sure we're in the right context! */ + KeAttachProcess(&Process->Pcb); + + ASSERT(Process->Peb->ProcessParameters); /* FIXME - must ProcessParameters be really != NULL? */ + + ProcParams = Process->Peb->ProcessParameters; + if(ProcessInformationLength < sizeof(UNICODE_STRING) + ProcParams->ImagePathName.Length + sizeof(WCHAR)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; + + _SEH_TRY + { + DstPath->Length = ProcParams->ImagePathName.Length; + DstPath->MaximumLength = DstPath->Length + sizeof(WCHAR); + DstPath->Buffer = (PWSTR)(DstPath + 1); + + RtlCopyMemory(DstPath->Buffer, ProcParams->ImagePathName.Buffer, ProcParams->ImagePathName.Length); + DstPath->Buffer[DstPath->Length / sizeof(WCHAR)] = L'\0'; + + if (ReturnLength) + { + *ReturnLength = sizeof(UNICODE_STRING) + ProcParams->ImagePathName.Length + sizeof(WCHAR); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + KeDetachProcess(); } else { - PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; - DstPath->Length = ProcParams->ImagePathName.Length; - DstPath->MaximumLength = DstPath->Length + sizeof(WCHAR); - DstPath->Buffer = (PWSTR)(DstPath + 1); - - RtlCopyMemory(DstPath->Buffer, ProcParams->ImagePathName.Buffer, ProcParams->ImagePathName.Length); - DstPath->Buffer[DstPath->Length / sizeof(WCHAR)] = L'\0'; + /* FIXME - what to do here? */ + Status = STATUS_UNSUCCESSFUL; } break; } @@ -1415,8 +1503,9 @@ default: Status = STATUS_INVALID_INFO_CLASS; } + ObDereferenceObject(Process); - return(Status); + return Status; }

1 0

[weiden] 13142: implemented the TokenSessionId class for NtQueryInformationToken()
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

implemented the TokenSessionId class for NtQueryInformationToken() Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-01-19 21:47:51 UTC (rev 13141) +++ trunk/reactos/ntoskrnl/se/token.c 2005-01-19 22:45:14 UTC (rev 13142) @@ -838,8 +838,18 @@ break; case TokenSessionId: - DPRINT1("NtQueryInformationToken(TokenSessionId) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT("NtQueryInformationToken(TokenSessionId)\n"); + if (TokenInformationLength < sizeof(ULONG)) + { + Length = sizeof(ULONG); + Status = MmCopyToCaller(ReturnLength, &Length, sizeof(ULONG)); + if (NT_SUCCESS(Status)) + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + Status = MmCopyToCaller(TokenInformation, &Token->SessionId, sizeof(ULONG)); + } break; default:

1 0

[weiden] 13141: 1. fixed the ProcessAccessToken information class to properly check buffers
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

1. fixed the ProcessAccessToken information class to properly check buffers 2. implemented the ProcessExceptionPort information class Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 21:05:26 UTC (rev 13140) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 21:47:51 UTC (rev 13141) @@ -1458,7 +1458,6 @@ { PEPROCESS Process; NTSTATUS Status; - PHANDLE ProcessAccessTokenP; KPROCESSOR_MODE PreviousMode; PreviousMode = ExGetPreviousMode(); @@ -1480,14 +1479,104 @@ case ProcessBasePriority: case ProcessRaisePriority: case ProcessDebugPort: - case ProcessExceptionPort: Status = STATUS_NOT_IMPLEMENTED; break; + case ProcessExceptionPort: + { + if(ProcessInformationLength != sizeof(PROCESS_ACCESS_TOKEN)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + HANDLE PortHandle; + + /* make a safe copy of the buffer on the stack */ + _SEH_TRY + { + PortHandle = *(PHANDLE)ProcessInformation; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + PEPORT ExceptionPort; + + /* in case we had success reading from the buffer, verify the provided + * LPC port handle + */ + Status = ObReferenceObjectByHandle(PortHandle, + 0, + LpcPortObjectType, + PreviousMode, + (PVOID)&ExceptionPort, + NULL); + if(NT_SUCCESS(Status)) + { + /* lock the process to be thread-safe! */ + + Status = PsLockProcess(Process, FALSE); + if(NT_SUCCESS(Status)) + { + /* + * according to "NT Native API" documentation, setting the exception + * port is only permitted once! + */ + if(Process->ExceptionPort == NULL) + { + Process->ExceptionPort = ExceptionPort; + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_PORT_ALREADY_SET; + } + PsUnlockProcess(Process); + } + + ObDereferenceObject(ExceptionPort); + } + } + } + break; + } + case ProcessAccessToken: - ProcessAccessTokenP = (PHANDLE)ProcessInformation; - Status = PspAssignPrimaryToken(Process, *ProcessAccessTokenP); + { + if(ProcessInformationLength != sizeof(PROCESS_ACCESS_TOKEN)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + HANDLE TokenHandle; + + /* make a safe copy of the buffer on the stack */ + _SEH_TRY + { + TokenHandle = ((PPROCESS_ACCESS_TOKEN)ProcessInformation)->Token; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + /* in case we had success reading from the buffer, perform the actual task */ + Status = PspAssignPrimaryToken(Process, TokenHandle); + } + } break; + } case ProcessDefaultHardErrorMode: { @@ -1572,7 +1661,7 @@ /* FIXME - update the session id for the process token */ - Status = PsLockProcess(Process, TRUE); + Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { Process->SessionId = SessionInfo.SessionId;

1 0

[hyperion] 13140: Temporary hack to make ntoskrnl stop crashing - an user-mode pointer (in the EBP register) was being dereferenced without any check
by hyperion＠svn.reactos.com 19 Jan '05

19 Jan '05

Temporary hack to make ntoskrnl stop crashing - an user-mode pointer (in the EBP register) was being dereferenced without any check Since I don't know what this is for, I'm disabling it for now - it works for people reporting the crash, and it apparently only breaks GDB support. Alex, this should be your baby, please have a look Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-19 21:04:37 UTC (rev 13139) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-19 21:05:26 UTC (rev 13140) @@ -95,14 +95,20 @@ pushl %gs // + 0x48 sub $0x28, %esp // + 0x70 +#if 0 #ifdef DBG /* Trick gdb 6 into backtracing over the system call */ + /* FIXME: %ebp is *never* initialized */ pushl 4(%ebp) /* DebugEIP */ // + 0x74 pushl (%ebp) /* DebugEBP */ // + 0x78 #else pushl 0x60(%esp) /* DebugEIP */ // + 0x74 pushl %ebp /* DebugEBP */ // + 0x78 #endif +#else + pushl $0 /* DebugEIP */ // + 0x74 + pushl $0 /* DebugEBP */ // + 0x78 +#endif /* Load the segment registers */ sti

1 0

[weiden] 13139: fixed typo in PsLockProcess()
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

fixed typo in PsLockProcess() Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 20:59:53 UTC (rev 13138) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 21:04:37 UTC (rev 13139) @@ -2426,7 +2426,7 @@ KernelMode, FALSE, Delay); - if(NT_SUCCESS(Status)) + if(!NT_SUCCESS(Status)) { #ifndef NDEBUG if(Status == STATUS_TIMEOUT)

1 0

[weiden] 13138: implemented the ProcessSessionInformation information class
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

implemented the ProcessSessionInformation information class Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 20:26:56 UTC (rev 13137) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 20:59:53 UTC (rev 13138) @@ -1132,7 +1132,10 @@ { PEPROCESS Process; NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + PreviousMode = ExGetPreviousMode(); + /* * TODO: Here we should probably check that ProcessInformationLength * bytes indeed are writable at address ProcessInformation. @@ -1141,7 +1144,7 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, PsProcessType, - UserMode, + PreviousMode, (PVOID*)&Process, NULL); if (Status != STATUS_SUCCESS) @@ -1228,7 +1231,35 @@ break; case ProcessSessionInformation: + { + if (ProcessInformationLength != sizeof(PROCESS_SESSION_INFORMATION)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + PPROCESS_SESSION_INFORMATION SessionInfo = (PPROCESS_SESSION_INFORMATION)ProcessInformation; + + _SEH_TRY + { + SessionInfo->SessionId = Process->SessionId; + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); + } + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + break; + } + case ProcessWow64Information: + DPRINT1("We currently don't support the ProcessWow64Information information class!\n"); Status = STATUS_NOT_IMPLEMENTED; break; @@ -1428,11 +1459,14 @@ PEPROCESS Process; NTSTATUS Status; PHANDLE ProcessAccessTokenP; + KPROCESSOR_MODE PreviousMode; + PreviousMode = ExGetPreviousMode(); + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_SET_INFORMATION, PsProcessType, - UserMode, + PreviousMode, (PVOID*)&Process, NULL); if (!NT_SUCCESS(Status)) @@ -1477,6 +1511,102 @@ } break; } + + case ProcessSessionInformation: + { + if(ProcessInformationLength != sizeof(UINT)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + PROCESS_SESSION_INFORMATION SessionInfo; + Status = STATUS_SUCCESS; + + _SEH_TRY + { + /* copy the structure to the stack */ + SessionInfo = *(PPROCESS_SESSION_INFORMATION)ProcessInformation; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + PEPROCESS Process2; + /* we successfully copied the structure to the stack, continue processing */ + + /* + * setting the session id requires the SeTcbPrivilege! + */ + if(!SeSinglePrivilegeCheck(SeTcbPrivilege, + PreviousMode)) + { + /* can't set the session id, bail! */ + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* + * ntinternals documents a PROCESS_SET_SESSIONID flag for NtOpenProcess, + * so we need to open the handle again with this access flag to make + * sure the handle has the required permissions to change the session id! + */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID, + PsProcessType, + PreviousMode, + (PVOID*)&Process2, + NULL); + if(!NT_SUCCESS(Status)) + { + /* the handle doesn't have the access rights */ + break; + } + + /* SANITY check, Process2 MUST be the same as Process as it's the same handle! */ + ASSERT(Process2 == Process); + + /* FIXME - update the session id for the process token */ + + Status = PsLockProcess(Process, TRUE); + if(NT_SUCCESS(Status)) + { + Process->SessionId = SessionInfo.SessionId; + + /* Update the session id in the PEB structure */ + if(Process->Peb != NULL) + { + /* we need to attach to the process to make sure we're in the right + context to access the PEB structure */ + KeAttachProcess(&Process->Pcb); + + _SEH_TRY + { + /* FIXME: Process->Peb->SessionId = SessionInfo.SessionId; */ + + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + KeDetachProcess(); + } + + PsUnlockProcess(Process); + } + + ObDereferenceObject(Process2); + } + } + break; + } case ProcessLdtInformation: case ProcessLdtSize: @@ -2296,11 +2426,18 @@ KernelMode, FALSE, Delay); - if(Status == STATUS_TIMEOUT) + if(NT_SUCCESS(Status)) { +#ifndef NDEBUG + if(Status == STATUS_TIMEOUT) + { + DPRINT1("PsLockProcess(0x%x) timed out!\n", Process); + } +#endif KeLeaveCriticalRegion(); - break; + } + break; } else {

1 0

[sedwards] 13137: make NtFlushVirtualMemory return STATUS_SUCCESS rather than hanging as being UNIMPLEMENTED. Added a DPRINT to warn that its a stub
by sedwards＠svn.reactos.com 19 Jan '05

19 Jan '05

make NtFlushVirtualMemory return STATUS_SUCCESS rather than hanging as being UNIMPLEMENTED. Added a DPRINT to warn that its a stub Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-19 20:16:26 UTC (rev 13136) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-19 20:26:56 UTC (rev 13137) @@ -49,8 +49,9 @@ * RETURNS: Status */ { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + /* This should be implemented once we support network filesystems */ + DPRINT("NtFlushVirtualMemory is UNIMPLEMENTED\n"); + return(STATUS_SUCCESS); }

1 0

[weiden] 13136: fixed implementation of SetErrorMode() which should rather store the mode in the EPROCESS structure
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

fixed implementation of SetErrorMode() which should rather store the mode in the EPROCESS structure Modified: trunk/reactos/lib/kernel32/except/except.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/w32call.c _____ Modified: trunk/reactos/lib/kernel32/except/except.c --- trunk/reactos/lib/kernel32/except/except.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/lib/kernel32/except/except.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -15,9 +15,28 @@ #define NDEBUG #include "../include/debug.h" -UINT GlobalErrorMode = 0; LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; +UINT +STDCALL +GetErrorMode(VOID) +{ + NTSTATUS Status; + UINT ErrMode; + + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + (PVOID)&ErrMode, + sizeof(ErrMode), + NULL); + if(!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + + return ErrMode; +} /* * @implemented @@ -26,7 +45,22 @@ STDCALL SetErrorMode(UINT uMode) { - return (UINT)InterlockedExchange((LONG*)&GlobalErrorMode, (LONG)uMode); + UINT PrevErrMode; + NTSTATUS Status; + + PrevErrMode = GetErrorMode(); + + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + (PVOID)&uMode, + sizeof(uMode)); + if(!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + + return PrevErrMode; } @@ -114,7 +148,7 @@ return EXCEPTION_CONTINUE_SEARCH; } - if ((GlobalErrorMode & SEM_NOGPFAULTERRORBOX) == 0) + if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0) { #ifdef _X86_ PULONG Frame; _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -25,7 +25,7 @@ #define MAX_RW_LENGTH (256 * 1024) #if defined(__GNUC__) -void * alloca(size_t size); +/* void * alloca(size_t size); */ #elif defined(_MSC_VER) void* _alloca(size_t size); #else _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -100,7 +100,7 @@ static volatile BOOLEAN LazyCloseThreadShouldTerminate; #if defined(__GNUC__) -void * alloca(size_t size); +/* void * alloca(size_t size); */ #elif defined(_MSC_VER) void* _alloca(size_t size); #else _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-01-19 20:16:26 UTC (rev 13136) @@ -62,4 +62,6 @@ #include <napi/teb.h> #include <napi/win32.h> +#include <pseh.h> + #endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -30,7 +30,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <pseh.h> + #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -10,7 +10,6 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> -#include <pseh.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -27,7 +27,6 @@ /* INCLUDE *****************************************************************/ #include <ntoskrnl.h> -#include <pseh.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -1139,7 +1139,7 @@ */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_SET_INFORMATION, + PROCESS_QUERY_INFORMATION, PsProcessType, UserMode, (PVOID*)&Process, @@ -1272,12 +1272,21 @@ else { PULONG HardErrMode = (PULONG)ProcessInformation; - *HardErrMode = Process->DefaultHardErrorProcessing; + _SEH_TRY + { + *HardErrMode = Process->DefaultHardErrorProcessing; + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } - if (ReturnLength) + Status = STATUS_SUCCESS; + } + _SEH_HANDLE { - *ReturnLength = sizeof(ULONG); + Status = _SEH_GetExceptionCode(); } + _SEH_END; } break; @@ -1445,10 +1454,32 @@ ProcessAccessTokenP = (PHANDLE)ProcessInformation; Status = PspAssignPrimaryToken(Process, *ProcessAccessTokenP); break; + + case ProcessDefaultHardErrorMode: + { + if(ProcessInformationLength != sizeof(UINT)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + _SEH_TRY + { + InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, + *(PLONG)ProcessInformation); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + break; + } case ProcessLdtInformation: case ProcessLdtSize: - case ProcessDefaultHardErrorMode: case ProcessIoPortHandlers: case ProcessWorkingSetWatch: case ProcessUserModeIOPL: _____ Modified: trunk/reactos/ntoskrnl/ps/w32call.c --- trunk/reactos/ntoskrnl/ps/w32call.c 2005-01-19 19:49:57 UTC (rev 13135) +++ trunk/reactos/ntoskrnl/ps/w32call.c 2005-01-19 20:16:26 UTC (rev 13136) @@ -25,7 +25,7 @@ #include <internal/debug.h> #if defined(__GNUC__) -void * alloca(size_t size); +/* void * alloca(size_t size); */ #elif defined(_MSC_VER) void* _alloca(size_t size); #else

1 0

[chorns] 13135: * Build freetype, win32k, and video drivers
by chorns＠svn.reactos.com 19 Jan '05

19 Jan '05

* Build freetype, win32k, and video drivers * Generate module.spec.def, not module.def Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/video/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml Added: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.x ml Added: branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml Modified: branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c Added: branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -19,3 +19,6 @@ <directory name="storage"> <xi:include href="storage/directory.xml" /> </directory> +<directory name="video"> + <xi:include href="video/directory.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/directory.xml --- branches/xmlbuildsystem/reactos/drivers/video/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,9 @@ +<directory name="displays"> + <xi:include href="displays/directory.xml" /> +</directory> +<directory name="miniport"> + <xi:include href="miniport/directory.xml" /> +</directory> +<directory name="videoprt"> + <xi:include href="videoprt/videoprt.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,6 @@ +<directory name="framebuf"> + <xi:include href="framebuf/framebuf.xml" /> +</directory> +<directory name="vga"> + <xi:include href="vga/vgaddi.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,14 @@ +<module name="framebuf" type="kernelmodedriver"> + <importlibrary definition="framebuf.def" /> + <include base="framebuf">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>win32k</library> + <file>enable.c</file> + <file>palette.c</file> + <file>pointer.c</file> + <file>screen.c</file> + <file>surface.c</file> + <file>framebuf.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,25 @@ +<module name="vgaddi" type="kernelmodedriver"> + <importlibrary definition="vgaddi.def" /> + <include base="vgaddi">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>win32k</library> + <directory name="main"> + <file>enable.c</file> + </directory> + <directory name="objects"> + <file>screen.c</file> + <file>pointer.c</file> + <file>lineto.c</file> + <file>paint.c</file> + <file>bitblt.c</file> + <file>transblt.c</file> + <file>offscreen.c</file> + <file>copybits.c</file> + </directory> + <directory name="vgavideo"> + <file>vgavideo.c</file> + </directory> + <file>vgaddi.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,9 @@ +<directory name="vbe"> + <xi:include href="vbe/vbemp.xml" /> +</directory> +<directory name="vga"> + <xi:include href="vga/vgamp.xml" /> +</directory> +<directory name="xboxvmp"> + <xi:include href="xboxvmp/xboxvmp.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,10 @@ +<module name="vbemp" type="kernelmodedriver"> + <include base="vbemp">.</include> + <include base="ntoskrnl">include</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>videoprt</library> + <file>vbemp.c</file> + <file>vbemp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,11 @@ +<module name="vgamp" type="kernelmodedriver"> + <include base="vgamp">.</include> + <include base="ntoskrnl">include</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>videoprt</library> + <file>initvga.c</file> + <file>vgamp.c</file> + <file>vgamp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.x ml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.x ml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.x ml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,10 @@ +<module name="xboxvmp" type="kernelmodedriver"> + <include base="xboxvmp">.</include> + <include base="ntoskrnl">include</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>videoprt</library> + <file>xboxvmp.c</file> + <file>xboxvmp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml --- branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,19 @@ +<module name="videoprt" type="kernelmodedriver"> + <importlibrary definition="videoprt.def" /> + <include base="videoprt">.</include> + <include base="ntoskrnl">include</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>dispatch.c</file> + <file>dma.c</file> + <file>event.c</file> + <file>int10.c</file> + <file>interrupt.c</file> + <file>resource.c</file> + <file>services.c</file> + <file>spinlock.c</file> + <file>timer.c</file> + <file>videoprt.c</file> + <file>videoprt.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -7,6 +7,9 @@ <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory> +<directory name="freetype"> + <xi:include href="freetype/freetype.xml" /> +</directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml --- branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,88 @@ +<module name="freetype" type="kernelmodedll"> + <importlibrary definition="freetype.def" /> + <include base="freetype">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_SEH_NO_NATIVE_NLG" /> + <define name="__NTDRIVER__" /> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="i386"> + <file>setjmplongjmp.s</file> + </directory> + <directory name="src"> + <directory name="base"> + <file>ftsystem.c</file> + <file>ftdebug.c</file> + <file>ftinit.c</file> + <file>ftbase.c</file> + <file>ftbbox.c</file> + <file>ftbdf.c</file> + <file>ftglyph.c</file> + <file>ftmm.c</file> + <file>ftpfr.c</file> + <file>ftstroke.c</file> + <file>fttype1.c</file> + <file>ftwinfnt.c</file> + <file>ftxf86.c</file> + </directory> + <directory name="autohint"> + <file>autohint.c</file> + </directory> + <directory name="bdf"> + <file>bdf.c</file> + </directory> + <directory name="cache"> + <file>ftcache.c</file> + </directory> + <directory name="cff"> + <file>cff.c</file> + </directory> + <directory name="cid"> + <file>type1cid.c</file> + </directory> + <directory name="gzip"> + <file>ftgzip.c</file> + </directory> + <directory name="lzw"> + <file>ftlzw.c</file> + </directory> + <directory name="pcf"> + <file>pcf.c</file> + </directory> + <directory name="pfr"> + <file>pfr.c</file> + </directory> + <directory name="psaux"> + <file>psaux.c</file> + </directory> + <directory name="pshinter"> + <file>pshinter.c</file> + </directory> + <directory name="psnames"> + <file>psmodule.c</file> + </directory> + <directory name="raster"> + <file>raster.c</file> + </directory> + <directory name="sfnt"> + <file>sfnt.c</file> + </directory> + <directory name="smooth"> + <file>smooth.c</file> + </directory> + <directory name="truetype"> + <file>truetype.c</file> + </directory> + <directory name="type1"> + <file>type1.c</file> + </directory> + <directory name="type42"> + <file>type42.c</file> + </directory> + <directory name="winfonts"> + <file>winfnt.c</file> + </directory> + </directory> + <file>rosglue.c</file> + <file>freetype.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -1,6 +1,6 @@ <module name="iphlpapi" type="win32dll"> <dependency>winebuild</dependency> - <importlibrary definition="iphlpapi.def" /> + <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/wine</include> <define name="YDEBUG" /> @@ -9,7 +9,6 @@ <define name="__REACTOS__" /> <define name="__USE_W32API" /> <library>wine</library> - <library>rtl</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml --- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -1,3 +1,6 @@ <directory name="system"> <xi:include href="system/directory.xml" /> </directory> +<directory name="win32k"> + <xi:include href="win32k/win32k.xml" /> +</directory> _____ Modified: branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c --- branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-01-19 19:49:57 UTC (rev 13135) @@ -199,12 +199,8 @@ } -/* - * This definition doesn't work - */ -// BOOL STDCALL DllMain(VOID) NTSTATUS STDCALL -DllMain ( +DriverEntry ( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { _____ Added: branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml --- branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-01-19 19:49:57 UTC (rev 13135) @@ -0,0 +1,132 @@ +<module name="win32k" type="kernelmodedriver"> + <importlibrary definition="win32k.def" /> + <include base="win32k">.</include> + <include base="win32k">include</include> + <include base="ntoskrnl">include</include> + <include base="freetype">include</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32K_" /> + <library>rosrtl</library> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <library>freetype</library> + <directory name="dib"> + <file>dib1bpp.c</file> + <file>dib4bpp.c</file> + <file>dib8bpp.c</file> + <file>dib16bpp.c</file> + <file>dib24bpp.c</file> + <file>dib32bpp.c</file> + <file>dib.c</file> + </directory> + <directory name="eng"> + <file>bitblt.c</file> + <file>brush.c</file> + <file>clip.c</file> + <file>copybits.c</file> + <file>debug.c</file> + <file>device.c</file> + <file>error.c</file> + <file>event.c</file> + <file>float.c</file> + <file>gradient.c</file> + <file>lineto.c</file> + <file>mem.c</file> + <file>misc.c</file> + <file>mouse.c</file> + <file>paint.c</file> + <file>palette.c</file> + <file>perfcnt.c</file> + <file>semaphor.c</file> + <file>sort.c</file> + <file>surface.c</file> + <file>transblt.c</file> + <file>xlate.c</file> + </directory> + <directory name="ldr"> + <file>loader.c</file> + </directory> + <directory name="main"> + <file>dllmain.c</file> + <file>svctabm.c</file> + </directory> + <directory name="misc"> + <file>driver.c</file> + <file>error.c</file> + <file>math.c</file> + <file>object.c</file> + </directory> + <directory name="ntddraw"> + <file>ddraw.c</file> + <file>stubs.c</file> + </directory> + <directory name="ntuser"> + <file>accelerator.c</file> + <file>callback.c</file> + <file>caret.c</file> + <file>class.c</file> + <file>clipboard.c</file> + <file>csr.c</file> + <file>cursoricon.c</file> + <file>desktop.c</file> + <file>focus.c</file> + <file>guicheck.c</file> + <file>hook.c</file> + <file>hotkey.c</file> + <file>input.c</file> + <file>keyboard.c</file> + <file>menu.c</file> + <file>message.c</file> + <file>metric.c</file> + <file>misc.c</file> + <file>monitor.c</file> + <file>msgqueue.c</file> + <file>painting.c</file> + <file>prop.c</file> + <file>scrollbar.c</file> + <file>stubs.c</file> + <file>timer.c</file> + <file>useratom.c</file> + <file>vis.c</file> + <file>windc.c</file> + <file>window.c</file> + <file>winpos.c</file> + <file>winsta.c</file> + </directory> + <directory name="objects"> + <file>bezier.c</file> + <file>bitmaps.c</file> + <file>brush.c</file> + <file>cliprgn.c</file> + <file>color.c</file> + <file>coord.c</file> + <file>dc.c</file> + <file>dib.c</file> + <file>fillshap.c</file> + <file>font.c</file> + <file>gdiobj.c</file> + <file>icm.c</file> + <file>line.c</file> + <file>metafile.c</file> + <file>paint.c</file> + <file>palette.c</file> + <file>path.c</file> + <file>pen.c</file> + <file>polyfill.c</file> + <file>print.c</file> + <file>rect.c</file> + <file>region.c</file> + <file>stockobj.c</file> + <file>text.c</file> + <file>wingl.c</file> + </directory> + <directory name="stubs"> + <file>stubs.c</file> + <file>xpstubs.c</file> + </directory> + <file>win32k.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-19 19:14:56 UTC (rev 13134) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-19 19:49:57 UTC (rev 13135) @@ -628,11 +628,11 @@ { string basename = GetBasename ( sourceFilename ); fprintf ( fMakefile, - "%s.def: %s\n", + "%s.spec.def: %s\n", basename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, - "\t%s --def=%s -o %s.def\n", + "\t%s --def=%s -o %s.spec.def\n", "${winebuild}", sourceFilename.c_str (), basename.c_str () ); @@ -1126,7 +1126,7 @@ MingwModuleHandler::GetSpecObjectDependencies ( const string& filename ) const { string basename = GetBasename ( filename ); - return basename + ".def" + " " + basename + ".stubs.c"; + return basename + ".spec.def" + " " + basename + ".stubs.c"; } string

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs