Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[hpoussin] 40266: Add some defines, to be used later in freeldr

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Mar 28 13:33:19 2009 New Revision: 40266 URL: http://svn.reactos.org/svn/reactos?rev=40266&view=rev Log: Add some defines, to be used later in freeldr Modified: trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Sat Mar 28 13:33:19 2009 @@ -29,6 +29,26 @@ EROFS, EMAXIMUM } ARC_CODES; + +typedef enum _SEEKMODE +{ + SeekAbsolute, + SeekRelative, +} SEEKMODE; + +typedef enum _OPENMODE +{ + OpenReadOnly, + OpenWriteOnly, + OpenReadWrite, + CreateWriteOnly, + CreateReadOnly, + SupersedeWriteOnly, + SupersedeReadOnly, + SupersedeReadWrite, + OpenDirectory, + CreateDirectory, +} OPENMODE; typedef enum _IDENTIFIER_FLAG { @@ -455,4 +475,21 @@ FIRMWARE_INFORMATION_LOADER_BLOCK FirmwareInformation; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; +typedef int CONFIGTYPE; +typedef struct tagFILEINFORMATION +{ + LARGE_INTEGER StartingAddress; + LARGE_INTEGER EndingAddress; + LARGE_INTEGER CurrentAddress; + CONFIGTYPE Type; + ULONG FileNameLength; + UCHAR Attributes; + CHAR Filename[32]; +} FILEINFORMATION; + +typedef LONG (*ARC_CLOSE)(ULONG FileId); +typedef LONG (*ARC_GET_FILE_INFORMATION)(ULONG FileId, FILEINFORMATION* Information); +typedef LONG (*ARC_OPEN)(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); +typedef LONG (*ARC_READ)(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); +typedef LONG (*ARC_SEEK)(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); #endif

15 years, 9 months

[hpoussin] 40265: Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Mar 28 12:28:05 2009 New Revision: 40265 URL: http://svn.reactos.org/svn/reactos?rev=40265&view=rev Log: Fix typo Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Sat Mar 28 12:28:05 2009 @@ -388,7 +388,7 @@ if (!Status) goto Failure; - FsCloseFile(AnsiFileHandle); + FsCloseFile(OemFileHandle); } /* finally the language file */

15 years, 9 months

[cgutman] 40264: - Remove an unnecessary parameter

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Mar 28 04:27:01 2009 New Revision: 40264 URL: http://svn.reactos.org/svn/reactos?rev=40264&view=rev Log: - Remove an unnecessary parameter Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Mar 28 04:27:01 2009 @@ -302,7 +302,6 @@ UINT BytesTransferred) { LAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - PVOID LanWorkItem; TI_DbgPrint(DEBUG_DATALINK,("called\n")); @@ -311,7 +310,7 @@ WQItem.BytesTransferred = BytesTransferred; if( !ChewCreate - ( &LanWorkItem, sizeof(LAN_WQ_ITEM), LanReceiveWorker, &WQItem ) ) + ( NULL, sizeof(LAN_WQ_ITEM), LanReceiveWorker, &WQItem ) ) ASSERT(0); }

15 years, 9 months

[cgutman] 40263: - More LockBuffers fixes - Now attempting to sync the clock with a network time server doesn't cause an access violation

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Mar 28 04:23:50 2009 New Revision: 40263 URL: http://svn.reactos.org/svn/reactos?rev=40263&view=rev Log: - More LockBuffers fixes - Now attempting to sync the clock with a network time server doesn't cause an access violation Modified: trunk/reactos/drivers/network/afd/afd/lock.c 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] Sat Mar 28 04:23:50 2009 @@ -69,7 +69,7 @@ BOOLEAN Write, BOOLEAN LockAddress ) { UINT i; /* Copy the buffer array so we don't lose it */ - UINT Lock = (LockAddress && AddressLen) ? 2 : 0; + UINT Lock = LockAddress ? 2 : 0; UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); BOOLEAN LockFailed = FALSE; @@ -77,17 +77,20 @@ AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf)); if( NewBuf ) { + RtlZeroMemory(NewBuf, Size * 2); + PAFD_MAPBUF MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock); _SEH2_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); - if( Lock != 0 ) { - NewBuf[Count].buf = AddressBuf; - NewBuf[Count].len = *AddressLen; - Count++; - NewBuf[Count].buf = (PVOID)AddressLen; - NewBuf[Count].len = sizeof(*AddressLen); - Count++; + if( LockAddress ) { + if (AddressBuf && AddressLen) { + NewBuf[Count].buf = AddressBuf; + NewBuf[Count].len = *AddressLen; + NewBuf[Count + 1].buf = (PVOID)AddressLen; + NewBuf[Count + 1].len = sizeof(*AddressLen); + } + Count += 2; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE,("Access violation copying buffer info "

