ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
August 2008
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
27 participants
853 discussions
Start a n
N
ew thread
[cwittich] 35795: start rewriting sysreg2 with libvirt
by cwittich@svn.reactos.org
Author: cwittich Date: Sat Aug 30 03:38:15 2008 New Revision: 35795 URL:
http://svn.reactos.org/svn/reactos?rev=35795&view=rev
Log: start rewriting sysreg2 with libvirt Added: trunk/tools/sysreg2/ (with props) trunk/tools/sysreg2/console.c (with props) trunk/tools/sysreg2/makefile (with props) trunk/tools/sysreg2/sysreg.h (with props) trunk/tools/sysreg2/utils.c (with props) trunk/tools/sysreg2/virt.c (with props) Propchange: trunk/tools/sysreg2/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 30 03:38:15 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/sysreg2/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/sysreg2/ ------------------------------------------------------------------------------ bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Added: trunk/tools/sysreg2/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35795&…
============================================================================== --- trunk/tools/sysreg2/console.c (added) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Aug 30 03:38:15 2008 @@ -1,0 +1,94 @@ +#include "sysreg.h" +#include <termios.h> +#include <poll.h> + +void ProcessDebugData(const char* tty, int timeout) +{ + int ttyfd, i; + struct termios ttyattr, rawattr; + + if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) + { + printf("error opening tty\n"); + return; + } + + if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) + return; + + rawattr = ttyattr; + rawattr.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP + | IGNCR | ICRNL | IXON); + rawattr.c_lflag &= ~(ICANON | ECHO | ECHONL); + rawattr.c_oflag &= ~OPOST; + rawattr.c_cflag &= ~(CSIZE | PARENB); + rawattr.c_cflag |= CS8; + + if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) + return; + + while (1) + { + int ret; + struct pollfd fds[] = { + { STDIN_FILENO, POLLIN, 0 }, + { ttyfd, POLLIN, 0 }, + }; + + ret = poll(fds, (sizeof(fds) / sizeof(struct pollfd)), timeout); + if (ret < 0) + { + if (errno == EINTR || errno == EAGAIN) + continue; + goto cleanup; + } + else if (ret == 0) + { + /* timeout */ + printf("timeout\n"); + goto cleanup; + } + + for (i=0; i<(sizeof(fds) / sizeof(struct pollfd)); i++) + { + if (!fds[i].revents) + continue; + if (fds[i].revents & POLLIN) + { + char buf[4096]; + int got, sent = 0; + + got = read(fds[i].fd, buf, sizeof(buf)); + if (got < 0) + goto cleanup; + if (!got || got == 1 && buf[0] == '\33') + goto cleanup; + + if (fds[i].fd != STDIN_FILENO) + { + while (sent < got) + { + int done; + if ((done = safewrite(STDOUT_FILENO, + buf + sent, got -sent)) <= 0) + { + goto cleanup; + } + sent += done; + } + } + if (buf) + free(buf); + } + } + + } + + +cleanup: + tcsetattr(STDIN_FILENO, TCSAFLUSH, &ttyattr); + close(ttyfd); + + +} + Propchange: trunk/tools/sysreg2/console.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg2/makefile URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/makefile?rev=35795&v…
============================================================================== --- trunk/tools/sysreg2/makefile (added) +++ trunk/tools/sysreg2/makefile [iso-8859-1] Sat Aug 30 03:38:15 2008 @@ -1,0 +1,28 @@ +TARGET := sysreg2 + +.PHONY: all + +all: $(TARGET) + +CC=gcc +CFLAGS := -O2 -std=c99 -D_GNU_SOURCE +LFLAGS := -s -L/usr/lib64 +LIBS := -lgcc -lm -lvirt -ltasn1 -lz -lxml2 -lgnutls +INC := -I/usr/include/libvirt/ -I/usr/include/libxml2/ + +SRCS := virt.c utils.c console.c + +OBJS := $(SRCS:.c=.o) + +$(TARGET): $(OBJS) + $(CC) $(LFLAGS) -o $@ $(OBJS) $(LIBS) + +.c.o: $< + $(CC) $(INC) $(CFLAGS) -c $< -o $@ + + +.PHONY: clean +clean: + -@rm $(TARGET) + -@rm $(OBJS) + Propchange: trunk/tools/sysreg2/makefile ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg2/sysreg.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=35795&v…
============================================================================== --- trunk/tools/sysreg2/sysreg.h (added) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Sat Aug 30 03:38:15 2008 @@ -1,0 +1,15 @@ +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdbool.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/xpath.h> +#include <libxml/xpathInternals.h> + +char* ReadFile (const char *filename); +void ProcessDebugData(const char* tty, int timeout); +ssize_t safewrite(int fd, const void *buf, size_t count); Propchange: trunk/tools/sysreg2/sysreg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg2/utils.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/utils.c?rev=35795&vi…
============================================================================== --- trunk/tools/sysreg2/utils.c (added) +++ trunk/tools/sysreg2/utils.c [iso-8859-1] Sat Aug 30 03:38:15 2008 @@ -1,0 +1,64 @@ +#include "sysreg.h" + +ssize_t safewrite(int fd, const void *buf, size_t count) +{ + size_t nwritten = 0; + while (count > 0) { + ssize_t r = write(fd, buf, count); + + if (r < 0 && errno == EINTR) + continue; + if (r < 0) + return r; + if (r == 0) + return nwritten; + buf = (const char *)buf + r; + count -= r; + nwritten += r; + } + return nwritten; +} + +char * ReadFile (const char *filename) +{ + char *buffer = NULL, *oldbuffer; + int len = 0, fd, r; + char b[1024]; + + fd = open (filename, O_RDONLY); + if (fd == -1) + return NULL; + + for (;;) { + r = read (fd, b, sizeof b); + if (r == -1) + { + if (buffer) free (buffer); + close(fd); + return NULL; + } + if (r == 0) break; /* end of file. */ + oldbuffer = buffer; + buffer = realloc (buffer, len+r); + if (buffer == NULL) { + /* out of memory */ + close(fd); + return NULL; + } + memcpy (buffer+len, b, r); + len += r; + } + + buffer = realloc (buffer, len+1); + if (buffer == NULL) + { + /* out of memory */ + close(fd); + return NULL; + } + buffer[len] = '\0'; + close (fd); + return buffer; +} + + Propchange: trunk/tools/sysreg2/utils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg2/virt.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35795&vie…
============================================================================== --- trunk/tools/sysreg2/virt.c (added) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Sat Aug 30 03:38:15 2008 @@ -1,0 +1,152 @@ +#include "sysreg.h" +#include <libvirt.h> + +const char* GetConsole(virDomainPtr vDomPtr) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + char* XmlDoc; + const char* RetVal = NULL; + + XmlDoc = virDomainGetXMLDesc(vDomPtr, 0); + if (!XmlDoc) + return NULL; + + xml = xmlReadDoc((const xmlChar *) XmlDoc, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + free(XmlDoc); + if (!xml) + return NULL; + + ctxt = xmlXPathNewContext(xml); + if (!ctxt) + { + xmlFreeDoc(xml); + return NULL; + } + + obj = xmlXPathEval(BAD_CAST "string(/domain/devices/console/@tty)", ctxt); + if ((obj != NULL) && ((obj->type == XPATH_STRING) && + (obj->stringval != NULL) && (obj->stringval[0] != 0))) + { + RetVal = (const char*)obj->stringval; + } + + xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); + return RetVal; +} + +bool IsVirtualMachineRunning(virConnectPtr vConn, const char* name) +{ + char* names[10]; + int iDomains; + int iMaxnames = 10; + + iDomains = virConnectListDefinedDomains(vConn, names, iMaxnames); + if (iDomains != -1) + { + int i; + for(i=0; i<iDomains; i++) + { + if (strcmp(name, names[i]) == 0) + return true; + } + } + return false; +} + +virDomainPtr LaunchVirtualMachine(virConnectPtr vConn, const char* XmlFileName, const char* BootDevice) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + char* XmlDoc; + char* buffer; + const char* name; + char* domname; + int len = 0; + + buffer = ReadFile(XmlFileName); + if (buffer == NULL) + return NULL; + + xml = xmlReadDoc((const xmlChar *) buffer, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) + return NULL; + + ctxt = xmlXPathNewContext(xml); + if (!ctxt) + return NULL; + + obj = xmlXPathEval(BAD_CAST "/domain/os/boot", ctxt); + if ((obj != NULL) && (obj->type == XPATH_NODESET) + && (obj->nodesetval != NULL) && (obj->nodesetval->nodeTab != NULL)) + { + xmlSetProp(obj->nodesetval->nodeTab[0], "dev", BootDevice); + } + + free(buffer); + xmlDocDumpMemory(xml, (xmlChar**) &buffer, &len); + xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); + xmlXPathFreeObject(obj); + + virDomainPtr vDomPtr = virDomainDefineXML(vConn, buffer); + xmlFree((xmlChar*)buffer); + if (vDomPtr) + { + if (virDomainCreate(vDomPtr) != 0) + { + virDomainUndefine(vDomPtr); + vDomPtr = NULL; + } + else + { + /* workaround a bug in libvirt */ + name = virDomainGetName(vDomPtr); + domname = strdup(name); + virDomainFree(vDomPtr); + vDomPtr = virDomainLookupByName(vConn, domname); + free(domname); + } + } + return vDomPtr; +} + + +int main() +{ + + virConnectPtr vConn; + virDomainPtr vDom; + + vConn = virConnectOpen("qemu:///session"); + + if (IsVirtualMachineRunning(vConn, "reactos")) + printf("Virtual Machine is already running\n"); + else + { + vDom = LaunchVirtualMachine(vConn, "/opt/buildbot/kvmtest/reactos.xml", "cdrom"); + { + if (vDom) + { + printf("Domain %s started.\n", virDomainGetName(vDom)); + printf("%s\n", GetConsole(vDom)); + ProcessDebugData(GetConsole(vDom), 10000 /*10 sec */); + + virDomainDestroy(vDom); + virDomainUndefine(vDom); + virDomainFree(vDom); + } + } + } + + virConnectClose(vConn); + return 1; +} + Propchange: trunk/tools/sysreg2/virt.c ------------------------------------------------------------------------------ svn:eol-style = native
16 years, 3 months
1
0
0
0
[fireball] 35794: - NDK fixes.
by fireball@svn.reactos.org
Author: fireball Date: Sat Aug 30 03:33:22 2008 New Revision: 35794 URL:
http://svn.reactos.org/svn/reactos?rev=35794&view=rev
Log: - NDK fixes. Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/mmtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=…
============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sat Aug 30 03:33:22 2008 @@ -389,9 +389,9 @@ // typedef struct _EVENT_COUNTER { + SLIST_ENTRY ListEntry; ULONG RefCount; KEVENT Event; - LIST_ENTRY ListEntry; } EVENT_COUNTER, *PEVENT_COUNTER; // @@ -642,7 +642,7 @@ ULONG Hashed:1; ULONG Direct:1; ULONG Age:2; - ULONG VirtualPageNumber:14; + ULONG VirtualPageNumber:20; } MMWSLENTRY, *PMMWSLENTRY; typedef struct _MMWSLE
16 years, 3 months
1
0
0
0
[janderwald] 35793: - Add IIDs && GUID of Netcfg
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Aug 30 03:17:33 2008 New Revision: 35793 URL:
http://svn.reactos.org/svn/reactos?rev=35793&view=rev
Log: - Add IIDs && GUID of Netcfg Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=35…
============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Aug 30 03:17:33 2008 @@ -99,6 +99,11 @@ DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); + DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); @@ -127,4 +132,6 @@ DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_ConnectionManager, 0xBA126AD1,0x2166, 0x11D1,0xB1,0xD0,0x0,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(CLSID_ConnectionManager, 0xBA126AD1,0x2166,0x11D1,0xB1,0xD0,0x0,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(CLSID_CNetCfg, 0x5B035261,0x40F9,0x11D1,0xAA,0xEC,0x00,0x80,0x5F,0xC1,0x27,0x0E); +
16 years, 3 months
1
0
0
0
[janderwald] 35792: - Import Netcfgx.h
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Aug 30 03:16:39 2008 New Revision: 35792 URL:
http://svn.reactos.org/svn/reactos?rev=35792&view=rev
Log: - Import Netcfgx.h Added: trunk/reactos/include/psdk/netcfgx.h (with props) Added: trunk/reactos/include/psdk/netcfgx.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcfgx.h?rev…
============================================================================== --- trunk/reactos/include/psdk/netcfgx.h (added) +++ trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] Sat Aug 30 03:16:39 2008 @@ -1,0 +1,105 @@ +#ifndef __NETCFGX_H__ +#define __NETCFGX_H__ + +#undef INTERFACE +#define INTERFACE INetCfgComponent +DECLARE_INTERFACE_(INetCfgComponent, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,GetDisplayName)(THIS_ LPWSTR *ppszwDisplayName) PURE; + STDMETHOD_(HRESULT,SetDisplayName)(THIS_ LPWSTR *ppszwDisplayName) PURE; + STDMETHOD_(HRESULT,GetHelpText)(THIS_ LPWSTR *pszwHelpText) PURE; + STDMETHOD_(HRESULT,GetId)(THIS_ LPWSTR *ppszwId) PURE; + STDMETHOD_(HRESULT,GetCharacteristics)(THIS_ LPDWORD pdwCharacteristics) PURE; + STDMETHOD_(HRESULT,GetInstanceGuid)(THIS_ GUID *pGuid) PURE; + STDMETHOD_(HRESULT,GetPnpDevNodeId)(THIS_ LPWSTR *ppszwDevNodeId) PURE; + STDMETHOD_(HRESULT,GetClassGuid)(THIS_ GUID *pGuid) PURE; + STDMETHOD_(HRESULT,GetBindName)(THIS_ LPWSTR *ppszwBindName) PURE; + STDMETHOD_(HRESULT,GetDeviceStatus)(THIS_ ULONG *pulStatus) PURE; + STDMETHOD_(HRESULT,OpenParamKey)(THIS_ HKEY *phkey) PURE; + STDMETHOD_(HRESULT,RaisePropertyUi)(THIS_ HWND hwndParent, DWORD dwFlags, IUnknown *punkContext) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgComponent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgComponent_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgComponent_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgComponent_GetDisplayName(p,a) (p)->lpVtbl->GetDisplayName(p,a) +#define INetCfgComponent_SetDisplayName(p,a) (p)->lpVtbl->SetDisplayName(p,a) +#define INetCfgComponent_GetHelpText(p,a) (p)->lpVtbl->GetHelpText(p,a) +#define INetCfgComponent_GetId(p,a) (p)->lpVtbl->GetId(p,a) +#define INetCfgComponent_GetCharacteristics(p,a) (p)->lpVtbl->GetCharacteristics(p,a) +#define INetCfgComponent_GetInstanceGuid(p,a) (p)->lpVtbl->GetInstanceGuid(p,a) +#define INetCfgComponent_GetPnpDevNodeId(p,a) (p)->lpVtbl->GetPnpDevNodeId(p,a) +#define INetCfgComponent_GetClassGuid(p,a) (p)->lpVtbl->GetClassGuid(p,a) +#define INetCfgComponent_GetBindName(p,a) (p)->lpVtbl->GetBindName(p,a) +#define INetCfgComponent_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a) +#define INetCfgComponent_OpenParamKey(p,a) (p)->lpVtbl->OpenParamKey(p,a) +#define INetCfgComponent_RaisePropertyUi(p,a,b,c) (p)->lpVtbl->OpenParamKey(p,a,b,c) +#endif + +#undef INTERFACE +#define INTERFACE IEnumNetCfgComponent +DECLARE_INTERFACE_(IEnumNetCfgComponent, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt, INetCfgComponent **rgelt, ULONG *pceltFetched) PURE; + STDMETHOD_(HRESULT,Skip) (THIS_ ULONG celt) PURE; + STDMETHOD_(HRESULT,Reset) (THIS) PURE; + STDMETHOD_(HRESULT,Clone) (THIS_ IEnumNetCfgComponent **ppenum) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IEnumNetCfgComponent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IEnumNetCfgComponent_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IEnumNetCfgComponent_Release(p) (p)->lpVtbl->Release(p) +#define IEnumNetCfgComponent_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) +#define IEnumNetCfgComponent_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#define IEnumNetCfgComponent_Reset(p) (p)->lpVtbl->Reset(p) +#define IEnumNetCfgComponent_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif + + +#undef INTERFACE +#define INTERFACE INetCfg +DECLARE_INTERFACE_(INetCfg, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Initialize) (THIS_ PVOID pvReserved) PURE; + STDMETHOD_(HRESULT,Uninitialize) (THIS) PURE; + STDMETHOD_(HRESULT,Apply) (THIS) PURE; + STDMETHOD_(HRESULT,Cancel) (THIS) PURE; + STDMETHOD_(HRESULT,EnumComponents) (THIS_ const GUID *pguidClass, IEnumNetCfgComponent **ppenumComponent) PURE; + STDMETHOD_(HRESULT,FindComponent) (THIS_ LPCWSTR pszwInfId, IEnumNetCfgComponent **ppenumComponent) PURE; + STDMETHOD_(HRESULT,QueryNetCfgClass) (THIS_ const GUID *pguidClass, REFIID riid, void **ppvObject) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfg_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfg_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfg_Release(p) (p)->lpVtbl->Release(p) +#define INetCfg_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) +#define INetCfg_Uninitialize(p) (p)->lpVtbl->Uninitialize(p) +#define INetCfg_Apply(p) (p)->lpVtbl->Apply(p) +#define INetCfg_Cancel(p) (p)->lpVtbl->Cancel(p) +#define INetCfg_EnumComponents(p,a,b) (p)->lpVtbl->EnumComponents(p,a,b) +#define INetCfg_FindComponent(p,a,b) (p)->lpVtbl->FindComponent(p,a,b) +#define INetCfg_QueryNetCfgClass(p,a,b,c) (p)->lpVtbl->QueryNetCfgClass(p,a,b,c) +#endif + +EXTERN_C const GUID CLSID_CNetCfg; +EXTERN_C const IID IID_INetCfg; + +#endif Propchange: trunk/reactos/include/psdk/netcfgx.h ------------------------------------------------------------------------------ svn:eol-style = native
16 years, 3 months
1
0
0
0
[fireball] 35791: - Fix broken MMPTE_LIST structure definition.
by fireball@svn.reactos.org
Author: fireball Date: Sat Aug 30 02:57:06 2008 New Revision: 35791 URL:
http://svn.reactos.org/svn/reactos?rev=35791&view=rev
Log: - Fix broken MMPTE_LIST structure definition. Modified: trunk/reactos/include/ndk/i386/mmtypes.h Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h…
============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Sat Aug 30 02:57:06 2008 @@ -115,9 +115,9 @@ ULONG Valid:1; ULONG OneEntry:1; ULONG filler0:8; - ULONG NextEntry:20; ULONG Prototype:1; ULONG filler1:1; + ULONG NextEntry:20; } MMPTE_LIST; #ifndef CONFIG_SMP
16 years, 3 months
1
0
0
0
[hpoussin] 35790: GCC doesn't need CDECL on variables
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sat Aug 30 02:11:57 2008 New Revision: 35790 URL:
http://svn.reactos.org/svn/reactos?rev=35790&view=rev
Log: GCC doesn't need CDECL on variables Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3579…
============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Aug 30 02:11:57 2008 @@ -73,8 +73,11 @@ #ifndef _NTRTL_ #ifndef DEFINE_GUIDEX - /* CDECL is used here in MS DDK but does this really work?? */ - #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name + #ifdef _MSC_VER + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name + #else + #define DEFINE_GUIDEX(name) EXTERN_C const GUID name + #endif #endif #ifndef STATICGUIDOF
16 years, 3 months
1
0
0
0
[sserapion] 35789: re-add missing api, remove unneded file
by sserapion@svn.reactos.org
Author: sserapion Date: Sat Aug 30 01:49:03 2008 New Revision: 35789 URL:
http://svn.reactos.org/svn/reactos?rev=35789&view=rev
Log: re-add missing api, remove unneded file Removed: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] Sat Aug 30 01:49:03 2008 @@ -311,6 +311,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ultoa(long ptr long) msvcrt._ultoa + @ cdecl _ultow(long ptr long) msvcrt._ultow @ cdecl _umask(long) msvcrt._umask @ cdecl _ungetch(long) msvcrt._ungetch @ cdecl _unlink(str) msvcrt._unlink Removed: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def (removed) @@ -1,121 +1,0 @@ -; WS2_32.DLL - Windows Sockets 2 DLL - -LIBRARY ws2_32.dll - -EXPORTS -WEP@0 @500 -WPUCompleteOverlappedRequest@20 @25 -WSAAccept@20 @26 -WSAAddressToStringA@20 @27 -WSAAddressToStringW@20 @28 -WSAAsyncGetHostByAddr@28 @102 -WSAAsyncGetHostByName@20 @103 -WSAAsyncGetProtoByName@20 @105 -WSAAsyncGetProtoByNumber@20 @104 -WSAAsyncGetServByName@24 @107 -WSAAsyncGetServByPort@24 @106 -WSAAsyncSelect@16 @101 -WSACancelAsyncRequest@4 @108 -WSACancelBlockingCall@0 @113 -WSACleanup@0 @116 -WSACloseEvent@4 @29 -WSAConnect@28 @30 -WSACreateEvent@0 @31 -WSADuplicateSocketA@12 @32 -WSADuplicateSocketW@12 @33 -WSAEnumNameSpaceProvidersA@8 @34 -WSAEnumNameSpaceProvidersW@8 @35 -WSAEnumNetworkEvents@12 @36 -WSAEnumProtocolsA@12 @37 -WSAEnumProtocolsW@12 @38 -WSAEventSelect@12 @39 -WSAGetLastError@0 @111 -WSAGetOverlappedResult@20 @40 -WSAGetQOSByName@12 @41 -WSAGetServiceClassInfoA@16 @42 -WSAGetServiceClassInfoW@16 @43 -WSAGetServiceClassNameByClassIdA@12 @44 -WSAGetServiceClassNameByClassIdW@12 @45 -WSAHtonl@12 @46 -WSAHtons@12 @47 -WSAInstallServiceClassA@4 @48 -WSAInstallServiceClassW@4 @49 -WSAIoctl@36 @50 -WSAIsBlocking@0 @114 -WSAJoinLeaf@32 @58 -WSALookupServiceBeginA@12 @59 -WSALookupServiceBeginW@12 @60 -WSALookupServiceEnd@4 @61 -WSALookupServiceNextA@16 @62 -WSALookupServiceNextW@16 @63 -WSANSPIoctl@32 @64 -WSANtohl@12 @65 -WSANtohs@12 @66 -WSAProviderConfigChange@12 @67 -WSARecv@28 @68 -WSARecvDisconnect@8 @69 -WSARecvFrom@36 @70 -WSARemoveServiceClass@4 @71 -WSAResetEvent@4 @72 -WSASend@28 @73 -WSASendDisconnect@8 @74 -WSASendTo@36 @75 -WSASetBlockingHook@4 @109 -WSASetEvent@4 @76 -WSASetLastError@4 @112 -WSASetServiceA@12 @77 -WSASetServiceW@12 @78 -WSASocketA@24 @79 -WSASocketW@24 @80 -WSAStartup@8 @115 -WSAStringToAddressA@20 @81 -WSAStringToAddressW@20 @82 -WSAUnhookBlockingHook@0 @110 -WSAWaitForMultipleEvents@20 @83 -WSApSetPostRoutine@4 @24 -WSCDeinstallProvider@8 @84 -WSCEnableNSProvider@8 @85 -WSCEnumProtocols@16 @86 -WSCGetProviderPath@16 @87 -WSCInstallNameSpace@20 @88 -WSCInstallProvider@20 @89 -WSCUnInstallNameSpace@4 @90 -WSCUpdateProvider@20 @91 -WSCWriteNameSpaceOrder@8 @92 -WSCWriteProviderOrder@8 @93 -__WSAFDIsSet@8 @151 -accept@12 @1 -bind@12 @2 -closesocket@4 @3 -connect@12 @4 -freeaddrinfo@4 @94 -getaddrinfo@16 @95 -gethostbyaddr@12 @51 -gethostbyname@4 @52 -gethostname@8 @57 -getnameinfo@28 @96 -getpeername@12 @5 -getprotobyname@4 @53 -getprotobynumber@4 @54 -getservbyname@8 @55 -getservbyport@8 @56 -getsockname@12 @6 -getsockopt@20 @7 -htonl@4 @8 -htons@4 @9 -inet_addr@4 @11 -inet_ntoa@4 @12 -ioctlsocket@12 @10 -listen@8 @13 -ntohl@4 @14 -ntohs@4 @15 -recv@16 @16 -recvfrom@24 @17 -select@20 @18 -send@16 @19 -sendto@24 @20 -setsockopt@20 @21 -shutdown@8 @22 -socket@12 @23 - -; EOF
16 years, 3 months
1
0
0
0
[cgutman] 35788: - Merge aicom-network-fixes up to r35787
by cgutman@svn.reactos.org
Author: cgutman Date: Fri Aug 29 22:42:46 2008 New Revision: 35788 URL:
http://svn.reactos.org/svn/reactos?rev=35788&view=rev
Log: - Merge aicom-network-fixes up to r35787 Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -53,6 +53,7 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); FCB->LocalAddress = TaCopyTransportAddress( &BindReq->Address ); if( FCB->LocalAddress ) 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 Aug 29 22:42:46 2008 @@ -33,6 +33,7 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -50,14 +51,18 @@ FCB->State = SOCKET_STATE_CONNECTED; - return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); + + if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + + return Status; } static NTSTATUS NTAPI StreamSocketConnectComplete @@ -166,6 +171,7 @@ return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); case SOCKET_STATE_CREATED: + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); FCB->LocalAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); @@ -193,6 +199,7 @@ /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -17,6 +17,7 @@ PFILE_OBJECT NewFileObject, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; + NTSTATUS Status; if( !SocketAcquireStateLock( FCB ) ) { LostSocket( Irp ); @@ -26,20 +27,27 @@ /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); - FCB->State = SOCKET_STATE_CONNECTED; FCB->Connection = Qelt->Object; + + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); FCB->RemoteAddress = TaCopyTransportAddress( Qelt->ConnInfo->RemoteAddress ); + if( !FCB->RemoteAddress ) + Status = STATUS_NO_MEMORY; + else + Status = MakeSocketIntoConnection( FCB ); + + if( NT_SUCCESS(Status) ) { + FCB->PollState |= AFD_EVENT_SEND; + PollReeval( DeviceExt, NewFileObject ); + } + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - + Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - - MakeSocketIntoConnection( FCB ); - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( DeviceExt, NewFileObject ); SocketStateUnlock( FCB ); } @@ -90,7 +98,7 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_FILE_CLOSED; + NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; @@ -99,7 +107,7 @@ return STATUS_CANCELLED; } - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ListenIrp.InFlightRequest = NULL; @@ -114,8 +122,10 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { + /* Is this correct? */ TdiCloseDevice( FCB->Connection.Handle, FCB->Connection.Object ); + Status = STATUS_NO_MEMORY; } else { UINT AddressType = FCB->LocalAddress->Address[0].AddressType; @@ -128,11 +138,12 @@ ConnectionReturnInfo->RemoteAddress)); TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); - TaCopyTransportAddressInPlace - ( Qelt->ConnInfo->RemoteAddress, - FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); - - InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + if( Qelt->ConnInfo ) { + TaCopyTransportAddressInPlace + ( Qelt->ConnInfo->RemoteAddress, + FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); + InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + } else Status = STATUS_NO_MEMORY; } /* Satisfy a pre-accept request if one is available */ @@ -160,7 +171,7 @@ SocketStateUnlock( FCB ); - return STATUS_SUCCESS; + return Status; } NTSTATUS AfdListenSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -136,7 +136,8 @@ NULL); /* Handle information */ if (!NT_SUCCESS(Status)) { AFD_DbgPrint(MIN_TRACE, ("ObReferenceObjectByHandle() failed with status (0x%X).\n", Status)); - ZwClose(*Handle); + ZwClose(*Handle); + *Handle = NULL; } else { AFD_DbgPrint(MAX_TRACE, ("Got handle (0x%X) Object (0x%X)\n", *Handle, *Object)); Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -1625,7 +1625,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status; Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -26,6 +26,9 @@ IF_LIST_ITER(CurrentIF); TI_DbgPrint(DEBUG_INFO, ("Called.\n")); + + if (!IpAddress) + return TDI_NO_RESOURCES; TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); @@ -80,7 +83,7 @@ if( !RCache || !RouteEntries ) { if( RCache ) ExFreePool( RCache ); if( RouteEntries ) ExFreePool( RouteEntries ); - return STATUS_NO_MEMORY; + return TDI_NO_RESOURCES; } RtlZeroMemory( RouteEntries, Size );
16 years, 3 months
1
0
0
0
[cgutman] 35787: - Change the status to STATUS_SUCCESS if TdiReceive returns STATUS_PENDING
by cgutman@svn.reactos.org
Author: cgutman Date: Fri Aug 29 22:29:41 2008 New Revision: 35787 URL:
http://svn.reactos.org/svn/reactos?rev=35787&view=rev
Log: - Change the status to STATUS_SUCCESS if TdiReceive returns STATUS_PENDING Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Aug 29 22:29:41 2008 @@ -33,6 +33,7 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -50,14 +51,18 @@ FCB->State = SOCKET_STATE_CONNECTED; - return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); + + if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + + return Status; } static NTSTATUS NTAPI StreamSocketConnectComplete
16 years, 3 months
1
0
0
0
[cgutman] 35786: - Check if TdiBuildNullConnectionInfo completed successfully - Add a comment - Fail if we can't allocate Qelt
by cgutman@svn.reactos.org
Author: cgutman Date: Fri Aug 29 21:53:20 2008 New Revision: 35786 URL:
http://svn.reactos.org/svn/reactos?rev=35786&view=rev
Log: - Check if TdiBuildNullConnectionInfo completed successfully - Add a comment - Fail if we can't allocate Qelt Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Aug 29 21:53:20 2008 @@ -98,7 +98,7 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_FILE_CLOSED; + NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; @@ -107,7 +107,7 @@ return STATUS_CANCELLED; } - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ListenIrp.InFlightRequest = NULL; @@ -122,8 +122,10 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { + /* Is this correct? */ TdiCloseDevice( FCB->Connection.Handle, FCB->Connection.Object ); + Status = STATUS_NO_MEMORY; } else { UINT AddressType = FCB->LocalAddress->Address[0].AddressType; @@ -136,11 +138,12 @@ ConnectionReturnInfo->RemoteAddress)); TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); - TaCopyTransportAddressInPlace - ( Qelt->ConnInfo->RemoteAddress, - FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); - - InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + if( Qelt->ConnInfo ) { + TaCopyTransportAddressInPlace + ( Qelt->ConnInfo->RemoteAddress, + FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); + InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + } else Status = STATUS_NO_MEMORY; } /* Satisfy a pre-accept request if one is available */ @@ -168,7 +171,7 @@ SocketStateUnlock( FCB ); - return STATUS_SUCCESS; + return Status; } NTSTATUS AfdListenSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,
16 years, 3 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200