Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[navaraf] 17008: Merge 16594 (jc) from trunk:

by navaraf＠svn.reactos.com

Merge 16594 (jc) from trunk: GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures. GetMenuString now works the same on both windows and ROS. Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c --- branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 16:15:15 UTC (rev 17007) +++ branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 16:17:15 UTC (rev 17008) @@ -3772,7 +3772,7 @@ RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = AnsiBuffer; - + mii->cch = strlen(AnsiBuffer); return TRUE; } @@ -3864,11 +3864,11 @@ MENUITEMINFOA mii; mii.dwTypeData = lpString; mii.fMask = MIIM_STRING; + mii.fType = MF_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&mii))) return 0; else return mii.cch; @@ -3893,10 +3893,9 @@ miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&miiW))) return 0; - else + else return miiW.cch; } @@ -4318,11 +4317,11 @@ mii.fState = MFS_ENABLED; UNIMPLEMENTED; - + if(!GetMenuItemInfoA( hMnu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), - &mii)) return FALSE; + &mii)) return FALSE; if(uFlags & MF_BITMAP) { @@ -4341,7 +4340,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } /* Item beginning with a backspace is a help item */ if (*lpNewItem == '\b') { @@ -4352,7 +4351,7 @@ mii.dwTypeData = (LPSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY; @@ -4439,7 +4438,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } if (*lpNewItem == '\b') { mii.fType |= MF_HELP; @@ -4449,7 +4448,7 @@ mii.dwTypeData = (LPWSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY;

19 years, 4 months

[navaraf] 17007: Fixed the size of the hyperspace area. Partial merge of 16592 from trunk.

by navaraf＠svn.reactos.com

Fixed the size of the hyperspace area. Partial merge of 16592 from trunk. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c 2005-08-03 16:11:00 UTC (rev 17006) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c 2005-08-03 16:15:15 UTC (rev 17007) @@ -40,7 +40,7 @@ #define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (512))) #define HYPERSPACE (Ke386Pae ? 0xc0800000 : 0xc0400000) -#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < 0xc0c00000)) +#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000)) ULONG MmGlobalKernelPageDirectory[1024]; ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; @@ -2371,32 +2371,41 @@ MEMORY_AREA* hyperspace_desc = NULL; PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; + NTSTATUS Status; DPRINT("MiInitPageDirectoryMap()\n"); BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x800000 : 0x400000, - 0, - &kernel_map_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + Ke386Pae ? 0x800000 : 0x400000, + 0, + &kernel_map_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } BaseAddress = (PVOID)HYPERSPACE; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x400000 : 0x800000, - 0, - &hyperspace_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + 0x400000, + 0, + &hyperspace_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } } /* EOF */

19 years, 4 months

[navaraf] 17006: Merge 16557 (hbirr) from trunk:

by navaraf＠svn.reactos.com

Merge 16557 (hbirr) from trunk: Fixed the allocation of the buffer for the environment variable in ProcessInput. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c --- branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c 2005-08-03 16:10:03 UTC (rev 17005) +++ branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c 2005-08-03 16:11:00 UTC (rev 17006) @@ -1061,18 +1061,19 @@ } else { - evar = malloc ( size * sizeof(TCHAR)); + evar = malloc ( 512 * sizeof(TCHAR)); if (evar==NULL) return 1; - size = GetEnvironmentVariable (ip, evar, size); - if (size!=0) + size = GetEnvironmentVariable (ip, evar, 512); + if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar!=NULL) + if (evar==NULL) { - size = GetEnvironmentVariable (ip, evar, size); + return 1; } + size = GetEnvironmentVariable (ip, evar, size); } if (size)

19 years, 4 months

[navaraf] 17005: Merge 16553 / 16555 (weiden) from trunk:

by navaraf＠svn.reactos.com

Merge 16553 / 16555 (weiden) from trunk: handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated Modified: branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c --- branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c 2005-08-03 15:05:54 UTC (rev 17004) +++ branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c 2005-08-03 16:10:03 UTC (rev 17005) @@ -48,17 +48,33 @@ /* initialize unicode variable value string and allocate buffer */ VarValueU.Length = 0; - VarValueU.MaximumLength = nSize * sizeof(WCHAR); - VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - VarValueU.MaximumLength); + if (nSize != 0) + { + VarValueU.MaximumLength = (nSize - 1) * sizeof(WCHAR); + VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + nSize * sizeof(WCHAR)); + if (VarValueU.Buffer != NULL) + { + /* NULL-terminate the buffer in any case! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length! */ + VarValueU.Buffer[nSize - 1] = L'\0'; + } + } + else + { + VarValueU.MaximumLength = 0; + VarValueU.Buffer = NULL; + } - /* get unicode environment variable */ - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarNameU, - &VarValueU); - if (!NT_SUCCESS(Status)) - { + if (VarValueU.Buffer != NULL || nSize == 0) + { + /* get unicode environment variable */ + Status = RtlQueryEnvironmentVariable_U (NULL, + &VarNameU, + &VarValueU); + if (!NT_SUCCESS(Status)) + { /* free unicode buffer */ RtlFreeHeap (RtlGetProcessHeap (), 0, @@ -70,28 +86,37 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return VarValueU.Length / sizeof(WCHAR) + 1; + return (VarValueU.Length / sizeof(WCHAR)) + 1; } else { return 0; } - } + } - /* convert unicode value string to ansi */ - RtlUnicodeStringToAnsiString (&VarValue, - &VarValueU, - FALSE); + /* convert unicode value string to ansi */ + RtlUnicodeStringToAnsiString (&VarValue, + &VarValueU, + FALSE); - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); + if (VarValueU.Buffer != NULL) + { + /* free unicode buffer */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + VarValueU.Buffer); + } - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); + /* free unicode variable name string */ + RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR)); + return (VarValueU.Length / sizeof(WCHAR)); + } + else + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return 0; + } } @@ -114,7 +139,7 @@ lpName); VarValue.Length = 0; - VarValue.MaximumLength = nSize * sizeof(WCHAR); + VarValue.MaximumLength = (nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); VarValue.Buffer = lpBuffer; Status = RtlQueryEnvironmentVariable_U (NULL, @@ -125,13 +150,20 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return (VarValue.Length / sizeof(WCHAR)) + 1; + return (VarValue.Length / sizeof(WCHAR)) + 1; } else { return 0; } } + + if (nSize != 0) + { + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + } return (VarValue.Length / sizeof(WCHAR)); }

