Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[mbosma] 21966: Nicer caption bar effect. Colors by EmuandCo.
by mbosma＠svn.reactos.org 21 May '06

21 May '06

Author: mbosma Date: Sun May 21 22:42:56 2006 New Revision: 21966 URL: http://svn.reactos.ru/svn/reactos?rev=21966&view=rev Log: Nicer caption bar effect. Colors by EmuandCo. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c Sun May 21 22:42:56 2006 @@ -1149,8 +1149,8 @@ { if (uFlags & DC_GRADIENT) { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; + static GRADIENT_RECT gcap [] = {{0, 1}, {2, 3}}; + TRIVERTEX vert[4]; COLORREF Colors[2]; LONG xx; @@ -1178,19 +1178,33 @@ vert[0].x = r.left; vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; + vert[0].Red = GetRValue(Colors[1]) << 8; + vert[0].Green = GetGValue(Colors[1]) << 8; + vert[0].Blue = GetBValue(Colors[1]) << 8; vert[0].Alpha = 0; vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; + vert[1].y = (lprc->bottom - lprc->top) >> 1; + vert[1].Red = GetRValue(Colors[0]) << 8; + vert[1].Green = GetGValue(Colors[0]) << 8; + vert[1].Blue = GetBValue(Colors[0]) << 8; vert[1].Alpha = 0; - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); + vert[2].x = r.left; + vert[2].y = (lprc->bottom - lprc->top) >> 1; + vert[2].Red = GetRValue(Colors[0]) << 8; + vert[2].Green = GetGValue(Colors[0]) << 8; + vert[2].Blue = GetBValue(Colors[0]) << 8; + vert[2].Alpha = 0; + + vert[3].x = r.right; + vert[3].y = (lprc->bottom - lprc->top); + vert[3].Red = GetRValue(Colors[1]) << 8; + vert[3].Green = GetGValue(Colors[1]) << 8; + vert[3].Blue = GetBValue(Colors[1]) << 8; + vert[3].Alpha = 0; + + GdiGradientFill(MemDC, vert, 4, &gcap, 2, GRADIENT_FILL_RECT_V); if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) { Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c Sun May 21 22:42:56 2006 @@ -32,7 +32,7 @@ { RGB(212, 208, 200), /* COLOR_SCROLLBAR */ RGB(58, 110, 165), /* COLOR_BACKGROUND */ - RGB(10, 36, 106), /* COLOR_ACTIVECAPTION */ + RGB(56, 112, 168), /* COLOR_ACTIVECAPTION */ RGB(128, 128, 128), /* COLOR_INACTIVECAPTION */ RGB(212, 208, 200), /* COLOR_MENU */ RGB(255, 255, 255), /* COLOR_WINDOW */ @@ -57,7 +57,7 @@ RGB(255, 255, 225), /* COLOR_INFOBK */ RGB(181, 181, 181), /* COLOR_UNKNOWN */ RGB(0, 0, 128), /* COLOR_HOTLIGHT */ - RGB(166, 202, 240), /* COLOR_GRADIENTACTIVECAPTION */ + RGB(133, 162, 192), /* COLOR_GRADIENTACTIVECAPTION */ RGB(192, 192, 192), /* COLOR_GRADIENTINACTIVECAPTION */ RGB(49, 106, 197), /* COLOR_MENUHILIGHT */ RGB(236, 233, 216) /* COLOR_MENUBAR */

1 0

[greatlrd] 21965: [AUDIT] clean from DJGPP
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 19:41:50 2006 New Revision: 21965 URL: http://svn.reactos.ru/svn/reactos?rev=21965&view=rev Log: [AUDIT] clean from DJGPP Modified: trunk/reactos/lib/crt/stdlib/itoa.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/itoa.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21964: reporting djgpp fgets to fgetws, with wine test the old version did fail on reading string, it did to far. now we do not have a any bug in fgetws, acoding wine test, I ran the test in win2k and reactos to be 100% sure it was not wine test fualt.
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 17:38:45 2006 New Revision: 21964 URL: http://svn.reactos.ru/svn/reactos?rev=21964&view=rev Log: reporting djgpp fgets to fgetws, with wine test the old version did fail on reading string, it did to far. now we do not have a any bug in fgetws, acoding wine test, I ran the test in win2k and reactos to be 100% sure it was not wine test fualt. Modified: trunk/reactos/lib/crt/stdio/fgetws.c Modified: trunk/reactos/lib/crt/stdio/fgetws.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdio/fgetws.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdio/fgetws.c (original) +++ trunk/reactos/lib/crt/stdio/fgetws.c Sun May 21 17:38:45 2006 @@ -32,23 +32,19 @@ wchar_t* fgetws(wchar_t* s, int n, FILE* f) { - wchar_t c = 0; - wchar_t* cs; + + int c=0; + wchar_t *cs; cs = s; - //while (--n > 0 && (c = getwc(f)) != WEOF) { - while (n > 0) { - c = getwc(f); - if (c == WEOF) - break; - n--; + while (--n>0 && (c = getwc(f)) != WEOF) + { *cs++ = c; if (c == L'\n') break; } - if (c == WEOF && cs == s) { + if (c == WEOF && cs == s) return NULL; - } *cs++ = L'\0'; return s; }

1 0

[greatlrd] 21963: [AUDIT] clean it is base on DJGPP fgets
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 17:31:38 2006 New Revision: 21963 URL: http://svn.reactos.ru/svn/reactos?rev=21963&view=rev Log: [AUDIT] clean it is base on DJGPP fgets Modified: trunk/reactos/lib/crt/stdio/fgetws.c (props changed) Propchange: trunk/reactos/lib/crt/stdio/fgetws.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ekohl] 21962: The MSFS_PIPE struct is actually an FCB (File Control Block). Rename it accordingly and store pointers to it in FileObject->FsContext.
by ekohl＠svn.reactos.org 21 May '06

21 May '06

