Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35363: - Raise the maximum IRQL that this routine is callable to APC_LEVEL

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 15 19:28:33 2008 New Revision: 35363 URL: http://svn.reactos.org/svn/reactos?rev=35363&view=rev Log: - Raise the maximum IRQL that this routine is callable to APC_LEVEL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Aug 15 19:28:33 2008 @@ -167,7 +167,7 @@ NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); AFD_DbgPrint(MAX_TRACE,("Called on %x, attempting to lock\n", FCB)); @@ -218,7 +218,7 @@ PVOID CurrentThread = KeGetCurrentThread(); #endif ASSERT(FCB->LockCount > 0); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ExAcquireFastMutex( &FCB->Mutex ); FCB->LockCount--;

16 years, 2 months

[tkreuzer] 35362: - fix pointer to ulong cast

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 15 19:18:27 2008 New Revision: 35362 URL: http://svn.reactos.org/svn/reactos?rev=35362&view=rev Log: - fix pointer to ulong cast Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Fri Aug 15 19:18:27 2008 @@ -544,7 +544,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (uintptr_t) va_arg(args, void *), 16, field_width, precision, flags); continue;

16 years, 2 months

[tkreuzer] 35361: fix KIPCR

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 15 19:17:52 2008 New Revision: 35361 URL: http://svn.reactos.org/svn/reactos?rev=35361&view=rev Log: fix KIPCR Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Fri Aug 15 19:17:52 2008 @@ -784,9 +784,8 @@ PVOID KdVersionBlock; // 0x108 PVOID Unused3; ULONG PcrAlign1[24]; - - ULONG Fill2; // 0x178 - KPRCB Prcb; + ULONG Fill2[2]; // 0x178 + KPRCB Prcb; // 0x180 // hack: ULONG ContextSwitches;

16 years, 2 months

[tkreuzer] 35360: - comment out ext2.sys in textsetup.sif, as it doesn't load - fix stupid error when creating page directory - fix PtrToPfn() based on updated mm types - some enhancements

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 15 19:16:54 2008 New Revision: 35360 URL: http://svn.reactos.org/svn/reactos?rev=35360&view=rev Log: - comment out ext2.sys in textsetup.sif, as it doesn't load - fix stupid error when creating page directory - fix PtrToPfn() based on updated mm types - some enhancements Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -33,7 +33,7 @@ scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 -ext2.sys=,,,,,,x,,,,,,4 +;ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -117,7 +117,7 @@ if (!pSubDir) return NULL; RtlZeroMemory(pSubDir, PAGE_SIZE); - pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE; + pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir); pDir->Pde[Index].Valid = 1; pDir->Pde[Index].Write = 1; } @@ -196,7 +196,7 @@ ULONG KernelPages; /* Allocate a Page for the PML4 */ - pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory); + pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); ASSERT(pPML4); @@ -205,7 +205,7 @@ * virtual address 0xfffff6fb7dbedf68 */ pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1; pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PXE_BASE); + pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4); /* Setup low memory pages */ if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024) Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -30,7 +30,7 @@ #define VA_MASK 0x0000FFFFFFFFFFFFUL #define PtrToPfn(p) \ - ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xffffffffffULL) + ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL) #define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF) #define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF)

16 years, 2 months

