Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 34986: - fix usage of InterlockedExchangePointer - some ULONG / SIZE_T fixes - pushlocks have a union with a PVOID and an ULONG, use them instead of typecasting - use InterlockedAndPointer for a pushlock
by tkreuzer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: tkreuzer Date: Thu Jul 31 18:01:51 2008 New Revision: 34986 URL: http://svn.reactos.org/svn/reactos?rev=34986&view=rev Log: - fix usage of InterlockedExchangePointer - some ULONG / SIZE_T fixes - pushlocks have a union with a PVOID and an ULONG, use them instead of typecasting - use InterlockedAndPointer for a pushlock Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmkcbncb.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/handle.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/pushlock.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/audit.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/lsa.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -903,7 +903,7 @@ for (i = 0; i < 4; i++) { /* Add it into the list */ - if (!InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + if (!InterlockedCompareExchangePointer((PVOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], KeyBody, NULL)) @@ -959,7 +959,7 @@ for (i = 0; i < 4; i++) { /* Add it into the list */ - if (InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + if (InterlockedCompareExchangePointer((VOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], NULL, KeyBody) == KeyBody) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -516,7 +516,7 @@ /* Write the new level and attempt to change the table code */ TableBase = ((ULONG_PTR)Mid) | 1; - Value = InterlockedExchangePointer(&HandleTable->TableCode, TableBase); + Value = InterlockedExchangePointer((PVOID*)&HandleTable->TableCode, (PVOID)TableBase); } else if (TableLevel == 1) { @@ -533,7 +533,7 @@ if (!Low) return FALSE; /* Update the table */ - Value = InterlockedExchangePointer(&SecondLevel[i], Low); + Value = InterlockedExchangePointer((PVOID*)&SecondLevel[i], Low); ASSERT(Value == NULL); } else @@ -560,7 +560,7 @@ /* Write the new table and change the table code */ TableBase = ((ULONG_PTR)High) | 2; - Value = InterlockedExchangePointer(&HandleTable->TableCode, + Value = InterlockedExchangePointer((PVOID*)&HandleTable->TableCode, (PVOID)TableBase); } } @@ -581,7 +581,7 @@ if (!Mid) return FALSE; /* Update the table pointer */ - Value = InterlockedExchangePointer(&ThirdLevel[i], Mid); + Value = InterlockedExchangePointer((PVOID*)&ThirdLevel[i], Mid); ASSERT(Value == NULL); } else @@ -596,7 +596,7 @@ if (!Low) return FALSE; /* Update the table pointer */ - Value = InterlockedExchangePointer(&ThirdLevel[i][j], Low); + Value = InterlockedExchangePointer((PVOID*)&ThirdLevel[i][j], Low); ASSERT(Value == NULL); } } @@ -886,8 +886,8 @@ /* It's not locked, remove the lock bit to lock it */ NewValue = OldValue & ~EXHANDLE_TABLE_ENTRY_LOCK_BIT; if (InterlockedCompareExchangePointer(&HandleTableEntry->Object, - NewValue, - OldValue) == (PVOID)OldValue) + (PVOID)NewValue, + (PVOID)OldValue) == (PVOID)OldValue) { /* We locked it, get out */ return TRUE; @@ -1010,7 +1010,7 @@ } /* Clear the handle */ - Object = InterlockedExchangePointer(&HandleTableEntry->Object, NULL); + Object = InterlockedExchangePointer((PVOID*)&HandleTableEntry->Object, NULL); /* Sanity checks */ ASSERT(Object != NULL); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -68,7 +68,7 @@ ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; ULONG ExpUnicodeCaseTableDataOffset; NLSTABLEINFO ExpNlsTableInfo; -ULONG ExpNlsTableSize; +SIZE_T ExpNlsTableSize; PVOID ExpNlsSectionPointer; /* CMOS Timer Sanity */ @@ -196,7 +196,7 @@ NTSTATUS Status; HANDLE NlsSection; PVOID SectionBase = NULL; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; LARGE_INTEGER SectionOffset = {{0}}; PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; @@ -369,7 +369,7 @@ OUT PCHAR *ProcessEnvironment) { NTSTATUS Status; - ULONG Size; + SIZE_T Size; PWSTR p; UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); UNICODE_STRING SmssName, Environment, SystemDriveString, DebugString; @@ -829,7 +829,7 @@ PLDR_DATA_TABLE_ENTRY NtosEntry; PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; ANSI_STRING CsdString; - ULONG Remaining = 0; + SIZE_T Remaining = 0; PCHAR RcEnd = NULL; CHAR VersionBuffer [65]; @@ -1258,7 +1258,8 @@ PCHAR StringBuffer, EndBuffer, BeginBuffer, MpString = ""; PINIT_BUFFER InitBuffer; ANSI_STRING TempString; - ULONG LastTzBias, Size, Length, YearHack = 0, Disposition, MessageCode = 0; + ULONG LastTzBias, Size, YearHack = 0, Disposition, MessageCode = 0; + SIZE_T Length; PRTL_USER_PROCESS_INFORMATION ProcessInfo; KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; UNICODE_STRING KeyName, DebugString; @@ -1738,7 +1739,7 @@ KeyValuePartialInformation, &KeyPartialInfo, sizeof(KeyPartialInfo), - &Length); + &Size); if (!NT_SUCCESS(Status)) AlternateShell = FALSE; } @@ -1890,17 +1891,17 @@ ZwClose(ProcessInfo->ProcessHandle); /* Free the initial process environment */ - Size = 0; + Length = 0; ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID*)&Environment, - &Size, + &Length, MEM_RELEASE); /* Free the initial process parameters */ - Size = 0; + Length = 0; ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID*)&ProcessParameters, - &Size, + &Length, MEM_RELEASE); /* Increase init phase */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -19,6 +19,12 @@ #undef PEX_PUSH_LOCK /* PRIVATE FUNCTIONS *********************************************************/ + +#ifdef _WIN64 +#define InterlockedAndPointer(ptr,val) InterlockedAnd64((PLONGLONG)ptr,(LONGLONG)val) +#else +#define InterlockedAndPointer(ptr,val) InterlockedAnd((PLONG)ptr,(LONG)val) +#endif /*++ * @name ExpInitializePushLocks @@ -87,7 +93,7 @@ ASSERT(NewValue.Waiting); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -97,7 +103,7 @@ } /* Save the First Block */ - FirstWaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + FirstWaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); WaitBlock = FirstWaitBlock; @@ -135,7 +141,7 @@ ASSERT(!NewValue.Waking); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) break; @@ -154,7 +160,7 @@ ASSERT(PushLock->Waiting); /* Remove waking bit from pushlock */ - InterlockedAnd((PLONG)PushLock, ~EX_PUSH_LOCK_WAKING); + InterlockedAndPointer(&PushLock->Value, ~EX_PUSH_LOCK_WAKING); /* Leave the loop */ break; @@ -236,7 +242,7 @@ } /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop the blocks */ @@ -270,7 +276,7 @@ ASSERT(!NewValue.Waking); /* Update the value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -477,7 +483,7 @@ ASSERT(NewValue.Locked); /* Set the new value */ - if (InterlockedCompareExchangePointer(PushLock, + if (InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr) != OldValue.Ptr) { @@ -507,8 +513,8 @@ WaitBlock->ShareCount = 0; /* Set the current Wait Block pointer */ - WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)( + OldValue.Value &~ EX_PUSH_LOCK_PTR_BITS); /* Point to ours */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_MULTIPLE_SHARED) | @@ -563,7 +569,7 @@ /* Write the new value */ TempValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) @@ -655,7 +661,7 @@ ASSERT(NewValue.Locked); /* Set the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) @@ -680,8 +686,8 @@ if (OldValue.Waiting) { /* Set the current Wait Block pointer */ - WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)( + OldValue.Value &~ EX_PUSH_LOCK_PTR_BITS); /* Nobody is the last waiter yet */ WaitBlock->Last = NULL; @@ -719,7 +725,7 @@ #endif /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Ptr != OldValue.Ptr) @@ -810,7 +816,7 @@ } /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -824,7 +830,7 @@ if (OldValue.MultipleShared) { /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop until we find the last wait block */ @@ -877,7 +883,7 @@ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -897,7 +903,7 @@ /* Write the new value */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; @@ -950,7 +956,7 @@ } /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -963,7 +969,7 @@ if (OldValue.MultipleShared) { /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop until we find the last wait block */ @@ -1013,7 +1019,7 @@ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -1033,7 +1039,7 @@ /* Write the new value */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; @@ -1087,7 +1093,7 @@ /* Write the New Value. Save our original value for waking */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -1108,7 +1114,7 @@ ASSERT(NewValue.Waking && !NewValue.Waiting); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -1152,7 +1158,7 @@ NewValue.Waking = TRUE; /* Write the New Value */ - if (InterlockedCompareExchangePointer(PushLock, + if (InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr) == OldValue.Ptr) { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -201,6 +201,7 @@ RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME)); StackPtr = (ULONG_PTR *) KernelStack; +#if _M_X86_ KdbTrapFrame->Tf.Ebp = StackPtr[3]; KdbTrapFrame->Tf.Edi = StackPtr[4]; KdbTrapFrame->Tf.Esi = StackPtr[5]; @@ -212,6 +213,7 @@ KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegGs = KGDT_R0_DATA; +#endif /* FIXME: what about the other registers??? */ } @@ -405,7 +407,7 @@ } /* Get the interrupt descriptor */ - if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(ULONG_PTR)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) { /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/ return FALSE; @@ -1073,7 +1075,7 @@ /* Get a pointer to the thread */ if (!NT_SUCCESS(PsLookupThreadByThreadId(ThreadId, &Thread))) { - KdbpPrint("Invalid thread id: 0x%08x\n", (ULONG)ThreadId); + KdbpPrint("Invalid thread id: 0x%08x\n", (ULONG_PTR)ThreadId); return FALSE; } Process = Thread->ThreadsProcess; @@ -1152,14 +1154,14 @@ /* Get a pointer to the process */ if (!NT_SUCCESS(PsLookupProcessByProcessId(ProcessId, &Process))) { - KdbpPrint("Invalid process id: 0x%08x\n", (ULONG)ProcessId); + KdbpPrint("Invalid process id: 0x%08x\n", (ULONG_PTR)ProcessId); return FALSE; } Entry = Process->ThreadListHead.Flink; if (Entry == &KdbCurrentProcess->ThreadListHead) { - KdbpPrint("No threads in process 0x%08x, cannot attach to process!\n", (ULONG)ProcessId); + KdbpPrint("No threads in process 0x%p, cannot attach to process!\n", ProcessId); return FALSE; } @@ -1200,7 +1202,7 @@ SavedStackLimit = Thread->Tcb.StackLimit; SavedKernelStack = Thread->Tcb.KernelStack; Thread->Tcb.InitialStack = Thread->Tcb.StackBase = (char*)KdbStack + KDB_STACK_SIZE; - Thread->Tcb.StackLimit = (ULONG)KdbStack; + Thread->Tcb.StackLimit = (ULONG_PTR)KdbStack; Thread->Tcb.KernelStack = (char*)KdbStack + KDB_STACK_SIZE; /*KdbpPrint("Switching to KDB stack 0x%08x-0x%08x\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase);*/ @@ -1613,7 +1615,7 @@ TrapFrame->Dr6 &= ~0x0000e00f; /* Skip the current instruction */ - Context->Eip++; +// Context->Eip++; } return ContinueType; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/audit.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -137,7 +137,7 @@ if (NT_SUCCESS(Status)) { /* Set it */ - if (InterlockedCompareExchangePointer(&Process-> + if (InterlockedCompareExchangePointer((PVOID*)&Process-> SeAuditProcessCreationInfo, AuditName, NULL)) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/lsa.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/lsa.c [iso-8859-1] Thu Jul 31 18:01:51 2008 @@ -49,7 +49,7 @@ NTAPI LsaFreeReturnBuffer(PVOID Buffer) { - ULONG Size = 0; + SIZE_T Size = 0; return ZwFreeVirtualMemory(NtCurrentProcess(), &Buffer, &Size,

