Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 35579: - Make sure IPAddr is non-NULL - Change STATUS_UNSUCCESSFUL to STATUS_INVALID_PARAMETER
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 17:06:49 2008 New Revision: 35579 URL: http://svn.reactos.org/svn/reactos?rev=35579&view=rev Log: - Make sure IPAddr is non-NULL - Change STATUS_UNSUCCESSFUL to STATUS_INVALID_PARAMETER Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 23 17:06:49 2008 @@ -61,6 +61,13 @@ IPAddr = (PTA_IP_ADDRESS)&ListenReceive->Address; + if( !IPAddr ) { + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + Irp->IoStatus.Status = STATUS_NO_MEMORY; + Irp->IoStatus.Information = 0; + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + } + AFD_DbgPrint(MID_TRACE,("IPAddr->TAAddressCount %d\n", IPAddr->TAAddressCount)); AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].AddressType %d\n", @@ -172,7 +179,7 @@ 0, NULL ); if( FCB->State != SOCKET_STATE_BOUND ) { - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MID_TRACE,("Could not listen an unbound socket\n")); return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); }

1 0

[cgutman] 35578: - Code cleanup - Make sure FCB->RemoteAddress is non-NULL
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 16:53:37 2008 New Revision: 35578 URL: http://svn.reactos.org/svn/reactos?rev=35578&view=rev Log: - Code cleanup - Make sure FCB->RemoteAddress is non-NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Aug 23 16:53:37 2008 @@ -33,7 +33,6 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -51,16 +50,14 @@ FCB->State = SOCKET_STATE_CONNECTED; - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - - return Status; + return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); } static NTSTATUS NTAPI StreamSocketConnectComplete @@ -84,15 +81,15 @@ if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; + AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); FCB->State = SOCKET_STATE_CONNECTED; - AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); - PollReeval( FCB->DeviceExt, FCB->FileObject ); } else { FCB->PollState |= AFD_EVENT_CONNECT_FAIL | AFD_EVENT_RECEIVE; AFD_DbgPrint(MID_TRACE,("Going to bound state\n")); FCB->State = SOCKET_STATE_BOUND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); /* Succeed pending irps on the FUNCTION_CONNECT list */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { @@ -199,6 +196,11 @@ FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + if( !FCB->RemoteAddress ) { + Status = STATUS_NO_MEMORY; + break; + } + if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { Status = STATUS_SUCCESS;

1 0

[cgutman] 35577: - Make sure FCB->AddressFrom is non-NULL
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 16:41:10 2008 New Revision: 35577 URL: http://svn.reactos.org/svn/reactos?rev=35577&view=rev Log: - Make sure FCB->AddressFrom is non-NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Aug 23 16:41:10 2008 @@ -70,6 +70,8 @@ TdiBuildConnectionInfo( &FCB->AddressFrom, FCB->LocalAddress ); + if( !FCB->AddressFrom ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Calling TdiReceiveDatagram\n")); Status = TdiReceiveDatagram

1 0

[cgutman] 35576: - Remove a hack not needed because of r35575
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 15:27:26 2008 New Revision: 35576 URL: http://svn.reactos.org/svn/reactos?rev=35576&view=rev Log: - Remove a hack not needed because of r35575 Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 23 15:27:26 2008 @@ -155,7 +155,6 @@ VOID DestroySocket( PAFD_FCB FCB ) { UINT i; BOOLEAN ReturnEarly = FALSE; - KIRQL Irql = KeGetCurrentIrql(); PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -193,7 +192,6 @@ i, InFlightRequest[i]->InFlightRequest)); IoCancelIrp(InFlightRequest[i]->InFlightRequest); InFlightRequest[i]->InFlightRequest = NULL; - IoReleaseCancelSpinLock(Irql); } }

1 0