15 years, 9 months

[cgutman] 40262: - Fix some issues with LockBuffers - We must lock buffers before using them

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Mar 28 01:32:28 2009 New Revision: 40262 URL: http://svn.reactos.org/svn/reactos?rev=40262&view=rev Log: - Fix some issues with LockBuffers - We must lock buffers before using them Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/write.c 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] Sat Mar 28 01:32:28 2009 @@ -72,7 +72,6 @@ UINT Lock = (LockAddress && AddressLen) ? 2 : 0; UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); - PMDL NewMdl; BOOLEAN LockFailed = FALSE; AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf)); @@ -82,7 +81,7 @@ _SEH2_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); - if( LockAddress ) { + if( Lock != 0 ) { NewBuf[Count].buf = AddressBuf; NewBuf[Count].len = *AddressLen; Count++; @@ -102,20 +101,18 @@ AFD_DbgPrint(MID_TRACE,("Locking buffer %d (%x:%d)\n", i, NewBuf[i].buf, NewBuf[i].len)); - if( NewBuf[i].len ) { - NewMdl = IoAllocateMdl( NewBuf[i].buf, - NewBuf[i].len, - FALSE, - FALSE, - NULL ); + if( NewBuf[i].buf && NewBuf[i].len ) { + MapBuf[i].Mdl = IoAllocateMdl( NewBuf[i].buf, + NewBuf[i].len, + FALSE, + FALSE, + NULL ); } else { MapBuf[i].Mdl = NULL; continue; } - AFD_DbgPrint(MID_TRACE,("NewMdl @ %x\n", NewMdl)); - - MapBuf[i].Mdl = NewMdl; + AFD_DbgPrint(MID_TRACE,("NewMdl @ %x\n", MapBuf[i].Mdl)); if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sat Mar 28 01:32:28 2009 @@ -391,6 +391,15 @@ return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); + + if( !SendReq->BufferArray ) + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + Irp, 0, NULL ); + AFD_DbgPrint (MID_TRACE,("RemoteAddress #%d Type %d\n", ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)->

15 years, 9 months

[fireball] 40261: - Fix queue index (actually do what comment in the code says). Spotted by Alex.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Mar 27 15:03:29 2009 New Revision: 40261 URL: http://svn.reactos.org/svn/reactos?rev=40261&view=rev Log: - Fix queue index (actually do what comment in the code says). Spotted by Alex. Modified: trunk/reactos/ntoskrnl/ke/balmgr.c Modified: trunk/reactos/ntoskrnl/ke/balmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/balmgr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/balmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/balmgr.c [iso-8859-1] Fri Mar 27 15:03:29 2009 @@ -121,7 +121,7 @@ else { /* Set the index we're in now */ - Prcb->QueueIndex = 0; + Prcb->QueueIndex = Index; } /* Increment the CPU number for next time and normalize to CPU count */

15 years, 9 months

[cgutman] 40260: - Wait on the correct event

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Mar 27 07:10:10 2009 New Revision: 40260 URL: http://svn.reactos.org/svn/reactos?rev=40260&view=rev Log: - Wait on the correct event Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Fri Mar 27 07:10:10 2009 @@ -98,7 +98,7 @@ NTSTATUS Status; PVOID APCContext; PVOID APCFunction; - HANDLE Event; + HANDLE Event = NULL; HANDLE SockEvent; PSOCKET_INFORMATION Socket; @@ -180,7 +180,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, + Event ? Event : SockEvent, APCFunction, APCContext, IOSB, @@ -253,7 +253,7 @@ NTSTATUS Status; PVOID APCContext; PVOID APCFunction; - HANDLE Event; + HANDLE Event = NULL; HANDLE SockEvent; PSOCKET_INFORMATION Socket; @@ -336,7 +336,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, + Event ? Event : SockEvent, APCFunction, APCContext, IOSB, @@ -395,7 +395,7 @@ NTSTATUS Status; PVOID APCContext; PVOID APCFunction; - HANDLE Event; + HANDLE Event = NULL; HANDLE SockEvent; PSOCKET_INFORMATION Socket; @@ -463,7 +463,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, + Event ? Event : SockEvent, APCFunction, APCContext, IOSB, @@ -516,7 +516,7 @@ NTSTATUS Status; PVOID APCContext; PVOID APCFunction; - HANDLE Event; + HANDLE Event = NULL; PTRANSPORT_ADDRESS RemoteAddress; UCHAR TdiBuffer[0x16]; PSOCKADDR BindAddress; @@ -593,7 +593,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, + Event ? Event : SockEvent, APCFunction, APCContext, IOSB,