1 0

[jimtabor] 34985: - Support relative callback proc with module base.
by jimtabor＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: jimtabor Date: Thu Jul 31 17:48:59 2008 New Revision: 34985 URL: http://svn.reactos.org/svn/reactos?rev=34985&view=rev Log: - Support relative callback proc with module base. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Jul 31 17:48:59 2008 @@ -1142,7 +1142,11 @@ Hook->ModuleName.Length = ModuleName.Length; } - Hook->Proc = HookProc; + if (Mod) /* make proc relative to the module base */ + Hook->Proc = (void *)((char *)HookProc - (char *)Mod); + else + Hook->Proc = HookProc; + Hook->Ansi = Ansi; Handle = Hook->Self;

1 0

[jmorlan] 34984: Fix handle leaks in RtlCreateUserThread and SmExecPgm.
by jmorlan＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: jmorlan Date: Thu Jul 31 16:33:17 2008 New Revision: 34984 URL: http://svn.reactos.org/svn/reactos?rev=34984&view=rev Log: Fix handle leaks in RtlCreateUserThread and SmExecPgm. Modified: trunk/reactos/base/system/smss/smapiexec.c trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] Thu Jul 31 16:33:17 2008 @@ -265,6 +265,8 @@ DPRINT1("SM: %s: SmCreateClient failed (Status=0x%08lx)\n", __FUNCTION__, Status); } + NtClose(ProcessInfo.ThreadHandle); + NtClose(ProcessInfo.ProcessHandle); } } else Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=34984… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Thu Jul 31 16:33:17 2008 @@ -209,7 +209,10 @@ else { /* Return thread data */ - if (ThreadHandle) *ThreadHandle = Handle; + if (ThreadHandle) + *ThreadHandle = Handle; + else + NtClose(Handle); if (ClientId) *ClientId = ThreadCid; }