[tkreuzer] 35359: The TEB member is called ClientID not Cid on all Windows versions I could check (XP, 2k3, vista).

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 15 18:40:42 2008 New Revision: 35359 URL: http://svn.reactos.org/svn/reactos?rev=35359&view=rev Log: The TEB member is called ClientID not Cid on all Windows versions I could check (XP, 2k3, vista). Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h branches/ros-amd64-bringup/reactos/lib/rtl/critical.c branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c branches/ros-amd64-bringup/reactos/lib/rtl/resource.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -73,7 +73,7 @@ /* Set up the data for CSR */ DbgBreakPoint(); IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId; /* Call it */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -152,7 +152,7 @@ { /* This is a server-to-server call. Save our CID and do a direct call */ DbgBreakPoint(); - ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; + ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -48,7 +48,7 @@ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -55,7 +55,7 @@ /* Create the pipe name */ swprintf(Buffer, L"\\Device\\NamedPipe\\Win32Pipes.%08x.%08x", - NtCurrentTeb()->Cid.UniqueProcess, + NtCurrentTeb()->ClientId.UniqueProcess, PipeId); RtlInitUnicodeString(&PipeName, Buffer); Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -272,7 +272,7 @@ DWORD STDCALL GetCurrentProcessId(VOID) { - return((DWORD)GetTeb()->Cid.UniqueProcess); + return((DWORD)GetTeb()->ClientId.UniqueProcess); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -319,7 +319,7 @@ WINAPI GetCurrentThreadId(VOID) { - return (DWORD)(NtCurrentTeb()->Cid).UniqueThread; + return (DWORD)(NtCurrentTeb()->ClientId).UniqueThread; } /* Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -1313,8 +1313,8 @@ { // We are current. //FIXME("Current!\n"); if ( lpdwProcessId ) - *lpdwProcessId = (DWORD)NtCurrentTeb()->Cid.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->Cid.UniqueThread; + *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; } else { // Ask kernel for info. Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -755,7 +755,7 @@ { NT_TIB Tib; PVOID EnvironmentPointer; - CLIENT_ID Cid; + CLIENT_ID ClientId; PVOID ActiveRpcHandle; PVOID ThreadLocalStoragePointer; struct _PEB *ProcessEnvironmentBlock; Modified: branches/ros-amd64-bringup/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/critical.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -310,7 +310,7 @@ DPRINT("Freeing from Buffer: %p. Entry: %lu inside Process: %p\n", DebugInfo, EntryId, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlpDebugInfoFreeList[EntryId] = FALSE; } else { @@ -318,7 +318,7 @@ /* It's a dynamic one, so free from the heap */ DPRINT("Freeing from Heap: %p inside Process: %p\n", DebugInfo, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlFreeHeap(NtCurrentPeb()->ProcessHeap, 0, DebugInfo); } @@ -424,7 +424,7 @@ NTAPI RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { @@ -522,7 +522,7 @@ CritcalSectionDebugData = RtlpAllocateDebugInfo(); DPRINT("Allocated Debug Data: %p inside Process: %p\n", CritcalSectionDebugData, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); if (!CritcalSectionDebugData) { @@ -657,11 +657,11 @@ -1) == -1) { /* It's ours */ - CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; - } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { + } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ _InterlockedIncrement(&CriticalSection->LockCount); Modified: branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG_PTR) NtCurrentTeb()->Cid.UniqueProcess; + ULONG Pid = (ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); Modified: branches/ros-amd64-bringup/reactos/lib/rtl/resource.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/resource.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/resource.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -94,7 +94,7 @@ } else if (Resource->NumberActive < 0) /* exclusive lock in progress */ { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { retVal = TRUE; Resource->NumberActive--; @@ -120,7 +120,7 @@ goto wait; } if (retVal == TRUE) - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; done: RtlLeaveCriticalSection(&Resource->Lock); return retVal; @@ -141,7 +141,7 @@ RtlEnterCriticalSection(&Resource->Lock); if (Resource->NumberActive < 0) { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { Resource->NumberActive--; retVal = TRUE; @@ -218,7 +218,7 @@ if (Resource->NumberActive == 1) { - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } else @@ -233,7 +233,7 @@ return; RtlEnterCriticalSection(&Resource->Lock); - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } RtlLeaveCriticalSection(&Resource->Lock); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -452,7 +452,7 @@ Teb->Tib.Self = (PNT_TIB)Teb; /* Set TEB Data */ - Teb->Cid = *ClientId; + Teb->ClientId = *ClientId; Teb->RealClientId = *ClientId; Teb->ProcessEnvironmentBlock = Process->Peb; Teb->CurrentLocale = PsDefaultThreadLocaleId; Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -155,7 +155,7 @@ hwnd, pEP->idObject, pEP->idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); return Result; @@ -185,14 +185,14 @@ if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - ((DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess)) + ((DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess)) { Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - (DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess) && + (DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { @@ -201,7 +201,7 @@ Window->hSelf, idObject, idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); }