Author: ekohl Date: Sun May 21 17:19:10 2006 New Revision: 21962 URL: http://svn.reactos.ru/svn/reactos?rev=21962&view=rev Log: The MSFS_PIPE struct is actually an FCB (File Control Block). Rename it accordingly and store pointers to it in FileObject->FsContext. Modified: trunk/reactos/drivers/filesystems/np/create.c trunk/reactos/drivers/filesystems/np/finfo.c trunk/reactos/drivers/filesystems/np/fsctrl.c trunk/reactos/drivers/filesystems/np/npfs.h trunk/reactos/drivers/filesystems/np/rw.c Modified: trunk/reactos/drivers/filesystems/np/create.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/crea… ============================================================================== --- trunk/reactos/drivers/filesystems/np/create.c (original) +++ trunk/reactos/drivers/filesystems/np/create.c Sun May 21 17:19:10 2006 @@ -15,23 +15,23 @@ /* FUNCTIONS *****************************************************************/ -static PNPFS_PIPE +static PNPFS_FCB NpfsFindPipe(PNPFS_DEVICE_EXTENSION DeviceExt, PUNICODE_STRING PipeName) { PLIST_ENTRY CurrentEntry; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; CurrentEntry = DeviceExt->PipeListHead.Flink; while (CurrentEntry != &DeviceExt->PipeListHead) { - Pipe = CONTAINING_RECORD(CurrentEntry, NPFS_PIPE, PipeListEntry); + Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, PipeListEntry); if (RtlCompareUnicodeString(PipeName, - &Pipe->PipeName, + &Fcb->PipeName, TRUE) == 0) { - DPRINT("<%wZ> = <%wZ>\n", PipeName, &Pipe->PipeName); - return Pipe; + DPRINT("<%wZ> = <%wZ>\n", PipeName, &Fcb->PipeName); + return Fcb; } CurrentEntry = CurrentEntry->Flink; @@ -42,15 +42,15 @@ static PNPFS_CCB -NpfsFindListeningServerInstance(PNPFS_PIPE Pipe) +NpfsFindListeningServerInstance(PNPFS_FCB Fcb) { PLIST_ENTRY CurrentEntry; PNPFS_WAITER_ENTRY Waiter; KIRQL oldIrql; PIRP Irp; - CurrentEntry = Pipe->WaiterListHead.Flink; - while (CurrentEntry != &Pipe->WaiterListHead) + CurrentEntry = Fcb->WaiterListHead.Flink; + while (CurrentEntry != &Fcb->WaiterListHead) { Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); Irp = CONTAINING_RECORD(Waiter, IRP, Tail.Overlay.DriverContext); @@ -76,15 +76,15 @@ static VOID -NpfsSignalAndRemoveListeningServerInstance(PNPFS_PIPE Pipe, +NpfsSignalAndRemoveListeningServerInstance(PNPFS_FCB Fcb, PNPFS_CCB Ccb) { PLIST_ENTRY CurrentEntry; PNPFS_WAITER_ENTRY Waiter; PIRP Irp; - CurrentEntry = Pipe->WaiterListHead.Flink; - while (CurrentEntry != &Pipe->WaiterListHead) + CurrentEntry = Fcb->WaiterListHead.Flink; + while (CurrentEntry != &Fcb->WaiterListHead) { Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); if (Waiter->Ccb == Ccb) @@ -109,7 +109,7 @@ { PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; PNPFS_CCB ClientCcb; PNPFS_CCB ServerCcb = NULL; PNPFS_DEVICE_EXTENSION DeviceExt; @@ -137,9 +137,9 @@ * Step 1. Find the pipe we're trying to open. */ KeLockMutex(&DeviceExt->PipeListLock); - Pipe = NpfsFindPipe(DeviceExt, - &FileObject->FileName); - if (Pipe == NULL) + Fcb = NpfsFindPipe(DeviceExt, + &FileObject->FileName); + if (Fcb == NULL) { /* Not found, bail out with error. */ DPRINT("No pipe found!\n"); @@ -155,7 +155,7 @@ * Acquire the lock for CCB lists. From now on no modifications to the * CCB lists are allowed, because it can cause various misconsistencies. */ - KeLockMutex(&Pipe->CcbListLock); + KeLockMutex(&Fcb->CcbListLock); /* * Step 2. Create the client CCB. @@ -164,14 +164,14 @@ if (ClientCcb == NULL) { DPRINT("No memory!\n"); - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; } ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; - ClientCcb->Pipe = Pipe; + ClientCcb->Fcb = Fcb; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; ClientCcb->OtherSide = NULL; ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; @@ -180,14 +180,14 @@ DPRINT("CCB: %p\n", ClientCcb); /* Initialize data list. */ - if (Pipe->OutboundQuota) - { - ClientCcb->Data = ExAllocatePool(PagedPool, Pipe->OutboundQuota); + if (Fcb->OutboundQuota) + { + ClientCcb->Data = ExAllocatePool(PagedPool, Fcb->OutboundQuota); if (ClientCcb->Data == NULL) { DPRINT("No memory!\n"); ExFreePool(ClientCcb); - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; @@ -201,8 +201,8 @@ ClientCcb->ReadPtr = ClientCcb->Data; ClientCcb->WritePtr = ClientCcb->Data; ClientCcb->ReadDataAvailable = 0; - ClientCcb->WriteQuotaAvailable = Pipe->OutboundQuota; - ClientCcb->MaxDataLength = Pipe->OutboundQuota; + ClientCcb->WriteQuotaAvailable = Fcb->OutboundQuota; + ClientCcb->MaxDataLength = Fcb->OutboundQuota; ExInitializeFastMutex(&ClientCcb->DataListLock); KeInitializeEvent(&ClientCcb->ConnectEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&ClientCcb->ReadEvent, SynchronizationEvent, FALSE); @@ -221,7 +221,7 @@ * complete even this request. */ - ServerCcb = NpfsFindListeningServerInstance(Pipe); + ServerCcb = NpfsFindListeningServerInstance(Fcb); if (ServerCcb == NULL) { PLIST_ENTRY CurrentEntry; @@ -232,8 +232,8 @@ * one of the listing server CCB on the pipe. */ - CurrentEntry = Pipe->ServerCcbListHead.Flink; - while (CurrentEntry != &Pipe->ServerCcbListHead) + CurrentEntry = Fcb->ServerCcbListHead.Flink; + while (CurrentEntry != &Fcb->ServerCcbListHead) { Ccb = CONTAINING_RECORD(CurrentEntry, NPFS_CCB, CcbListEntry); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) @@ -254,7 +254,7 @@ DPRINT("No listening server CCB found!\n"); if (ClientCcb->Data) ExFreePool(ClientCcb->Data); - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_PIPE_BUSY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_PIPE_BUSY; @@ -264,13 +264,13 @@ { /* Signal the server thread and remove it from the waiter list */ /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ - NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerCcb); + NpfsSignalAndRemoveListeningServerInstance(Fcb, ServerCcb); } } - else if (IsListEmpty(&Pipe->ServerCcbListHead)) + else if (IsListEmpty(&Fcb->ServerCcbListHead)) { DPRINT("No server fcb found!\n"); - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -281,7 +281,7 @@ */ /* Add the client CCB to the pipe CCB list. */ - InsertTailList(&Pipe->ClientCcbListHead, &ClientCcb->CcbListEntry); + InsertTailList(&Fcb->ClientCcbListHead, &ClientCcb->CcbListEntry); /* Connect to listening server side */ if (ServerCcb) @@ -292,8 +292,9 @@ ServerCcb->PipeState = FILE_PIPE_CONNECTED_STATE; } - KeUnlockMutex(&Pipe->CcbListLock); - + KeUnlockMutex(&Fcb->CcbListLock); + + FileObject->FsContext = Fcb; FileObject->FsContext2 = ClientCcb; FileObject->Flags |= FO_NAMED_PIPE; @@ -313,7 +314,7 @@ PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_DEVICE_EXTENSION DeviceExt; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; PNAMED_PIPE_CREATE_PARAMETERS Buffer; BOOLEAN NewPipe = FALSE; @@ -352,9 +353,9 @@ /* * First search for existing Pipe with the same name. */ - Pipe = NpfsFindPipe(DeviceExt, - &FileObject->FileName); - if (Pipe != NULL) + Fcb = NpfsFindPipe(DeviceExt, + &FileObject->FileName); + if (Fcb != NULL) { /* * Found Pipe with the same name. Check if we are @@ -362,7 +363,7 @@ */ KeUnlockMutex(&DeviceExt->PipeListLock); - if (Pipe->CurrentInstances >= Pipe->MaximumInstances) + if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { DPRINT("Out of instances.\n"); ExFreePool(Ccb); @@ -372,8 +373,8 @@ } /* FIXME: Check pipe modes also! */ - if (Pipe->MaximumInstances != Buffer->MaximumInstances || - Pipe->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart) + if (Fcb->MaximumInstances != Buffer->MaximumInstances || + Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart) { DPRINT("Asked for invalid pipe mode.\n"); ExFreePool(Ccb); @@ -385,8 +386,8 @@ else { NewPipe = TRUE; - Pipe = ExAllocatePool(NonPagedPool, sizeof(NPFS_PIPE)); - if (Pipe == NULL) + Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + if (Fcb == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -395,13 +396,13 @@ return STATUS_NO_MEMORY; } - Pipe->PipeName.Length = FileObject->FileName.Length; - Pipe->PipeName.MaximumLength = Pipe->PipeName.Length + sizeof(UNICODE_NULL); - Pipe->PipeName.Buffer = ExAllocatePool(NonPagedPool, Pipe->PipeName.MaximumLength); - if (Pipe->PipeName.Buffer == NULL) + Fcb->PipeName.Length = FileObject->FileName.Length; + Fcb->PipeName.MaximumLength = Fcb->PipeName.Length + sizeof(UNICODE_NULL); + Fcb->PipeName.Buffer = ExAllocatePool(NonPagedPool, Fcb->PipeName.MaximumLength); + if (Fcb->PipeName.Buffer == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); - ExFreePool(Pipe); + ExFreePool(Fcb); ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; @@ -409,88 +410,88 @@ return STATUS_NO_MEMORY; } - RtlCopyUnicodeString(&Pipe->PipeName, &FileObject->FileName); - - InitializeListHead(&Pipe->ServerCcbListHead); - InitializeListHead(&Pipe->ClientCcbListHead); - InitializeListHead(&Pipe->WaiterListHead); - KeInitializeMutex(&Pipe->CcbListLock, 0); - - Pipe->PipeType = Buffer->NamedPipeType; - Pipe->WriteMode = Buffer->ReadMode; - Pipe->ReadMode = Buffer->ReadMode; - Pipe->CompletionMode = Buffer->CompletionMode; + RtlCopyUnicodeString(&Fcb->PipeName, &FileObject->FileName); + + InitializeListHead(&Fcb->ServerCcbListHead); + InitializeListHead(&Fcb->ClientCcbListHead); + InitializeListHead(&Fcb->WaiterListHead); + KeInitializeMutex(&Fcb->CcbListLock, 0); + + Fcb->PipeType = Buffer->NamedPipeType; + Fcb->WriteMode = Buffer->ReadMode; + Fcb->ReadMode = Buffer->ReadMode; + Fcb->CompletionMode = Buffer->CompletionMode; switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) { case FILE_SHARE_READ: - Pipe->PipeConfiguration = FILE_PIPE_OUTBOUND; + Fcb->PipeConfiguration = FILE_PIPE_OUTBOUND; break; case FILE_SHARE_WRITE: - Pipe->PipeConfiguration = FILE_PIPE_INBOUND; + Fcb->PipeConfiguration = FILE_PIPE_INBOUND; break; case FILE_SHARE_READ|FILE_SHARE_WRITE: - Pipe->PipeConfiguration = FILE_PIPE_FULL_DUPLEX; + Fcb->PipeConfiguration = FILE_PIPE_FULL_DUPLEX; break; } - Pipe->MaximumInstances = Buffer->MaximumInstances; - Pipe->CurrentInstances = 0; - Pipe->TimeOut = Buffer->DefaultTimeout; - if (!(Pipe->PipeConfiguration & FILE_PIPE_OUTBOUND) || - Pipe->PipeConfiguration & FILE_PIPE_FULL_DUPLEX) + Fcb->MaximumInstances = Buffer->MaximumInstances; + Fcb->CurrentInstances = 0; + Fcb->TimeOut = Buffer->DefaultTimeout; + if (!(Fcb->PipeConfiguration & FILE_PIPE_OUTBOUND) || + Fcb->PipeConfiguration & FILE_PIPE_FULL_DUPLEX) { if (Buffer->InboundQuota == 0) { - Pipe->InboundQuota = DeviceExt->DefaultQuota; + Fcb->InboundQuota = DeviceExt->DefaultQuota; } else { - Pipe->InboundQuota = PAGE_ROUND_UP(Buffer->InboundQuota); - if (Pipe->InboundQuota < DeviceExt->MinQuota) + Fcb->InboundQuota = PAGE_ROUND_UP(Buffer->InboundQuota); + if (Fcb->InboundQuota < DeviceExt->MinQuota) { - Pipe->InboundQuota = DeviceExt->MinQuota; + Fcb->InboundQuota = DeviceExt->MinQuota; } - else if (Pipe->InboundQuota > DeviceExt->MaxQuota) + else if (Fcb->InboundQuota > DeviceExt->MaxQuota) { - Pipe->InboundQuota = DeviceExt->MaxQuota; + Fcb->InboundQuota = DeviceExt->MaxQuota; } } } else { - Pipe->InboundQuota = 0; - } - - if (Pipe->PipeConfiguration & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) + Fcb->InboundQuota = 0; + } + + if (Fcb->PipeConfiguration & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) { if (Buffer->OutboundQuota == 0) { - Pipe->OutboundQuota = DeviceExt->DefaultQuota; + Fcb->OutboundQuota = DeviceExt->DefaultQuota; } else { - Pipe->OutboundQuota = PAGE_ROUND_UP(Buffer->OutboundQuota); - if (Pipe->OutboundQuota < DeviceExt->MinQuota) + Fcb->OutboundQuota = PAGE_ROUND_UP(Buffer->OutboundQuota); + if (Fcb->OutboundQuota < DeviceExt->MinQuota) { - Pipe->OutboundQuota = DeviceExt->MinQuota; + Fcb->OutboundQuota = DeviceExt->MinQuota; } - else if (Pipe->OutboundQuota > DeviceExt->MaxQuota) + else if (Fcb->OutboundQuota > DeviceExt->MaxQuota) { - Pipe->OutboundQuota = DeviceExt->MaxQuota; + Fcb->OutboundQuota = DeviceExt->MaxQuota; } } } else { - Pipe->OutboundQuota = 0; - } - - InsertTailList(&DeviceExt->PipeListHead, &Pipe->PipeListEntry); + Fcb->OutboundQuota = 0; + } + + InsertTailList(&DeviceExt->PipeListHead, &Fcb->PipeListEntry); KeUnlockMutex(&DeviceExt->PipeListLock); } - if (Pipe->InboundQuota) + if (Fcb->InboundQuota) { - Ccb->Data = ExAllocatePool(PagedPool, Pipe->InboundQuota); + Ccb->Data = ExAllocatePool(PagedPool, Fcb->InboundQuota); if (Ccb->Data == NULL) { ExFreePool(Ccb); @@ -498,10 +499,10 @@ if (NewPipe) { KeLockMutex(&DeviceExt->PipeListLock); - RemoveEntryList(&Pipe->PipeListEntry); + RemoveEntryList(&Fcb->PipeListEntry); KeUnlockMutex(&DeviceExt->PipeListLock); - RtlFreeUnicodeString(&Pipe->PipeName); - ExFreePool(Pipe); + RtlFreeUnicodeString(&Fcb->PipeName); + ExFreePool(Fcb); } Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -517,14 +518,14 @@ Ccb->ReadPtr = Ccb->Data; Ccb->WritePtr = Ccb->Data; Ccb->ReadDataAvailable = 0; - Ccb->WriteQuotaAvailable = Pipe->InboundQuota; - Ccb->MaxDataLength = Pipe->InboundQuota; + Ccb->WriteQuotaAvailable = Fcb->InboundQuota; + Ccb->MaxDataLength = Fcb->InboundQuota; InitializeListHead(&Ccb->ReadRequestListHead); ExInitializeFastMutex(&Ccb->DataListLock); - Pipe->CurrentInstances++; - - Ccb->Pipe = Pipe; + Fcb->CurrentInstances++; + + Ccb->Fcb = Fcb; Ccb->PipeEnd = FILE_PIPE_SERVER_END; Ccb->PipeState = FILE_PIPE_LISTENING_STATE; Ccb->OtherSide = NULL; @@ -535,10 +536,11 @@ KeInitializeEvent(&Ccb->ReadEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&Ccb->WriteEvent, SynchronizationEvent, FALSE); - KeLockMutex(&Pipe->CcbListLock); - InsertTailList(&Pipe->ServerCcbListHead, &Ccb->CcbListEntry); - KeUnlockMutex(&Pipe->CcbListLock); - + KeLockMutex(&Fcb->CcbListLock); + InsertTailList(&Fcb->ServerCcbListHead, &Ccb->CcbListEntry); + KeUnlockMutex(&Fcb->CcbListLock); + + FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; FileObject->Flags |= FO_NAMED_PIPE; @@ -559,7 +561,7 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_CCB Ccb, OtherSide; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; BOOLEAN Server; DPRINT("NpfsCleanup(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -579,11 +581,11 @@ } DPRINT("CCB %p\n", Ccb); - Pipe = Ccb->Pipe; - - DPRINT("Cleaning pipe %wZ\n", &Pipe->PipeName); - - KeLockMutex(&Pipe->CcbListLock); + Fcb = Ccb->Fcb; + + DPRINT("Cleaning pipe %wZ\n", &Fcb->PipeName); + + KeLockMutex(&Fcb->CcbListLock); Server = (Ccb->PipeEnd == FILE_PIPE_SERVER_END); @@ -637,8 +639,8 @@ KIRQL oldIrql; PIRP tmpIrp; - Entry = Ccb->Pipe->WaiterListHead.Flink; - while (Entry != &Ccb->Pipe->WaiterListHead) + Entry = Ccb->Fcb->WaiterListHead.Flink; + while (Entry != &Ccb->Fcb->WaiterListHead) { WaitEntry = CONTAINING_RECORD(Entry, NPFS_WAITER_ENTRY, Entry); if (WaitEntry->Ccb == Ccb) @@ -666,7 +668,7 @@ } Ccb->PipeState = FILE_PIPE_CLOSING_STATE; - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); ExAcquireFastMutex(&Ccb->DataListLock); if (Ccb->Data) @@ -694,8 +696,8 @@ PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; - PNPFS_PIPE Pipe; BOOLEAN Server; DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -715,18 +717,18 @@ } DPRINT("CCB %x\n", Ccb); - Pipe = Ccb->Pipe; - - DPRINT("Closing pipe %wZ\n", &Pipe->PipeName); - - KeLockMutex(&Pipe->CcbListLock); + Fcb = Ccb->Fcb; + + DPRINT("Closing pipe %wZ\n", &Fcb->PipeName); + + KeLockMutex(&Fcb->CcbListLock); Server = (Ccb->PipeEnd == FILE_PIPE_SERVER_END); if (Server) { DPRINT("Server\n"); - Pipe->CurrentInstances--; + Fcb->CurrentInstances--; } else { @@ -741,16 +743,17 @@ ExFreePool(Ccb); - KeUnlockMutex(&Pipe->CcbListLock); - - if (IsListEmpty(&Pipe->ServerCcbListHead) && - IsListEmpty(&Pipe->ClientCcbListHead)) - { - RtlFreeUnicodeString(&Pipe->PipeName); + KeUnlockMutex(&Fcb->CcbListLock); + + if (IsListEmpty(&Fcb->ServerCcbListHead) && + IsListEmpty(&Fcb->ClientCcbListHead)) + { + RtlFreeUnicodeString(&Fcb->PipeName); KeLockMutex(&DeviceExt->PipeListLock); - RemoveEntryList(&Pipe->PipeListEntry); + RemoveEntryList(&Fcb->PipeListEntry); KeUnlockMutex(&DeviceExt->PipeListLock); - ExFreePool(Pipe); + ExFreePool(Fcb); + FileObject->FsContext = NULL; } Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/np/finfo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/finf… ============================================================================== --- trunk/reactos/drivers/filesystems/np/finfo.c (original) +++ trunk/reactos/drivers/filesystems/np/finfo.c Sun May 21 17:19:10 2006 @@ -22,17 +22,17 @@ PFILE_PIPE_INFORMATION Info, PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; PFILE_PIPE_INFORMATION Request; DPRINT("NpfsSetPipeInformation()\n"); /* Get the Pipe and data */ - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; Request = (PFILE_PIPE_INFORMATION)Info; /* Set Pipe Data */ - Pipe->ReadMode = Request->ReadMode; - Pipe->CompletionMode = Request->CompletionMode; + Fcb->ReadMode = Request->ReadMode; + Fcb->CompletionMode = Request->CompletionMode; /* Return Success */ return STATUS_SUCCESS; @@ -45,17 +45,17 @@ PFILE_PIPE_INFORMATION Info, PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; PFILE_PIPE_REMOTE_INFORMATION Request; DPRINT("NpfsSetPipeRemoteInformation()\n"); /* Get the Pipe and data */ - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; Request = (PFILE_PIPE_REMOTE_INFORMATION)Info; /* Set the Settings */ - Pipe->TimeOut = Request->CollectDataTime; - Pipe->InboundQuota = Request->MaximumCollectionCount; + Fcb->TimeOut = Request->CollectDataTime; + Fcb->InboundQuota = Request->MaximumCollectionCount; /* Return Success */ return STATUS_SUCCESS; @@ -68,18 +68,18 @@ PFILE_PIPE_INFORMATION Info, PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; DPRINT("NpfsQueryPipeInformation()\n"); /* Get the Pipe */ - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; /* Clear Info */ RtlZeroMemory(Info, sizeof(FILE_PIPE_INFORMATION)); /* Return Info */ - Info->CompletionMode = Pipe->CompletionMode; - Info->ReadMode = Pipe->ReadMode; + Info->CompletionMode = Fcb->CompletionMode; + Info->ReadMode = Fcb->ReadMode; /* Return success */ *BufferLength -= sizeof(FILE_PIPE_INFORMATION); @@ -93,18 +93,18 @@ PFILE_PIPE_REMOTE_INFORMATION Info, PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; DPRINT("NpfsQueryPipeRemoteInformation()\n"); /* Get the Pipe */ - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; /* Clear Info */ RtlZeroMemory(Info, sizeof(FILE_PIPE_REMOTE_INFORMATION)); /* Return Info */ - Info->MaximumCollectionCount = Pipe->InboundQuota; - Info->CollectDataTime = Pipe->TimeOut; + Info->MaximumCollectionCount = Fcb->InboundQuota; + Info->CollectDataTime = Fcb->TimeOut; /* Return success */ *BufferLength -= sizeof(FILE_PIPE_REMOTE_INFORMATION); @@ -118,21 +118,21 @@ PFILE_PIPE_LOCAL_INFORMATION Info, PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; DPRINT("NpfsQueryLocalPipeInformation()\n"); - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; RtlZeroMemory(Info, sizeof(FILE_PIPE_LOCAL_INFORMATION)); - Info->NamedPipeType = Pipe->PipeType; - Info->NamedPipeConfiguration = Pipe->PipeConfiguration; - Info->MaximumInstances = Pipe->MaximumInstances; - Info->CurrentInstances = Pipe->CurrentInstances; - Info->InboundQuota = Pipe->InboundQuota; - Info->OutboundQuota = Pipe->OutboundQuota; + Info->NamedPipeType = Fcb->PipeType; + Info->NamedPipeConfiguration = Fcb->PipeConfiguration; + Info->MaximumInstances = Fcb->MaximumInstances; + Info->CurrentInstances = Fcb->CurrentInstances; + Info->InboundQuota = Fcb->InboundQuota; + Info->OutboundQuota = Fcb->OutboundQuota; Info->NamedPipeState = Ccb->PipeState; Info->NamedPipeEnd = Ccb->PipeEnd; @@ -160,8 +160,8 @@ FILE_INFORMATION_CLASS FileInformationClass; PFILE_OBJECT FileObject; PNPFS_DEVICE_EXTENSION DeviceExtension; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; - PNPFS_PIPE Pipe; PVOID SystemBuffer; ULONG BufferLength; NTSTATUS Status; @@ -173,12 +173,12 @@ DeviceExtension = DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = (PNPFS_CCB)FileObject->FsContext2; - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; - DPRINT("Pipe name: %wZ\n", &Pipe->PipeName); + DPRINT("Pipe name: %wZ\n", &Fcb->PipeName); DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); DPRINT("BufferLength %lu\n", BufferLength); @@ -229,8 +229,8 @@ PIO_STACK_LOCATION IoStack; FILE_INFORMATION_CLASS FileInformationClass; PFILE_OBJECT FileObject; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; - PNPFS_PIPE Pipe; PVOID SystemBuffer; ULONG BufferLength; NTSTATUS Status; @@ -241,12 +241,12 @@ FileInformationClass = IoStack->Parameters.QueryFile.FileInformationClass; FileObject = IoStack->FileObject; Ccb = (PNPFS_CCB)FileObject->FsContext2; - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; - DPRINT("Pipe name: %wZ\n", &Pipe->PipeName); + DPRINT("Pipe name: %wZ\n", &Fcb->PipeName); DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); DPRINT("BufferLength %lu\n", BufferLength); Modified: trunk/reactos/drivers/filesystems/np/fsctrl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/fsct… ============================================================================== --- trunk/reactos/drivers/filesystems/np/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/np/fsctrl.c Sun May 21 17:19:10 2006 @@ -25,14 +25,14 @@ Waiter = (PNPFS_WAITER_ENTRY)&Irp->Tail.Overlay.DriverContext; DPRINT1("NpfsListeningCancelRoutine() called for <%wZ>\n", - &Waiter->Ccb->Pipe->PipeName); + &Waiter->Ccb->Fcb->PipeName); IoReleaseCancelSpinLock(Irp->CancelIrql); - KeLockMutex(&Waiter->Ccb->Pipe->CcbListLock); + KeLockMutex(&Waiter->Ccb->Fcb->CcbListLock); RemoveEntryList(&Waiter->Entry); - KeUnlockMutex(&Waiter->Ccb->Pipe->CcbListLock); + KeUnlockMutex(&Waiter->Ccb->Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; @@ -51,17 +51,17 @@ Entry->Ccb = Ccb; - KeLockMutex(&Ccb->Pipe->CcbListLock); + KeLockMutex(&Ccb->Fcb->CcbListLock); IoMarkIrpPending(Irp); - InsertTailList(&Ccb->Pipe->WaiterListHead, &Entry->Entry); + InsertTailList(&Ccb->Fcb->WaiterListHead, &Entry->Entry); IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { (void)IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); IoReleaseCancelSpinLock(oldIrql); - KeUnlockMutex(&Ccb->Pipe->CcbListLock); + KeUnlockMutex(&Ccb->Fcb->CcbListLock); return STATUS_PENDING; } IoReleaseCancelSpinLock(oldIrql); @@ -71,7 +71,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - KeUnlockMutex(&Ccb->Pipe->CcbListLock); + KeUnlockMutex(&Ccb->Fcb->CcbListLock); return STATUS_CANCELLED; } @@ -81,8 +81,8 @@ NpfsConnectPipe(PIRP Irp, PNPFS_CCB Ccb) { - PNPFS_PIPE Pipe; PLIST_ENTRY current_entry; + PNPFS_FCB Fcb; PNPFS_CCB ClientCcb; NTSTATUS Status; @@ -99,13 +99,13 @@ DPRINT("Waiting for connection...\n"); - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; /* search for a listening client fcb */ - KeLockMutex(&Pipe->CcbListLock); - - current_entry = Pipe->ClientCcbListHead.Flink; - while (current_entry != &Pipe->ClientCcbListHead) + KeLockMutex(&Fcb->CcbListLock); + + current_entry = Fcb->ClientCcbListHead.Flink; + while (current_entry != &Fcb->ClientCcbListHead) { ClientCcb = CONTAINING_RECORD(current_entry, NPFS_CCB, @@ -133,7 +133,7 @@ Ccb->PipeState = FILE_PIPE_CONNECTED_STATE; ClientCcb->PipeState = FILE_PIPE_CONNECTED_STATE; - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); /* FIXME: create and initialize data queues */ @@ -155,7 +155,7 @@ Status = NpfsAddListeningServerInstance(Irp, Ccb); - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status); @@ -167,14 +167,14 @@ NpfsDisconnectPipe(PNPFS_CCB Ccb) { NTSTATUS Status; + PNPFS_FCB Fcb; PNPFS_CCB OtherSide; - PNPFS_PIPE Pipe; BOOLEAN Server; DPRINT("NpfsDisconnectPipe()\n"); - Pipe = Ccb->Pipe; - KeLockMutex(&Pipe->CcbListLock); + Fcb = Ccb->Fcb; + KeLockMutex(&Fcb->CcbListLock); if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) { @@ -225,8 +225,8 @@ BOOLEAN Complete = FALSE; PIRP Irp = NULL; - Entry = Ccb->Pipe->WaiterListHead.Flink; - while (Entry != &Ccb->Pipe->WaiterListHead) + Entry = Ccb->Fcb->WaiterListHead.Flink; + while (Entry != &Ccb->Fcb->WaiterListHead) { WaitEntry = CONTAINING_RECORD(Entry, NPFS_WAITER_ENTRY, Entry); if (WaitEntry->Ccb == Ccb) @@ -259,7 +259,7 @@ { Status = STATUS_UNSUCCESSFUL; } - KeUnlockMutex(&Pipe->CcbListLock); + KeUnlockMutex(&Fcb->CcbListLock); return Status; } @@ -268,8 +268,8 @@ NpfsWaitPipe(PIRP Irp, PNPFS_CCB Ccb) { - PNPFS_PIPE Pipe; PLIST_ENTRY current_entry; + PNPFS_FCB Fcb; PNPFS_CCB ServerCcb; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; NTSTATUS Status; @@ -277,7 +277,7 @@ DPRINT("NpfsWaitPipe\n"); WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; if (Ccb->PipeState != 0) { @@ -286,8 +286,8 @@ } /* search for listening server */ - current_entry = Pipe->ServerCcbListHead.Flink; - while (current_entry != &Pipe->ServerCcbListHead) + current_entry = Fcb->ServerCcbListHead.Flink; + while (current_entry != &Fcb->ServerCcbListHead) { ServerCcb = CONTAINING_RECORD(current_entry, NPFS_CCB, @@ -339,8 +339,8 @@ PIO_STACK_LOCATION IoStack) { ULONG OutputBufferLength; - PNPFS_PIPE Pipe; PFILE_PIPE_PEEK_BUFFER Reply; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; NTSTATUS Status; @@ -358,7 +358,7 @@ Ccb = IoStack->FileObject->FsContext2; Reply = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; Reply->NamedPipeState = Ccb->PipeState; @@ -389,7 +389,7 @@ PFILE_OBJECT FileObject; NTSTATUS Status; PNPFS_DEVICE_EXTENSION DeviceExt; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; PNPFS_CCB Ccb; DPRINT("NpfsFileSystemContol(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -401,9 +401,9 @@ DPRINT("FileObject: %p\n", FileObject); Ccb = FileObject->FsContext2; DPRINT("CCB: %p\n", Ccb); - Pipe = Ccb->Pipe; - DPRINT("Pipe: %p\n", Pipe); - DPRINT("PipeName: %wZ\n", &Pipe->PipeName); + Fcb = Ccb->Fcb; + DPRINT("Pipe: %p\n", Fcb); + DPRINT("PipeName: %wZ\n", &Fcb->PipeName); Irp->IoStatus.Information = 0; @@ -415,17 +415,17 @@ break; case FSCTL_PIPE_DISCONNECT: - DPRINT("Disconnecting pipe %wZ\n", &Pipe->PipeName); + DPRINT("Disconnecting pipe %wZ\n", &Fcb->PipeName); Status = NpfsDisconnectPipe(Ccb); break; case FSCTL_PIPE_LISTEN: - DPRINT("Connecting pipe %wZ\n", &Pipe->PipeName); + DPRINT("Connecting pipe %wZ\n", &Fcb->PipeName); Status = NpfsConnectPipe(Irp, Ccb); break; case FSCTL_PIPE_PEEK: - DPRINT("Peeking pipe %wZ\n", &Pipe->PipeName); + DPRINT("Peeking pipe %wZ\n", &Fcb->PipeName); Status = NpfsPeekPipe(Irp, (PIO_STACK_LOCATION)IoStack); break; @@ -442,7 +442,7 @@ break; case FSCTL_PIPE_WAIT: - DPRINT("Waiting for pipe %wZ\n", &Pipe->PipeName); + DPRINT("Waiting for pipe %wZ\n", &Fcb->PipeName); Status = NpfsWaitPipe(Irp, Ccb); break; Modified: trunk/reactos/drivers/filesystems/np/npfs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/npfs… ============================================================================== --- trunk/reactos/drivers/filesystems/np/npfs.h (original) +++ trunk/reactos/drivers/filesystems/np/npfs.h Sun May 21 17:19:10 2006 @@ -15,8 +15,9 @@ ULONG MaxQuota; } NPFS_DEVICE_EXTENSION, *PNPFS_DEVICE_EXTENSION; -typedef struct _NPFS_PIPE +typedef struct _NPFS_FCB { + FSRTL_COMMON_FCB_HEADER RFCB; UNICODE_STRING PipeName; LIST_ENTRY PipeListEntry; KMUTEX CcbListLock; @@ -34,14 +35,14 @@ ULONG InboundQuota; ULONG OutboundQuota; LARGE_INTEGER TimeOut; -} NPFS_PIPE, *PNPFS_PIPE; +} NPFS_FCB, *PNPFS_FCB; typedef struct _NPFS_CCB { LIST_ENTRY CcbListEntry; struct _NPFS_CCB* OtherSide; struct ETHREAD *Thread; - PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; KEVENT ConnectEvent; KEVENT ReadEvent; KEVENT WriteEvent; Modified: trunk/reactos/drivers/filesystems/np/rw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/rw.c… ============================================================================== --- trunk/reactos/drivers/filesystems/np/rw.c (original) +++ trunk/reactos/drivers/filesystems/np/rw.c Sun May 21 17:19:10 2006 @@ -414,7 +414,7 @@ KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } if (Information > 0 && - (Ccb->Pipe->ReadMode != FILE_PIPE_BYTE_STREAM_MODE || + (Ccb->Fcb->ReadMode != FILE_PIPE_BYTE_STREAM_MODE || Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) { break; @@ -430,13 +430,13 @@ { /* Wait for ReadEvent to become signaled */ - DPRINT("Waiting for readable data (%wZ)\n", &Ccb->Pipe->PipeName); + DPRINT("Waiting for readable data (%wZ)\n", &Ccb->Fcb->PipeName); Status = KeWaitForSingleObject(&Ccb->ReadEvent, UserRequest, KernelMode, FALSE, NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Pipe->PipeName, Status); + DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); ExAcquireFastMutex(&Ccb->DataListLock); } else @@ -455,7 +455,7 @@ } } ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - if (Ccb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); /* Byte stream mode */ @@ -603,9 +603,9 @@ { PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; + PNPFS_FCB Fcb = NULL; PNPFS_CCB Ccb = NULL; PNPFS_CCB ReaderCcb; - PNPFS_PIPE Pipe = NULL; PUCHAR Buffer; NTSTATUS Status = STATUS_SUCCESS; ULONG Length; @@ -623,7 +623,7 @@ Ccb = FileObject->FsContext2; ReaderCcb = Ccb->OtherSide; - Pipe = Ccb->Pipe; + Fcb = Ccb->Fcb; Length = IoStack->Parameters.Write.Length; Offset = IoStack->Parameters.Write.ByteOffset.u.LowPart; @@ -680,13 +680,13 @@ } ExReleaseFastMutex(&ReaderCcb->DataListLock); - DPRINT("Waiting for buffer space (%S)\n", Pipe->PipeName.Buffer); + DPRINT("Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); Status = KeWaitForSingleObject(&Ccb->WriteEvent, UserRequest, KernelMode, FALSE, NULL); - DPRINT("Finished waiting (%S)! Status: %x\n", Pipe->PipeName.Buffer, Status); + DPRINT("Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); ExAcquireFastMutex(&ReaderCcb->DataListLock); /* @@ -702,7 +702,7 @@ } } - if (Pipe->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) + if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0)

