Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 35852: -fix some bugs -create a blank hdd image before each run
by cwittich＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: cwittich Date: Mon Sep 1 07:20:29 2008 New Revision: 35852 URL: http://svn.reactos.org/svn/reactos?rev=35852&view=rev Log: -fix some bugs -create a blank hdd image before each run Modified: trunk/tools/sysreg2/options.c trunk/tools/sysreg2/reactos.xml trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/sysreg.xml trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/options.c?rev=35852&… ============================================================================== --- trunk/tools/sysreg2/options.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/options.c [iso-8859-1] Mon Sep 1 07:20:29 2008 @@ -30,7 +30,7 @@ strncpy(AppSettings.Filename, obj->stringval, 254); } - obj = xmlXPathEval(BAD_CAST"string(/settings/@name)",ctxt); + obj = xmlXPathEval(BAD_CAST"string(/settings/@vm)",ctxt); if ((obj != NULL) && ((obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0))) { @@ -43,6 +43,15 @@ /* when no value is set - return value is negative * which means infinite */ AppSettings.Timeout = (int)obj->floatval; + } + + obj = xmlXPathEval(BAD_CAST"number(/settings/general/hdd/@size)",ctxt); + if ((obj != NULL) && (obj->type == XPATH_NUMBER)) + { + if (obj->floatval <= 0) + AppSettings.ImageSize = 512; + else + AppSettings.ImageSize = (int)obj->floatval; } for (Stage=0;Stage<3;Stage++) @@ -59,6 +68,27 @@ } xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); + + xml = xmlReadFile(AppSettings.Filename, NULL, 0); + if (!xml) + return false; + ctxt = xmlXPathNewContext(xml); + if (!ctxt) + { + xmlFreeDoc(xml); + return false; + } + + obj = xmlXPathEval(BAD_CAST"string(/domain/devices/disk[@device='disk']/source/@file)",ctxt); + if ((obj != NULL) && ((obj->type == XPATH_STRING) && + (obj->stringval != NULL) && (obj->stringval[0] != 0))) + { + strncpy(AppSettings.HardDiskImage, obj->stringval, 254); + } + + xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); return true; } + Modified: trunk/tools/sysreg2/reactos.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/reactos.xml?rev=3585… ============================================================================== --- trunk/tools/sysreg2/reactos.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/reactos.xml [iso-8859-1] Mon Sep 1 07:20:29 2008 @@ -21,7 +21,7 @@ <target dev='hda' bus='ide'/> </disk> <disk type='file' device='cdrom'> - <source file='/opt/buildbot/kvmtest/ReactOS.iso'/> + <source file='/opt/buildbot/kvmtest/ReactOS-RegTest.iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> Modified: trunk/tools/sysreg2/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=35852&r… ============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Mon Sep 1 07:20:29 2008 @@ -18,6 +18,8 @@ int Timeout; char Filename[255]; char Name[80]; + char HardDiskImage[255]; + int ImageSize; stage Stage[3]; } Settings; Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=35852… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Mon Sep 1 07:20:29 2008 @@ -2,7 +2,9 @@ <general>  <timeout ms="20000"/> - </general2 +  + <hdd size="512"/> + </general> <firststage bootdevice="cdrom"> <success on="SYSREG_CHECKPOINT:USETUP_COMPLETE"/> </firststage> Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35852&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Mon Sep 1 07:20:29 2008 @@ -41,24 +41,40 @@ bool IsVirtualMachineRunning(virConnectPtr vConn, const char* name) { - char* names[10]; - int iDomains; - int iMaxnames = 10; + int* ids = NULL; + int numids; + int maxids = 0; + const char* domname; + virDomainPtr vDomPtr = NULL; - iDomains = virConnectListDefinedDomains(vConn, names, iMaxnames); - if (iDomains != -1) + maxids = virConnectNumOfDomains(vConn); + if (maxids < 0) + return false; + + ids = malloc(sizeof(int) * maxids); + if (!ids) + return false; + + numids = virConnectListDomains(vConn, &ids[0], maxids); + if (numids > -1) { int i; - for(i=0; i<iDomains; i++) + for(i=0; i<numids; i++) { - if (strcasecmp(name, names[i]) == 0) - return true; + vDomPtr = virDomainLookupByID(vConn, ids[i]); + domname = virDomainGetName(vDomPtr); + if (strcasecmp(name, domname) == 0) + { + virDomainFree(vDomPtr); + return true; + } + virDomainFree(vDomPtr); } } return false; } -virDomainPtr LaunchVirtualMachine(virConnectPtr vConn, const char* XmlFileName, const char* BootDevice) +virDomainPtr LaunchVirtualMachine(virConnectPtr vConn, const char* XmlFileName, const char* BootDevice) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; @@ -111,7 +127,8 @@ name = virDomainGetName(vDomPtr); domname = strdup(name); virDomainFree(vDomPtr); - free(domname); + vDomPtr = virDomainLookupByName(vConn, domname); + free(domname); } } return vDomPtr; @@ -124,6 +141,8 @@ virDomainPtr vDom; int Stage; int Stages = 1; /* 1 for testing, should be set to 3 later */ + char qemu_img_cmdline[300]; + FILE* file; if (!LoadSettings("sysreg.xml")) { @@ -133,26 +152,45 @@ vConn = virConnectOpen("qemu:///session"); + if (IsVirtualMachineRunning(vConn, AppSettings.Name)) + { + printf("Error: Virtual Machine is already running.\n"); + return EXIT_FAILURE; + } + + if (file = fopen(AppSettings.HardDiskImage, "r")) + { + fclose(file); + remove(AppSettings.HardDiskImage); + } + + sprintf(qemu_img_cmdline, "qemu-img create -f qcow2 %s %dM", + AppSettings.HardDiskImage, AppSettings.ImageSize); + FILE* p = popen(qemu_img_cmdline, "r"); + char buf[100]; + while(feof(p)==0) + { + memset(buf,0,strlen(buf)); + fgets(buf,100,p); + printf("%s\n",buf); + } + pclose(p); + for (Stage=0;Stage<Stages; Stage++) { - if (IsVirtualMachineRunning(vConn, AppSettings.Name)) - printf("Virtual Machine is already running\n"); - else + vDom = LaunchVirtualMachine(vConn, AppSettings.Filename, + AppSettings.Stage[Stage].BootDevice); { - vDom = LaunchVirtualMachine(vConn, AppSettings.Filename, - AppSettings.Stage[Stage].BootDevice); + if (vDom) { - if (vDom) - { - printf("Domain %s started.\n", virDomainGetName(vDom)); - ProcessDebugData(GetConsole(vDom), - AppSettings.Timeout, Stage); - virDomainDestroy(vDom); - virDomainUndefine(vDom); - virDomainFree(vDom); - } - } - } + printf("Domain %s started.\n", virDomainGetName(vDom)); + ProcessDebugData(GetConsole(vDom), + AppSettings.Timeout, Stage); + virDomainDestroy(vDom); + virDomainUndefine(vDom); + virDomainFree(vDom); + } + } } virConnectClose(vConn);