1 0

[mkupfer] 34983: Mario Kacmar <kario AT szm DOT sk> - Key remapping for qwertz applied.
by mkupfer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: mkupfer Date: Thu Jul 31 14:53:49 2008 New Revision: 34983 URL: http://svn.reactos.org/svn/reactos?rev=34983&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Key remapping for qwertz applied. Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] Thu Jul 31 14:53:49 2008 @@ -41,9 +41,9 @@ '7', '8', '9', '0', VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, /* - 0f - */ - /* First Letters Row */ + /* First Letters Row - qwertZ */ VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', + 'R', 'T', 'Z', 'U', 'I', 'O', 'P', VK_OEM_4, VK_OEM_6, VK_RETURN, /* - 1d - */ @@ -55,7 +55,7 @@ VK_LSHIFT, VK_OEM_7, /* - 2c - */ /* Third letters row */ - 'Z', 'X', 'C', 'V', + 'Y', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT|KEXT, /* - 37 - */ @@ -253,8 +253,8 @@ { 'V', CAPS, {'v', 'V', 0x16, '@'} }, { 'W', CAPS, {'w', 'W', 0x17, '|'} }, { 'X', CAPS, {'x', 'X', 0x18, '#'} }, - { 'Y', CAPS, {'z', 'Z', 0x1a, WCH_NONE} }, // qwertZ - { 'Z', CAPS, {'y', 'Y', 0x19, '>'} }, + { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, '>'} }, { 0, 0 } };

