Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[janderwald] 47805: [PORTCLS] - Fix buffer overflow
by janderwald＠svn.reactos.org 19 Jun '10

19 Jun '10

Author: janderwald Date: Sat Jun 19 07:43:45 2010 New Revision: 47805 URL: http://svn.reactos.org/svn/reactos?rev=47805&view=rev Log: [PORTCLS] - Fix buffer overflow Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sat Jun 19 07:43:45 2010 @@ -207,7 +207,7 @@ if (FromSubDeviceDescriptor) { - FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength, TAG_PORTCLASS); + FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength + sizeof(WCHAR), TAG_PORTCLASS); if (!FromEntry) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -217,7 +217,7 @@ if (ToSubDeviceDescriptor) { - ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength, TAG_PORTCLASS); + ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength + sizeof(WCHAR), TAG_PORTCLASS); if (!ToEntry) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -229,9 +229,9 @@ { FromEntry->FromPin = FromPin; FromEntry->Connection.Pin = ToPin; - FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength; + FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength + sizeof(WCHAR); RtlMoveMemory(&FromEntry->Connection.SymbolicLinkName, ToString->Buffer, ToString->MaximumLength); - FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = L'\0'; + FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = UNICODE_NULL; InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); } @@ -241,9 +241,9 @@ { ToEntry->FromPin = ToPin; ToEntry->Connection.Pin = FromPin; - ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength; + ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength + sizeof(WCHAR); RtlMoveMemory(&ToEntry->Connection.SymbolicLinkName, FromString->Buffer, FromString->MaximumLength); - ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = L'\0'; + ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = UNICODE_NULL; InsertTailList(&ToSubDeviceDescriptor->PhysicalConnectionList, &ToEntry->Entry);

1 0

[janderwald] 47804: [SYSAUDIO] - Perform all allocations / frees in dedicated alloc / free function
by janderwald＠svn.reactos.org 19 Jun '10

19 Jun '10