19 years, 4 months

[ea] 17004: Document <module type="nativecui" ...>

by ea＠svn.reactos.com

Document <module type="nativecui" ...> Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk --- trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-03 14:48:38 UTC (rev 17003) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-03 15:05:54 UTC (rev 17004) @@ -1171,6 +1171,21 @@ </row> <row> + <entry>nativecui</entry> + + <entry>.exe</entry> + + <entry>_NtProcessStartup</entry> + + <entry>-</entry> + + <entry>-</entry> + + <entry>Build a native NT/ROS program (no enviroment + subsystem required to run).</entry> + </row> + + <row> <entry>nativedll</entry> <entry><filename>.dll</filename></entry>

19 years, 4 months

[hpoussin] 17003: Fix mouse.inf file (missing %)

by hpoussin＠svn.reactos.com

Fix mouse.inf file (missing %) Modified: trunk/reactos/media/inf/mouse.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-08-03 14:46:17 UTC (rev 17002) +++ trunk/reactos/media/inf/mouse.inf 2005-08-03 14:48:38 UTC (rev 17003) @@ -25,7 +25,7 @@ [Manufacturer] %StdMfg% = StdMfg -%LogMfg = LogMsf +%LogMfg% = LogMsf %MSMfg% = MSMfg [StdMfg] @@ -39,7 +39,7 @@ [MSMfg] %*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 %*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 -%*PNP0F13.DeviceDesc" = PS2_Inst,*PNP0F13 +%*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 ;---------------------------- MOUCLASS DRIVER ---------------------------

19 years, 4 months

[hpoussin] 17002: Don't display available resolutions even if DBG is set. Rely only on NDEBUG

by hpoussin＠svn.reactos.com

Don't display available resolutions even if DBG is set. Rely only on NDEBUG Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-08-03 14:46:12 UTC (rev 17001) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-08-03 14:46:17 UTC (rev 17002) @@ -372,10 +372,10 @@ VBESortModes(VBEDeviceExtension); /* - * Print the supported video modes when DBG is set. + * Print the supported video modes when NDEBUG is not set. */ -#if defined(DBG) && ! defined(NDEBUG) +#ifndef NDEBUG for (CurrentMode = 0; CurrentMode < SuitableModeCount; CurrentMode++)

19 years, 4 months

[hpoussin] 17001: Implement VideoPortVerifyAccessRanges

by hpoussin＠svn.reactos.com

