Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37277: - Update readme.wine and delete an out-of-date reactos tree structure explanation.
by fireball＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: fireball Date: Mon Nov 10 06:03:57 2008 New Revision: 37277 URL: http://svn.reactos.org/svn/reactos?rev=37277&view=rev Log: - Update readme.wine and delete an out-of-date reactos tree structure explanation. Removed: trunk/reactos/media/doc/DIRS Modified: trunk/reactos/media/doc/README.WINE Removed: trunk/reactos/media/doc/DIRS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/DIRS?rev=37276&v… ============================================================================== --- trunk/reactos/media/doc/DIRS [iso-8859-1] (original) +++ trunk/reactos/media/doc/DIRS (removed) @@ -1,24 +1,0 @@ -DIRECTORIES - -apps : applications (base directory) -apps/net : network applications -apps/system : system applications (required for startup) -doc : documentation -include : win32 headers -include/internal : kernel private header files -include/ntdll : system library private header files -include/kernel32 : system library private header files -include/ddk : header files for modules -lib/advapi32 : advapi32 source -lib/kernel32 : kernel32 source -lib/ntdll : NT dll source -loaders/dos : DOS based loader -loaders/boot : boot loader -ntoskrnl : kernel source -ntoskrnl/hal : hardware abstraction layer source -ntoskrnl/mm : memory managment subsystem source -ntoskrnl/io : IO manager subsystem source -ntoskrnl/ke : kernel source -services : various services (device drivers, filesystems etc) -services/dd : device drivers -services/fs : file systems Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 10 06:03:57 2008 @@ -124,6 +124,7 @@ reactos/base/applications/games/winemine # Out of sync reactos/base/applications/regedit # Out of sync reactos/base/applications/cmdutils/xcopy # Synced to Wine-0_9_54 +reactos/base/services/rpcss # Synced to Wine-20081105 reactos/base/system/expand # Out of sync reactos/base/system/msiexec # Wine 1.0-rc1 reactos/base/applications/winhelp # Synced to Wine-0_9_53 @@ -153,8 +154,9 @@ reactos/lib/sdk/crt/cpp.c # Synced at 20071111 reactos/lib/sdk/crt/cppexcept.c # Synced at 20071111 reactos/lib/sdk/crt/strings/scanf.c/h # Synced at 20080604 + reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 - reactos/lib/sdk/crt/wine # Synced at XXXXXXXX + reactos/lib/sdk/crt/wine/undname.c # Synced at XXXXXXXX reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 -

1 0