1 0

[pschweitzer] 34982: - Implemented FsRtlNotifyFullChangeDirectory, FsRtlNotifyFullReportChange, FsRtlNotifyReportChange - Fixed implementation for FsRtlNotifyChangeDirectory - Updated comments
by pschweitzer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: pschweitzer Date: Thu Jul 31 13:42:50 2008 New Revision: 34982 URL: http://svn.reactos.org/svn/reactos?rev=34982&view=rev Log: - Implemented FsRtlNotifyFullChangeDirectory, FsRtlNotifyFullReportChange, FsRtlNotifyReportChange - Fixed implementation for FsRtlNotifyChangeDirectory - Updated comments Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Thu Jul 31 13:42:50 2008 @@ -44,8 +44,7 @@ * * @return None * - * @remarks This function only redirects to FsRtlNotifyFullChangeDirectory. - * So, it's better to call the entire function. + * @remarks This function only redirects to FsRtlNotifyFilterChangeDirectory. * *--*/ VOID @@ -58,16 +57,17 @@ IN ULONG CompletionFilter, IN PIRP NotifyIrp) { - FsRtlNotifyFullChangeDirectory(NotifySync, - NotifyList, - FsContext, - FullDirectoryName, - WatchTree, - TRUE, - CompletionFilter, - NotifyIrp, - NULL, - NULL); + FsRtlNotifyFilterChangeDirectory(NotifySync, + NotifyList, + FsContext, + FullDirectoryName, + WatchTree, + TRUE, + CompletionFilter, + NotifyIrp, + NULL, + NULL, + NULL); } /*++ @@ -219,43 +219,46 @@ /*++ * @name FsRtlNotifyFullChangeDirectory - * @unimplemented - * - * FILLME - * - * @param NotifySync - * FILLME - * - * @param NotifyList - * FILLME + * @implemented + * + * Lets FSD know if changes occures in the specified directory. + * + * @param NotifySync + * Synchronization object pointer + * + * @param NotifyList + * Notify list pointer (to head) * * @param FsContext - * FILLME + * Used to identify the notify structure * * @param FullDirectoryName - * FILLME + * String (A or W) containing the full directory name * * @param WatchTree - * FILLME + * True to notify changes in subdirectories too * * @param IgnoreBuffer - * FILLME + * True to reenumerate directory. It's ignored it NotifyIrp is null * * @param CompletionFilter - * FILLME - * - * @param Irp - * FILLME + * Used to define types of changes to notify + * + * @param NotifyIrp + * IRP pointer to complete notify operation. It can be null * * @param TraverseCallback - * FILLME + * Pointer to a callback function. It's called each time a change is + * done in a subdirectory of the main directory. It's ignored it NotifyIrp + * is null * * @param SubjectContext - * FILLME - * - * @return None - * - * @remarks None + * Pointer to pass to SubjectContext member of TraverseCallback. + * It's freed after use. It's ignored it NotifyIrp is null + * + * @return None + * + * @remarks This function only redirects to FsRtlNotifyFilterChangeDirectory. * *--*/ VOID @@ -267,49 +270,60 @@ IN BOOLEAN WatchTree, IN BOOLEAN IgnoreBuffer, IN ULONG CompletionFilter, - IN PIRP Irp, + IN PIRP NotifyIrp, IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL, IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL) { - KEBUGCHECK(0); + FsRtlNotifyFilterChangeDirectory(NotifySync, + NotifyList, + FsContext, + FullDirectoryName, + WatchTree, + IgnoreBuffer, + CompletionFilter, + NotifyIrp, + TraverseCallback, + SubjectContext, + NULL); } /*++ * @name FsRtlNotifyFullReportChange - * @unimplemented - * - * FILLME - * - * @param NotifySync - * FILLME - * - * @param NotifyList - * FILLME + * @implemented + * + * Complets the pending notify IRPs. + * + * @param NotifySync + * Synchronization object pointer + * + * @param NotifyList + * Notify list pointer (to head) * * @param FullTargetName - * FILLME + * String (A or W) containing the full directory name that changed * * @param TargetNameOffset - * FILLME + * Offset, in FullTargetName, of the final component that is in the changed directory * * @param StreamName - * FILLME + * String (A or W) containing a stream name * * @param NormalizedParentName - * FILLME + * String (A or W) containing the full directory name that changed with long names * * @param FilterMatch - * FILLME + * Flags that will be compared to the completion filter * * @param Action - * FILLME + * Action code to store in user's buffer * * @param TargetContext - * FILLME - * - * @return None - * - * @remarks None + * Pointer to a callback function. It's called each time a change is + * done in a subdirectory of the main directory. + * + * @return None + * + * @remarks This function only redirects to FsRtlNotifyFilterReportChange. * *--*/ VOID @@ -324,7 +338,16 @@ IN ULONG Action, IN PVOID TargetContext) { - KEBUGCHECK(0); + FsRtlNotifyFilterReportChange(NotifySync, + NotifyList, + FullTargetName, + TargetNameOffset, + StreamName, + NormalizedParentName, + FilterMatch, + Action, + TargetContext, + NULL); } /*++ @@ -350,28 +373,28 @@ /*++ * @name FsRtlNotifyReportChange - * @unimplemented - * - * FILLME - * - * @param NotifySync - * FILLME - * - * @param NotifyList - * FILLME + * @implemented + * + * Complets the pending notify IRPs. + * + * @param NotifySync + * Synchronization object pointer + * + * @param NotifyList + * Notify list pointer (to head) * * @param FullTargetName - * FILLME + * String (A or W) containing the full directory name that changed * * @param FileNamePartLength - * FILLME + * Length of the final component that is in the changed directory * * @param FilterMatch - * FILLME - * - * @return None - * - * @remarks None + * Flags that will be compared to the completion filter + * + * @return None + * + * @remarks This function only redirects to FsRtlNotifyFilterReportChange. * *--*/ VOID @@ -382,11 +405,20 @@ IN PUSHORT FileNamePartLength, IN ULONG FilterMatch) { - KEBUGCHECK(0); -} - -/*++ - * @name FsRtlCurrentBatchOplock + FsRtlNotifyFilterReportChange(NotifySync, + NotifyList, + FullTargetName, + FullTargetName->Length - *FileNamePartLength, + NULL, + NULL, + FilterMatch, + 0, + NULL, + NULL); +} + +/*++ + * @name FsRtlNotifyUninitializeSync * @implemented * * Uninitialize a NOTIFY_SYNC object