Author: janderwald Date: Sat Jun 19 07:26:20 2010 New Revision: 47804 URL: http://svn.reactos.org/svn/reactos?rev=47804&view=rev Log: [SYSAUDIO] - Perform all allocations / frees in dedicated alloc / free function Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -145,7 +145,7 @@ ULONG Index; Length = sizeof(KSP_PIN) + sizeof(KSMULTIPLE_ITEM) + ClientFormat->DataFormat.FormatSize; - PinRequest = ExAllocatePool(NonPagedPool, Length); + PinRequest = AllocateItem(NonPagedPool, Length); if (!PinRequest) return STATUS_UNSUCCESSFUL; @@ -166,7 +166,7 @@ if (NT_SUCCESS(Status)) { - ExFreePool(PinRequest); + FreeItem(PinRequest); return Status; } @@ -181,10 +181,10 @@ return Status; } - MultipleItem = ExAllocatePool(NonPagedPool, BytesReturned); + MultipleItem = AllocateItem(NonPagedPool, BytesReturned); if (!MultipleItem) { - ExFreePool(PinRequest); + FreeItem(PinRequest); return STATUS_NO_MEMORY; } @@ -192,8 +192,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("Property Request KSPROPERTY_PIN_DATARANGES failed with %x\n", Status); - ExFreePool(MultipleItem); - ExFreePool(PinRequest); + FreeItem(MultipleItem); + FreeItem(PinRequest); return STATUS_UNSUCCESSFUL; } @@ -253,8 +253,8 @@ #endif - ExFreePool(MultipleItem); - ExFreePool(PinRequest); + FreeItem(MultipleItem); + FreeItem(PinRequest); if (bFound) return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -70,7 +70,7 @@ PKSAUDIO_DEVICE_ENTRY DeviceEntry = NULL; /* a new device has arrived */ - DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); + DeviceEntry = AllocateItem(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); if (!DeviceEntry) { /* no memory */ @@ -84,7 +84,7 @@ DeviceEntry->DeviceName.Length = 0; DeviceEntry->DeviceName.MaximumLength = DeviceName->MaximumLength + 10 * sizeof(WCHAR); - DeviceEntry->DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceEntry->DeviceName.MaximumLength); + DeviceEntry->DeviceName.Buffer = AllocateItem(NonPagedPool, DeviceEntry->DeviceName.MaximumLength); if (!DeviceEntry->DeviceName.Buffer) { @@ -115,9 +115,9 @@ if (DeviceEntry) { if (DeviceEntry->DeviceName.Buffer) - ExFreePool(DeviceEntry->DeviceName.Buffer); - - ExFreePool(DeviceEntry); + FreeItem(DeviceEntry->DeviceName.Buffer); + + FreeItem(DeviceEntry); } return Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -70,7 +70,7 @@ DPRINT("DispatchCreateSysAudio entered\n"); /* allocate create item */ - CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); if (!CreateItem) { Irp->IoStatus.Information = 0; @@ -105,7 +105,7 @@ PKSOBJECT_CREATE_ITEM CreateItem; /* allocate create item */ - CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); if (!CreateItem) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -18,6 +18,25 @@ const GUID KSCATEGORY_PREFERRED_WAVEIN_DEVICE = {0xD6C50671L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; const GUID KSCATEGORY_PREFERRED_MIDIOUT_DEVICE = {0xD6C50674L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes) +{ + PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + if (!Item) + return Item; + + RtlZeroMemory(Item, NumberOfBytes); + return Item; +} + +VOID +FreeItem( + IN PVOID Item) +{ + ExFreePool(Item); +} VOID @@ -58,7 +77,7 @@ RtlFreeUnicodeString(&DeviceEntry->DeviceName); /* free audio device entry */ - ExFreePool(DeviceEntry); + FreeItem(DeviceEntry); } Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -149,7 +149,7 @@ ZwClose(Context->hMixerPin); } - ExFreePool(Context); + FreeItem(Context); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -315,7 +315,7 @@ /* the audio irp pin didnt accept the input format * let's compute a compatible format */ - MixerPinConnect = ExAllocatePool(NonPagedPool, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); + MixerPinConnect = AllocateItem(NonPagedPool, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); if (!MixerPinConnect) { /* not enough memory */ @@ -335,7 +335,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ComputeCompatibleFormat failed with %x\n", Status); - ExFreePool(MixerPinConnect); + FreeItem(MixerPinConnect); return Status; } @@ -348,7 +348,7 @@ DPRINT1(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); DPRINT1("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); - ExFreePool(MixerPinConnect); + FreeItem(MixerPinConnect); return Status; } } @@ -378,7 +378,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Mixer Pin with %x\n", Status); - ExFreePool(MixerPinConnect); + FreeItem(MixerPinConnect); } } /* done */ @@ -408,7 +408,7 @@ ParametersLength = IoStack->FileObject->FileName.MaximumLength - ObjectLength; /* allocate buffer */ - Buffer = ExAllocatePool(NonPagedPool, ParametersLength); + Buffer = AllocateItem(NonPagedPool, ParametersLength); if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -471,7 +471,7 @@ /* allocate dispatch context */ - DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); + DispatchContext = AllocateItem(NonPagedPool, sizeof(DISPATCH_CONTEXT)); if (!DispatchContext) { /* failed */ @@ -488,7 +488,7 @@ if (!NT_SUCCESS(Status)) { /* failed */ - ExFreePool(DispatchContext); + FreeItem(DispatchContext); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -500,7 +500,7 @@ { /* failed */ KsFreeObjectHeader(DispatchContext->ObjectHeader); - ExFreePool(DispatchContext); + FreeItem(DispatchContext); } else { Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Sat Jun 19 07:26:20 2010 @@ -116,3 +116,13 @@ IN ULONG PinId, IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat); + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes); + +VOID +FreeItem( + IN PVOID Item); +

1 0

[cgutman] 47803: [MSAFD] - Add locking to protect the socket list
by cgutman＠svn.reactos.org 19 Jun '10

19 Jun '10