[cgutman] 35575: - Release the cancel spin lock before returning - Revert some unintentional changes made in r35485
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 15:21:15 2008 New Revision: 35575 URL: http://svn.reactos.org/svn/reactos?rev=35575&view=rev Log: - Release the cancel spin lock before returning - Revert some unintentional changes made in r35485 Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Aug 23 15:21:15 2008 @@ -179,17 +179,21 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); + + IoReleaseCancelSpinLock(Irp->CancelIrql); return; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); + break; } break; case TDI_RECEIVE_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); + break; } DGRemoveIRP(TranContext->Handle.AddressHandle, Irp);

1 0

[dreimer] 35574: Some more work on the updater.
by dreimer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: dreimer Date: Sat Aug 23 15:05:08 2008 New Revision: 35574 URL: http://svn.reactos.org/svn/reactos?rev=35574&view=rev Log: Some more work on the updater. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sat Aug 23 15:05:08 2008 @@ -11,14 +11,18 @@ :: The Update Server set url=www.foo.bar +:: First check for a new Updater +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd +"%_ROSBE_BASEDIR%\update.cmd" + :: PS1 Files -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Build.ps1" ( +if exist "%_ROSBE_BASEDIR%\Build.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.ps1 ) -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Clean.ps1" ( +if exist "%_ROSBE_BASEDIR%\Clean.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.ps1 ) -if exist "%_ROSBE_BASEDIR%\"%_ROSBE_BASEDIR%\Help.ps1" ( +if exist "%_ROSBE_BASEDIR%\Help.ps1" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.ps1 ) if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( @@ -74,4 +78,18 @@ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.mac "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.cmd "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/TimeDate.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd + +:: Load GCC and Tool SRC packages +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/GCC.7z +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Tools.7z + +:: Extract GCC +"%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" +"%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" + +:: Build the tools +make -f %TEMP%\makefile +copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" + +:: Unload Vars +set url=

1 0

[pschweitzer] 35573: Take UpcaseTable into account. FsRtlIsNameInExpression should be rewritten...
by pschweitzer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: pschweitzer Date: Sat Aug 23 13:55:05 2008 New Revision: 35573 URL: http://svn.reactos.org/svn/reactos?rev=35573&view=rev Log: Take UpcaseTable into account. FsRtlIsNameInExpression should be rewritten... Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Aug 23 13:55:05 2008 @@ -282,17 +282,24 @@ } else { - /* FIXME: Take UpcaseTable into account! */ - if (Expression->Buffer[ExpressionPosition] == L'?' || - (IgnoreCase && + if (Expression->Buffer[ExpressionPosition] == L'?' || ( + IgnoreCase && !UpcaseTable && RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && - Expression->Buffer[ExpressionPosition] == + (!IgnoreCase && Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++; + } + else if (IgnoreCase && UpcaseTable) + { + if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == + UpcaseTable[Name->Buffer[NamePosition]]) + { + NamePosition++; + ExpressionPosition++; + } } else {

1 0

[janderwald] 35572: - Refresh treeview when a folder item is deleted
by janderwald＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: janderwald Date: Sat Aug 23 13:10:04 2008 New Revision: 35572 URL: http://svn.reactos.org/svn/reactos?rev=35572&view=rev Log: - Refresh treeview when a folder item is deleted Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Sat Aug 23 13:10:04 2008 @@ -1313,7 +1313,6 @@ { (void)TreeView_DeleteItem(hwnd, hItem); } - return S_OK; } } NotifyShellViewWindow(lpcmi, TRUE);

1 0