1 0

[greatlrd] 21961: [AUDIT] after looking through code no signs of reverse engineering were found. Only code exists is to dllmain api rest is warper to crt.a
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 15:49:34 2006 New Revision: 21961 URL: http://svn.reactos.ru/svn/reactos?rev=21961&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Only code exists is to dllmain api rest is warper to crt.a Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c (props changed) trunk/reactos/dll/win32/msvcrt/msvcrt.def (props changed) trunk/reactos/dll/win32/msvcrt/msvcrt.rc (props changed) trunk/reactos/dll/win32/msvcrt/precomp.h (props changed) Propchange: trunk/reactos/dll/win32/msvcrt/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msvcrt/msvcrt.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msvcrt/msvcrt.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msvcrt/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21960: patch from w3seek : optimize FindWindowEx and fix passing a NULL window class
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 13:21:38 2006 New Revision: 21960 URL: http://svn.reactos.ru/svn/reactos?rev=21960&view=rev Log: patch from w3seek : optimize FindWindowEx and fix passing a NULL window class Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/wi… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sun May 21 13:21:38 2006 @@ -516,33 +516,51 @@ LPCSTR lpszClass, LPCSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; HWND Result; - if (lpszClass == NULL) - { - ucClassName.Buffer = NULL; - ucClassName.Length = 0; - } - else if (IS_ATOM(lpszClass)) + if (IS_ATOM(lpszClass)) { ucClassName.Buffer = (LPWSTR)lpszClass; ucClassName.Length = 0; + pucClassName = &ucClassName; } - else + else if (lpszClass != NULL) { - RtlCreateUnicodeStringFromAsciiz(&ucClassName, (LPSTR)lpszClass); + if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, + (LPSTR)lpszClass)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + pucClassName = &ucClassName; } - RtlCreateUnicodeStringFromAsciiz(&ucWindowName, (LPSTR)lpszWindow); - - Result = NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, - &ucWindowName); - - if (!IS_ATOM(lpszClass)) + if (lpszWindow != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, + (LPSTR)lpszWindow)) + { + if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlFreeUnicodeString(&ucWindowName); + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pucWindowName = &ucWindowName; + } + + Result = NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); + + if (!IS_ATOM(lpszClass) && lpszClass != NULL) RtlFreeUnicodeString(&ucClassName); - RtlFreeUnicodeString(&ucWindowName); + if (lpszWindow != NULL) + RtlFreeUnicodeString(&ucWindowName); return Result; } @@ -557,27 +575,33 @@ LPCWSTR lpszClass, LPCWSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; - - if (lpszClass == NULL) + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; + + if (IS_ATOM(lpszClass)) { - ucClassName.Buffer = NULL; ucClassName.Length = 0; + ucClassName.Buffer = (LPWSTR)lpszClass; + pucClassName = &ucClassName; } - else if (IS_ATOM(lpszClass)) + else if (lpszClass != NULL) { - RtlInitUnicodeString(&ucClassName, NULL); - ucClassName.Buffer = (LPWSTR)lpszClass; + RtlInitUnicodeString(&ucClassName, + lpszClass); + pucClassName = &ucClassName; } - else + + if (lpszWindow != NULL) { - RtlInitUnicodeString(&ucClassName, lpszClass); + RtlInitUnicodeString(&ucWindowName, + lpszWindow); + pucWindowName = &ucWindowName; } - RtlInitUnicodeString(&ucWindowName, lpszWindow); - - return NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, &ucWindowName); + return NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sun May 21 13:21:38 2006 @@ -2433,60 +2433,63 @@ DPRINT("Enter NtUserFindWindowEx\n"); UserEnterShared(); - _SEH_TRY - { + if (ucClassName != NULL || ucWindowName != NULL) + { + _SEH_TRY + { + if (ucClassName != NULL) + { + ClassName = ProbeForReadUnicodeString(ucClassName); + if (ClassName.Length != 0) + { + ProbeForRead(ClassName.Buffer, + ClassName.Length, + sizeof(WCHAR)); + } + else if (!IS_ATOM(ClassName.Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH_LEAVE; + } + + if (!IntGetAtomFromStringOrAtom(&ClassName, + &ClassAtom)) + { + _SEH_LEAVE; + } + } + + if (ucWindowName != NULL) + { + WindowName = ProbeForReadUnicodeString(ucWindowName); + if (WindowName.Length != 0) + { + ProbeForRead(WindowName.Buffer, + WindowName.Length, + sizeof(WCHAR)); + } + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + RETURN(NULL); + } + _SEH_END; + if (ucClassName != NULL) { - ClassName = ProbeForReadUnicodeString(ucClassName); - if (ClassName.Length != 0) - { - ProbeForRead(ClassName.Buffer, - ClassName.Length, - sizeof(WCHAR)); - } - else if (ClassName.Buffer != NULL && !IS_ATOM(ClassName.Buffer)) + if (ClassName.Length == 0 && ClassName.Buffer != NULL && + !IS_ATOM(ClassName.Buffer)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - _SEH_LEAVE; + RETURN(NULL); } - - if (!IntGetAtomFromStringOrAtom(&ClassName, - &ClassAtom)) + else if (ClassAtom == (RTL_ATOM)0) { - _SEH_LEAVE; + /* LastError code was set by IntGetAtomFromStringOrAtom */ + RETURN(NULL); } - } - - if (ucWindowName != NULL) - { - WindowName = ProbeForReadUnicodeString(ucWindowName); - if (WindowName.Length != 0) - { - ProbeForRead(WindowName.Buffer, - WindowName.Length, - sizeof(WCHAR)); - } - } - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - RETURN(NULL); - } - _SEH_END; - - if (ucClassName != NULL) - { - if (ClassName.Length == 0 && ClassName.Buffer != NULL && - !IS_ATOM(ClassName.Buffer)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(NULL); - } - else if (ClassAtom == (RTL_ATOM)0) - { - /* LastError code was set by IntGetAtomFromStringOrAtom */ - RETURN(NULL); } }