1 0

[gedmurphy] 35851: Check for null pointers passed to inet_addr See issue #3695 for more details.
by gedmurphy＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: gedmurphy Date: Mon Sep 1 03:00:22 2008 New Revision: 35851 URL: http://svn.reactos.org/svn/reactos?rev=35851&view=rev Log: Check for null pointers passed to inet_addr See issue #3695 for more details. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Mon Sep 1 03:00:22 2008 @@ -1297,6 +1297,12 @@ ULONG u = 0; p = (PCHAR)cp; + + if (!p) + { + WSASetLastError(WSAEFAULT); + return INADDR_NONE; + } if (strlen(p) == 0) return INADDR_NONE;

1 0

[pschweitzer] 35850: Code cleanup
by pschweitzer＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: pschweitzer Date: Mon Sep 1 02:21:58 2008 New Revision: 35850 URL: http://svn.reactos.org/svn/reactos?rev=35850&view=rev Log: Code cleanup Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Sep 1 02:21:58 2008 @@ -50,15 +50,15 @@ ULONG SkipFirstSlash = 0; /* Zero the strings before continuing */ - RtlZeroMemory(FirstPart, sizeof(*FirstPart)); - RtlZeroMemory(RemainingPart, sizeof(*RemainingPart)); + RtlZeroMemory(FirstPart, sizeof(ANSI_STRING)); + RtlZeroMemory(RemainingPart, sizeof(ANSI_STRING)); /* Just quit if the string is empty */ if (!Name.Length) return; /* Find first backslash */ - FirstPosition = Name.Length / sizeof(CHAR); - for (i = 0; i < Name.Length / sizeof(CHAR); i++) + FirstPosition = Name.Length; + for (i = 0; i < Name.Length; i++) { /* First make sure the character it's not the Lead DBCS */ if (FsRtlIsLeadDbcsCharacter(Name.Buffer[i])) @@ -84,14 +84,14 @@ /* Set up the first result string */ FirstPart->Buffer = Name.Buffer + SkipFirstSlash; - FirstPart->Length = (FirstPosition - SkipFirstSlash) * sizeof(CHAR); + FirstPart->Length = (FirstPosition - SkipFirstSlash); FirstPart->MaximumLength = FirstPart->Length; /* And second one, if necessary */ - if (FirstPosition < (Name.Length / sizeof(CHAR))) + if (FirstPosition < (Name.Length)) { RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; - RemainingPart->Length = Name.Length - (FirstPosition + 1) * sizeof(CHAR); + RemainingPart->Length = Name.Length - (FirstPosition + 1); RemainingPart->MaximumLength = RemainingPart->Length; } } @@ -168,7 +168,7 @@ return !(Expression->Length ^ Name->Length); } - for (ExpressionPosition = 0; ExpressionPosition < Expression->Length / sizeof(CHAR); ExpressionPosition++) + for (ExpressionPosition = 0; ExpressionPosition < Expression->Length; ExpressionPosition++) { if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[MatchingChars]) || (Expression->Buffer[ExpressionPosition] == '?') || @@ -180,11 +180,11 @@ } else if (Expression->Buffer[ExpressionPosition] == '*') { - MatchingChars = Name->Length / sizeof(CHAR); + MatchingChars = Name->Length; } else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { - for (NamePosition = MatchingChars; NamePosition < Name->Length / sizeof(CHAR); NamePosition++) + for (NamePosition = MatchingChars; NamePosition < Name->Length; NamePosition++) { if (Name->Buffer[NamePosition] == '.') { @@ -197,7 +197,7 @@ { MatchingChars = 0; } - if (MatchingChars == Name->Length / sizeof(CHAR)) + if (MatchingChars == Name->Length) { return TRUE; } @@ -282,7 +282,7 @@ } /* Filename must be 8.3 filename */ - if (FirstPart.Length / sizeof(CHAR) < 3 || FirstPart.Length / sizeof(CHAR) > 12) + if (FirstPart.Length < 3 || FirstPart.Length > 12) return FALSE; if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FirstPart)) @@ -291,12 +291,12 @@ /* Now, we will parse the filename to find everything bad in * It mustn't contain: * 0x00-0x1F, 0x22, 0x2B, 0x2C, 0x2F, 0x3A, 0x3B, 0x3D, 0x5B, 0x5D, 0x7C */ - for (i = 0; i < FirstPart.Length / sizeof(CHAR); i++) + for (i = 0; i < FirstPart.Length; i++) { /* First make sure the character it's not the Lead DBCS */ if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) { - if (i == (FirstPart.Length / sizeof(CHAR)) - 1) + if (i == (FirstPart.Length) - 1) return FALSE; i++; } @@ -319,7 +319,7 @@ /* We mustn't have spaces before dot or at the end of the filename * and no dot at the beginning of the filename */ - if ((i == (FirstPart.Length / sizeof(CHAR)) - 1) || i == 0) + if ((i == (FirstPart.Length) - 1) || i == 0) return FALSE; if (i > 0) @@ -327,13 +327,13 @@ return FALSE; /* Filename must be 8.3 filename and not 3.8 filename */ - if ((FirstPart.Length / sizeof(CHAR) - 1) - i > 3) + if ((FirstPart.Length - 1) - i > 3) return FALSE; } } /* Filename mustn't finish with a space */ - if (FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == ' ') + if (FirstPart.Buffer[FirstPart.Length - 1] == ' ') return FALSE; EndLoop: @@ -433,12 +433,12 @@ /* Now, we will parse the filename to find everything bad in * It mustn't contain: * 0x00-0x1F, 0x22, 0x2A, 0x2F, 0x3A, 0x3C, 0x3E, 0x3F, 0x7C */ - for (i = 0; i < FirstPart.Length / sizeof(CHAR); i++) + for (i = 0; i < FirstPart.Length; i++) { /* First make sure the character it's not the Lead DBCS */ if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) { - if (i == (FirstPart.Length / sizeof(CHAR)) - 1) + if (i == (FirstPart.Length) - 1) return FALSE; i++; } @@ -453,8 +453,8 @@ } /* Filename mustn't finish with a space or a dot */ - if ((FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == ' ') || - (FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == '.')) + if ((FirstPart.Buffer[FirstPart.Length - 1] == ' ') || + (FirstPart.Buffer[FirstPart.Length - 1] == '.')) return FALSE; EndLoop: 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] Mon Sep 1 02:21:58 2008 @@ -166,8 +166,8 @@ ULONG SkipFirstSlash = 0; /* Zero the strings before continuing */ - RtlZeroMemory(FirstPart, sizeof(*FirstPart)); - RtlZeroMemory(RemainingPart, sizeof(*RemainingPart)); + RtlZeroMemory(FirstPart, sizeof(UNICODE_STRING)); + RtlZeroMemory(RemainingPart, sizeof(UNICODE_STRING)); /* Just quit if the string is empty */ if (!Name.Length) return;