Author: cgutman Date: Sat Jun 19 05:04:40 2010 New Revision: 47803 URL: http://svn.reactos.org/svn/reactos?rev=47803&view=rev Log: [MSAFD] - Add locking to protect the socket list 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] Sat Jun 19 05:04:40 2010 @@ -23,6 +23,7 @@ WSPUPCALLTABLE Upcalls; LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; PSOCKET_INFORMATION SocketListHead = NULL; +CRITICAL_SECTION SocketListLock; LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; HANDLE SockAsyncHelperAfdHandle; @@ -280,8 +281,10 @@ NULL); /* Save in Process Sockets List */ + EnterCriticalSection(&SocketListLock); Socket->NextSocket = SocketListHead; SocketListHead = Socket; + LeaveCriticalSection(&SocketListLock); /* Create the Socket Context */ CreateContext(Socket); @@ -556,6 +559,7 @@ NtClose(Socket->TdiConnectionHandle); Socket->TdiConnectionHandle = NULL; + EnterCriticalSection(&SocketListLock); if (SocketListHead == Socket) { SocketListHead = SocketListHead->NextSocket; @@ -574,6 +578,7 @@ CurrentSocket = CurrentSocket->NextSocket; } } + LeaveCriticalSection(&SocketListLock); HeapFree(GlobalHeap, 0, Socket); @@ -2314,14 +2319,21 @@ { PSOCKET_INFORMATION CurrentSocket; + EnterCriticalSection(&SocketListLock); + CurrentSocket = SocketListHead; while (CurrentSocket) { if (CurrentSocket->Handle == Handle) + { + LeaveCriticalSection(&SocketListLock); return CurrentSocket; + } CurrentSocket = CurrentSocket->NextSocket; } + + LeaveCriticalSection(&SocketListLock); return NULL; } @@ -2841,6 +2853,9 @@ /* Heap to use when allocating */ GlobalHeap = GetProcessHeap(); + /* Initialize the lock that protects our socket list */ + InitializeCriticalSection(&SocketListLock); + AFD_DbgPrint(MAX_TRACE, ("MSAFD.DLL has been loaded\n")); break; @@ -2852,6 +2867,10 @@ break; case DLL_PROCESS_DETACH: + + /* Delete the socket list lock */ + DeleteCriticalSection(&SocketListLock); + break; }

1 0

[jgardou] 47802: Merge 47800 from yarotows branch. Changelog should have been: [GDI32] - Use default LOGFONT in EnumFontFamilies if none is given. + ~3000 gdi32:font winetests
by jgardou＠svn.reactos.org 18 Jun '10

18 Jun '10

Author: jgardou Date: Fri Jun 18 22:46:34 2010 New Revision: 47802 URL: http://svn.reactos.org/svn/reactos?rev=47802&view=rev Log: Merge 47800 from yarotows branch. Changelog should have been: [GDI32] - Use default LOGFONT in EnumFontFamilies if none is given. + ~3000 gdi32:font winetests Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/gdi32/objects/font.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 18 22:46:34 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 -/branches/reactos-yarotows:46966 +/branches/reactos-yarotows:46966,47800 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Fri Jun 18 22:46:34 2010 @@ -154,6 +154,7 @@ int i; ENUMLOGFONTEXA EnumLogFontExA; NEWTEXTMETRICEXA NewTextMetricExA; + LOGFONTW lfW; Info = RtlAllocateHeap(GetProcessHeap(), 0, INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); @@ -161,6 +162,15 @@ { return 0; } + + if (!LogFont) + { + lfW.lfCharSet = DEFAULT_CHARSET; + lfW.lfPitchAndFamily = 0; + lfW.lfFaceName[0] = 0; + LogFont = &lfW; + } + FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT); if (FontFamilyCount < 0) { @@ -464,7 +474,7 @@ return 0; } - nSet = uCount; + nSet = uCount; if ( nSet > lpResults->nGlyphs ) nSet = lpResults->nGlyphs; @@ -522,7 +532,7 @@ iFirstChar, (ULONG)(iLastChar - iFirstChar + 1), (PWCHAR) NULL, - 0, + 0, (PVOID) pxBuffer); } @@ -688,7 +698,7 @@ wstr[0], (ULONG) count, (PWCHAR) wstr, - GCW_NOFLOAT|GCW_WIN32, + GCW_NOFLOAT|GCW_WIN32, (PVOID) lpBuffer); HeapFree(GetProcessHeap(), 0, str); @@ -772,7 +782,7 @@ return FALSE; } - ret = NtGdiGetCharABCWidthsW( hdc, + ret = NtGdiGetCharABCWidthsW( hdc, wstr[0], (ULONG)count, (PWCHAR)wstr, @@ -890,7 +900,7 @@ if ((Ret == ARABIC_CHARSET) || (Ret == HEBREW_CHARSET)) Ret = (GCP_KASHIDA|GCP_DIACRITIC|GCP_LIGATE|GCP_GLYPHSHAPE|GCP_REORDER); } - Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); + Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); if ( Gcp == GCP_ERROR) return Gcp; else