[fireball] 37276: - Make rpcss an autostart service. Finally fixes "cmd windows spawning bug" (when rpcss.exe is infinitely spawned by wine's ole32 while (TRUE) loop).
by fireball＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: fireball Date: Mon Nov 10 05:17:50 2008 New Revision: 37276 URL: http://svn.reactos.org/svn/reactos?rev=37276&view=rev Log: - Make rpcss an autostart service. Finally fixes "cmd windows spawning bug" (when rpcss.exe is infinitely spawned by wine's ole32 while (TRUE) loop). Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Nov 10 05:17:50 2008 @@ -1004,7 +1004,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 ; Scsiport driver

1 0

[fireball] 37275: - We use CcPin* interface for FAT tables and directory entries access - indicate so to CcInitializeCacheMap.
by fireball＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: fireball Date: Mon Nov 10 04:22:33 2008 New Revision: 37275 URL: http://svn.reactos.org/svn/reactos?rev=37275&view=rev Log: - We use CcPin* interface for FAT tables and directory entries access - indicate so to CcInitializeCacheMap. Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Mon Nov 10 04:22:33 2008 @@ -332,7 +332,7 @@ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, fcb); Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Nov 10 04:22:33 2008 @@ -538,7 +538,7 @@ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, Fcb);

1 0

[mjmartin] 37274: - PRPC_UNICODE_STRING is the same as PUNICODE_STRING. Correct DPRINT1 for those types.
by mjmartin＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: mjmartin Date: Mon Nov 10 04:21:00 2008 New Revision: 37274 URL: http://svn.reactos.org/svn/reactos?rev=37274&view=rev Log: - PRPC_UNICODE_STRING is the same as PUNICODE_STRING. Correct DPRINT1 for those types. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Mon Nov 10 04:21:00 2008 @@ -194,23 +194,23 @@ switch (EventType) { case EVENTLOG_SUCCESS: - DPRINT1("Success: %S\n", Strings[i]); + DPRINT1("Success: %wZ\n", Strings[i]); break; case EVENTLOG_ERROR_TYPE: - DPRINT1("Error: %S\n", Strings[i]); + DPRINT1("Error: %wZ\n", Strings[i]); break; case EVENTLOG_WARNING_TYPE: - DPRINT1("Warning: %S\n", Strings[i]); + DPRINT1("Warning: %wZ\n", Strings[i]); break; case EVENTLOG_INFORMATION_TYPE: - DPRINT1("Info: %S\n", Strings[i]); + DPRINT1("Info: %wZ\n", Strings[i]); break; default: - DPRINT1("Type %hu: %S\n", EventType, Strings[i]); + DPRINT1("Type %hu: %wZ\n", EventType, Strings[i]); break; } }

1 0

[mjmartin] 37273: - Remove WINE_DECLARE_DEBUG_CHANNEL. - Call ElfrReportEventW with correct parameters. - In Prep for implementing EventLog Api's.
by mjmartin＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: mjmartin Date: Mon Nov 10 04:18:00 2008 New Revision: 37273 URL: http://svn.reactos.org/svn/reactos?rev=37273&view=rev Log: - Remove WINE_DECLARE_DEBUG_CHANNEL. - Call ElfrReportEventW with correct parameters. - In Prep for implementing EventLog Api's. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Mon Nov 10 04:18:00 2008 @@ -25,7 +25,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(advapi); -WINE_DECLARE_DEBUG_CHANNEL(eventlog); static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; @@ -903,9 +902,9 @@ IN LPCWSTR *lpStrings, IN LPVOID lpRawData) { -#if 0 NTSTATUS Status; UNICODE_STRING *Strings; + UNICODE_STRING ComputerName; WORD i; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", @@ -923,6 +922,9 @@ for (i = 0; i < wNumStrings; i++) RtlInitUnicodeString(&Strings[i], lpStrings[i]); + + /*FIXME: ComputerName */ + RtlInitEmptyUnicodeString(&ComputerName, NULL, 0); _SEH_TRY { @@ -933,9 +935,9 @@ dwEventID, wNumStrings, dwDataSize, - L"", /* FIXME: ComputerName */ + (PRPC_UNICODE_STRING) &ComputerName, lpUserSid, - (LPWSTR *)lpStrings, /* FIXME: should be Strings */ + (PRPC_UNICODE_STRING*) &Strings, lpRawData, 0, NULL, @@ -956,43 +958,4 @@ } return TRUE; -#else - int i; - - /* partial stub */ - - if (wNumStrings == 0) - return TRUE; - - if (lpStrings == NULL) - return TRUE; - - for (i = 0; i < wNumStrings; i++) - { - switch (wType) - { - case EVENTLOG_SUCCESS: - TRACE_(eventlog)("Success: %S\n", lpStrings[i]); - break; - - case EVENTLOG_ERROR_TYPE: - ERR_(eventlog)("Error: %S\n", lpStrings[i]); - break; - - case EVENTLOG_WARNING_TYPE: - WARN_(eventlog)("Warning: %S\n", lpStrings[i]); - break; - - case EVENTLOG_INFORMATION_TYPE: - TRACE_(eventlog)("Info: %S\n", lpStrings[i]); - break; - - default: - TRACE_(eventlog)("Type %hu: %S\n", wType, lpStrings[i]); - break; - } - } - - return TRUE; -#endif -} +}

1 0

[fireball] 37272: - Revert 25073 (vfatfs part). CcCopyRead is guaranteed (see WDK) to succeed if Wait parameter is TRUE, and the only case of failure is when Wait is FALSE meaning there is a need in additional processing time, hence returning of STATUS_PENDING. This fixes the "unable to read system hive" problem when booting Windows 2003 with this driver. See issue #1855 for more details.
by fireball＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: fireball Date: Mon Nov 10 03:57:42 2008 New Revision: 37272 URL: http://svn.reactos.org/svn/reactos?rev=37272&view=rev Log: - Revert 25073 (vfatfs part). CcCopyRead is guaranteed (see WDK) to succeed if Wait parameter is TRUE, and the only case of failure is when Wait is FALSE meaning there is a need in additional processing time, hence returning of STATUS_PENDING. This fixes the "unable to read system hive" problem when booting Windows 2003 with this driver. See issue #1855 for more details. Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon Nov 10 03:57:42 2008 @@ -678,7 +678,7 @@ (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, &IrpContext->Irp->IoStatus)) { - Status = IrpContext->Irp->IoStatus.Status;//STATUS_PENDING; + Status = STATUS_PENDING; goto ByeBye; } if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status))

1 0

[janderwald] 37271: - Show Drive Tools Page only local harddisks
by janderwald＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: janderwald Date: Mon Nov 10 01:43:37 2008 New Revision: 37271 URL: http://svn.reactos.org/svn/reactos?rev=37271&view=rev Log: - Show Drive Tools Page only local harddisks Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Mon Nov 10 01:43:37 2008 @@ -655,11 +655,12 @@ { LPSTR resname; DLGPROC dlgproc; + UINT DriveType; } PropPages[] = { - { "DRIVE_GENERAL_DLG", DriveGeneralDlg }, - { "DRIVE_EXTRA_DLG", DriveExtraDlg }, - { "DRIVE_HARDWARE_DLG", DriveHardwareDlg }, + { "DRIVE_GENERAL_DLG", DriveGeneralDlg, -1}, + { "DRIVE_EXTRA_DLG", DriveExtraDlg, DRIVE_FIXED}, + { "DRIVE_HARDWARE_DLG", DriveHardwareDlg, -1}, }; HRESULT @@ -686,6 +687,7 @@ WCHAR szName[MAX_PATH+6]; DWORD dwMaxComponent, dwFileSysFlags; IDataObject * pDataObj = NULL; + UINT DriveType; ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); @@ -693,7 +695,6 @@ psh.hwndParent = NULL; psh.nStartPage = 0; psh.phpage = hpsp; - if (GetVolumeInformationW(drive, szName, sizeof(szName)/sizeof(WCHAR), NULL, &dwMaxComponent, &dwFileSysFlags, NULL, 0)) @@ -717,15 +718,20 @@ } } + DriveType = GetDriveTypeW(drive); for (i = 0; i < DRIVE_PROPERTY_PAGES; i++) { - HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); - if (hprop) + if (PropPages[i].DriveType == (UINT)-1 || (PropPages[i].DriveType != (UINT)-1 && PropPages[i].DriveType == DriveType)) { - hpsp[psh.nPages] = hprop; - psh.nPages++; + HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); + if (hprop) + { + hpsp[psh.nPages] = hprop; + psh.nPages++; + } } } + if (SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (void**)&pDataObj) == S_OK) { hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Drive", MAX_PROPERTY_SHEET_PAGE-DRIVE_PROPERTY_PAGES, pDataObj);

1 0

[gschneider] 37269: - Create the XLateObj between background and brush color - Allows hatched brush colors to show - Edit a FIXME: a bitmap is not a brush information
by gschneider＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: gschneider Date: Sun Nov 9 16:02:46 2008 New Revision: 37269 URL: http://svn.reactos.org/svn/reactos?rev=37269&view=rev Log: - Create the XLateObj between background and brush color - Allows hatched brush colors to show - Edit a FIXME: a bitmap is not a brush information Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Nov 9 16:02:46 2008 @@ -62,12 +62,12 @@ if (Count == 0) return 0; /* Set colour */ - Buffer->lbColor = BrushObject->BrushAttr.lbColor; + Buffer->lbColor = BrushObject->BrushAttr.lbColor; /* set Hatch */ if ((BrushObject->flAttrs & GDIBRUSH_IS_HATCH)!=0) { - /* FIXME : is this right value */ + /* FIXME : this is not the right value */ Buffer->lbHatch = (LONG)BrushObject->hbmPattern; } else @@ -153,7 +153,7 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) {

1 0

[gschneider] 37268: Fix BitBlt MERGEPAINT operation command.
by gschneider＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: gschneider Date: Sun Nov 9 12:38:02 2008 New Revision: 37268 URL: http://svn.reactos.org/svn/reactos?rev=37268&view=rev Log: Fix BitBlt MERGEPAINT operation command. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -173,7 +173,7 @@ case ROP3_TO_ROP4(PATINVERT): return(Dest ^ Pattern); case ROP3_TO_ROP4(SRCINVERT): return(Dest ^ Source); case ROP3_TO_ROP4(SRCAND): return(Dest & Source); - case ROP3_TO_ROP4(MERGEPAINT): return(Dest & (~Source)); + case ROP3_TO_ROP4(MERGEPAINT): return(Dest | (~Source)); case ROP3_TO_ROP4(SRCPAINT): return(Dest | Source); case ROP3_TO_ROP4(MERGECOPY): return(Source & Pattern); case ROP3_TO_ROP4(SRCCOPY): return(Source); Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -147,7 +147,7 @@ { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, - { ROPCODE_MERGEPAINT, "MERGEPAINT", "D & (~S)", 1, 1, 0 }, + { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 },

1 0

[cgutman] 37267: - Merge aicom-network-fixes up to r37266
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 12:17:00 2008 New Revision: 37267 URL: http://svn.reactos.org/svn/reactos?rev=37267&view=rev Log: - Merge aicom-network-fixes up to r37266 Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/ip.rbuild trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -83,11 +83,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Mdl = IoAllocateMdl ( Irp->UserBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, @@ -105,11 +100,21 @@ if( NT_SUCCESS(Status) ) { if( Local ) { + if( FCB->AddressFile.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + Status = TdiQueryInformation ( FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + if( FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -25,7 +25,7 @@ NULL ); if( Irp->MdlAddress ) { _SEH_TRY { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH_HANDLE { LockFailed = TRUE; } _SEH_END; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -425,7 +425,7 @@ *TotalBytesCopied = BytesToCopy; - if (!RecvReq->TdiFlags & TDI_RECEIVE_PEEK) { + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { FCB->Recv.BytesUsed = 0; } } Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -74,7 +74,7 @@ KeWaitForSingleObject( Event, Executive, - UserMode, + KernelMode, FALSE, NULL); Status = Iosb->Status; @@ -853,7 +853,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -862,7 +862,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -934,7 +934,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -944,7 +944,7 @@ _SEH_TRY { AFD_DbgPrint(MIN_TRACE, ("probe and lock\n")); - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); @@ -1034,7 +1034,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -1043,7 +1043,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1132,7 +1132,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1142,7 +1142,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -220,7 +220,7 @@ RemoveEntryList(&Connection->ListEntry); TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - ExFreePool(Connection); + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -387,8 +387,10 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); + if( AddrFile->Listener ) { + TCPClose( AddrFile->Listener ); + ExFreePool( AddrFile->Listener ); + } break; case IPPROTO_UDP: @@ -488,20 +490,18 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; - NTSTATUS Status = STATUS_SUCCESS; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TCPClose(Connection); DeleteConnectionEndpoint(Connection); TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/ip.rbuild?r… ============================================================================== --- trunk/reactos/lib/drivers/ip/ip.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/ip.rbuild [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ip" type="staticlibrary" allowwarnings="true"> +<module name="ip" type="staticlibrary"> <define name="__NTDRIVER__"/> <include base="tcpip">include</include> <include base="oskittcp">include</include> Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -181,6 +181,7 @@ */ { PNEIGHBOR_CACHE_ENTRY NCE; + NTSTATUS Status; TI_DbgPrint(DEBUG_ICMP, ("Called.\n")); @@ -191,7 +192,11 @@ /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - IPSendDatagram(IPPacket, NCE, Complete, Context); + Status = IPSendDatagram(IPPacket, NCE, Complete, Context); + if (!NT_SUCCESS(Status)) + { + Complete(Context, IPPacket->NdisPacket, Status); + } } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -150,12 +150,17 @@ Protocol = 0; } - /* Call the appropriate protocol handler */ - (*ProtocolTable[Protocol])(Interface, IPPacket); - /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also - * must be handled here. */ - if( Protocol == IPPROTO_ICMP ) - ICMPReceive( Interface, IPPacket ); + if (Protocol < IP_PROTOCOL_TABLE_SIZE && + Protocol >= 0) + { + /* Call the appropriate protocol handler */ + (*ProtocolTable[Protocol])(Interface, IPPacket); + + /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also + * must be handled here. */ + if( Protocol == IPPROTO_ICMP ) + ICMPReceive( Interface, IPPacket ); + } } Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -196,6 +196,7 @@ AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); + AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback); Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -28,13 +28,20 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + UINT HashValue; if(!(NCE->State & NUD_CONNECTED)) return; + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); + &NeighborCache[HashValue].Lock); if( PacketEntry != NULL ) { Packet = CONTAINING_RECORD( PacketEntry, NEIGHBOR_PACKET, Next ); @@ -333,15 +340,22 @@ */ { KIRQL OldIrql; + UINT HashValue; TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X) LinkAddress (0x%X) State (0x%X).\n", NCE, LinkAddress, State)); - TcpipAcquireSpinLock(&NCE->Table->Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); RtlCopyMemory(NCE->LinkAddress, LinkAddress, NCE->LinkAddressLength); NCE->State = State; - TcpipReleaseSpinLock(&NCE->Table->Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); @@ -444,9 +458,9 @@ * TRUE if the packet was successfully queued, FALSE if not */ { - PKSPIN_LOCK Lock; KIRQL OldIrql; PNEIGHBOR_PACKET Packet; + UINT HashValue; TI_DbgPrint (DEBUG_NCACHE, @@ -457,16 +471,20 @@ /* FIXME: Should we limit the number of queued packets? */ - Lock = &NCE->Table->Lock; - - TcpipAcquireSpinLock(Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); Packet->Complete = PacketComplete; Packet->Context = PacketContext; Packet->Packet = NdisPacket; InsertTailList( &NCE->PacketQueue, &Packet->Next ); - TcpipReleaseSpinLock(Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -112,13 +112,14 @@ ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - ListEntry = ListEntry->Flink; if( Bucket->AssociatedEndpoint == Connection ) { - RemoveEntryList( ListEntry->Blink ); + RemoveEntryList( &Bucket->Entry ); ExFreePool( Bucket ); break; } + + ListEntry = ListEntry->Flink; } TcpipRecursiveMutexLeave( &TCPLock ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -36,7 +36,6 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { while( !IsListEmpty( &Connection->ConnectRequest ) ) { - Connection->State |= NewState; Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -283,8 +282,7 @@ } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TI_DbgPrint(MAX_TRACE,("FIXME: Cancel all pending requests\n")); - /* XXX Cancel all pending requests */ + TCPClose( Connection ); ExFreePool( Connection ); } @@ -839,7 +837,7 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; i < sizeof( ListHead ) / sizeof( ListHead[0] ); i++ ) { + for( i = 0; i < 4; i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; Entry = Entry->Flink ) {

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