Implement VideoPortVerifyAccessRanges Modified: trunk/reactos/drivers/video/videoprt/resource.c _____ Modified: trunk/reactos/drivers/video/videoprt/resource.c --- trunk/reactos/drivers/video/videoprt/resource.c 2005-08-03 14:45:50 UTC (rev 17000) +++ trunk/reactos/drivers/video/videoprt/resource.c 2005-08-03 14:46:12 UTC (rev 17001) @@ -576,7 +576,7 @@ } /* - * @unimplemented + * @implemented */ VP_STATUS STDCALL @@ -585,8 +585,74 @@ IN ULONG NumAccessRanges, IN PVIDEO_ACCESS_RANGE AccessRanges) { - DPRINT1("VideoPortVerifyAccessRanges not implemented\n"); - return NO_ERROR; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + BOOLEAN ConflictDetected; + ULONG i; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCM_RESOURCE_LIST ResourceList; + ULONG ResourceListSize; + NTSTATUS Status; + + DPRINT("VideoPortVerifyAccessRanges\n"); + + DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + + /* Create the resource list */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + + (NumAccessRanges - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = ExAllocatePool(PagedPool, ResourceListSize); + if (!ResourceList) + { + DPRINT("ExAllocatePool() failed\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Fill resource list */ + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = DeviceExtension->AdapterInterfaceType; + ResourceList->List[0].BusNumber = DeviceExtension->SystemIoBusNumber; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = NumAccessRanges; + for (i = 0; i < NumAccessRanges; i++, AccessRanges++) + { + PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + if (AccessRanges->RangeInIoSpace) + { + PartialDescriptor->Type = CmResourceTypePort; + PartialDescriptor->u.Port.Start = AccessRanges->RangeStart; + PartialDescriptor->u.Port.Length = AccessRanges->RangeLength; + } + else + { + PartialDescriptor->Type = CmResourceTypeMemory; + PartialDescriptor->u.Memory.Start = AccessRanges->RangeStart; + PartialDescriptor->u.Memory.Length = AccessRanges->RangeLength; + } + if (AccessRanges->RangeShareable) + PartialDescriptor->ShareDisposition = CmResourceShareShared; + else + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->Flags = 0; + if (AccessRanges->RangePassive & VIDEO_RANGE_PASSIVE_DECODE) + PartialDescriptor->Flags |= CM_RESOURCE_PORT_PASSIVE_DECODE; + if (AccessRanges->RangePassive & VIDEO_RANGE_10_BIT_DECODE) + PartialDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + } + + /* Try to acquire all resource ranges */ + Status = IoReportResourceForDetection( + DeviceExtension->DriverObject, + NULL, 0, /* Driver List */ + DeviceExtension->PhysicalDeviceObject, + ResourceList, ResourceListSize, + &ConflictDetected); + ExFreePool(ResourceList); + + if (!NT_SUCCESS(Status) || ConflictDetected) + return ERROR_INVALID_PARAMETER; + else + return NO_ERROR; } /*

19 years, 4 months

[chorns] 17000: Fix building kernel32 test

by chorns＠svn.reactos.com

Fix building kernel32 test Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml Modified: trunk/reactos/lib/kernel32/tests/setup.c _____ Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml --- trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-03 14:45:39 UTC (rev 16999) +++ trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-03 14:45:50 UTC (rev 17000) @@ -1,5 +1,6 @@ <module name="kernel32_test" type="test"> <include base="rtshared">.</include> + <include base="kernel32">.</include> <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__USE_W32API" /> @@ -10,6 +11,7 @@ <library>regtests</library> <library>kernel32_base</library> <library>pseh</library> + <library>intrlck</library> <library>ntdll</library> <library>msvcrt</library> <linkerflag>-lgcc</linkerflag> _____ Modified: trunk/reactos/lib/kernel32/tests/setup.c --- trunk/reactos/lib/kernel32/tests/setup.c 2005-08-03 14:45:39 UTC (rev 16999) +++ trunk/reactos/lib/kernel32/tests/setup.c 2005-08-03 14:45:50 UTC (rev 17000) @@ -1,4 +1,5 @@ #include <k32.h> +#include <regtests.h> int mainCRTStartup(int argc, char *argv[])

19 years, 4 months

[navaraf] 16999: Fix name length handing in RtlQueryAtomInAtomTable.

by navaraf＠svn.reactos.com

Fix name length handing in RtlQueryAtomInAtomTable. Modified: trunk/reactos/lib/rtl/atom.c _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-08-03 14:26:56 UTC (rev 16998) +++ trunk/reactos/lib/rtl/atom.c 2005-08-03 14:45:39 UTC (rev 16999) @@ -602,19 +602,10 @@ if (*NameLength < Length + sizeof(WCHAR)) { - /* prevent underflow! */ - if (*NameLength >= sizeof(WCHAR)) - { - Length = *NameLength - sizeof(WCHAR); - } - else - { - Length = 0; - Status = STATUS_BUFFER_TOO_SMALL; - } + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; } - - if (Length) + else { RtlCopyMemory(AtomName, NameString, @@ -652,19 +643,10 @@ if (*NameLength < Length + sizeof(WCHAR)) { - /* prevent underflow! */ - if (*NameLength >= sizeof(WCHAR)) - { - Length = *NameLength - sizeof(WCHAR); - } - else - { - Length = 0; - Status = STATUS_BUFFER_TOO_SMALL; - } + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; } - - if (Length) + else { RtlCopyMemory(AtomName, Entry->Name,

19 years, 4 months

← Newer
1
...
57
58
59
60
61
62
63
...
67
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 August 2005