[gbrunmar] 35571: This seems to be more correct
by gbrunmar＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: gbrunmar Date: Sat Aug 23 12:52:35 2008 New Revision: 35571 URL: http://svn.reactos.org/svn/reactos?rev=35571&view=rev Log: This seems to be more correct Modified: trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sat Aug 23 12:52:35 2008 @@ -59,11 +59,6 @@ // TODO: Query driver for correct DX version pThisBaseDevice->dwDXVersion = 9; - pThisBaseDevice->CurrentDisplayMode[0].Width = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayWidth; - pThisBaseDevice->CurrentDisplayMode[0].Height = pDirect3D9->DisplayAdapters[0].DriverCaps.dwDisplayHeight; - pThisBaseDevice->CurrentDisplayMode[0].RefreshRate = pDirect3D9->DisplayAdapters[0].DriverCaps.dwRefreshRate; - pThisBaseDevice->CurrentDisplayMode[0].Format = pDirect3D9->DisplayAdapters[0].DriverCaps.DisplayFormat; - for (i = 0; i < NumAdaptersToCreate; i++) { if (FALSE == CreateD3D9DeviceData(&pDirect3D9->DisplayAdapters[i], &pThisBaseDevice->DeviceData[i])) @@ -73,7 +68,10 @@ } pThisBaseDevice->AdapterIndexInGroup[i] = i; - pThisBaseDevice->CurrentDisplayMode[i] = pThisBaseDevice->CurrentDisplayMode[0]; + pThisBaseDevice->CurrentDisplayMode[i].Width = pDirect3D9->DisplayAdapters[i].DriverCaps.dwDisplayWidth; + pThisBaseDevice->CurrentDisplayMode[i].Height = pDirect3D9->DisplayAdapters[i].DriverCaps.dwDisplayHeight; + pThisBaseDevice->CurrentDisplayMode[i].RefreshRate = pDirect3D9->DisplayAdapters[i].DriverCaps.dwRefreshRate; + pThisBaseDevice->CurrentDisplayMode[i].Format = pDirect3D9->DisplayAdapters[i].DriverCaps.RawDisplayFormat; pThisBaseDevice->pSwapChains[i] = CreateDirect3DSwapChain9(RT_BUILTIN, pThisBaseDevice, i); pThisBaseDevice->pSwapChains2[i] = pThisBaseDevice->pSwapChains[i];

1 0

[janderwald] 35570: - Check if source and destination is the same. Fixes creating a new directory and using the default name - Prevent a potential buffer overflow in the file properties dialog
by janderwald＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: janderwald Date: Sat Aug 23 12:32:17 2008 New Revision: 35570 URL: http://svn.reactos.org/svn/reactos?rev=35570&view=rev Log: - Check if source and destination is the same. Fixes creating a new directory and using the default name - Prevent a potential buffer overflow in the file properties dialog Modified: trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Aug 23 12:32:17 2008 @@ -664,7 +664,7 @@ int EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA * hpsxa, IDataObject *pDataObj) { - WCHAR szName[100]; + WCHAR szName[MAX_PATH] = {0}; WCHAR * pOffset; UINT Length; DWORD dwName; @@ -675,7 +675,7 @@ if (!pOffset) { Length = wcslen(szName); - if (Length >=94) + if (Length + 6 > sizeof(szName)/sizeof(szName[0])) return 0; if (CLSIDFromString(wFileName, &clsid) == NOERROR) @@ -691,7 +691,7 @@ else { Length = wcslen(pOffset); - if (Length >= 100) + if (Length >= sizeof(szName)/sizeof(szName[0])) return 0; wcscpy(szName, pOffset); } @@ -799,7 +799,11 @@ hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID*)&pDataObj); if (hResult == S_OK) { - EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj); + if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj)) + { + hpsxa[0] = NULL; + hpsxa[1] = NULL; + } } if ( GetFileVersionInfoSizeW(lpf, &dwHandle)) @@ -813,8 +817,8 @@ if (hResult == S_OK) { - SHDestroyPropSheetExtArray(hpsxa[0]); - SHDestroyPropSheetExtArray(hpsxa[1]); + SHDestroyPropSheetExtArray(hpsxa[0]); + SHDestroyPropSheetExtArray(hpsxa[1]); IDataObject_Release(pDataObj); } Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] Sat Aug 23 12:32:17 2008 @@ -864,6 +864,16 @@ } } + if (!memcmp(szSrc, szDest, (wcslen(szDest)+1) * sizeof(WCHAR))) + { + /* src and destination is the same */ + hr = S_OK; + if (pPidlOut) + hr = _ILCreateFromPathW(szDest, pPidlOut); + + return hr; + } + TRACE ("src=%s dest=%s\n", debugstr_w(szSrc), debugstr_w(szDest)); if (MoveFileW (szSrc, szDest)) {

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