1 0

[cgutman] 35849: - Don't return NDIS_STATUS_SUCCESS when we really failed
by cgutman＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: cgutman Date: Sun Aug 31 22:58:34 2008 New Revision: 35849 URL: http://svn.reactos.org/svn/reactos?rev=35849&view=rev Log: - Don't return NDIS_STATUS_SUCCESS when we really failed Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Aug 31 22:58:34 2008 @@ -1420,6 +1420,7 @@ { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; return (NTSTATUS)NdisStatus; } @@ -1462,6 +1463,7 @@ Adapter->LookaheadBuffer = NULL; } ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; return (NTSTATUS)NdisStatus; }

1 0

[cgutman] 35848: - Initially set PoolHandle, ConfigurationHandle, KeyHandle, and Filter to NULL - Initially set PortOffset to 0 - Fix 4 memory leaks - Remove a useless if
by cgutman＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: cgutman Date: Sun Aug 31 22:13:35 2008 New Revision: 35848 URL: http://svn.reactos.org/svn/reactos?rev=35848&view=rev Log: - Initially set PoolHandle, ConfigurationHandle, KeyHandle, and Filter to NULL - Initially set PortOffset to 0 - Fix 4 memory leaks - Remove a useless if Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c branches/aicom-network-fixes/drivers/network/ndis/ndis/efilter.c branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Sun Aug 31 22:13:35 2008 @@ -488,6 +488,8 @@ "NumberOfDescriptors (%d) ProtocolReservedLength (%d).\n", Status, PoolHandle, NumberOfDescriptors, ProtocolReservedLength)); + *PoolHandle = NULL; + if (NumberOfDescriptors > 0xffff) { *Status = NDIS_STATUS_RESOURCES; @@ -528,8 +530,9 @@ *Status = NDIS_STATUS_SUCCESS; *PoolHandle = (PNDIS_HANDLE)Pool; - } else + } else { *Status = NDIS_STATUS_RESOURCES; + } } } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Sun Aug 31 22:13:35 2008 @@ -193,13 +193,14 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + *ConfigurationHandle = NULL; + *Status = ZwDuplicateObject(NtCurrentProcess(), RootKeyHandle, NtCurrentProcess(), &KeyHandle, 0, 0, DUPLICATE_SAME_ACCESS); if(!NT_SUCCESS(*Status)) { NDIS_DbgPrint(MID_TRACE, ("Failed to open registry configuration for this miniport\n")); - *ConfigurationHandle = NULL; *Status = NDIS_STATUS_FAILURE; return; } @@ -743,7 +744,8 @@ if(!MiniportResource) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_FAILURE; + ExFreePool(IntArray); + *Status = NDIS_STATUS_RESOURCES; return; } @@ -797,6 +799,8 @@ NDIS_HANDLE RegKeyHandle; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext; + *KeyHandle = NULL; + *Status = ZwEnumerateKey(ConfigurationHandle, Index, KeyBasicInformation, NULL, 0, &KeyInformationLength); if(*Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_SUCCESS) { @@ -885,6 +889,8 @@ OBJECT_ATTRIBUTES KeyAttributes; NDIS_HANDLE RegKeyHandle; + *KeyHandle = NULL; + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/efilter.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/efilter.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/efilter.c [iso-8859-1] Sun Aug 31 22:13:35 2008 @@ -44,6 +44,7 @@ *Filter = (PETH_FILTER)NewFilter; return TRUE; } + *Filter = NULL; return FALSE; } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Aug 31 22:13:35 2008 @@ -841,6 +841,8 @@ PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; ULONG AddressSpace = 1; /* FIXME The HAL handles this wrong atm */ + *PortOffset = 0; + NDIS_DbgPrint(MAX_TRACE, ("Called - InitialPort 0x%x, NumberOfPorts 0x%x\n", InitialPort, NumberOfPorts)); memset(&PortAddress, 0, sizeof(PortAddress)); @@ -878,7 +880,6 @@ NDIS_DbgPrint(MAX_TRACE, ("calling MmMapIoSpace\n")); - *PortOffset = 0; *PortOffset = MmMapIoSpace(TranslatedAddress, NumberOfPorts, MmNonCached); NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x for port range\n", *PortOffset)); Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Aug 31 22:13:35 2008 @@ -562,13 +562,6 @@ /* FIXME: Wait in pending case! */ - /* XXX is status_pending part of success macro? */ - if ((NT_SUCCESS(NdisStatus)) || (NdisStatus == NDIS_STATUS_PENDING)) - { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Miniport returned status (0x%X).\n", NdisStatus)); - return NdisStatus; - } - return NdisStatus; } @@ -1017,6 +1010,7 @@ RegistryPath = ExAllocatePool(PagedPool, sizeof(UNICODE_STRING)); if(!RegistryPath) { + ExFreePool(Miniport); NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return; } @@ -1028,6 +1022,8 @@ if(!RegistryBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(Miniport); + ExFreePool(RegistryPath); return; }