1 0

[cgutman] 47801: [NTOSKRNL] - Fix a string termination bug in the device interface code - Thanks to janderwald for spotting the bug
by cgutman＠svn.reactos.org 18 Jun '10

18 Jun '10

Author: cgutman Date: Fri Jun 18 21:57:07 2010 New Revision: 47801 URL: http://svn.reactos.org/svn/reactos?rev=47801&view=rev Log: [NTOSKRNL] - Fix a string termination bug in the device interface code - Thanks to janderwald for spotting the bug Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Fri Jun 18 21:57:07 2010 @@ -105,17 +105,19 @@ goto cleanup; } - SubKeyName.Buffer = ExAllocatePool(PagedPool, SymbolicLinkName->Length); + SubKeyName.MaximumLength = SymbolicLinkName->Length + sizeof(WCHAR); + SubKeyName.Length = 0; + SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); if (!SubKeyName.Buffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - SubKeyName.MaximumLength = SymbolicLinkName->Length; - SubKeyName.Length = 0; RtlAppendUnicodeStringToString(&SubKeyName, SymbolicLinkName); + + SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = UNICODE_NULL; SubKeyName.Buffer[0] = L'#'; SubKeyName.Buffer[1] = L'#';

1 0

[jgardou] 47800: [GDI32] - Use default LOGFONT in EnumFontFamilies. + ~3000 gdi32:font winetests
by jgardou＠svn.reactos.org 18 Jun '10

18 Jun '10

Author: jgardou Date: Fri Jun 18 21:12:29 2010 New Revision: 47800 URL: http://svn.reactos.org/svn/reactos?rev=47800&view=rev Log: [GDI32] - Use default LOGFONT in EnumFontFamilies. + ~3000 gdi32:font winetests Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/font.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/font.c [iso-8859-1] Fri Jun 18 21:12:29 2010 @@ -154,6 +154,7 @@ int i; ENUMLOGFONTEXA EnumLogFontExA; NEWTEXTMETRICEXA NewTextMetricExA; + LOGFONTW lfW; Info = RtlAllocateHeap(GetProcessHeap(), 0, INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); @@ -161,6 +162,15 @@ { return 0; } + + if (!LogFont) + { + lfW.lfCharSet = DEFAULT_CHARSET; + lfW.lfPitchAndFamily = 0; + lfW.lfFaceName[0] = 0; + LogFont = &lfW; + } + FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT); if (FontFamilyCount < 0) { @@ -464,7 +474,7 @@ return 0; } - nSet = uCount; + nSet = uCount; if ( nSet > lpResults->nGlyphs ) nSet = lpResults->nGlyphs; @@ -522,7 +532,7 @@ iFirstChar, (ULONG)(iLastChar - iFirstChar + 1), (PWCHAR) NULL, - 0, + 0, (PVOID) pxBuffer); } @@ -688,7 +698,7 @@ wstr[0], (ULONG) count, (PWCHAR) wstr, - GCW_NOFLOAT|GCW_WIN32, + GCW_NOFLOAT|GCW_WIN32, (PVOID) lpBuffer); HeapFree(GetProcessHeap(), 0, str); @@ -772,7 +782,7 @@ return FALSE; } - ret = NtGdiGetCharABCWidthsW( hdc, + ret = NtGdiGetCharABCWidthsW( hdc, wstr[0], (ULONG)count, (PWCHAR)wstr, @@ -890,7 +900,7 @@ if ((Ret == ARABIC_CHARSET) || (Ret == HEBREW_CHARSET)) Ret = (GCP_KASHIDA|GCP_DIACRITIC|GCP_LIGATE|GCP_GLYPHSHAPE|GCP_REORDER); } - Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); + Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); if ( Gcp == GCP_ERROR) return Gcp; else

