Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 16706: Added makefile which tell how to compile rosapps.
by mbosma＠svn.reactos.com 23 Jul '05

23 Jul '05

Added makefile which tell how to compile rosapps. Added: trunk/rosapps/makefile _____ Added: trunk/rosapps/makefile --- trunk/rosapps/makefile 2005-07-23 17:40:48 UTC (rev 16705) +++ trunk/rosapps/makefile 2005-07-23 17:45:41 UTC (rev 16706) @@ -0,0 +1,3 @@ +all: + @echo To build rosapps it has to be copied it into the reactos\modules folder. After + @echo this you can run "make depends" in the \reactos directory to compile it.

1 0

[ion] 16705: - Disable APC Queuing & Flush APC queues during thread shutdown.
by ion＠svn.reactos.com 23 Jul '05

23 Jul '05

- Disable APC Queuing & Flush APC queues during thread shutdown. - Detect if Kernel APCs were pending during thread shutdown. - Call Lego Routine, if registered, during thread shutdown. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/notify.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-23 17:40:48 UTC (rev 16705) @@ -253,6 +253,10 @@ STDCALL KeForceResumeThread(IN PKTHREAD Thread); +BOOLEAN +STDCALL +KeDisableThreadApcQueueing(IN PKTHREAD Thread); + BOOLEAN STDCALL KiInsertTimer(PKTIMER Timer, LARGE_INTEGER DueTime); VOID inline FASTCALL KiSatisfyObjectWait(PDISPATCHER_HEADER Object, PKTHREAD Thread); @@ -292,6 +296,12 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2); +PLIST_ENTRY +STDCALL +KeFlushQueueApc(IN PKTHREAD Thread, + IN KPROCESSOR_MODE PreviousMode); + + VOID STDCALL KiAttachProcess(struct _KTHREAD *Thread, struct _KPROCESS *Process, KIRQL ApcLock, struct _KAPC_STATE *SavedApcState); VOID STDCALL KiSwapProcess(struct _KPROCESS *NewProcess, struct _KPROCESS *OldProcess); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-07-23 17:40:48 UTC (rev 16705) @@ -184,6 +184,10 @@ STDCALL PspRunCreateProcessNotifyRoutines(PEPROCESS, BOOLEAN); +VOID +STDCALL +PspRunLegoRoutine(IN PKTHREAD Thread); + VOID INIT_FUNCTION PsInitJobManagment(VOID); /* CLIENT ID */ _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-23 17:40:48 UTC (rev 16705) @@ -270,14 +270,14 @@ */ if ((Apc->ApcMode != KernelMode) && (Apc->KernelRoutine == (PKKERNEL_ROUTINE)PsExitSpecialApc)) { - DPRINT ("Inserting the Process Exit APC into the Queue\n"); + DPRINT1("Inserting the Process Exit APC into the Queue\n"); Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = TRUE; InsertHeadList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); } else if (Apc->NormalRoutine == NULL) { - DPRINT ("Inserting Special APC %x into the Queue\n", Apc); + DPRINT("Inserting Special APC %x into the Queue\n", Apc); for (ApcListEntry = Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc-> ApcMode].Flink; ApcListEntry != &Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc- >ApcMode]; @@ -293,7 +293,7 @@ } else { - DPRINT ("Inserting Normal APC %x into the %x Queue\n", Apc, Apc->ApcMode); + DPRINT("Inserting Normal APC %x into the %x Queue\n", Apc, Apc->ApcMode); InsertTailList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); } @@ -441,6 +441,73 @@ } /*++ + * KeFlushQueueApc + * + * The KeFlushQueueApc routine flushes all APCs of the given processor mode + * from the specified Thread's APC queue. + * + * Params: + * Thread - Pointer to the thread whose APC queue will be flushed. + * + * PreviousMode - Specifies which APC Queue to flush. + * + * Returns: + * A pointer to the first entry in the flushed APC queue. + * + * Remarks: + * If the routine returns NULL, it means that no APCs were to be flushed. + * + * Callers of KeFlushQueueApc must be running at DISPATCH_LEVEL or lower. + * + *--*/ +PLIST_ENTRY +STDCALL +KeFlushQueueApc(IN PKTHREAD Thread, + IN KPROCESSOR_MODE PreviousMode) +{ + KIRQL OldIrql; + PKAPC Apc; + PLIST_ENTRY ApcEntry, CurrentEntry; + + /* Lock the Dispatcher Database and APC Queue */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); + + /* Check if the list is empty */ + if (IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) + { + /* We'll return NULL */ + ApcEntry = NULL; + } + else + { + /* Remove this one */ + RemoveEntryList(&Thread->ApcState.ApcListHead[PreviousMode]); + CurrentEntry = ApcEntry; + + /* Remove all the other ones too, if present */ + do + { + /* Get the APC */ + Apc = CONTAINING_RECORD(CurrentEntry, KAPC, ApcListEntry); + + /* Move to the next one */ + CurrentEntry = CurrentEntry->Flink; + + /* Mark it as not inserted */ + Apc->Inserted = FALSE; + } while (ApcEntry != CurrentEntry); + } + + /* Release the locks */ + KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Return the first entry */ + return ApcEntry; +} + +/*++ * KeRemoveQueueApc * * The KeRemoveQueueApc routine removes a given APC object from the system _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-23 17:40:48 UTC (rev 16705) @@ -387,6 +387,29 @@ return (ULONG)PsGetCurrentThread()->Tcb.PreviousMode; } +BOOLEAN +STDCALL +KeDisableThreadApcQueueing(IN PKTHREAD Thread) +{ + KIRQL OldIrql; + BOOLEAN PreviousState; + + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Save old state */ + PreviousState = Thread->ApcQueueable; + + /* Disable it now */ + Thread->ApcQueueable = FALSE; + + /* Release the Lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Return old state */ + return PreviousState; +} + VOID STDCALL KeRundownThread(VOID) _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-07-23 17:40:48 UTC (rev 16705) @@ -213,6 +213,8 @@ PTERMINATION_PORT TerminationPort; PTEB Teb; KIRQL oldIrql; + PLIST_ENTRY ApcEntry, CurrentApc; + PKAPC Apc; DPRINT("PspExitThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); @@ -332,6 +334,50 @@ /* Rundown Mutexes */ KeRundownThread(); + /* Disable new APC Queuing, this is as far as we'll let them go */ + KeDisableThreadApcQueueing(&CurrentThread->Tcb); + + /* Flush the User APCs */ + if ((ApcEntry = KeFlushQueueApc(&CurrentThread->Tcb, UserMode))) + { + CurrentApc = ApcEntry; + do + { + /* Get the APC */ + Apc = CONTAINING_RECORD(CurrentApc, KAPC, ApcListEntry); + + /* Move to the next one */ + CurrentApc = CurrentApc->Flink; + + /* Rundown the APC or de-allocate it */ + if (Apc->RundownRoutine) + { + /* Call its own routine */ + (Apc->RundownRoutine)(Apc); + } + else + { + /* Do it ourselves */ + ExFreePool(Apc); + } + } + while (CurrentApc != ApcEntry); + } + + /* Call the Lego routine */ + if (CurrentThread->Tcb.LegoData) PspRunLegoRoutine(&CurrentThread->Tcb); + + /* Flush the APC queue, which should be empty */ + if ((ApcEntry = KeFlushQueueApc(&CurrentThread->Tcb, KernelMode))) + { + /* Bugcheck time */ + KEBUGCHECKEX(KERNEL_APC_PENDING_DURING_EXIT, + (ULONG_PTR)ApcEntry, + CurrentThread->Tcb.KernelApcDisable, + oldIrql, + 0); + } + /* Terminate the Thread from the Scheduler */ KeTerminateThread(0); DPRINT1("Unexpected return, CurrentThread %x PsGetCurrentThread() %x\n", CurrentThread, PsGetCurrentThread()); _____ Modified: trunk/reactos/ntoskrnl/ps/notify.c --- trunk/reactos/ntoskrnl/ps/notify.c 2005-07-23 13:43:52 UTC (rev 16704) +++ trunk/reactos/ntoskrnl/ps/notify.c 2005-07-23 17:40:48 UTC (rev 16705) @@ -26,9 +26,10 @@ static PLOAD_IMAGE_NOTIFY_ROUTINE PspLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; + +typedef VOID (STDCALL *PLEGO_NOTIFY_ROUTINE)(IN PKTHREAD Thread); +static PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; -static PVOID PspLegoNotifyRoutine; - /* FUNCTIONS ***************************************************************/ /* @@ -231,4 +232,12 @@ } } +VOID +STDCALL +PspRunLegoRoutine(IN PKTHREAD Thread) +{ + /* Call it */ + if (PspLegoNotifyRoutine) (PspLegoNotifyRoutine)(Thread); +} + /* EOF */

1 0

[ekohl] 16704: - Implement CM_Get_Child_Ex, CM_Get_Parent_Ex, CM_Get_Sibling_Ex and CM_Set_DevNode_Problem[_Ex].
by ekohl＠svn.reactos.com 23 Jul '05

23 Jul '05

- Implement CM_Get_Child_Ex, CM_Get_Parent_Ex, CM_Get_Sibling_Ex and CM_Set_DevNode_Problem[_Ex]. - Clean-up indentation. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/include/idl/pnp.idl 2005-07-23 13:43:52 UTC (rev 16704) @@ -29,15 +29,15 @@ [out, string, size_is(Length)] wchar_t *DeviceInstance, [in] DWORD Length); -// cpp_quote("#define PNP_DEVICE_PARENT 1") -// cpp_quote("#define PNP_DEVICE_CHILD 2") -// cpp_quote("#define PNP_DEVICE_SIBLING 3") -// CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, -// [in] DWORD Relationship, -// [in, string] wchar_t *DeviceId, -// [out, string, size_is(Length)] wchar_t *RelatedDeviceId, -// [in] DWORD Length, -// [in] DWORD Flags); + cpp_quote("#define PNP_DEVICE_PARENT 1") + cpp_quote("#define PNP_DEVICE_CHILD 2") + cpp_quote("#define PNP_DEVICE_SIBLING 3") + CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, + [in] DWORD Relationship, + [in, string] wchar_t *DeviceId, + [out, string, size_is(Length)] wchar_t *RelatedDeviceId, + [in] DWORD Length, + [in] DWORD Flags); CONFIGRET PNP_GetDepth(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, @@ -49,4 +49,9 @@ [out] unsigned long *Status, [out] unsigned long *Problem, [in] DWORD Flags); + + CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] unsigned long Problem, + [in] DWORD Flags); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-07-23 13:43:52 UTC (rev 16704) @@ -84,7 +84,16 @@ #define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION #define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS +/* ulFlags for CM_Set_DevNode_Problem[_Ex] */ +#define CM_SET_DEVNODE_PROBLEM_NORMAL 0x00000000 +#define CM_SET_DEVNODE_PROBLEM_OVERRIDE 0x00000001 +#define CM_SET_DEVNODE_PROBLEM_BITS 0x00000001 +#define CM_SET_DEVINST_PROBLEM_NORMAL CM_SET_DEVNODE_PROBLEM_NORMAL +#define CM_SET_DEVINST_PROBLEM_OVERRIDE CM_SET_DEVNODE_PROBLEM_OVERRIDE +#define CM_SET_DEVINST_PROBLEM_BITS CM_SET_DEVNODE_PROBLEM_BITS + + CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) @@ -141,5 +150,7 @@ CONFIGRET WINAPI CM_Open_Class_Key_ExW(LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE); #define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) +CONFIGRET WINAPI CM_Set_DevNode_Problem( DEVINST, ULONG, ULONG ); +CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( DEVINST, ULONG, ULONG, HMACHINE ); #endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-23 13:43:52 UTC (rev 16704) @@ -251,7 +251,6 @@ CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { -#if 0 WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -310,9 +309,6 @@ *pdnDevInst = dwIndex; return CR_SUCCESS; -#endif - FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_FAILURE; } @@ -322,8 +318,7 @@ CONFIGRET WINAPI CM_Get_Depth( PULONG pulDepth, DEVINST dnDevInst, ULONG ulFlags) { - TRACE("%p %lx %lx\n", - pulDepth, dnDevInst, ulFlags); + TRACE("%p %lx %lx\n", pulDepth, dnDevInst, ulFlags); return CM_Get_Depth_Ex(pulDepth, dnDevInst, ulFlags, NULL); } @@ -738,7 +733,6 @@ CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { -#if 0 WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -797,9 +791,6 @@ *pdnDevInst = dwIndex; return CR_SUCCESS; -#endif - FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_FAILURE; } @@ -820,7 +811,6 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { -#if 0 WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -879,9 +869,6 @@ *pdnDevInst = dwIndex; return CR_SUCCESS; -#endif - FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_FAILURE; } @@ -1035,3 +1022,60 @@ return rc; } + + +/********************************************************************** * + * CM_Set_DevNode_Problem [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_DevNode_Problem( + DEVINST dnDevInst, ULONG ulProblem, ULONG ulFlags) +{ + TRACE("%lx %lx %lx\n", dnDevInst, ulProblem, ulFlags); + return CM_Set_DevNode_Problem_Ex(dnDevInst, ulProblem, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Set_DevNode_Problem_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( + DEVINST dnDevInst, ULONG ulProblem, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + CONFIGRET rc = CR_SUCCESS; + + TRACE("%lx %lx %lx %lx\n", dnDevInst, ulProblem, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_SET_DEVNODE_PROBLEM_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_SetDeviceProblem(BindingHandle, + lpDevInst, + ulProblem, + ulFlags); +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-07-23 13:43:52 UTC (rev 16704) @@ -170,8 +170,8 @@ @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex -@ stub CM_Set_DevNode_Problem -@ stub CM_Set_DevNode_Problem_Ex +@ stdcall CM_Set_DevNode_Problem(long long long) +@ stdcall CM_Set_DevNode_Problem_Ex(long long long long) @ stub CM_Set_DevNode_Registry_PropertyA @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_DevNode_Registry_Property_ExA _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-23 13:43:52 UTC (rev 16704) @@ -48,8 +48,8 @@ static SERVICE_TABLE_ENTRY ServiceTable[2] = { - {TEXT("PlugPlay"), ServiceMain}, - {NULL, NULL} + {TEXT("PlugPlay"), ServiceMain}, + {NULL, NULL} }; static WCHAR szRootDeviceId[] = L"HTREE\\ROOT\\0"; @@ -59,41 +59,41 @@ static DWORD WINAPI RpcServerThread(LPVOID lpParameter) { - RPC_STATUS Status; + RPC_STATUS Status; - DPRINT("RpcServerThread() called\n"); + DPRINT("RpcServerThread() called\n"); - Status = RpcServerUseProtseqEpW(L"ncacn_np", - 20, - L"\\pipe\\umpnpmgr", - NULL); // Security descriptor - if (Status != RPC_S_OK) - { - DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return 0; - } + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 20, + L"\\pipe\\umpnpmgr", + NULL); // Security descriptor + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } - Status = RpcServerRegisterIf(pnp_v1_0_s_ifspec, - NULL, - NULL); - if (Status != RPC_S_OK) - { - DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return 0; - } + Status = RpcServerRegisterIf(pnp_v1_0_s_ifspec, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } - Status = RpcServerListen(1, - 20, - FALSE); - if (Status != RPC_S_OK) - { - DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); - return 0; - } + Status = RpcServerListen(1, + 20, + FALSE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return 0; + } - DPRINT("RpcServerThread() done\n"); + DPRINT("RpcServerThread() done\n"); - return 0; + return 0; } @@ -202,7 +202,6 @@ } -#if 0 CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, unsigned long Relationship, @@ -211,21 +210,40 @@ unsigned long Length, unsigned long Flags) { + PLUGPLAY_CONTROL_RELATED_DEVICE_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; - DPRINT1("PNP_GetRelatedDeviceInstance() called\n"); - DPRINT1(" Relationship %ld\n", Relationship); - DPRINT1(" DeviceId %S\n", DeviceId); + DPRINT("PNP_GetRelatedDeviceInstance() called\n"); + DPRINT(" Relationship %ld\n", Relationship); + DPRINT(" DeviceId %S\n", DeviceId); - lstrcpyW(RelatedDeviceId, - szRootDeviceId); + RtlInitUnicodeString(&PlugPlayData.TargetDeviceInstance, + DeviceId); -//Done: - DPRINT1("PNP_GetRelatedDeviceInstance() done (returns %lx)\n", ret); + PlugPlayData.Relation = Relationship; + PlugPlayData.RelatedDeviceInstance.Length = 0; + PlugPlayData.RelatedDeviceInstance.MaximumLength = Length; + PlugPlayData.RelatedDeviceInstance.Buffer = RelatedDeviceId; + + Status = NtPlugPlayControl(PlugPlayControlGetRelatedDevice, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_RELATED_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Map Status to ret */ + ret = CR_FAILURE; + } + + DPRINT("PNP_GetRelatedDeviceInstance() done (returns %lx)\n", ret); + if (ret == 0) + { + DPRINT("RelatedDevice: %wZ\n", &PlugPlayData.RelatedDeviceInstance); + } + return ret; } -#endif CONFIGRET @@ -297,104 +315,124 @@ } +CONFIGRET +PNP_SetDeviceProblem(handle_t BindingHandle, + wchar_t *DeviceInstance, + unsigned long Problem, + DWORD Flags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_SetDeviceProblem() called\n"); + + /* FIXME */ + + DPRINT1("PNP_SetDeviceProblem() done (returns %lx)\n", ret); + + return ret; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { - PPLUGPLAY_EVENT_BLOCK PnpEvent; - ULONG PnpEventSize; - NTSTATUS Status; - RPC_STATUS RpcStatus; + PPLUGPLAY_EVENT_BLOCK PnpEvent; + ULONG PnpEventSize; + NTSTATUS Status; + RPC_STATUS RpcStatus; - PnpEventSize = 0x1000; - PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); - if (PnpEvent == NULL) - return ERROR_OUTOFMEMORY; - - for (;;) - { - DPRINT("Calling NtGetPlugPlayEvent()\n"); - - /* Wait for the next pnp event */ - Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - /* Resize the buffer for the PnP event if it's too small. */ - if (Status == STATUS_BUFFER_TOO_SMALL) - { - PnpEventSize += 0x400; - PnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); - if (PnpEvent == NULL) + PnpEventSize = 0x1000; + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); + if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; - continue; - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtPlugPlayEvent() failed (Status %lx)\n", Status); - break; - } - DPRINT("Received PnP Event\n"); - if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + for (;;) { - DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else - { - DPRINT1("Unknown event\n"); - } + DPRINT("Calling NtGetPlugPlayEvent()\n"); - /* FIXME: Process the pnp event */ + /* Wait for the next pnp event */ + Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - /* Dequeue the current pnp event and signal the next one */ - NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); - } + /* Resize the buffer for the PnP event if it's too small. */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + PnpEventSize += 0x400; + PnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + if (PnpEvent == NULL) + return ERROR_OUTOFMEMORY; + continue; + } - HeapFree(GetProcessHeap(), 0, PnpEvent); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtPlugPlayEvent() failed (Status %lx)\n", Status); + break; + } - return ERROR_SUCCESS; + DPRINT("Received PnP Event\n"); + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + { + DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else + { + DPRINT1("Unknown event\n"); + } + + /* FIXME: Process the pnp event */ + + /* Dequeue the current pnp event and signal the next one */ + NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); + } + + HeapFree(GetProcessHeap(), 0, PnpEvent); + + return ERROR_SUCCESS; } static VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) { - HANDLE hThread; - DWORD dwThreadId; + HANDLE hThread; + DWORD dwThreadId; - DPRINT("ServiceMain() called\n"); + DPRINT("ServiceMain() called\n"); - hThread = CreateThread(NULL, - 0, - PnpEventThread, - NULL, - 0, - &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); + hThread = CreateThread(NULL, + 0, + PnpEventThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); - hThread = CreateThread(NULL, - 0, - RpcServerThread, - NULL, - 0, - &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); + hThread = CreateThread(NULL, + 0, + RpcServerThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); - DPRINT("ServiceMain() done\n"); + DPRINT("ServiceMain() done\n"); } int main(int argc, char *argv[]) { - DPRINT("Umpnpmgr: main() started\n"); + DPRINT("Umpnpmgr: main() started\n"); - StartServiceCtrlDispatcher(ServiceTable); + StartServiceCtrlDispatcher(ServiceTable); - DPRINT("Umpnpmgr: main() done\n"); + DPRINT("Umpnpmgr: main() done\n"); - ExitThread(0); + ExitThread(0); - return 0; + return 0; } /* EOF */ _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-23 11:55:33 UTC (rev 16703) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-23 13:43:52 UTC (rev 16704) @@ -108,7 +108,7 @@ typedef DWORD RETURN_TYPE; -typedef RETURN_TYPE CONFIGRET; +typedef RETURN_TYPE CONFIGRET; typedef HANDLE HMACHINE; typedef HMACHINE *PHMACHINE;