1 0

[jimtabor] 35847: - Add flag sets and clears for SetMapMode. Assosiate Map Mode flags with Xform flags and start the use and implementation for user mode.
by jimtabor＠svn.reactos.org 01 Sep '08

01 Sep '08

Author: jimtabor Date: Sun Aug 31 19:51:05 2008 New Revision: 35847 URL: http://svn.reactos.org/svn/reactos?rev=35847&view=rev Log: - Add flag sets and clears for SetMapMode. Assosiate Map Mode flags with Xform flags and start the use and implementation for user mode. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Aug 31 19:51:05 2008 @@ -668,6 +668,10 @@ Dc_Attr->szlWindowExt.cy = 1; Dc_Attr->szlViewportExt.cx = 1; Dc_Attr->szlViewportExt.cy = 1; + Dc_Attr->flXform &= ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| + PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP); + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|PAGE_TO_DEVICE_SCALE_IDENTITY| + INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); break; case MM_LOMETRIC: @@ -707,7 +711,12 @@ break; case MM_ANISOTROPIC: + Dc_Attr->flXform &= ~(PAGE_TO_DEVICE_IDENTITY|POSITIVE_Y_IS_UP); + Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; break; + default: + Dc_Attr->iMapMode = PrevMapMode; + PrevMapMode = 0; } DC_UpdateXforms(dc);