1 0

[ekohl] 47799: [NTOSKRNL] - Use the current partition descriptor to check for container partitions. Logical units in extended partitions become visible again but you cannot access them yet. This fixes the first half of bug #2564.
by ekohl＠svn.reactos.org 17 Jun '10

17 Jun '10

Author: ekohl Date: Thu Jun 17 19:41:52 2010 New Revision: 47799 URL: http://svn.reactos.org/svn/reactos?rev=47799&view=rev Log: [NTOSKRNL] - Use the current partition descriptor to check for container partitions. Logical units in extended partitions become visible again but you cannot access them yet. This fixes the first half of bug #2564. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Thu Jun 17 19:41:52 2010 @@ -1686,7 +1686,7 @@ for (Entry = 1; Entry <= 4; Entry++, PartitionDescriptor++) { /* Check if this is a container partition, since we skipped them */ - if (IsContainerPartition(PartitionType)) + if (IsContainerPartition(PartitionDescriptor->PartitionType)) { /* Get its offset */ Offset.QuadPart = VolumeOffset.QuadPart +

1 0

[fireball] 47798: [VENDOR/WINE] - Import Wine-1.2-rc3 gdi32, user32, winex11.drv, wineserver.
by fireball＠svn.reactos.org 17 Jun '10

17 Jun '10

Author: fireball Date: Thu Jun 17 07:19:22 2010 New Revision: 47798 URL: http://svn.reactos.org/svn/reactos?rev=47798&view=rev Log: [VENDOR/WINE] - Import Wine-1.2-rc3 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/bidi.c vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/enhmfdrv/graphics.c vendor/wine/dlls/gdi32/current/tests/dc.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/resources/oic_bang.svg vendor/wine/dlls/user32/current/resources/oic_hand.svg vendor/wine/dlls/user32/current/resources/oic_note.svg vendor/wine/dlls/user32/current/resources/oic_ques.svg vendor/wine/dlls/user32/current/resources/oic_sample.svg vendor/wine/dlls/user32/current/resources/user32_Da.rc vendor/wine/dlls/user32/current/resources/user32_Pl.rc vendor/wine/dlls/user32/current/tests/cursoricon.c vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/queue.c vendor/wine/server/current/user.h vendor/wine/server/current/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/bidi.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bidi.c?re… Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/enhmfdrv/graphics.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmfdrv/… Modified: vendor/wine/dlls/gdi32/current/tests/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/dc.… Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… Modified: vendor/wine/dlls/user32/current/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Da.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Pl.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/tests/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cu… Modified: vendor/wine/dlls/winex11.drv/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/dib… Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/queue.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/queue.c?rev=4… Modified: vendor/wine/server/current/user.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/user.h?rev=47… Modified: vendor/wine/server/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/window.c?rev=…

1 0

[jgardou] 47797: [WIN32K] - apply r47787 to yarotows
by jgardou＠svn.reactos.org 17 Jun '10

17 Jun '10

Author: jgardou Date: Thu Jun 17 01:34:52 2010 New Revision: 47797 URL: http://svn.reactos.org/svn/reactos?rev=47797&view=rev Log: [WIN32K] - apply r47787 to yarotows Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Thu Jun 17 01:34:52 2010 @@ -299,6 +299,16 @@ psurfBmp->SurfObj.sizlBitmap.cx, psurfBmp->SurfObj.sizlBitmap.cy); + if (psurfBmp->hSecure) + { + /* Set DIBSECTION attribute */ + pdcattr->ulDirty_ |= DC_DIBSECTION; + } + else + { + pdcattr->ulDirty_ &= ~DC_DIBSECTION; + } + /* Release the exclusive lock */ SURFACE_UnlockSurface(psurfBmp);

1 0

[jgardou] 47796: [WIN32K] - Delete useless file once and for all
by jgardou＠svn.reactos.org 17 Jun '10

17 Jun '10

Author: jgardou Date: Thu Jun 17 01:31:03 2010 New Revision: 47796 URL: http://svn.reactos.org/svn/reactos?rev=47796&view=rev Log: [WIN32K] - Delete useless file once and for all Removed: branches/reactos-yarotows/subsystems/win32/win32k/ldr/

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010