16 years, 2 months

[cgutman] 35358: - Fix a memory leak that occurs when AfdSetContext is called with a buffer that is too small - Properly return STATUS_BUFFER_TOO_SMALL when the buffer passed is too small

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 15 13:26:52 2008 New Revision: 35358 URL: http://svn.reactos.org/svn/reactos?rev=35358&view=rev Log: - Fix a memory leak that occurs when AfdSetContext is called with a buffer that is too small - Properly return STATUS_BUFFER_TOO_SMALL when the buffer passed is too small Modified: branches/aicom-network-fixes/drivers/network/afd/afd/context.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] Fri Aug 15 13:26:52 2008 @@ -39,27 +39,30 @@ NTSTATUS STDCALL AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_NO_MEMORY; + NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if( FCB->Context ) { + ExFreePool( FCB->Context ); + FCB->Context = NULL; + } + if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { - if( FCB->Context ) - ExFreePool( FCB->Context ); FCB->Context = ExAllocatePool ( PagedPool, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - } - if( FCB->Context ) { - Status = STATUS_SUCCESS; + if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + RtlCopyMemory( FCB->Context, IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); + Status = STATUS_SUCCESS; } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status));

16 years, 2 months

[fireball] 35357: Gregor Schneider <grschneider@gmail.com> - Floating point values are not passed directly, but using the stack. Ref: Wine code and http://en.wikibooks.org/wiki/Reverse_Engineering/Floating_Point_Numbers code. - mem/i386/memchr_asm.s: don't loop if given size is 0. - Python test_builtin passes all 50 tests now. See issue #1255 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 15 13:24:11 2008 New Revision: 35357 URL: http://svn.reactos.org/svn/reactos?rev=35357&view=rev Log: Gregor Schneider <grschneider(a)gmail.com> - Floating point values are not passed directly, but using the stack. Ref: Wine code and http://en.wikibooks.org/wiki/Reverse_Engineering/Floating_Point_Numbers code. - mem/i386/memchr_asm.s: don't loop if given size is 0. - Python test_builtin passes all 50 tests now. See issue #1255 for more details. Modified: trunk/reactos/lib/sdk/crt/math/stubs.c trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s Modified: trunk/reactos/lib/sdk/crt/math/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] Fri Aug 15 13:24:11 2008 @@ -1,134 +1,138 @@ #include <precomp.h> #include <math.h> -double _CIsin(double x); -double _CIcos(double x); -double _CItan(double x); -double _CIsinh(double x); -double _CIcosh(double x); -double _CItanh(double x); -double _CIasin(double x); -double _CIacos(double x); -double _CIatan(double x); -double _CIatan2(double y, double x); -double _CIexp(double x); -double _CIlog(double x); -double _CIlog10(double x); -double _CIpow(double x, double y); -double _CIsqrt(double x); -double _CIfmod(double x, double y); - - -/* - * @implemented - */ -double _CIsin(double x) -{ +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/* + * @implemented + */ +double CDECL _CIsin(void) +{ + FPU_DOUBLE(x); return sin(x); } /* * @implemented */ -double _CIcos(double x) -{ +double CDECL _CIcos(void) +{ + FPU_DOUBLE(x); return cos(x); } /* * @implemented */ -double _CItan(double x) -{ +double CDECL _CItan(void) +{ + FPU_DOUBLE(x); return tan(x); } /* * @implemented */ -double _CIsinh(double x) -{ +double CDECL _CIsinh(void) +{ + FPU_DOUBLE(x); return sinh(x); } /* * @implemented */ -double _CIcosh(double x) -{ +double CDECL _CIcosh(void) +{ + FPU_DOUBLE(x); return cosh(x); } /* * @implemented */ -double _CItanh(double x) -{ +double CDECL _CItanh(void) +{ + FPU_DOUBLE(x); return tanh(x); } /* * @implemented */ -double _CIasin(double x) -{ +double CDECL _CIasin(void) +{ + FPU_DOUBLE(x); return asin(x); } /* * @implemented */ -double _CIacos(double x) -{ +double CDECL _CIacos(void) +{ + FPU_DOUBLE(x); return acos(x); } /* * @implemented */ -double _CIatan(double x) -{ +double CDECL _CIatan(void) +{ + FPU_DOUBLE(x); return atan(x); } /* * @implemented */ -double _CIatan2(double y, double x) -{ - return atan2(y, x); -} -/* - * @implemented - */ -double _CIexp(double x) -{ +double CDECL _CIatan2(void) +{ + FPU_DOUBLES(x, y); + return atan2(x, y); +} +/* + * @implemented + */ +double CDECL _CIexp(void) +{ + FPU_DOUBLE(x); return exp(x); } /* * @implemented */ -double _CIlog(double x) -{ +double CDECL _CIlog(void) +{ + FPU_DOUBLE(x); return log(x); } /* * @implemented */ -double _CIlog10(double x) -{ +double CDECL _CIlog10(void) +{ + FPU_DOUBLE(x); return log10(x); } /* * @implemented */ -double _CIpow(double x, double y) -{ +double CDECL _CIpow(void) +{ + FPU_DOUBLES(x, y); return pow(x, y); } /* * @implemented */ -double _CIsqrt(double x) -{ +double CDECL _CIsqrt(void) +{ + FPU_DOUBLE(x); return sqrt(x); } /* * @implemented */ -double _CIfmod(double x, double y) -{ +double CDECL _CIfmod(void) +{ + FPU_DOUBLES(x, y); return fmod(x, y); } Modified: trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memch… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] Fri Aug 15 13:24:11 2008 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/string/i386/memchr.s + * FILE: lib/sdk/crt/mem/i386/memchr.s */ /* @@ -19,13 +19,14 @@ mov 0xc(%ebp),%eax mov 0x10(%ebp),%ecx cld + jecxz .Lnotfound repne scasb - je .L1 + je .Lfound +.Lnotfound: mov $1,%edi -.L1: +.Lfound: mov %edi,%eax dec %eax pop %edi leave ret -

