Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35800: - Add missing KdD0Transition and KdD3Transition prototypes
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 05:50:52 2008 New Revision: 35800 URL: http://svn.reactos.org/svn/reactos?rev=35800&view=rev Log: - Add missing KdD0Transition and KdD3Transition prototypes Modified: trunk/reactos/include/reactos/kddll.h Modified: trunk/reactos/include/reactos/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/kddll.h?re… ============================================================================== --- trunk/reactos/include/reactos/kddll.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/kddll.h [iso-8859-1] Sat Aug 30 05:50:52 2008 @@ -51,4 +51,16 @@ IN OUT PKD_CONTEXT Context ); +NTSTATUS +NTAPI +KdD0Transition( + VOID +); + +NTSTATUS +NTAPI +KdD3Transition( + VOID +); + #endif

1 0

[fireball] 35799: Gregor Schneider <grschneider@gmail.com> - Negative position values are allowed, fixes 3 "msvcrt_winetest.exe printf" failures (25 fails left).
by fireball＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: fireball Date: Sat Aug 30 05:18:48 2008 New Revision: 35799 URL: http://svn.reactos.org/svn/reactos?rev=35799&view=rev Log: Gregor Schneider <grschneider(a)gmail.com> - Negative position values are allowed, fixes 3 "msvcrt_winetest.exe printf" failures (25 fails left). Modified: trunk/reactos/lib/sdk/crt/stdlib/fcvtbuf.c Modified: trunk/reactos/lib/sdk/crt/stdlib/fcvtbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/fcvtbuf… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/fcvtbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/fcvtbuf.c [iso-8859-1] Sat Aug 30 05:18:48 2008 @@ -48,7 +48,6 @@ double fi, fj; char *p, *p1; - if (ndigits < 0) ndigits = 0; if (ndigits >= CVTBUFSIZE - 1) ndigits = CVTBUFSIZE - 2; r2 = 0; *sign = 0;

1 0

[cwittich] 35798: oops, looks like I typed in the wrong window :D
by cwittich＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cwittich Date: Sat Aug 30 05:04:33 2008 New Revision: 35798 URL: http://svn.reactos.org/svn/reactos?rev=35798&view=rev Log: oops, looks like I typed in the wrong window :D Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35798&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Aug 30 05:04:33 2008 @@ -1,4 +1,4 @@ -oh,#include "sysreg.h" +#include "sysreg.h" #include <termios.h> #include <poll.h>

1 0

[cwittich] 35797: forgot to revert my changes when playing with getline - spotted by Ged
by cwittich＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cwittich Date: Sat Aug 30 03:46:08 2008 New Revision: 35797 URL: http://svn.reactos.org/svn/reactos?rev=35797&view=rev Log: forgot to revert my changes when playing with getline - spotted by Ged Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35797&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Aug 30 03:46:08 2008 @@ -1,4 +1,4 @@ -#include "sysreg.h" +oh,#include "sysreg.h" #include <termios.h> #include <poll.h> @@ -77,8 +77,6 @@ sent += done; } } - if (buf) - free(buf); } }

1 0

[cwittich] 35796: xml config for use with kvm
by cwittich＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cwittich Date: Sat Aug 30 03:42:28 2008 New Revision: 35796 URL: http://svn.reactos.org/svn/reactos?rev=35796&view=rev Log: xml config for use with kvm Added: trunk/tools/sysreg2/reactos.xml (with props) Added: trunk/tools/sysreg2/reactos.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/reactos.xml?rev=3579… ============================================================================== --- trunk/tools/sysreg2/reactos.xml (added) +++ trunk/tools/sysreg2/reactos.xml [iso-8859-1] Sat Aug 30 03:42:28 2008 @@ -1,0 +1,47 @@ +<domain type='kvm' id='1'> + <name>ReactOS</name> + <uuid>0ab69219-58c2-1e5c-6beb-fb29db74b0ae</uuid> + <memory>262144</memory> + <currentMemory>262144</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <features> + </features> + <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <disk type='file' device='disk'> + <source file='/opt/buildbot/kvmtest/ros.img'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='cdrom'> + <source file='/opt/buildbot/kvmtest/ReactOS.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:2e:dd:df'/> + <source bridge='virbr0'/> + <target dev='vnet0'/> + <model type='pcnet'/> + </interface> + <serial type='pty'> + <source path='/dev/pts/4'/> + <target port='1'/> + </serial> + <console type='pty' tty='/dev/pts/4'> + <source path='/dev/pts/4'/> + <target port='1'/> + </console> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5900' listen='0.0.0.0'/> + </devices> +</domain> + Propchange: trunk/tools/sysreg2/reactos.xml ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 35795: start rewriting sysreg2 with libvirt
by cwittich＠svn.reactos.org 30 Aug '08

30 Aug '08

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

1 0

[fireball] 35794: - NDK fixes.
by fireball＠svn.reactos.org 30 Aug '08

30 Aug '08

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

1 0

[janderwald] 35793: - Add IIDs && GUID of Netcfg
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

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); +

1 0

[janderwald] 35792: - Import Netcfgx.h
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

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

1 0

[fireball] 35791: - Fix broken MMPTE_LIST structure definition.
by fireball＠svn.reactos.org 30 Aug '08

30 Aug '08

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

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