1 0

[pschweitzer] 34981: Added two missing functions to ntifs.h
by pschweitzer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: pschweitzer Date: Thu Jul 31 13:17:25 2008 New Revision: 34981 URL: http://svn.reactos.org/svn/reactos?rev=34981&view=rev Log: Added two missing functions to ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Thu Jul 31 13:17:25 2008 @@ -3195,6 +3195,37 @@ NTKERNELAPI VOID NTAPI +FsRtlNotifyFilterChangeDirectory ( + IN PNOTIFY_SYNC NotifySync, + IN PLIST_ENTRY NotifyList, + IN PVOID FsContext, + IN PSTRING FullDirectoryName, + IN BOOLEAN WatchTree, + IN BOOLEAN IgnoreBuffer, + IN ULONG CompletionFilter, + IN PIRP NotifyIrp, + IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL, + IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL, + IN PFILTER_REPORT_CHANGE FilterCallback OPTIONAL); + +NTKERNELAPI +VOID +NTAPI +FsRtlNotifyFilterReportChange ( + IN PNOTIFY_SYNC NotifySync, + IN PLIST_ENTRY NotifyList, + IN PSTRING FullTargetName, + IN USHORT TargetNameOffset, + IN PSTRING StreamName OPTIONAL, + IN PSTRING NormalizedParentName OPTIONAL, + IN ULONG FilterMatch, + IN ULONG Action, + IN PVOID TargetContext, + IN PVOID FilterContext); + +NTKERNELAPI +VOID +NTAPI FsRtlNotifyFullChangeDirectory ( IN PNOTIFY_SYNC NotifySync, IN PLIST_ENTRY NotifyList,