1 0

[pschweitzer] 35846: Reverted r35812 because of unwanted triple fault bug. See issue #3704, 3706 for more details.
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 16:58:44 2008 New Revision: 35846 URL: http://svn.reactos.org/svn/reactos?rev=35846&view=rev Log: Reverted r35812 because of unwanted triple fault bug. See issue #3704,3706 for more details. Modified: trunk/reactos/dll/ntdll/dispatch/ (props changed) trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/vectoreh.c Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ (empty) Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -15,6 +15,10 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); +EXCEPTION_DISPOSITION NTAPI +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context); + /* FUNCTIONS ****************************************************************/ /* @@ -28,16 +32,26 @@ EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* Dispatch the exception and check the result */ - if (RtlDispatchException(ExceptionRecord, Context)) + /* call the vectored exception handlers */ + if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, + Context) != ExceptionContinueExecution) { - /* Continue executing */ - Status = NtContinue(Context, FALSE); + goto ContinueExecution; } else { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); + /* Dispatch the exception and check the result */ + if(RtlDispatchException(ExceptionRecord, Context)) + { +ContinueExecution: + /* Continue executing */ + Status = NtContinue(Context, FALSE); + } + else + { + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); + } } /* Setup the Exception record */ Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -183,13 +183,43 @@ .globl _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: - /* Clear direction flag */ + /* clear the direct flag + * text from bug 2279 + * if it not clear it means that if an exception occurs while + * the direction flag is set (typically inside memmove), the + * exception handlers will be called with the direction flag still + * set. The Windows x86-32 and x86-64 ABI requires that the + * direction flag be Calling memset() with a compile-time constant + * size on both GCC and MSVC will result in inlining a "rep stosd" + * instruction. Because of the ABI, they will assume that the + * direction flag is clear and not emit a "cld" instruction. + * Using memset() in an exception handler therefore will + * corrupt memory if the exception occurred during a reverse copy + * such as a forward overlapping memmove(). + * + * For reliability and ease of debugging, please add "cld" to the beginning of + * KiUserExceptionDispatcher. Note that the same will be true of x86-64 whenever + * that happens. This does not affect continuing execution; the CONTEXT of the + * exception has the direction flag set and will be restored upon NtContinue. + * KiUserApcDispatcher and KiUserCallbackDispatcher need to be evaluated for this + * issue. + */ + cld /* Save the Context and Exception Records */ mov ecx, [esp+4] mov ebx, [esp] + /* Call the vectored exception handler */ + push ecx + push ebx + call _RtlpExecuteVectoredExceptionHandlers@8 + + /* Check for success */ + or al, al + jnz ContinueExecution + /* Dispatch the exception */ sub esp, 8 call _RtlDispatchException@8 @@ -198,6 +228,7 @@ or al, al jz RaiseException +ContinueExecution: /* Pop off the records */ pop ebx pop ecx Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -73,13 +73,6 @@ EXCEPTION_DISPOSITION Disposition; ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; - - /* Call any registered vectored handlers */ - if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) - { - /* Exception handled, continue execution */ - return TRUE; - } /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=35846&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -36,13 +36,6 @@ VOID NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); - -BOOLEAN -NTAPI -RtlCallVectoredExceptionHandlers( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context -); typedef struct _DISPATCHER_CONTEXT { Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=358… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -28,10 +28,9 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN -NTAPI -RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) +EXCEPTION_DISPOSITION NTAPI +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) { PLIST_ENTRY CurrentEntry; PRTL_VECTORED_EXCEPTION_HANDLER veh; @@ -56,7 +55,7 @@ if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - return TRUE; + return ExceptionContinueSearch; } RtlEnterCriticalSection(&RtlpVectoredExceptionLock); @@ -64,7 +63,7 @@ RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } - return FALSE; + return ExceptionContinueExecution; } VOID