1 0

[ekohl] 16703: - Fix offset calculation bug in the ProcFormatString.
by ekohl＠svn.reactos.com 23 Jul '05

23 Jul '05

- Fix offset calculation bug in the ProcFormatString. - Fix offset calculation bug in the marshalling and unmarshalling code. - Fix typos in the TypeFormatString. This makes the [string, out, size_is()] parameters work properly. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-07-23 11:51:47 UTC (rev 16702) +++ trunk/reactos/tools/widl/ChangeLog 2005-07-23 11:55:33 UTC (rev 16703) @@ -1,5 +1,15 @@ ChangeLog +2005-07-23 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Fix offset calculation bug in the ProcFormatString. +- Fix offset calculation bug in the marshalling and unmarshalling code. +- Fix typos in the TypeFormatString. +This makes the [string, out, size_is()] parameters work properly. + 2005-07-17 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-07-23 11:51:47 UTC (rev 16702) +++ trunk/reactos/tools/widl/client.c 2005-07-23 11:55:33 UTC (rev 16703) @@ -108,7 +108,7 @@ get_var_type_offset(var_t *var) { unsigned int toffset = 0; - void *size_is_attr; + void *sizeis_attr; int string_attr; if (var->ptr_level == 0) @@ -133,10 +133,10 @@ } else if (var->ptr_level == 1) { - size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); string_attr = is_attr(var->attrs, ATTR_STRING); - if (size_is_attr) + if (sizeis_attr) { if (string_attr) { @@ -337,9 +337,6 @@ } else if (var->type->type == RPC_FC_RP) { - var_t *field = var->type->ref->ref->fields; - int size; - if (in_attr & !out_attr) print_client("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -352,17 +349,6 @@ print_client("0x02,\n"); fprintf(client, "#endif\n"); print_client("NdrFcShort(0x%x),\n", type_offset); - - size = 9; - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - size++; - field = PREV_LINK(field); - } - if (size % 2) - size++; - type_offset += size; } else { @@ -389,7 +375,6 @@ print_client("0x02,\n"); fprintf(client, "#endif\n"); print_client("NdrFcShort(0x%x),\n", type_offset); - type_offset += 4; // } // else // { @@ -405,6 +390,8 @@ return; } + type_offset += get_var_type_offset(var); + var = PREV_LINK(var); } } @@ -552,7 +539,7 @@ print_client("0x%02x,\n", 0x20 + type_type); print_client("0x00,\n"); - fprintf(client, "#ifndef _APLHA_\n"); + fprintf(client, "#ifndef _ALPHA_\n"); print_client("NdrFcShort(0x%02X),\n", get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); fprintf(client, "#else\n"); @@ -568,7 +555,7 @@ print_client("0x%02x,\n", 0x20 + type_type); print_client("0x00,\n"); - fprintf(client, "#ifndef _APLHA_\n"); + fprintf(client, "#ifndef _ALPHA_\n"); print_client("NdrFcShort(0x04),\n"); fprintf(client, "#else\n"); print_client("NdrFcShort(0x08),\n"); @@ -967,7 +954,8 @@ indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 2); indent--; fprintf(client, "\n"); print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); @@ -1045,7 +1033,8 @@ indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset); indent--; fprintf(client, "\n"); } @@ -1126,7 +1115,7 @@ print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - *type_offset + 4); + local_type_offset + 4); indent--; fprintf(client, "\n"); } @@ -1184,7 +1173,7 @@ print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", - *type_offset + 4); + local_type_offset + 4); print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); @@ -1199,7 +1188,7 @@ print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", - *type_offset + 4); + local_type_offset + 4); print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); @@ -1282,7 +1271,7 @@ print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", - *type_offset + 4); + local_type_offset + 4); print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-23 11:51:47 UTC (rev 16702) +++ trunk/reactos/tools/widl/server.c 2005-07-23 11:55:33 UTC (rev 16703) @@ -342,9 +342,6 @@ } else if (var->type->type == RPC_FC_RP) { - var_t *field = var->type->ref->ref->fields; - int size; - if (in_attr & !out_attr) print_server("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -357,17 +354,6 @@ print_server("0x02,\n"); fprintf(server, "#endif\n"); print_server("NdrFcShort(0x%x),\n", type_offset); - - size = 9; - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - size++; - field = PREV_LINK(field); - } - if (size % 2) - size++; - type_offset += size; } else { @@ -392,7 +378,6 @@ print_server("0x02,\n"); fprintf(server, "#endif\n"); print_server("NdrFcShort(0x%x),\n", type_offset); - type_offset += 4; // } // else // { @@ -402,6 +387,8 @@ // } } + type_offset += get_var_type_offset(var); + var = PREV_LINK(var); } } @@ -549,7 +536,7 @@ print_server("0x%02x,\n", 0x20 + type_type); print_server("0x00,\n"); - fprintf(server, "#ifndef _APLHA_\n"); + fprintf(server, "#ifndef _ALPHA_\n"); print_server("NdrFcShort(0x%02X),\n", get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); fprintf(server, "#else\n"); @@ -565,7 +552,7 @@ print_server("0x%02x,\n", 0x20 + type_type); print_server("0x00,\n"); - fprintf(server, "#ifndef _APLHA_\n"); + fprintf(server, "#ifndef _ALPHA_\n"); print_server("NdrFcShort(0x04),\n"); fprintf(server, "#else\n"); print_server("NdrFcShort(0x08),\n"); @@ -840,10 +827,10 @@ empty_line = 1; } - - /* calculate the next type offset */ - local_type_offset += get_var_type_offset(var); } + + /* calculate the next type offset */ + local_type_offset += get_var_type_offset(var); } if (empty_line)

1 0

[hbirr] 16702: Fixed an uninitialized variable error.
by hbirr＠svn.reactos.com 23 Jul '05

23 Jul '05

Fixed an uninitialized variable error. Modified: trunk/reactos/ntoskrnl/io/vpb.c _____ Modified: trunk/reactos/ntoskrnl/io/vpb.c --- trunk/reactos/ntoskrnl/io/vpb.c 2005-07-23 11:43:34 UTC (rev 16701) +++ trunk/reactos/ntoskrnl/io/vpb.c 2005-07-23 11:51:47 UTC (rev 16702) @@ -320,6 +320,7 @@ if (PreviousMode != KernelMode) { + Status = STATUS_SUCCESS; _SEH_TRY { if (IoStatusBlock != NULL)

1 0

[hbirr] 16701: Fixed an uninitialized variable error.
by hbirr＠svn.reactos.com 23 Jul '05

23 Jul '05

Fixed an uninitialized variable error. Modified: trunk/reactos/ntoskrnl/lpc/connect.c _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-07-23 11:25:12 UTC (rev 16700) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-07-23 11:43:34 UTC (rev 16701) @@ -250,8 +250,8 @@ LPC_SECTION_WRITE WriteMap; LPC_SECTION_READ ReadMap; ULONG MaximumMessageSize; - PVOID ConnectData; - ULONG ConnectDataLength; + PVOID ConnectData = NULL; + ULONG ConnectDataLength = 0; PSECTION_OBJECT SectionObject; LARGE_INTEGER SectionOffset; PEPORT ConnectedPort; @@ -335,13 +335,8 @@ /* * Handle connection data. */ - if (UnsafeConnectData == NULL) + if (UnsafeConnectData) { - ConnectDataLength = 0; - ConnectData = NULL; - } - else - { if (PreviousMode != KernelMode) { _SEH_TRY

1 0

[hbirr] 16700: Split the page fault handler from the trap handler.
by hbirr＠svn.reactos.com 23 Jul '05

23 Jul '05

Split the page fault handler from the trap handler. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-23 10:08:15 UTC (rev 16699) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-23 11:25:12 UTC (rev 16700) @@ -473,6 +473,8 @@ NTSTATUS Status; ULONG Esp0; + ASSERT(ExceptionNr != 14); + /* Store the exception number in an unused field in the trap frame. */ Tf->DebugArgMark = (PVOID)ExceptionNr; @@ -483,11 +485,6 @@ cr2 = Ke386GetCr2(); Tf->DebugPointer = (PVOID)cr2; - if (ExceptionNr == 14 && Tf->Eflags & FLAG_IF) - { - Ke386EnableInterrupts(); - } - /* * If this was a V86 mode exception then handle it specially */ @@ -524,26 +521,6 @@ } /* - * Maybe handle the page fault and return - */ - if (ExceptionNr == 14) - { - if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= (ULONG_PTR)MmSystemRangeStart) - { - KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); - } - Status = MmPageFault(Tf->Cs&0xffff, - &Tf->Eip, - &Tf->Eax, - cr2, - Tf->ErrorCode); - if (NT_SUCCESS(Status)) - { - return(0); - } - } - - /* * Check for a breakpoint that was only for the attention of the debugger. */ if (ExceptionNr == 3 && Tf->Eip == ((ULONG)DbgBreakPointNoBugCheck) + 1) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-07-23 10:08:15 UTC (rev 16699) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-07-23 11:25:12 UTC (rev 16700) @@ -307,7 +307,7 @@ pushl %ebx pushl %esi movl $14, %esi - movl $_KiTrapHandler, %ebx + movl $_KiPageFaultHandler, %ebx jmp _KiTrapProlog2 .globl _KiTrap15 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c --- trunk/reactos/ntoskrnl/ke/i386/v86m.c 2005-07-23 10:08:15 UTC (rev 16699) +++ trunk/reactos/ntoskrnl/ke/i386/v86m.c 2005-07-23 11:25:12 UTC (rev 16700) @@ -686,26 +686,27 @@ PUCHAR Ip; PKV86M_TRAP_FRAME VTf; + ASSERT (ExceptionNr != 14); + VTf = (PKV86M_TRAP_FRAME)Tf; /* FIXME: This should use ->VdmObjects */ if(KeGetCurrentProcess()->Unused) { VTf->regs->PStatus = (PNTSTATUS) ExceptionNr; - if(ExceptionNr != 14) return 1; + return 1; } /* * Check if we have reached the recovery instruction */ Ip = (PUCHAR)((Tf->Cs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); - if (ExceptionNr != 14) - { - DPRINT("ExceptionNr %d Ip[0] %x Ip[1] %x Ip[2] %x Ip[3] %x Tf->Cs %x " - "Tf->Eip %x\n", ExceptionNr, Ip[0], Ip[1], Ip[2], Ip[3], Tf->Cs, - Tf->Eip); - DPRINT("VTf %x VTf->regs %x\n", VTf, VTf->regs); - } + + DPRINT("ExceptionNr %d Ip[0] %x Ip[1] %x Ip[2] %x Ip[3] %x Tf->Cs %x " + "Tf->Eip %x\n", ExceptionNr, Ip[0], Ip[1], Ip[2], Ip[3], Tf->Cs, + Tf->Eip); + DPRINT("VTf %x VTf->regs %x\n", VTf, VTf->regs); + if (ExceptionNr == 6 && memcmp(Ip, VTf->regs->RecoveryInstruction, 4) == 0 && (Tf->Cs * 16 + Tf->Eip) == VTf->regs->RecoveryAddress) @@ -788,32 +789,6 @@ case 13: return(KeV86GPF(VTf, Tf)); - /* Page fault */ - case 14: - { - NTSTATUS Status; - - Status = MmPageFault(USER_CS, - &Tf->Eip, - NULL, - address, - Tf->ErrorCode); - if (!NT_SUCCESS(Status)) - { - /* FIXME: This should use ->VdmObjects */ - if(KeGetCurrentProcess()->Unused) - { - VTf->regs->PStatus = (PNTSTATUS) STATUS_NONCONTINUABLE_EXCEPTION; - return 1; - } - - DPRINT("V86Exception, halting due to page fault\n"); - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - } - return(0); - } - /* Intel reserved */ case 15: case 16: _____ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c --- trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-07-23 10:08:15 UTC (rev 16699) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-07-23 11:25:12 UTC (rev 16700) @@ -19,66 +19,117 @@ extern VOID MmSafeReadPtrStart(VOID); extern VOID MmSafeReadPtrEnd(VOID); -extern ULONG MmGlobalKernelPageDirectory[1024]; -BOOLEAN -Mmi386MakeKernelPageTableGlobal(PVOID Address); +extern BOOLEAN Mmi386MakeKernelPageTableGlobal(PVOID Address); +extern ULONG KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2); +extern BOOLEAN Ke386NoExecute; + /* FUNCTIONS *****************************************************************/ -NTSTATUS MmPageFault(ULONG Cs, - PULONG Eip, - PULONG Eax, - ULONG Cr2, - ULONG ErrorCode) +ULONG KiPageFaultHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr) { + ULONG_PTR cr2; + NTSTATUS Status; KPROCESSOR_MODE Mode; - NTSTATUS Status; + + ASSERT(ExceptionNr == 14); + + /* Store the exception number in an unused field in the trap frame. */ + Tf->DebugArgMark = (PVOID)14; - DPRINT("MmPageFault(Eip %x, Cr2 %x, ErrorCode %x)\n", - *Eip, Cr2, ErrorCode); + /* get the faulting address */ + cr2 = Ke386GetCr2(); + Tf->DebugPointer = (PVOID)cr2; - if (ErrorCode & 0x4) + /* it's safe to enable interrupts after cr2 has been saved */ + if (Tf->Eflags & (X86_EFLAGS_VM|X86_EFLAGS_IF)) { - Mode = UserMode; + Ke386EnableInterrupts(); } - else + + if (cr2 >= (ULONG_PTR)MmSystemRangeStart) { - Mode = KernelMode; + /* check for an invalid page directory in kernel mode */ + if (!(Tf->ErrorCode & 0x5) && Mmi386MakeKernelPageTableGlobal((PVOID)cr2)) + { + return 0; + } + + /* check for non executable memory in kernel mode */ + if (Ke386NoExecute && Tf->ErrorCode & 0x10) + { + KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); + } } - if (Mode == KernelMode && Cr2 >= (ULONG_PTR)MmSystemRangeStart && - Mmi386MakeKernelPageTableGlobal((PVOID)Cr2)) + Mode = Tf->ErrorCode & 0x4 ? UserMode : KernelMode; + + /* handle the fault */ + if (Tf->ErrorCode & 0x1) { - return(STATUS_SUCCESS); + Status = MmAccessFault(Mode, cr2, FALSE); } + else + { + Status = MmNotPresentFault(Mode, cr2, FALSE); + } + + /* handle the return for v86 mode */ + if (Tf->Eflags & X86_EFLAGS_VM) + { + if (!NT_SUCCESS(Status)) + { + /* FIXME: This should use ->VdmObjects */ + if(!KeGetCurrentProcess()->Unused) + { + *((PKV86M_TRAP_FRAME)Tf)->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; + } + return 1; + } + return 0; + } - if (ErrorCode & 0x1) + if (Mode == KernelMode) { - Status = MmAccessFault(Mode, Cr2, FALSE); + if (!NT_SUCCESS(Status)) + { + if (Tf->Eip >= (ULONG_PTR)MmSafeReadPtrStart && + Tf->Eip < (ULONG_PTR)MmSafeReadPtrEnd) + { + Tf->Eip = (ULONG_PTR)MmSafeReadPtrEnd; + Tf->Eax = 0; + return 0; + } + } } else { - Status = MmNotPresentFault(Mode, Cr2, FALSE); + if (KeGetCurrentThread()->ApcState.UserApcPending) + { + KIRQL oldIrql; + + KeRaiseIrql(APC_LEVEL, &oldIrql); + KiDeliverApc(UserMode, NULL, NULL); + KeLowerIrql(oldIrql); + } } - if (Mode == UserMode && KeGetCurrentThread()->ApcState.UserApcPending) + if (NT_SUCCESS(Status)) { - KIRQL oldIrql; - - KeRaiseIrql(APC_LEVEL, &oldIrql); - KiDeliverApc(UserMode, NULL, NULL); - KeLowerIrql(oldIrql); + return 0; } - if (!NT_SUCCESS(Status) && (Mode == KernelMode) && - ((*Eip) >= (ULONG_PTR)MmSafeReadPtrStart) && - ((*Eip) <= (ULONG_PTR)MmSafeReadPtrEnd)) + /* + * Handle user exceptions differently + */ + if (Mode == KernelMode) { - (*Eip) = (ULONG_PTR)MmSafeReadPtrEnd; - (*Eax) = 0; - return(STATUS_SUCCESS); + return(KiKernelTrapHandler(Tf, 14, (PVOID)cr2)); } + else + { + return(KiUserTrapHandler(Tf, 14, (PVOID)cr2)); + } +} - return(Status); -}

1 0

[weiden] 16699: export LsaLookupSids which is required by aclui.dll
by weiden＠svn.reactos.com 23 Jul '05

23 Jul '05

export LsaLookupSids which is required by aclui.dll Modified: trunk/reactos/lib/advapi32/advapi32.def _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-07-23 09:58:23 UTC (rev 16698) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-07-23 10:08:15 UTC (rev 16699) @@ -373,7 +373,7 @@ ;LsaLookupPrivilegeDisplayName@16 ;LsaLookupPrivilegeName@12 ;LsaLookupPrivilegeValue@12 -;LsaLookupSids@20 +LsaLookupSids@20 LsaNtStatusToWinError@4 ;LsaOpenAccount@16 LsaOpenPolicy@16

1 0

[weiden] 16698: regedit should be installed in %SystemRoot% directly
by weiden＠svn.reactos.com 23 Jul '05

23 Jul '05

regedit should be installed in %SystemRoot% directly Modified: trunk/reactos/subsys/system/regedit/regedit.xml _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-07-23 08:14:21 UTC (rev 16697) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-07-23 09:58:23 UTC (rev 16698) @@ -1,4 +1,4 @@ -<module name="regedit" type="win32gui" installbase="system32" installname="regedit.exe"> +<module name="regedit" type="win32gui" installname="regedit.exe"> <include base="regedit">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define>

1 0

[sedwards] 16689: some fixes for the host gcc4 on FC4
by sedwards＠svn.reactos.com 22 Jul '05

22 Jul '05

some fixes for the host gcc4 on FC4 Modified: trunk/reactos/tools/buildno/pch.h Modified: trunk/reactos/tools/rbuild/pch.h Modified: trunk/reactos/tools/wmc/misc.c _____ Modified: trunk/reactos/tools/buildno/pch.h --- trunk/reactos/tools/buildno/pch.h 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/buildno/pch.h 2005-07-22 19:45:32 UTC (rev 16689) @@ -26,12 +26,15 @@ #include <wctype.h> #include <math.h> -inline char* strlwr ( char* str ) +inline char * strlwr(char *x) { - char* p = str; - while ( *p ) - *p++ = tolower(*p); - return str; + char *y=x; + + while (*y) { + *y=tolower(*y); + y++; + } + return x; } #define _finite __finite _____ Modified: trunk/reactos/tools/rbuild/pch.h --- trunk/reactos/tools/rbuild/pch.h 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/rbuild/pch.h 2005-07-22 19:45:32 UTC (rev 16689) @@ -39,20 +39,26 @@ #include <wctype.h> #include <math.h> -inline char* strlwr ( char* str ) +inline char * strlwr(char *x) { - char* p = str; - while ( *p ) - *p++ = tolower(*p); - return str; + char *y=x; + + while (*y) { + *y=tolower(*y); + y++; + } + return x; } + +inline char *strupr(char *x) +{ + char *y=x; -inline char* strupr ( char* str ) -{ - char *c = str; - while ( *str++ ) - toupper( *str ); - return c; + while (*y) { + *y=toupper(*y); + y++; + } + return x; } #define _finite __finite _____ Modified: trunk/reactos/tools/wmc/misc.c --- trunk/reactos/tools/wmc/misc.c 2005-07-22 14:53:24 UTC (rev 16688) +++ trunk/reactos/tools/wmc/misc.c 2005-07-22 19:45:32 UTC (rev 16689) @@ -5,9 +5,9 @@ typedef unsigned short UINT; typedef unsigned int DWORD; -typedef const unsigned char* LPCSTR; +typedef char* LPCSTR; typedef wchar_t* LPWSTR; -typedef unsigned char* LPSTR; +typedef char* LPSTR; typedef const wchar_t* LPCWSTR; typedef unsigned int* LPBOOL;

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