1 0

[jmorlan] 34980: In exit and _cexit, call atexit routines. (Bug 3432_)
by jmorlan＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: jmorlan Date: Thu Jul 31 12:46:50 2008 New Revision: 34980 URL: http://svn.reactos.org/svn/reactos?rev=34980&view=rev Log: In exit and _cexit, call atexit routines. (Bug 3432_) Modified: trunk/reactos/lib/sdk/crt/stdlib/_exit.c Modified: trunk/reactos/lib/sdk/crt/stdlib/_exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/_exit.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/_exit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/_exit.c [iso-8859-1] Thu Jul 31 12:46:50 2008 @@ -1,5 +1,7 @@ #include <precomp.h> #include <internal/atexit.h> + +extern void _atexit_cleanup(void); struct __atexit *__atexit_ptr = 0; @@ -18,6 +20,7 @@ */ /* in case the program set it this way */ _setmode(0, O_TEXT); + _atexit_cleanup(); _exit(status); for(;;); } @@ -28,6 +31,7 @@ */ void _exit(int _status) { + // FIXME: _exit and _c_exit should prevent atexit routines from being called during DLL unload ExitProcess(_status); for(;;); } @@ -37,6 +41,7 @@ */ void _cexit( void ) { + _atexit_cleanup(); // flush } @@ -45,5 +50,6 @@ */ void _c_exit( void ) { + // FIXME: _exit and _c_exit should prevent atexit routines from being called during DLL unload // reset interup vectors }