16 years, 2 months

[cgutman] 35356: - Fix a typo resulting in any call to AfdGetSockOrPeerName with Local set to FALSE to return STATUS_NO_MEMORY

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 15 13:14:55 2008 New Revision: 35356 URL: http://svn.reactos.org/svn/reactos?rev=35356&view=rev Log: - Fix a typo resulting in any call to AfdGetSockOrPeerName with Local set to FALSE to return STATUS_NO_MEMORY Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Fri Aug 15 13:14:55 2008 @@ -113,7 +113,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( !NT_SUCCESS + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, FCB->LocalAddress->Address[0].AddressType ) ) ) {

16 years, 2 months

[hpoussin] 35355: Fix typo which was preventing compilation on *nix

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 15 11:09:17 2008 New Revision: 35355 URL: http://svn.reactos.org/svn/reactos?rev=35355&view=rev Log: Fix typo which was preventing compilation on *nix Modified: trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Fri Aug 15 11:09:17 2008 @@ -33,7 +33,7 @@ </if> <if property="ARCH" value="arm"> <directory name="arm"> - <file>stubs_asm.S</file> + <file>stubs_asm.s</file> </directory> </if> <ifnot property="ARCH" value="i386">

16 years, 2 months

[ros-arm-bringup] 35354: Don't build with -s, this strips vital information from the output. Use --strip-debug instead, which gets rid of the DWARF debugging information, but keeps the file and symbols sane, so objdump can still be used on the output.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Aug 15 10:02:40 2008 New Revision: 35354 URL: http://svn.reactos.org/svn/reactos?rev=35354&view=rev Log: Don't build with -s, this strips vital information from the output. Use --strip-debug instead, which gets rid of the DWARF debugging information, but keeps the file and symbols sane, so objdump can still be used on the output. Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=353… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Fri Aug 15 10:02:40 2008 @@ -68,7 +68,7 @@ <define name="__MSVCRT__"/> <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> - <linkerflag>-s</linkerflag> + <linkerflag>--strip-debug</linkerflag> <linkerflag>-static</linkerflag> <directory name="media">

16 years, 2 months

← Newer
1
...
46
47
48
49
50
51
52
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008