15 years, 9 months

[cgutman] 40259: - Remove some unnecessary code

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Mar 27 06:48:16 2009 New Revision: 40259 URL: http://svn.reactos.org/svn/reactos?rev=40259&view=rev Log: - Remove some unnecessary code Modified: trunk/reactos/drivers/network/afd/afd/connect.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Mar 27 06:48:16 2009 @@ -202,16 +202,6 @@ TaCopyTransportAddress( &ConnectReq->RemoteAddress ); if( FCB->LocalAddress ) { - RtlZeroMemory( FCB->LocalAddress, - TaLengthOfTransportAddress - ( &ConnectReq->RemoteAddress ) ); - - FCB->LocalAddress->TAAddressCount = 1; - FCB->LocalAddress->Address[0].AddressType = - ConnectReq->RemoteAddress.Address[0].AddressType; - FCB->LocalAddress->Address[0].AddressLength = - ConnectReq->RemoteAddress.Address[0].AddressLength; - Status = WarmSocketForBind( FCB ); if( NT_SUCCESS(Status) )

15 years, 9 months

[cgutman] 40258: - Fix several handle leaks

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Mar 27 06:21:21 2009 New Revision: 40258 URL: http://svn.reactos.org/svn/reactos?rev=40258&view=rev Log: - Fix several handle leaks Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Mar 27 06:21:21 2009 @@ -402,6 +402,7 @@ /* If a Close is already in Process, give up */ if (Socket->SharedData.State == SocketClosed) { + NtClose(SockEvent); *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } @@ -447,6 +448,7 @@ */ if (Socket->SharedData.NonBlocking) { + NtClose(SockEvent); Socket->SharedData.State = OldState; *lpErrno = WSAEWOULDBLOCK; return SOCKET_ERROR; @@ -504,6 +506,7 @@ /* Close the handle */ NtClose((HANDLE)Handle); + NtClose(SockEvent); return NO_ERROR; } @@ -951,7 +954,10 @@ WSPSelect(0, &ReadSet, NULL, NULL, &Timeout, NULL); if (ReadSet.fd_array[0] != Socket->Handle) + { + NtClose(SockEvent); return 0; + } /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Socket->Handle, @@ -1199,6 +1205,7 @@ if (!NT_SUCCESS(Status)) { + NtClose(SockEvent); WSPCloseSocket( AcceptSocket, lpErrno ); MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); return INVALID_SOCKET;

15 years, 9 months

[fireball] 40257: Apply patch from Wine: http://www.winehq.org/pipermail/wine-patches/2009-March/071155.html - Fix bitmap size calculation in IMAGELIST_InternalExpandBitmaps and remove unneeded parameter. Memory requirements are greatly reduced after this fix. See issue #4304 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 26 22:46:11 2009 New Revision: 40257 URL: http://svn.reactos.org/svn/reactos?rev=40257&view=rev Log: Apply patch from Wine: http://www.winehq.org/pipermail/wine-patches/2009-March/071155.html - Fix bitmap size calculation in IMAGELIST_InternalExpandBitmaps and remove unneeded parameter. Memory requirements are greatly reduced after this fix. See issue #4304 for more details. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Thu Mar 26 22:46:11 2009 @@ -155,7 +155,7 @@ * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) +IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; @@ -166,15 +166,14 @@ && (himl->cy >= cy)) return; - if (cx == 0) cx = himl->cx; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz); TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); @@ -248,7 +247,7 @@ nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); hdcBitmap = CreateCompatibleDC(0); @@ -350,7 +349,7 @@ else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -2304,7 +2303,7 @@ if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); + IMAGELIST_InternalExpandBitmaps (himl, 1, 0); nIndex = himl->cCurImage; himl->cCurImage++;

15 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009