1 0

[greatlrd] 21959: revert r21958
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 12:41:16 2006 New Revision: 21959 URL: http://svn.reactos.ru/svn/reactos?rev=21959&view=rev Log: revert r21958 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sun May 21 12:41:16 2006 @@ -2444,7 +2444,7 @@ ClassName.Length, sizeof(WCHAR)); } - else if (ClassName.Buffer != NULL || !IS_ATOM(ClassName.Buffer)) + else if (ClassName.Buffer != NULL && !IS_ATOM(ClassName.Buffer)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); _SEH_LEAVE;

1 0

[greatlrd] 21958: patch from w3seek : Another fix for NtUserFindWindowEx
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 12:39:42 2006 New Revision: 21958 URL: http://svn.reactos.ru/svn/reactos?rev=21958&view=rev Log: patch from w3seek : Another fix for NtUserFindWindowEx Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sun May 21 12:39:42 2006 @@ -2444,7 +2444,7 @@ ClassName.Length, sizeof(WCHAR)); } - else if (ClassName.Buffer != NULL && !IS_ATOM(ClassName.Buffer)) + else if (ClassName.Buffer != NULL || !IS_ATOM(ClassName.Buffer)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); _SEH_LEAVE;

1 0

[greatlrd] 21957: patch from w3seek : Another fix for NtUserFindWindowEx
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 10:17:25 2006 New Revision: 21957 URL: http://svn.reactos.ru/svn/reactos?rev=21957&view=rev Log: patch from w3seek : Another fix for NtUserFindWindowEx Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sun May 21 10:17:25 2006 @@ -2444,13 +2444,16 @@ ClassName.Length, sizeof(WCHAR)); } - else if (IS_ATOM(ClassName.Buffer)) + else if (ClassName.Buffer != NULL && !IS_ATOM(ClassName.Buffer)) { - if (!IntGetAtomFromStringOrAtom(&ClassName, - &ClassAtom)) - { - _SEH_LEAVE; - } + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH_LEAVE; + } + + if (!IntGetAtomFromStringOrAtom(&ClassName, + &ClassAtom)) + { + _SEH_LEAVE; } } @@ -2472,9 +2475,10 @@ } _SEH_END; - if (ucClassName != NULL && ClassName.Length == 0) - { - if (!IS_ATOM(ClassName.Buffer)) + if (ucClassName != NULL) + { + if (ClassName.Length == 0 && ClassName.Buffer != NULL && + !IS_ATOM(ClassName.Buffer)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); RETURN(NULL);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
38
Older →

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 May 2006