1 0

[sginsberg] 34979: - Change an infinite loop to an assert to simplify debugging
by sginsberg＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: sginsberg Date: Thu Jul 31 09:25:35 2008 New Revision: 34979 URL: http://svn.reactos.org/svn/reactos?rev=34979&view=rev Log: - Change an infinite loop to an assert to simplify debugging Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Thu Jul 31 09:25:35 2008 @@ -281,7 +281,7 @@ (Dispatch.Interrupt->Mode == Interrupt->Mode)) { /* The vector is shared and the interrupts are compatible */ - while (TRUE); // FIXME: NOT YET SUPPORTED/TESTED + ASSERT(FALSE); // FIXME: NOT YET SUPPORTED/TESTED Interrupt->Connected = Connected = TRUE; ASSERT(Irql <= SYNCH_LEVEL);

1 0

[pschweitzer] 34978: Refactored directory change notification: - Used PSEH - Added a simple test case - Renamed it to VfatNotifyChange The code looks better, should work better but is still commented out because of missing implementations in FsRtl. See issue #2821 for more details.
by pschweitzer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: pschweitzer Date: Thu Jul 31 03:06:02 2008 New Revision: 34978 URL: http://svn.reactos.org/svn/reactos?rev=34978&view=rev Log: Refactored directory change notification: - Used PSEH - Added a simple test case - Renamed it to VfatNotifyChange The code looks better, should work better but is still commented out because of missing implementations in FsRtl. See issue #2821 for more details. Modified: branches/pierre-fsd/drivers/filesystems/fastfat/dir.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/dir.c [iso-8859-1] Thu Jul 31 03:06:02 2008 @@ -471,54 +471,112 @@ return RC; } -#if 0 -static NTSTATUS NotifyChange (PVFAT_IRP_CONTEXT IrpContext) //bug 2821 +VOID VfatNotifyChangeFinal (PVFAT_IRP_CONTEXT IrpContext, + PVFATFCB pFcb, + BOOLEAN AcquiredFCB, + BOOLEAN PostRequest, + PNTSTATUS pRC) +{ + if (PostRequest) + { + if (AcquiredFCB) + { + ExReleaseResourceLite(&pFcb->MainResource); + AcquiredFCB = FALSE; + } + *pRC = STATUS_PENDING; + } + else + { + VfatFreeIrpContext(IrpContext); + } + + if (AcquiredFCB) + { + ExReleaseResourceLite(&pFcb->MainResource); + AcquiredFCB = FALSE; + } +} + +_SEH_DEFINE_LOCALS(VfatNotifyChangeFinal) +{ + PVFAT_IRP_CONTEXT IrpContext; + PVFATFCB pFcb; + BOOLEAN AcquiredFCB; + BOOLEAN PostRequest; + PNTSTATUS pRC; +}; + +_SEH_FINALLYFUNC(VfatNotifyChangeFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(VfatNotifyChangeFinal); + VfatNotifyChangeFinal(_SEH_VAR(IrpContext), _SEH_VAR(pFcb), + _SEH_VAR(AcquiredFCB), _SEH_VAR(PostRequest), _SEH_VAR(pRC)); +} + +static NTSTATUS VfatNotifyChange (PVFAT_IRP_CONTEXT IrpContext) { PIRP pIrp; PVFATCCB pCcb; PVFATFCB pFcb; PDEVICE_EXTENSION pVcb; - BOOLEAN WatchTree = FALSE; - ULONG CompletionFilter = 0; - BOOLEAN PostRequest = FALSE; +#if 0 + BOOLEAN WatchTree = FALSE; + ULONG CompletionFilter = 0; +#endif NTSTATUS RC = STATUS_SUCCESS; - +#if 0 PIO_STACK_LOCATION Stack = IrpContext->Stack; - +#endif + pIrp = (PIRP) IrpContext->Irp; pFcb = (PVFATFCB) IrpContext->FileObject->FsContext; pCcb = (PVFATCCB) IrpContext->FileObject->FsContext2; pVcb = (PDEVICE_EXTENSION) IrpContext->DeviceExt; - - if (!ExAcquireResourceSharedLite(&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - PostRequest = TRUE; - } - - if (!PostRequest) - { + + if (!vfatFCBIsDirectory(pFcb)) + { + return STATUS_INVALID_PARAMETER; + } + +#if 0 + _SEH_TRY + { + _SEH_DECLARE_LOCALS(VfatNotifyChangeFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pFcb) = pFcb; + _SEH_VAR(AcquiredFCB) = FALSE; + _SEH_VAR(PostRequest) = FALSE; + _SEH_VAR(pRC) = &RC; + + if (!ExAcquireResourceSharedLite(&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + _SEH_VAR(PostRequest) = TRUE; + RC = STATUS_PENDING; + _SEH_LEAVE; + } + _SEH_VAR(AcquiredFCB) = TRUE; + CompletionFilter = Stack->Parameters.NotifyDirectory.CompletionFilter; WatchTree = (Stack->Flags & SL_WATCH_TREE ? TRUE : FALSE); - + + /* FIXME: FsRtlNotifyFullChangeDirectory is unimplemented */ FsRtlNotifyFullChangeDirectory(pVcb->NotifySync, &(pVcb->NotifyList), pCcb, (PSTRING)&(pFcb->LongNameU), WatchTree, FALSE, CompletionFilter, pIrp, NULL, NULL); - } - - if (PostRequest) - { - VfatQueueRequest(IrpContext); - } - else - { - VfatFreeIrpContext(IrpContext); - ExReleaseResourceLite(&pFcb->MainResource); - } - + + RC = STATUS_PENDING; + } + _SEH_FINALLY(VfatNotifyChangeFinal_PSEH) + _SEH_END; +#else + DPRINT (" vfat, dir : change\n"); + RC = STATUS_NOT_IMPLEMENTED; +#endif + return RC; } -#endif NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT IrpContext) @@ -535,17 +593,11 @@ RC = DoQuery (IrpContext); break; case IRP_MN_NOTIFY_CHANGE_DIRECTORY: -#if 0 - RC = NotifyChange (IrpContext); -#else - DPRINT (" vfat, dir : change\n"); - RC = STATUS_NOT_IMPLEMENTED; -#endif + RC = VfatNotifyChange (IrpContext); break; default: // error - DbgPrint ("unexpected minor function %x in VFAT driver\n", - IrpContext->MinorFunction); + DbgPrint ("unexpected minor function %x in VFAT driver\n", IrpContext->MinorFunction); RC = STATUS_INVALID_DEVICE_REQUEST; break; }