1 0

[sginsberg] 35837: - "0xbadf00d" is not a valid tag. use "PcNt" instead
by sginsberg＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: sginsberg Date: Sun Aug 31 12:56:13 2008 New Revision: 35837 URL: http://svn.reactos.org/svn/reactos?rev=35837&view=rev Log: - "0xbadf00d" is not a valid tag. use "PcNt" instead Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Sun Aug 31 12:56:13 2008 @@ -146,7 +146,7 @@ #endif /* memory pool tag */ -#define PCNET_TAG 0xbaadf00d +#define PCNET_TAG TAG('P', 'c', 'N', 't') #endif // _PCNET_H_

2 1

[pschweitzer] 35844: Add primary tests to FsRtlInsertPerFileObjectContext. That's only to test branch build ; ).
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 14:47:19 2008 New Revision: 35844 URL: http://svn.reactos.org/svn/reactos?rev=35844&view=rev Log: Add primary tests to FsRtlInsertPerFileObjectContext. That's only to test branch build ;). Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/filtr… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] Sun Aug 31 14:47:19 2008 @@ -112,7 +112,7 @@ } ExAcquireFastMutex(PerStreamContext->FastMutex); - InsertHeadList(&PerStreamContext->FilterContexts, &Ptr->Links); + InsertHeadList(&(PerStreamContext->FilterContexts), &(Ptr->Links)); ExReleaseFastMutex(PerStreamContext->FastMutex); return STATUS_SUCCESS; } @@ -179,6 +179,16 @@ FsRtlInsertPerFileObjectContext(IN PFILE_OBJECT FileObject, IN PFSRTL_PER_FILEOBJECT_CONTEXT Ptr) { + if (!FileObject) + { + return STATUS_INVALID_PARAMETER; + } + + if (FileObject->Flags & FO_NAMED_PIPE) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + KEBUGCHECK(0); return STATUS_NOT_IMPLEMENTED; }

1 0

[pschweitzer] 35843: Define TAG macro before use. That fixes build
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 14:15:06 2008 New Revision: 35843 URL: http://svn.reactos.org/svn/reactos?rev=35843&view=rev Log: Define TAG macro before use. That fixes build Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Sun Aug 31 14:15:06 2008 @@ -145,6 +145,10 @@ #define BREAKPOINT #endif +#ifndef TAG +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif + /* memory pool tag */ #define PCNET_TAG TAG('P', 'c', 'N', 't')

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