1 0

[ros-arm-bringup] 34977: - Fix ARM NTOS brekage (and amd64/ppc): - Only build kd/i386 on i386 builds since this code is x86-32 centric. - Only call KdpEnableSafeMem on i386 builds, since the code uses x86-32 centric defines.
by ros-arm-bringup＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: ros-arm-bringup Date: Thu Jul 31 02:31:55 2008 New Revision: 34977 URL: http://svn.reactos.org/svn/reactos?rev=34977&view=rev Log: - Fix ARM NTOS brekage (and amd64/ppc): - Only build kd/i386 on i386 builds since this code is x86-32 centric. - Only call KdpEnableSafeMem on i386 builds, since the code uses x86-32 centric defines. Modified: trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Thu Jul 31 02:31:55 2008 @@ -258,7 +258,11 @@ return TRUE; } else - KdpEnableSafeMem(); + { +#ifdef _M_IX86 + KdpEnableSafeMem(); +#endif + } /* Call the Initialization Routines of the Registered Providers */ KdpCallInitRoutine(BootPhase); Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jul 31 02:31:55 2008 @@ -273,9 +273,11 @@ </directory> </directory> <directory name="kd"> - <directory name="i386"> - <file>kdmemsup.c</file> - </directory> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>kdmemsup.c</file> + </directory> + </if> </directory> <if property="_WINKD_" value="0"> <directory name="kdbg">

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