Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[gvg] 16471: Sync to Wine-20050628:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

Sync to Wine-20050628: Thomas Weidenmueller <wine-patches(a)reactsoft.com> - Removed local variables only used in TRACE statements. Gerold Jens Wucherpfennig <gjwucherpfennig(a)gmx.net> - Some FCI work. Modified: trunk/reactos/lib/cabinet/cabextract.c Modified: trunk/reactos/lib/cabinet/cabinet.h Modified: trunk/reactos/lib/cabinet/cabinet_main.c Modified: trunk/reactos/lib/cabinet/fci.c _____ Modified: trunk/reactos/lib/cabinet/cabextract.c --- trunk/reactos/lib/cabinet/cabextract.c 2005-07-06 22:16:28 UTC (rev 16470) +++ trunk/reactos/lib/cabinet/cabextract.c 2005-07-06 22:24:04 UTC (rev 16471) @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <ctype.h> #include "windef.h" #include "winbase.h" @@ -2523,13 +2524,8 @@ * print_fileinfo (internal) */ void print_fileinfo(struct cab_file *fi) { - int d; - int t; char *fname = NULL; - d = fi->date; - t = fi->time; - if (fi->attribs & cffile_A_NAME_IS_UTF) { fname = malloc(strlen(fi->filename) + 1); if (fname) { @@ -2540,8 +2536,8 @@ TRACE("%9u | %02d.%02d.%04d %02d:%02d:%02d | %s\n", fi->length, - d & 0x1f, (d>>5) & 0xf, (d>>9) + 1980, - t >> 11, (t>>5) & 0x3f, (t << 1) & 0x3e, + fi->date & 0x1f, (fi->date>>5) & 0xf, (fi->date>>9) + 1980, + fi->time >> 11, (fi->time>>5) & 0x3f, (fi->time << 1) & 0x3e, fname ? fname : fi->filename ); _____ Modified: trunk/reactos/lib/cabinet/cabinet.h --- trunk/reactos/lib/cabinet/cabinet.h 2005-07-06 22:16:28 UTC (rev 16470) +++ trunk/reactos/lib/cabinet/cabinet.h 2005-07-06 22:24:04 UTC (rev 16471) @@ -305,7 +305,41 @@ PFNFCIDELETE pfndelete; PFNFCIGETTEMPFILE pfnfcigtf; PCCAB pccab; - void *pv; + BOOL fPrevCab; + BOOL fNextCab; + BOOL fSplitFolder; + cab_ULONG statusFolderCopied; + cab_ULONG statusFolderTotal; + BOOL fGetNextCabInVain; + void *pv; + char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ + char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ + CCAB oldCCAB; + char* data_in; /* uncompressed data blocks */ + cab_UWORD cdata_in; + char* data_out; /* compressed data blocks */ + ULONG cCompressedBytesInFolder; + cab_UWORD cFolders; + cab_UWORD cFiles; + cab_ULONG cDataBlocks; + cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + /* of spanned file of a spanning folder of a spanning cabinet */ + cab_UBYTE szFileNameCFDATA1[CB_MAX_FILENAME]; + int handleCFDATA1; + cab_UBYTE szFileNameCFFILE1[CB_MAX_FILENAME]; + int handleCFFILE1; + cab_UBYTE szFileNameCFDATA2[CB_MAX_FILENAME]; + int handleCFDATA2; + cab_UBYTE szFileNameCFFILE2[CB_MAX_FILENAME]; + int handleCFFILE2; + cab_UBYTE szFileNameCFFOLDER[CB_MAX_FILENAME]; + int handleCFFOLDER; + cab_ULONG sizeFileCFDATA1; + cab_ULONG sizeFileCFFILE1; + cab_ULONG sizeFileCFDATA2; + cab_ULONG sizeFileCFFILE2; + cab_ULONG sizeFileCFFOLDER; + BOOL fNewPrevious; } FCI_Int, *PFCI_Int; typedef struct { @@ -326,6 +360,18 @@ /* cast an HFDI into a PFDI_Int */ #define PFDI_INT(hfdi) ((PFDI_Int)(hfdi)) +/* quick pfci method invokers */ +#define PFCI_ALLOC(hfdi, size) ((*PFCI_INT(hfdi)->pfnalloc) (size)) +#define PFCI_FREE(hfdi, ptr) ((*PFCI_INT(hfdi)->pfnfree) (ptr)) +#define PFCI_GETTEMPFILE(hfci,name,length) ((*PFCI_INT(hfci)->pfnfcigtf)(name,length,PFCI_INT(hfci)->pv)) +#define PFCI_DELETE(hfci,name,err,pv) ((*PFCI_INT(hfci)->pfndelete)(name,err,pv)) +#define PFCI_OPEN(hfci,name,oflag,pmode,err,pv) ((*PFCI_INT(hfci)->pfnopen)(name,oflag,pmode,err,pv)) +#define PFCI_READ(hfci,hf,memory,cb,err,pv)((*PFCI_INT(hfci)->pfnread)(hf,memory ,cb,err,pv)) +#define PFCI_WRITE(hfci,hf,memory,cb,err,pv) ((*PFCI_INT(hfci)->pfnwrite)(hf,memory,cb,err,pv)) +#define PFCI_CLOSE(hfci,hf,err,pv) ((*PFCI_INT(hfci)->pfnclose)(hf,err,pv)) +#define PFCI_SEEK(hfci,hf,dist,seektype,err,pv)((*PFCI_INT(hfci)->pfnseek)(hf,di st,seektype,err,pv)) +#define PFCI_FILEPLACED(hfci,pccab,name,cb,cont,pv)((*PFCI_INT(hfci)->pfnfiledes t)(pccab,name,cb,cont,pv)) + /* quickie pfdi method invokers */ #define PFDI_ALLOC(hfdi, size) ((*PFDI_INT(hfdi)->pfnalloc) (size)) #define PFDI_FREE(hfdi, ptr) ((*PFDI_INT(hfdi)->pfnfree) (ptr)) _____ Modified: trunk/reactos/lib/cabinet/cabinet_main.c --- trunk/reactos/lib/cabinet/cabinet_main.c 2005-07-06 22:16:28 UTC (rev 16470) +++ trunk/reactos/lib/cabinet/cabinet_main.c 2005-07-06 22:24:04 UTC (rev 16471) @@ -89,15 +89,14 @@ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR what) { #define DUMPC(idx) idx >= sizeof(EXTRACTdest) ? ' ' : \ - ptr[idx] >= 0x20 ? ptr[idx] : '.' + ((unsigned char*) dest)[idx] >= 0x20 ? \ + ((unsigned char*) dest)[idx] : '.' -#define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ptr[idx] +#define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ((unsigned char*) dest)[idx] LPSTR dir; - unsigned char *ptr; unsigned int i; - ptr = ((unsigned char*) dest); TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what)); if (!dest) { _____ Modified: trunk/reactos/lib/cabinet/fci.c --- trunk/reactos/lib/cabinet/fci.c 2005-07-06 22:16:28 UTC (rev 16470) +++ trunk/reactos/lib/cabinet/fci.c 2005-07-06 22:24:04 UTC (rev 16471) @@ -19,9 +19,27 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + +There is still some work to be done: + +- currently no support for big-endian machines +- the ERF error structure aren't used on error +- no real compression yet +- unknown behaviour if files>4GB or cabinet >4GB +- incorrect status information +- check if the maximum size for a cabinet is too small to store any data +- call pfnfcignc on exactly the same position as MS FCIAddFile in every case + +*/ + + + #include "config.h" #include <stdarg.h> +#include <stdio.h> +#include <string.h> #include "windef.h" #include "winbase.h" @@ -33,12 +51,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet); +typedef struct { + cab_UBYTE signature[4]; /* !CAB for unfinished cabinets else MSCF */ + cab_ULONG reserved1; + cab_ULONG cbCabinet; /* size of the cabinet file in bytes*/ + cab_ULONG reserved2; + cab_ULONG coffFiles; /* offset to first CFFILE section */ + cab_ULONG reserved3; + cab_UBYTE versionMinor; /* 3 */ + cab_UBYTE versionMajor; /* 1 */ + cab_UWORD cFolders; /* number of CFFOLDER entries in the cabinet*/ + cab_UWORD cFiles; /* number of CFFILE entries in the cabinet*/ + cab_UWORD flags; /* 1=prev cab, 2=next cabinet, 4=reserved setions*/ + cab_UWORD setID; /* identification number of all cabinets in a set*/ + cab_UWORD iCabinet; /* number of the cabinet in a set */ + /* additional area if "flags" were set*/ +} CFHEADER; /* minimum 36 bytes */ + +typedef struct { + cab_ULONG coffCabStart; /* offset to the folder's first CFDATA section */ + cab_UWORD cCFData; /* number of this folder's CFDATA sections */ + cab_UWORD typeCompress; /* compression type of data in CFDATA section*/ + /* additional area if reserve flag was set */ +} CFFOLDER; /* minumum 8 bytes */ + +typedef struct { + cab_ULONG cbFile; /* size of the uncompressed file in bytes */ + cab_ULONG uoffFolderStart; /* offset of the uncompressed file in the folder */ + cab_UWORD iFolder; /* number of folder in the cabinet 0=first */ + /* for special values see below this structure*/ + cab_UWORD date; /* last modification date*/ + cab_UWORD time; /* last modification time*/ + cab_UWORD attribs; /* DOS fat attributes and UTF indicator */ + /* ... and a C string with the name of the file */ +} CFFILE; /* 16 bytes + name of file */ + + +typedef struct { + cab_ULONG csum; /* checksum of this entry*/ + cab_UWORD cbData; /* number of compressed bytes */ + cab_UWORD cbUncomp; /* number of bytes when data is uncompressed */ + /* optional reserved area */ + /* compressed data */ +} CFDATA; + + /*********************************************************************** * FCICreate (CABINET.10) * - * Provided with several callbacks, - * returns a handle which can be used to perform operations - * on cabinet files. + * FCICreate is provided with several callbacks and + * returns a handle which can be used to create cabinet files. * * PARAMS * perf [IO] A pointer to an ERF structure. When FCICreate @@ -54,7 +116,7 @@ * the same interface as _open. * pfnread [I] A pointer to a function which reads from a file into * a caller-provided buffer. Uses the same interface - * as _read + * as _read. * pfnwrite [I] A pointer to a function which writes to a file from * a caller-provided buffer. Uses the same interface * as _write. @@ -64,8 +126,8 @@ * Uses the same interface as _lseek. * pfndelete [I] A pointer to a function which deletes a file. * pfnfcigtf [I] A pointer to a function which gets the name of a - * temporary file; ignored in wine - * pccab [I] A pointer to an initialized CCAB structure + * temporary file. + * pccab [I] A pointer to an initialized CCAB structure. * pv [I] A pointer to an application-defined notification * function which will be passed to other FCI functions * as a parameter. @@ -94,9 +156,13 @@ PCCAB pccab, void *pv) { - HFCI rv; + HFCI hfci; + int err; + PFCI_Int p_fci_internal; - if ((!pfnalloc) || (!pfnfree)) { + if ((!perf) || (!pfnalloc) || (!pfnfree) || (!pfnopen) || (!pfnread) || + (!pfnwrite) || (!pfnclose) || (!pfnseek) || (!pfndelete) || + (!pfnfcigtf) || (!pccab)) { perf->erfOper = FCIERR_NONE; perf->erfType = ERROR_BAD_ARGUMENTS; perf->fError = TRUE; @@ -105,7 +171,7 @@ return NULL; } - if (!(rv = (HFCI) (*pfnalloc)(sizeof(FCI_Int)))) { + if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) { perf->erfOper = FCIERR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; @@ -114,41 +180,1977 @@ return NULL; } - PFCI_INT(rv)->FCI_Intmagic = FCI_INT_MAGIC; - PFCI_INT(rv)->perf = perf; - PFCI_INT(rv)->pfnfiledest = pfnfiledest; - PFCI_INT(rv)->pfnalloc = pfnalloc; - PFCI_INT(rv)->pfnfree = pfnfree; - PFCI_INT(rv)->pfnopen = pfnopen; - PFCI_INT(rv)->pfnread = pfnread; - PFCI_INT(rv)->pfnwrite = pfnwrite; - PFCI_INT(rv)->pfnclose = pfnclose; - PFCI_INT(rv)->pfnseek = pfnseek; - PFCI_INT(rv)->pfndelete = pfndelete; - PFCI_INT(rv)->pfnfcigtf = pfnfcigtf; - PFCI_INT(rv)->pccab = pccab; - PFCI_INT(rv)->pv = pv; + p_fci_internal=((PFCI_Int)(hfci)); + p_fci_internal->FCI_Intmagic = FCI_INT_MAGIC; + p_fci_internal->perf = perf; + p_fci_internal->pfnfiledest = pfnfiledest; + p_fci_internal->pfnalloc = pfnalloc; + p_fci_internal->pfnfree = pfnfree; + p_fci_internal->pfnopen = pfnopen; + p_fci_internal->pfnread = pfnread; + p_fci_internal->pfnwrite = pfnwrite; + p_fci_internal->pfnclose = pfnclose; + p_fci_internal->pfnseek = pfnseek; + p_fci_internal->pfndelete = pfndelete; + p_fci_internal->pfnfcigtf = pfnfcigtf; + p_fci_internal->pccab = pccab; + p_fci_internal->fPrevCab = FALSE; + p_fci_internal->fNextCab = FALSE; + p_fci_internal->fSplitFolder = FALSE; + p_fci_internal->fGetNextCabInVain = FALSE; + p_fci_internal->pv = pv; + p_fci_internal->data_in = NULL; + p_fci_internal->cdata_in = 0; + p_fci_internal->data_out = NULL; + p_fci_internal->cCompressedBytesInFolder = 0; + p_fci_internal->cFolders = 0; + p_fci_internal->cFiles = 0; + p_fci_internal->cDataBlocks = 0; + p_fci_internal->sizeFileCFDATA1 = 0; + p_fci_internal->sizeFileCFFILE1 = 0; + p_fci_internal->sizeFileCFDATA2 = 0; + p_fci_internal->sizeFileCFFILE2 = 0; + p_fci_internal->sizeFileCFFOLDER = 0; + p_fci_internal->sizeFileCFFOLDER = 0; + p_fci_internal->fNewPrevious = FALSE; - /* Still mark as incomplete, because of other missing FCI* APIs */ + memcpy(p_fci_internal->szPrevCab, pccab->szCab, CB_MAX_CABINET_NAME); + memcpy(p_fci_internal->szPrevDisk, pccab->szDisk, CB_MAX_DISK_NAME); - PFCI_INT(rv)->FCI_Intmagic = 0; - PFDI_FREE(rv, rv); - FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", - perf, pfnfiledest, pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, - pfnseek, pfndelete, pfnfcigtf, pccab, pv); + /* CFDATA */ + if( !PFCI_GETTEMPFILE(hfci,p_fci_internal->szFileNameCFDATA1, + CB_MAX_FILENAME)) { + /* TODO error handling */ + return FALSE; + } + /* safety */ + if ( strlen(p_fci_internal->szFileNameCFDATA1) >= CB_MAX_FILENAME ) { + /* TODO set error code */ + return FALSE; + } - perf->erfOper = FCIERR_NONE; - perf->erfType = 0; - perf->fError = TRUE; + p_fci_internal->handleCFDATA1 = PFCI_OPEN(hfci, + p_fci_internal->szFileNameCFDATA1, 34050, 384, &err, pv); + /* TODO check handle */ + /* TODO error checking of err */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + /* array of all CFFILE in a folder */ + if( !PFCI_GETTEMPFILE(hfci,p_fci_internal->szFileNameCFFILE1, + CB_MAX_FILENAME)) { + /* TODO error handling */ + return FALSE; + } + /* safety */ + if ( strlen(p_fci_internal->szFileNameCFFILE1) >= CB_MAX_FILENAME ) { + /* TODO set error code */ + return FALSE; + } + p_fci_internal->handleCFFILE1 = PFCI_OPEN(hfci, + p_fci_internal->szFileNameCFFILE1, 34050, 384, &err, pv); + /* TODO check handle */ + /* TODO error checking of err */ - return NULL; + /* CFDATA with checksum and ready to be copied into cabinet */ + if( !PFCI_GETTEMPFILE(hfci,p_fci_internal->szFileNameCFDATA2, + CB_MAX_FILENAME)) { + /* TODO error handling */ + return FALSE; + } + /* safety */ + if ( strlen(p_fci_internal->szFileNameCFDATA2) >= CB_MAX_FILENAME ) { + /* TODO set error code */ + return FALSE; + } + p_fci_internal->handleCFDATA2 = PFCI_OPEN(hfci, + p_fci_internal->szFileNameCFDATA2, 34050, 384, &err, pv); + /* TODO check handle */ + /* TODO error checking of err */ -} + /* array of all CFFILE in a folder, ready to be copied into cabinet */ + if( !PFCI_GETTEMPFILE(hfci,p_fci_internal->szFileNameCFFILE2, + CB_MAX_FILENAME)) { + /* TODO error handling */ + return FALSE; + } + /* safety */ + if ( strlen(p_fci_internal->szFileNameCFFILE2) >= CB_MAX_FILENAME ) { + /* TODO set error code */ + return FALSE; + } + p_fci_internal->handleCFFILE2 = PFCI_OPEN(hfci, + p_fci_internal->szFileNameCFFILE2, 34050, 384, &err, pv); + /* TODO check handle */ + /* TODO error checking of err */ + /* array of all CFFILE in a folder, ready to be copied into cabinet */ + if( !PFCI_GETTEMPFILE(hfci,p_fci_internal->szFileNameCFFOLDER, + CB_MAX_FILENAME)) { + /* TODO error handling */ + return FALSE; + } + /* safety */ + if ( strlen(p_fci_internal->szFileNameCFFOLDER) >= CB_MAX_FILENAME ) { + /* TODO set error code */ + return FALSE; + } + p_fci_internal->handleCFFOLDER = PFCI_OPEN(hfci, + p_fci_internal->szFileNameCFFOLDER, 34050, 384, &err, pv); + + + /* TODO close and delete new files when return FALSE */ + + /* TODO check handle */ + /* TODO error checking of err */ + + return hfci; +} /* end of FCICreate */ + + + + + + +static BOOL fci_flush_data_block (HFCI hfci, int* err, + PFNFCISTATUS pfnfcis) { + + /* attention no hfci checks!!! */ + /* attention no checks if there is data available!!! */ + CFDATA data; + CFDATA* cfdata=&data; + char* reserved; + PFCI_Int p_fci_internal=((PFCI_Int)(hfci)); + UINT cbReserveCFData=p_fci_internal->pccab->cbReserveCFData; + UINT i; + + /* TODO compress the data of p_fci_internal->data_in */ + /* and write it to p_fci_internal->data_out */ + memcpy(p_fci_internal->data_out, p_fci_internal->data_in, + p_fci_internal->cdata_in /* number of bytes to copy */); + + cfdata->csum=0; /* checksum has to be set later */ + /* TODO set realsize of compressed data */ + cfdata->cbData = p_fci_internal->cdata_in; + cfdata->cbUncomp = p_fci_internal->cdata_in; + + /* write cfdata to p_fci_internal->handleCFDATA1 */ + if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA1, /* file handle */ + cfdata, sizeof(*cfdata), err, p_fci_internal->pv) + != sizeof(*cfdata) ) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFDATA1 += sizeof(*cfdata); + + /* add optional reserved area */ + + /* This allocation and freeing at each CFData block is a bit */ + /* inefficent, but it's harder to forget about freeing the buffer :-). */ + /* Reserved areas are used seldom besides that... */ + if (cbReserveCFData!=0) { + if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData))) { + p_fci_internal->perf->erfOper = FCIERR_ALLOC_FAIL; + p_fci_internal->perf->erfType = ERROR_NOT_ENOUGH_MEMORY; + p_fci_internal->perf->fError = TRUE; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + for(i=0;i<cbReserveCFData;) { + reserved[i++]='\0'; + } + if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA1, /* file handle */ + reserved, /* memory buffer */ + cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv) != cbReserveCFData ) { + PFCI_FREE(hfci, reserved); + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err PFCI_FREE(hfci, reserved)*/ + + p_fci_internal->sizeFileCFDATA1 += cbReserveCFData; + PFCI_FREE(hfci, reserved); + } + + /* write p_fci_internal->data_out to p_fci_internal->handleCFDATA1 */ + if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA1, /* file handle */ + p_fci_internal->data_out, /* memory buffer */ + cfdata->cbData, /* number of bytes to copy */ + err, p_fci_internal->pv) != cfdata->cbData) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFDATA1 += cfdata->cbData; + + /* reset the offset */ + p_fci_internal->cdata_in = 0; + p_fci_internal->cCompressedBytesInFolder += cfdata->cbData; + + /* report status with pfnfcis about uncompressed and compressed file data */ + if( (*pfnfcis)(statusFile, cfdata->cbData, cfdata->cbUncomp, + p_fci_internal->pv) == -1) { + /* TODO set error code and abort */ + return FALSE; + } + + ++(p_fci_internal->cDataBlocks); + + return TRUE; +} /* end of fci_flush_data_block */ + + + + + +static cab_ULONG fci_get_checksum(void *pv, UINT cb, CHECKSUM seed) +{ + cab_ULONG csum; + cab_ULONG ul; + int cUlong; + BYTE *pb; + + csum = seed; + cUlong = cb / 4; + pb = pv; + + while (cUlong-- > 0) { + ul = *pb++; + ul |= (((cab_ULONG)(*pb++)) << 8); + ul |= (((cab_ULONG)(*pb++)) << 16); + ul |= (((cab_ULONG)(*pb++)) << 24); + + csum ^= ul; + } + + ul = 0; + switch (cb % 4) { + case 3: + ul |= (((ULONG)(*pb++)) << 16); + case 2: + ul |= (((ULONG)(*pb++)) << 8); + case 1: + ul |= *pb++; + default: + break; + } + csum ^= ul; + + return csum; +} /* end of fci_get_checksum */ + + + + + +static BOOL fci_flushfolder_copy_cfdata(HFCI hfci, char* buffer, UINT cbReserveCFData, + PFNFCISTATUS pfnfcis, int* err, int handleCFDATA1new, + cab_ULONG* psizeFileCFDATA1new, cab_ULONG* payload) +{ + cab_ULONG read_result; + CFDATA* pcfdata=(CFDATA*)buffer; + BOOL split_block=FALSE; + cab_UWORD savedUncomp=0; + PFCI_Int p_fci_internal=((PFCI_Int)(hfci)); + + *payload=0; + + /* while not all CFDATAs have been copied do */ + while(!FALSE) { + if( p_fci_internal->fNextCab ) { + if( split_block ) { + /* TODO internal error should never happen */ + return FALSE; + } + } + /* REUSE the variable read_result */ + if ( p_fci_internal->oldCCAB.cbReserveCFHeader != 0 || + p_fci_internal->oldCCAB.cbReserveCFFolder != 0 || + p_fci_internal->oldCCAB.cbReserveCFData != 0 ) { + read_result=4; + } else { + read_result=0; + } + if (p_fci_internal->fPrevCab) { + read_result+=strlen(p_fci_internal->szPrevCab)+1 + + strlen(p_fci_internal->szPrevDisk)+1; + } + /* No more CFDATA fits into the cabinet under construction */ + /* So don't try to store more data into it */ + if( p_fci_internal->fNextCab && + (p_fci_internal->oldCCAB.cb <= sizeof(CFDATA) + cbReserveCFData + + p_fci_internal->sizeFileCFFILE1 + p_fci_internal->sizeFileCFDATA2 + + p_fci_internal->sizeFileCFFILE2 + p_fci_internal->sizeFileCFFOLDER + + sizeof(CFHEADER) + + read_result + + p_fci_internal->oldCCAB.cbReserveCFHeader + + sizeof(CFFOLDER) + + p_fci_internal->oldCCAB.cbReserveCFFolder + + strlen(p_fci_internal->pccab->szCab)+1 + + strlen(p_fci_internal->pccab->szDisk)+1 + )) { + /* This may never be run for the first time the while loop is entered. + Pray that the code that calls fci_flushfolder_copy_cfdata handles this.*/ + split_block=TRUE; /* In this case split_block is abused to store */ + /* the complete data block into the next cabinet and not into the */ + /* current one. Originally split_block is the indicator that a */ + /* data block has been splitted across different cabinets. */ + } else { + + /* read CFDATA from p_fci_internal->handleCFDATA1 to cfdata*/ + read_result= PFCI_READ(hfci, p_fci_internal->handleCFDATA1,/*file handle*/ + buffer, /* memory buffer */ + sizeof(CFDATA)+cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv); + if (read_result!=sizeof(CFDATA)+cbReserveCFData) { + if (read_result==0) break; /* ALL DATA has been copied */ + /* TODO read error */ + return FALSE; + } + /* TODO error handling of err */ + + /* REUSE buffer p_fci_internal->data_out !!! */ + /* read data from p_fci_internal->handleCFDATA1 to */ + /* p_fci_internal->data_out */ + if( PFCI_READ(hfci, p_fci_internal->handleCFDATA1 /* file handle */, + p_fci_internal->data_out /* memory buffer */, + pcfdata->cbData /* number of bytes to copy */, + err, p_fci_internal->pv) != pcfdata->cbData ) { + /* TODO read error */ + return FALSE; + } + /* TODO error handling of err */ + + /* if cabinet size is too large */ + + /* REUSE the variable read_result */ + if ( p_fci_internal->oldCCAB.cbReserveCFHeader != 0 || + p_fci_internal->oldCCAB.cbReserveCFFolder != 0 || + p_fci_internal->oldCCAB.cbReserveCFData != 0 ) { + read_result=4; + } else { + read_result=0; + } + if (p_fci_internal->fPrevCab) { + read_result+=strlen(p_fci_internal->szPrevCab)+1 + + strlen(p_fci_internal->szPrevDisk)+1; + } + + /* Is cabinet with new CFDATA too large? Then data block has to be split */ + if( p_fci_internal->fNextCab && + (p_fci_internal->oldCCAB.cb < sizeof(CFDATA) + cbReserveCFData + + pcfdata->cbData + + p_fci_internal->sizeFileCFFILE1 + p_fci_internal->sizeFileCFDATA2 + + p_fci_internal->sizeFileCFFILE2 + p_fci_internal->sizeFileCFFOLDER + + sizeof(CFHEADER) + + read_result + + p_fci_internal->oldCCAB.cbReserveCFHeader + + sizeof(CFFOLDER) + /* size of new CFFolder entry */ + p_fci_internal->oldCCAB.cbReserveCFFolder + + strlen(p_fci_internal->pccab->szCab)+1 + /* name of next cabinet */ + strlen(p_fci_internal->pccab->szDisk)+1 /* name of next disk */ + )) { + /* REUSE read_result to save the size of the compressed data */ + read_result=pcfdata->cbData; + /* Modify the size of the compressed data to store only a part of the */ + /* data block into the current cabinet. This is done to prevent */ + /* that the maximum cabinet size will be exceeded. The remainer */ + /* will be stored into the next following cabinet. */ + + /* The cabinet will be of size "p_fci_internal->oldCCAB.cb". */ + /* Substract everything except the size of the block of data */ + /* to get it's actual size */ + pcfdata->cbData = p_fci_internal->oldCCAB.cb - ( + sizeof(CFDATA) + cbReserveCFData + + p_fci_internal->sizeFileCFFILE1 + p_fci_internal->sizeFileCFDATA2 + + p_fci_internal->sizeFileCFFILE2 + p_fci_internal->sizeFileCFFOLDER + + sizeof(CFHEADER) + + p_fci_internal->oldCCAB.cbReserveCFHeader + + sizeof(CFFOLDER) + /* set size of new CFFolder entry */ + p_fci_internal->oldCCAB.cbReserveCFFolder ); + /* substract the size of special header fields */ + if ( p_fci_internal->oldCCAB.cbReserveCFHeader != 0 || + p_fci_internal->oldCCAB.cbReserveCFFolder != 0 || + p_fci_internal->oldCCAB.cbReserveCFData != 0 ) { + pcfdata->cbData-=4; + } + if (p_fci_internal->fPrevCab) { + pcfdata->cbData-=strlen(p_fci_internal->szPrevCab)+1 + + strlen(p_fci_internal->szPrevDisk)+1; + } + pcfdata->cbData-=strlen(p_fci_internal->pccab->szCab)+1 + + strlen(p_fci_internal->pccab->szDisk)+1; + + savedUncomp = pcfdata->cbUncomp; + pcfdata->cbUncomp = 0; /* on splitted blocks of data this is zero */ + + /* if split_block==TRUE then the above while loop won't */ + /* be executed again */ + split_block=TRUE; /* split_block is the indicator that */ + /* a data block has been splitted across */ + /* diffentent cabinets.*/ + } + + /* This should never happen !!! */ + if (pcfdata->cbData==0) { + /* TODO set error */ + return FALSE; + } + + /* get checksum and write to cfdata.csum */ + pcfdata->csum = fci_get_checksum( &(pcfdata->cbData), + sizeof(CFDATA)+cbReserveCFData - + sizeof(pcfdata->csum), fci_get_checksum( p_fci_internal->data_out, /*buffer*/ + pcfdata->cbData, 0 ) ); + + /* write cfdata with checksum to p_fci_internal->handleCFDATA2 */ + if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA2, /* file handle */ + buffer, /* memory buffer */ + sizeof(CFDATA)+cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv) != sizeof(CFDATA)+cbReserveCFData ) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFDATA2 += sizeof(CFDATA)+cbReserveCFData; + + /* write compressed data into p_fci_internal->handleCFDATA2 */ + if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA2, /* file handle */ + p_fci_internal->data_out, /* memory buffer */ + pcfdata->cbData, /* number of bytes to copy */ + err, p_fci_internal->pv) != pcfdata->cbData) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFDATA2 += pcfdata->cbData; + ++(p_fci_internal->cDataBlocks); + p_fci_internal->statusFolderCopied += pcfdata->cbData; + (*payload)+=pcfdata->cbUncomp; + /* if cabinet size too large and data has been split */ + /* write the remainer of the data block to the new CFDATA1 file */ + if( split_block ) { /* This does not include the */ + /* abused one (just search for "abused" )*/ + /* copy all CFDATA structures from handleCFDATA1 to handleCFDATA1new */ + if (p_fci_internal->fNextCab==FALSE ) { + /* TODO internal error */ + return FALSE; + } + + /* set cbData the size of the remainer of the data block */ + pcfdata->cbData = read_result - pcfdata->cbData; + /*recover former value of cfdata.cbData; read_result will be the offset*/ + read_result -= pcfdata->cbData; + pcfdata->cbUncomp = savedUncomp; + + /* reset checksum, it will be computed later */ + pcfdata->csum=0; + /* write cfdata WITHOUT checksum to handleCFDATA1new */ + if( PFCI_WRITE(hfci, handleCFDATA1new, /* file handle */ + buffer, /* memory buffer */ + sizeof(CFDATA)+cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv) != sizeof(CFDATA)+cbReserveCFData ) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + + *psizeFileCFDATA1new += sizeof(CFDATA)+cbReserveCFData; + + /* write compressed data into handleCFDATA1new */ + if( PFCI_WRITE(hfci, handleCFDATA1new, /* file handle */ + p_fci_internal->data_out + read_result, /* memory buffer + offset */ + /* to last part of split data */ + pcfdata->cbData, /* number of bytes to copy */ + err, p_fci_internal->pv) != pcfdata->cbData) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->statusFolderCopied += pcfdata->cbData; + + *psizeFileCFDATA1new += pcfdata->cbData; + /* the two blocks of the split data block have been written */ + /* dont reset split_data yet, because it is still needed see below */ + } + + /* report status with pfnfcis about copied size of folder */ + if( (*pfnfcis)(statusFolder, + p_fci_internal->statusFolderCopied, /*cfdata.cbData(+previous ones)*/ + p_fci_internal->statusFolderTotal, /* total folder size */ + p_fci_internal->pv) == -1) { + /* TODO set error code and abort */ + return FALSE; + } + } + + /* if cabinet size too large */ + /* write the remaining data blocks to the new CFDATA1 file */ + if ( split_block ) { /* This does include the */ + /* abused one (just search for "abused" )*/ + if (p_fci_internal->fNextCab==FALSE ) { + /* TODO internal error */ + return FALSE; + } + /* copy all CFDATA structures from handleCFDATA1 to handleCFDATA1new */ + while(!FALSE) { + /* read CFDATA from p_fci_internal->handleCFDATA1 to cfdata*/ + read_result= PFCI_READ(hfci, p_fci_internal->handleCFDATA1,/* handle */ + buffer, /* memory buffer */ + sizeof(CFDATA)+cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv); + if (read_result!=sizeof(CFDATA)+cbReserveCFData) { + if (read_result==0) break; /* ALL DATA has been copied */ + /* TODO read error */ + return FALSE; + } + /* TODO error handling of err */ + + /* REUSE buffer p_fci_internal->data_out !!! */ + /* read data from p_fci_internal->handleCFDATA1 to */ + /* p_fci_internal->data_out */ + if( PFCI_READ(hfci, p_fci_internal->handleCFDATA1 /* file handle */, + p_fci_internal->data_out /* memory buffer */, + pcfdata->cbData /* number of bytes to copy */, + err, p_fci_internal->pv) != pcfdata->cbData ) { + /* TODO read error */ + return FALSE; + } + /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + + /* write cfdata with checksum to handleCFDATA1new */ + if( PFCI_WRITE(hfci, handleCFDATA1new, /* file handle */ + buffer, /* memory buffer */ + sizeof(CFDATA)+cbReserveCFData, /* number of bytes to copy */ + err, p_fci_internal->pv) != sizeof(CFDATA)+cbReserveCFData ) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + + *psizeFileCFDATA1new += sizeof(CFDATA)+cbReserveCFData; + + /* write compressed data into handleCFDATA1new */ + if( PFCI_WRITE(hfci, handleCFDATA1new, /* file handle */ + p_fci_internal->data_out, /* memory buffer */ + pcfdata->cbData, /* number of bytes to copy */ + err, p_fci_internal->pv) != pcfdata->cbData) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + *psizeFileCFDATA1new += pcfdata->cbData; + p_fci_internal->statusFolderCopied += pcfdata->cbData; + + /* report status with pfnfcis about copied size of folder */ + if( (*pfnfcis)(statusFolder, + p_fci_internal->statusFolderCopied,/*cfdata.cbData(+revious ones)*/ + p_fci_internal->statusFolderTotal, /* total folder size */ + p_fci_internal->pv) == -1) { + /* TODO set error code and abort */ + return FALSE; + } + + } /* end of WHILE */ + break; /* jump out of the next while loop */ + } /* end of if( split_data ) */ + } /* end of WHILE */ + return TRUE; +} /* end of fci_flushfolder_copy_cfdata */ + + + + + +static BOOL fci_flushfolder_copy_cffolder(HFCI hfci, int* err, UINT cbReserveCFFolder, + cab_ULONG sizeFileCFDATA2old) +{ + CFFOLDER cffolder; + UINT i; + char* reserved; + PFCI_Int p_fci_internal=((PFCI_Int)(hfci)); + + /* absolute offset cannot be set yet, because the size of cabinet header, */ + /* the number of CFFOLDERs and the number of CFFILEs may change. */ + /* Instead the size of all previous data blocks will be stored and */ + /* the remainer of the offset will be added when the cabinet will be */ + /* flushed to disk. */ + /* This is exactly the way the original CABINET.DLL works!!! */ + cffolder.coffCabStart=sizeFileCFDATA2old; + + /* set the number of this folder's CFDATA sections */ + cffolder.cCFData=p_fci_internal->cDataBlocks; + /* TODO set compression type */ + cffolder.typeCompress = tcompTYPE_NONE; + + /* write cffolder to p_fci_internal->handleCFFOLDER */ + if( PFCI_WRITE(hfci, p_fci_internal->handleCFFOLDER, /* file handle */ + &cffolder, /* memory buffer */ + sizeof(cffolder), /* number of bytes to copy */ + err, p_fci_internal->pv) != sizeof(cffolder) ) { + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFFOLDER += sizeof(cffolder); + + /* add optional reserved area */ + if (cbReserveCFFolder!=0) { + if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFFolder))) { + p_fci_internal->perf->erfOper = FCIERR_ALLOC_FAIL; + p_fci_internal->perf->erfType = ERROR_NOT_ENOUGH_MEMORY; + p_fci_internal->perf->fError = TRUE; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + for(i=0;i<cbReserveCFFolder;) { + reserved[i++]='\0'; + } + if( PFCI_WRITE(hfci, p_fci_internal->handleCFFOLDER, /* file handle */ + reserved, /* memory buffer */ + cbReserveCFFolder, /* number of bytes to copy */ + err, p_fci_internal->pv) != cbReserveCFFolder ) { + PFCI_FREE(hfci, reserved); + /* TODO write error */ + return FALSE; + } + /* TODO error handling of err */ + + p_fci_internal->sizeFileCFFOLDER += cbReserveCFFolder; + + PFCI_FREE(hfci, reserved); + } + return TRUE; +} /* end of fci_flushfolder_copy_cffolder */ + + + + + +static BOOL fci_flushfolder_copy_cffile(HFCI hfci, int* err, int handleCFFILE1new, + cab_ULONG *psizeFileCFFILE1new, cab_ULONG payload) +{ + CFFILE cffile; + cab_ULONG read_result; + cab_ULONG seek=0; + cab_ULONG sizeOfFiles=0, sizeOfFilesPrev; + BOOL may_be_prev=TRUE; + cab_ULONG cbFileRemainer=0; + PFCI_Int p_fci_internal=((PFCI_Int)(hfci)); + /* set seek of p_fci_internal->handleCFFILE1 to 0 */ + if( PFCI_SEEK(hfci,p_fci_internal->handleCFFILE1,0,SEEK_SET,err, + p_fci_internal->pv) !=0 ) { + /* TODO wrong return value */ + } + /* TODO error handling of err */ + + /* while not all CFFILE structures have been copied do */ + while(!FALSE) { + /* REUSE the variable read_result */ + /* read data from p_fci_internal->handleCFFILE1 to cffile */ + read_result = PFCI_READ(hfci,p_fci_internal->handleCFFILE1/* file handle */, + &cffile, /* memory buffer */ + sizeof(cffile), /* number of bytes to copy */ + err, p_fci_internal->pv); + if( read_result != sizeof(cffile) ) { + if( read_result == 0 ) break; /* ALL CFFILE structures have been copied */ + /* TODO read error */ + return FALSE; + } + /* TODO error handling of err */ + + /* Microsoft's(R) CABINET.DLL would do a seek to the current! */ + /* position. I don't know why so I'll just omit it */ + + /* read the filename from p_fci_internal->handleCFFILE1 */ + /* REUSE the variable read_result AGAIN */ + /* REUSE the memory buffer PFCI(hfci)->data_out */ + if( PFCI_READ(hfci, p_fci_internal->handleCFFILE1 /*file handle*/, + p_fci_internal->data_out, /* memory buffer */ + CB_MAX_FILENAME, /* number of bytes to copy */ + err, p_fci_internal->pv) <2) { + /* TODO read error */ + return FALSE; + } + /* TODO maybe other checks of read_result */ + /* TODO error handling of err */ + + /* safety */ + if( strlen(p_fci_internal->data_out)>=CB_MAX_FILENAME ) { + /* TODO set error code internal error */ + return FALSE; + } [truncated at 1000 lines; 1788 more skipped]

1 0

[gvg] 16470: Sync to Wine-20050628:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

Sync to Wine-20050628: Robert Shearman <rob(a)codeweavers.com> - Add more struct types for TLB generation. Stefan Huehner <stefan(a)huehner.org> - Fix some -Wmissing-declarations by making functions static. Huw Davies <huw(a)codeweavers.com> - Add comments describing the first DWORD in an import table entry. Alexandre Julliard <julliard(a)winehq.org> - Workaround to allow using the async keyword as method name. Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/proxy.c Modified: trunk/reactos/tools/widl/typelib.c Modified: trunk/reactos/tools/widl/typelib_struct.h Modified: trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/header.c --- trunk/reactos/tools/widl/header.c 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/header.c 2005-07-06 22:16:28 UTC (rev 16470) @@ -748,7 +748,7 @@ } } -void write_guid(const char *guid_prefix, const char *name, UUID *uuid) +static void write_guid(const char *guid_prefix, const char *name, UUID *uuid) { if (!uuid) return; fprintf(header, "DEFINE_GUID(%s_%s, 0x%08lx, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x);\n", @@ -756,25 +756,25 @@ uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); } -void write_iface_guid(type_t *iface) +static void write_iface_guid(type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("IID", iface->name, uuid); } -void write_dispiface_guid(type_t *iface) +static void write_dispiface_guid(type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("DIID", iface->name, uuid); } -void write_coclass_guid(class_t *cocl) +static void write_coclass_guid(class_t *cocl) { UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); write_guid("CLSID", cocl->name, uuid); } -void write_com_interface(type_t *iface) +static void write_com_interface(type_t *iface) { if (!iface->funcs && !iface->ref) { yywarning("%s has no methods", iface->name); @@ -836,7 +836,7 @@ fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); } -void write_rpc_interface(type_t *iface) +static void write_rpc_interface(type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/parser.y 2005-07-06 22:16:28 UTC (rev 16470) @@ -545,6 +545,7 @@ ident: aIDENTIFIER { $$ = make_var($1); } /* some "reserved words" used in attributes are also used as field names in some MS IDL files */ | aKNOWNTYPE { $$ = make_var($<str>1); } + | tASYNC { $$ = make_var($<str>1); } | tID { $$ = make_var($<str>1); } | tRETVAL { $$ = make_var($<str>1); } | tVERSION { $$ = make_var($<str>1); } _____ Modified: trunk/reactos/tools/widl/proxy.c --- trunk/reactos/tools/widl/proxy.c 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/proxy.c 2005-07-06 22:16:28 UTC (rev 16470) @@ -141,7 +141,7 @@ print_proxy( "\n"); } -static void init_proxy() +static void init_proxy(void) { if (proxy) return; if(!(proxy = fopen(proxy_name, "w"))) _____ Modified: trunk/reactos/tools/widl/typelib.c --- trunk/reactos/tools/widl/typelib.c 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/typelib.c 2005-07-06 22:16:28 UTC (rev 16470) @@ -148,13 +148,18 @@ case RPC_FC_ENUM16: case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return VT_USERDEFINED; case 0: if(t->attrs) return VT_USERDEFINED; return 0; default: - error("get_type_vt: unknown-type: %d\n", t->type); + error("get_type_vt: unknown type: 0x%02x\n", t->type); } return 0; } _____ Modified: trunk/reactos/tools/widl/typelib_struct.h --- trunk/reactos/tools/widl/typelib_struct.h 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/typelib_struct.h 2005-07-06 22:16:28 UTC (rev 16470) @@ -157,9 +157,12 @@ /* layout of an entry with information on imported types */ typedef struct tagMSFT_ImpInfo { - INT res0; /* unknown */ - INT oImpFile; /* offset inthe Import File table */ - INT oGuid; /* offset in Guid table */ + INT res0; /* bits 0 - 15: count */ + /* bit 16: if set oGuid is an offset to Guid */ + /* if clear oGuid is a typeinfo index in the specified typelib */ + /* bits 24 - 31: TKIND of reference */ + INT oImpFile; /* offset in the Import File table */ + INT oGuid; /* offset in Guid table or typeinfo index (see bit 16 of res0) */ } MSFT_ImpInfo; /* function description data */ _____ Modified: trunk/reactos/tools/widl/write_msft.c --- trunk/reactos/tools/widl/write_msft.c 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/write_msft.c 2005-07-06 22:16:28 UTC (rev 16470) @@ -875,6 +875,11 @@ chat("encode_type: trying to ref not added type\n"); switch(type->type) { case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: add_structure_typeinfo(typelib, type); break; case RPC_FC_IP: _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-07-06 21:40:07 UTC (rev 16469) +++ trunk/reactos/tools/widl/y.tab.c 2005-07-06 22:16:28 UTC (rev 16470) @@ -257,7 +257,7 @@ -#define YYFINAL 463 +#define YYFINAL 464 #define YYFLAG -32768 #define YYNTBASE 145 @@ -327,14 +327,15 @@ 435, 439, 443, 447, 451, 455, 459, 463, 466, 469, 472, 477, 482, 486, 488, 492, 494, 499, 500, 503, 506, 510, 513, 515, 520, 528, 529, 531, 532, 534, - 536, 538, 540, 542, 544, 546, 548, 550, 552, 555, - 558, 560, 562, 564, 566, 568, 570, 572, 573, 575, - 577, 580, 583, 586, 589, 591, 593, 596, 599, 602, - 607, 608, 611, 614, 617, 620, 623, 626, 630, 633, - 637, 643, 644, 647, 650, 653, 656, 662, 670, 672, - 675, 678, 681, 684, 687, 692, 695, 698, 700, 702, - 706, 708, 712, 714, 716, 722, 724, 726, 728, 731, - 733, 736, 738, 741, 743, 746, 751, 757, 768, 770 + 536, 538, 540, 542, 544, 546, 548, 550, 552, 554, + 557, 560, 562, 564, 566, 568, 570, 572, 574, 575, + 577, 579, 582, 585, 588, 591, 593, 595, 598, 601, + 604, 609, 610, 613, 616, 619, 622, 625, 628, 632, + 635, 639, 645, 646, 649, 652, 655, 658, 664, 672, + 674, 677, 680, 683, 686, 689, 694, 697, 700, 702, + 704, 708, 710, 714, 716, 718, 724, 726, 728, 730, + 733, 735, 738, 740, 743, 745, 748, 753, 759, 770, + 772 }; static const short yyrhs[] = { @@ -392,30 +393,30 @@ 163, 134, 0, 134, 0, 162, 213, 209, 160, 0, 162, 213, 166, 209, 135, 156, 136, 0, 0, 186, 0, 0, 3, 0, 4, 0, 3, 0, 4, 0, - 60, 0, 95, 0, 117, 0, 22, 0, 119, 0, - 189, 0, 97, 189, 0, 113, 189, 0, 113, 0, - 50, 0, 98, 0, 42, 0, 20, 0, 47, 0, - 52, 0, 0, 70, 0, 70, 0, 101, 188, 0, - 96, 188, 0, 76, 188, 0, 59, 188, 0, 71, - 0, 28, 0, 29, 3, 0, 29, 4, 0, 163, - 190, 0, 191, 137, 193, 138, 0, 0, 193, 194, - 0, 162, 204, 0, 40, 3, 0, 40, 4, 0, - 163, 195, 0, 86, 141, 0, 197, 182, 134, 0, - 77, 141, 0, 198, 183, 134, 0, 196, 137, 197, - 198, 138, 0, 0, 141, 4, 0, 72, 3, 0, - 72, 4, 0, 163, 201, 0, 202, 200, 137, 148, - 138, 0, 202, 141, 3, 137, 152, 148, 138, 0, - 199, 0, 201, 134, 0, 195, 134, 0, 78, 3, - 0, 78, 4, 0, 163, 205, 0, 206, 137, 148, - 138, 0, 128, 209, 0, 32, 208, 0, 186, 0, - 208, 0, 135, 209, 136, 0, 209, 0, 210, 122, - 209, 0, 93, 0, 112, 0, 105, 185, 137, 180, - 138, 0, 118, 0, 4, 0, 187, 0, 32, 213, - 0, 173, 0, 46, 3, 0, 212, 0, 105, 3, - 0, 215, 0, 111, 3, 0, 110, 162, 213, 210, - 0, 111, 185, 137, 180, 138, 0, 111, 185, 106, - 135, 182, 136, 184, 137, 167, 138, 0, 5, 0, - 5, 144, 5, 0 + 16, 0, 60, 0, 95, 0, 117, 0, 22, 0, + 119, 0, 189, 0, 97, 189, 0, 113, 189, 0, + 113, 0, 50, 0, 98, 0, 42, 0, 20, 0, + 47, 0, 52, 0, 0, 70, 0, 70, 0, 101, + 188, 0, 96, 188, 0, 76, 188, 0, 59, 188, + 0, 71, 0, 28, 0, 29, 3, 0, 29, 4, + 0, 163, 190, 0, 191, 137, 193, 138, 0, 0, + 193, 194, 0, 162, 204, 0, 40, 3, 0, 40, + 4, 0, 163, 195, 0, 86, 141, 0, 197, 182, + 134, 0, 77, 141, 0, 198, 183, 134, 0, 196, + 137, 197, 198, 138, 0, 0, 141, 4, 0, 72, + 3, 0, 72, 4, 0, 163, 201, 0, 202, 200, + 137, 148, 138, 0, 202, 141, 3, 137, 152, 148, + 138, 0, 199, 0, 201, 134, 0, 195, 134, 0, + 78, 3, 0, 78, 4, 0, 163, 205, 0, 206, + 137, 148, 138, 0, 128, 209, 0, 32, 208, 0, + 186, 0, 208, 0, 135, 209, 136, 0, 209, 0, + 210, 122, 209, 0, 93, 0, 112, 0, 105, 185, + 137, 180, 138, 0, 118, 0, 4, 0, 187, 0, + 32, 213, 0, 173, 0, 46, 3, 0, 212, 0, + 105, 3, 0, 215, 0, 111, 3, 0, 110, 162, + 213, 210, 0, 111, 185, 137, 180, 138, 0, 111, + 185, 106, 135, 182, 136, 184, 137, 167, 138, 0, + 5, 0, 5, 144, 5, 0 }; #endif @@ -441,14 +442,15 @@ 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 495, 496, 499, 505, 510, 511, 516, 517, 518, 519, 522, 525, 536, 537, 540, 541, 542, - 545, 547, 548, 549, 550, 553, 554, 555, 556, 557, - 569, 570, 571, 572, 573, 574, 575, 578, 579, 582, - 583, 584, 585, 586, 587, 588, 591, 592, 595, 602, - 607, 608, 611, 615, 616, 619, 631, 632, 635, 636, - 639, 654, 655, 658, 659, 662, 670, 678, 685, 688, - 690, 693, 694, 697, 702, 708, 709, 712, 713, 714, - 717, 719, 722, 724, 727, 737, 738, 739, 740, 741, - 742, 743, 744, 745, 746, 749, 762, 766, 779, 781 + 545, 547, 548, 549, 550, 551, 554, 555, 556, 557, + 558, 570, 571, 572, 573, 574, 575, 576, 579, 580, + 583, 584, 585, 586, 587, 588, 589, 592, 593, 596, + 603, 608, 609, 612, 616, 617, 620, 632, 633, 636, + 637, 640, 655, 656, 659, 660, 663, 671, 679, 686, + 689, 691, 694, 695, 698, 703, 709, 710, 713, 714, + 715, 718, 720, 723, 725, 728, 738, 739, 740, 741, + 742, 743, 744, 745, 746, 747, 750, 763, 767, 780, + 782 }; #endif @@ -520,14 +522,15 @@ 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 177, 177, 178, 179, 180, 180, 181, 181, 181, 181, 182, 183, 184, 184, 185, 185, 185, - 186, 186, 186, 186, 186, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 188, 188, 189, - 189, 189, 189, 189, 189, 189, 190, 190, 191, 192, - 193, 193, 194, 195, 195, 196, 197, 197, 198, 198, - 199, 200, 200, 201, 201, 202, 203, 203, 203, 204, - 204, 205, 205, 206, 207, 208, 208, 209, 209, 209, - 210, 210, 211, 211, 212, 213, 213, 213, 213, 213, - 213, 213, 213, 213, 213, 214, 215, 215, 216, 216 + 186, 186, 186, 186, 186, 186, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 188, 188, + 189, 189, 189, 189, 189, 189, 189, 190, 190, 191, + 192, 193, 193, 194, 195, 195, 196, 197, 197, 198, + 198, 199, 200, 200, 201, 201, 202, 203, 203, 203, + 204, 204, 205, 205, 206, 207, 208, 208, 209, 209, + 209, 210, 210, 211, 211, 212, 213, 213, 213, 213, + 213, 213, 213, 213, 213, 213, 214, 215, 215, 216, + 216 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -550,14 +553,15 @@ 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 4, 4, 3, 1, 3, 1, 4, 0, 2, 2, 3, 2, 1, 4, 7, 0, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, - 2, 2, 2, 2, 1, 1, 2, 2, 2, 4, - 0, 2, 2, 2, 2, 2, 2, 3, 2, 3, - 5, 0, 2, 2, 2, 2, 5, 7, 1, 2, - 2, 2, 2, 2, 4, 2, 2, 1, 1, 3, - 1, 3, 1, 1, 5, 1, 1, 1, 2, 1, - 2, 1, 2, 1, 2, 4, 5, 10, 1, 3 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 1, 2, 2, 2, 2, 1, 1, 2, 2, 2, + 4, 0, 2, 2, 2, 2, 2, 2, 3, 2, + 3, 5, 0, 2, 2, 2, 2, 5, 7, 1, + 2, 2, 2, 2, 2, 4, 2, 2, 1, 1, + 3, 1, 3, 1, 1, 5, 1, 1, 1, 2, + 1, 2, 1, 2, 1, 2, 4, 5, 10, 1, + 3 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -567,318 +571,326 @@ { 2, 1, 0, 0, 0, 167, 0, 0, 0, 167, 49, 167, 18, 0, 8, 20, 9, 23, 9, 7, - 0, 0, 0, 0, 0, 5, 0, 0, 218, 0, - 211, 4, 3, 0, 6, 0, 0, 0, 236, 184, - 175, 195, 0, 183, 167, 185, 181, 186, 187, 189, - 194, 187, 187, 0, 182, 187, 167, 167, 180, 235, - 176, 239, 237, 177, 241, 0, 243, 0, 203, 204, - 168, 169, 0, 0, 0, 213, 214, 0, 0, 50, + 0, 0, 0, 0, 0, 5, 0, 0, 219, 0, + 212, 4, 3, 0, 6, 0, 0, 0, 237, 185, + 176, 196, 0, 184, 167, 186, 182, 187, 188, 190, + 195, 188, 188, 0, 183, 188, 167, 167, 181, 236, + 177, 240, 238, 178, 242, 0, 244, 0, 204, 205, + 168, 169, 0, 0, 0, 214, 215, 0, 0, 50, 0, 55, 56, 0, 0, 59, 60, 61, 62, 63, 0, 0, 67, 0, 0, 71, 72, 0, 0, 0, 0, 0, 78, 0, 80, 0, 0, 83, 84, 0, 86, 87, 88, 89, 90, 91, 92, 0, 94, 95, 96, 97, 98, 99, 100, 101, 102, 0, 104, 105, 0, 0, 0, 109, 0, 111, 112, 0, 0, 0, - 52, 115, 0, 0, 0, 0, 0, 0, 198, 205, - 215, 223, 19, 21, 22, 200, 220, 0, 219, 0, - 0, 15, 24, 25, 26, 238, 240, 188, 193, 192, - 191, 178, 190, 242, 244, 179, 170, 171, 172, 173, - 174, 0, 0, 123, 0, 28, 157, 0, 0, 157, + 52, 115, 0, 0, 0, 0, 0, 0, 199, 206, + 216, 224, 19, 21, 22, 201, 221, 0, 220, 0, + 0, 15, 24, 25, 26, 239, 241, 189, 194, 193, + 192, 179, 191, 243, 245, 180, 170, 171, 172, 173, + 174, 175, 0, 0, 123, 0, 28, 157, 0, 0, + 157, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 133, 0, 133, 0, 0, + 0, 0, 0, 0, 0, 51, 29, 14, 0, 12, + 11, 10, 13, 32, 197, 198, 30, 222, 223, 31, + 49, 0, 49, 0, 213, 15, 49, 0, 27, 0, + 125, 126, 129, 156, 49, 0, 0, 0, 228, 229, + 231, 246, 49, 49, 0, 137, 135, 136, 0, 0, + 0, 0, 0, 155, 0, 153, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 133, 0, 133, 0, 0, 0, - 0, 0, 0, 0, 51, 29, 14, 0, 12, 11, - 10, 13, 32, 196, 197, 30, 221, 222, 31, 49, - 0, 49, 0, 212, 15, 49, 0, 27, 0, 125, - 126, 129, 156, 49, 0, 0, 0, 227, 228, 230, - 245, 49, 49, 0, 137, 135, 136, 0, 0, 0, - 0, 0, 155, 0, 153, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 131, 134, 232, 233, 0, 0, 0, 0, 0, 0, - 248, 0, 0, 53, 0, 199, 0, 201, 206, 0, - 0, 0, 49, 0, 49, 224, 17, 0, 0, 122, - 130, 124, 0, 162, 234, 0, 50, 158, 0, 226, - 225, 0, 0, 0, 246, 57, 0, 148, 149, 147, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 58, 65, 64, 66, 68, 69, 70, 73, - 74, 75, 76, 77, 79, 81, 0, 133, 85, 93, - 103, 106, 107, 108, 110, 0, 113, 114, 54, 202, - 208, 0, 207, 210, 0, 15, 216, 116, 16, 127, - 128, 243, 161, 159, 229, 231, 165, 0, 152, 0, - 145, 146, 139, 140, 142, 141, 143, 144, 0, 154, - 82, 132, 249, 43, 209, 49, 117, 0, 160, 0, - 166, 151, 150, 0, 133, 163, 217, 0, 118, 138, - 0, 0, 46, 33, 0, 45, 0, 44, 235, 0, - 38, 34, 36, 0, 0, 0, 0, 247, 119, 47, - 0, 164, 0, 0, 43, 0, 49, 48, 37, 43, - 33, 40, 49, 121, 33, 39, 0, 120, 0, 42, - 41, 0, 0, 0 + 0, 131, 134, 233, 234, 0, 0, 0, 0, 0, + 0, 249, 0, 0, 53, 0, 200, 0, 202, 207, + 0, 0, 0, 49, 0, 49, 225, 17, 0, 0, + 122, 130, 124, 0, 162, 235, 0, 50, 158, 0, + 227, 226, 0, 0, 0, 247, 57, 0, 148, 149, + 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 58, 65, 64, 66, 68, 69, 70, + 73, 74, 75, 76, 77, 79, 81, 0, 133, 85, + 93, 103, 106, 107, 108, 110, 0, 113, 114, 54, + 203, 209, 0, 208, 211, 0, 15, 217, 116, 16, + 127, 128, 244, 161, 159, 230, 232, 165, 0, 152, + 0, 145, 146, 139, 140, 142, 141, 143, 144, 0, + 154, 82, 132, 250, 43, 210, 49, 117, 0, 160, + 0, 166, 151, 150, 0, 133, 163, 218, 0, 118, + 138, 0, 0, 46, 33, 0, 45, 0, 44, 236, + 0, 38, 34, 36, 0, 0, 0, 0, 248, 119, + 47, 0, 164, 0, 0, 43, 0, 49, 48, 37, + 43, 33, 40, 49, 121, 33, 39, 0, 120, 0, + 42, 41, 0, 0, 0 }; static const short yydefgoto[] = { - 461, 1, 142, 235, 306, 15, 16, 17, 147, 18, - 19, 429, 430, 431, 432, 415, 421, 307, 79, 139, - 140, 407, 424, 438, 21, 238, 239, 240, 61, 279, - 280, 262, 263, 264, 23, 243, 317, 318, 308, 409, - 72, 247, 62, 168, 63, 148, 24, 218, 229, 297, - 26, 27, 231, 302, 28, 160, 29, 30, 219, 220, - 151, 33, 221, 248, 249, 250, 141, 64, 434, 36, - 66, 291 + 462, 1, 142, 236, 307, 15, 16, 17, 147, 18, + 19, 430, 431, 432, 433, 416, 422, 308, 79, 139, + 140, 408, 425, 439, 21, 239, 240, 241, 61, 280, + 281, 263, 264, 265, 23, 244, 318, 319, 309, 410, + 72, 248, 62, 168, 63, 148, 24, 219, 230, 298, + 26, 27, 232, 303, 28, 160, 29, 30, 220, 221, + 151, 33, 222, 249, 250, 251, 141, 64, 435, 36, + 66, 292 }; static const short yypact[] = { - -32768, 613, 602, -100, 104, 112, 13, 48, 140, 112, - -67, 112,-32768, 772,-32768,-32768,-32768,-32768,-32768,-32768, - 11, -37, -34, 25, -47,-32768, 32, -10,-32768, 47, - -9,-32768,-32768, 2,-32768, 49, 51, 59,-32768,-32768, - -32768,-32768, 602,-32768, 153,-32768,-32768,-32768, 60,-32768, - -32768, 60, 60, 296,-32768, 60, 187, 222, 296,-32768, - -32768,-32768,-32768,-32768,-32768, 17,-32768, 181,-32768,-32768, - -32768,-32768, 69, 602, 68,-32768,-32768, 74, 602,-32768, - -75,-32768,-32768, 87, 98,-32768,-32768,-32768,-32768,-32768, - 106, 122,-32768, 134, 143,-32768,-32768, 144, 146, 150, - 151, 152,-32768, 154,-32768, 155, 163,-32768,-32768, 164, - -32768,-32768,-32768,-32768,-32768,-32768,-32768, 168,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768, 169,-32768,-32768, - 170, 171, 176,-32768, 177,-32768,-32768, 182, 184, -84, - -32768,-32768, 450, 532, 233, 205, 268, 102,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768, 202,-32768, 270, - 165,-32768,-32768,-32768,-32768,-32768, 183,-32768,-32768,-32768, - -32768,-32768,-32768, 183, -74,-32768,-32768,-32768,-32768,-32768, - -32768, 186, 190, 17, 17,-32768,-32768, 353, 188,-32768, - 17, 328, 247, 322, 323, 253, 328, 325, 329, 328, - 330, 328, 17, 286, 328, -60, 328, 328, 602, 602, - 333, 337, 602, 772, 207,-32768,-32768, 8,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 138, - 203, -51, 211,-32768,-32768, 644, 328,-32768, 212, 227, - -32768, 209,-32768, -35, -7, 353, 353,-32768,-32768,-32768, - 232, -67, -29, 223,-32768,-32768,-32768, 225, 328, 328, - 328, 497, 167, -78,-32768, 229, 234, 235, 238, 240, - 242, 244, 248, 250, 251, 257, 259, 260, 355, -72, - -32768, 167,-32768,-32768, 263, -49, 71, 264, 265, 266, - 224, 267, 269,-32768, 772,-32768, -11,-32768,-32768, 273, - 602, 275, 145, 343, 655,-32768,-32768, 602, 282,-32768, - -32768, 17, 328,-32768,-32768, 602, 283,-32768, 284,-32768, - -32768, 285, 353, 287,-32768,-32768, 602, 277, 277, 277, - 91, 288, 328, 328, 328, 328, 328, 328, 328, 328, - 328, 328,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768, 289, 328,-32768,-32768, - -32768,-32768,-32768,-32768,-32768, 421,-32768,-32768,-32768,-32768, - -32768, 353,-32768,-32768, 295,-32768,-32768, 324,-32768,-32768, - -32768, 297,-32768,-32768,-32768,-32768, 17, 294,-32768, 328, - 277, 277, 103, 36, 58, 58, 12, 12, 139,-32768, - -32768,-32768,-32768, 300,-32768, 665,-32768, 353,-32768, 299, - -32768,-32768, 277, 328, 503,-32768,-32768, 298,-32768, 167, - 54, -73,-32768, 293, -2,-32768, 328, 301, -44, 306, - -32768, 338,-32768, 602, 353, 328, 305,-32768,-32768, 167, - 328,-32768, 415, 353, -69, 351, -28, 167,-32768, -4, - 293,-32768, -28,-32768, 293,-32768, 314,-32768, 316,-32768, - -32768, 455, 464,-32768 + -32768, 686, 644, -99, 30, 93, 13, 51, 119, 93, + -32, 93,-32768, 814,-32768,-32768,-32768,-32768,-32768,-32768, + 11, -6, 6, 9, -25,-32768, 34, 7,-32768, 36, + 43,-32768,-32768, 14,-32768, 52, 54, 56,-32768,-32768, + -32768,-32768, 644,-32768, 146,-32768,-32768,-32768, 2,-32768, + -32768, 2, 2, 35,-32768, 2, 197, 199, 35,-32768, + -32768,-32768,-32768,-32768,-32768, 21,-32768, 186,-32768,-32768, + -32768,-32768, 61, 644, 70,-32768,-32768, 69, 644,-32768, + -76,-32768,-32768, 74, 80,-32768,-32768,-32768,-32768,-32768, + 88, 99,-32768, 107, 116,-32768,-32768, 120, 122, 124, + 130, 132,-32768, 134,-32768, 135, 136,-32768,-32768, 137, + -32768,-32768,-32768,-32768,-32768,-32768,-32768, 138,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768, 139,-32768,-32768, + 141, 142, 150,-32768, 152,-32768,-32768, 154, 155, -81, + -32768,-32768, 568, 655, 209, 224, 222, 144,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768, 205,-32768, 234, + 157,-32768,-32768,-32768,-32768,-32768, 160,-32768,-32768,-32768, + -32768,-32768,-32768, 160, -71,-32768,-32768,-32768,-32768,-32768, + -32768,-32768, 156, 163, 21, 21,-32768,-32768, 327, 165, + -32768, 21, 423, 469, 285, 296, 527, 423, 297, 298, + 423, 306, 423, 21, 262, 423, -62, 423, 423, 644, + 644, 308, 313, 644, 814, 181,-32768,-32768, 46,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 111, 180, -59, 185,-32768,-32768, 247, 423,-32768, 187, + 202,-32768, 184,-32768, -47, -9, 327, 327,-32768,-32768, + -32768, 207, -32, -30, 191,-32768,-32768,-32768, 200, 423, + 423, 423, 515, 38, -69,-32768, 203, 204, 206, 208, + 210, 212, 214, 215, 217, 220, 225, 226, 227, 333, + -67,-32768, 38,-32768,-32768, 229, -65, 92, 230, 233, + 235, 194, 240, 241,-32768, 814,-32768, -18,-32768,-32768, + 219, 644, 211, 123, 314, 697,-32768,-32768, 644, 238, + -32768,-32768, 21, 423,-32768,-32768, 644, 245,-32768, 249, + -32768,-32768, 248, 327, 253,-32768,-32768, 644, 252, 252, + 252, 357, 254, 423, 423, 423, 423, 423, 423, 423, + 423, 423, 423,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768, 255, 423,-32768, + -32768,-32768,-32768,-32768,-32768,-32768, 365,-32768,-32768,-32768, + -32768,-32768, 327,-32768,-32768, 263,-32768,-32768, 293,-32768, + -32768,-32768, 266,-32768,-32768,-32768,-32768, 21, 265,-32768, + 423, 252, 252, 388, 104, 28, 28, 17, 17, 363, + -32768,-32768,-32768,-32768, 264,-32768, 707,-32768, 327,-32768, + 267,-32768,-32768, 252, 423, 535,-32768,-32768, 270,-32768, + 38, 59, -80,-32768, 236, -12,-32768, 423, 269, -54, + 277,-32768, 292,-32768, 644, 327, 423, 274,-32768,-32768, + 38, 423,-32768, 360, 327, -22, 383, -61, 38,-32768, + -5, 236,-32768, -61,-32768, 236,-32768, 281,-32768, 282, + -32768,-32768, 420, 421,-32768 }; static const short yypgoto[] = { - -32768,-32768, 448, -224, 18,-32768,-32768, 166,-32768,-32768, - -32768, -317,-32768,-32768, 26, -327,-32768, -8, -1,-32768, - -196,-32768,-32768,-32768,-32768,-32768,-32768, 160, 5, 278, - -330, -165,-32768, -183,-32768, 304, -381, -197, 193,-32768, - 19, -64,-32768, 73, 65,-32768,-32768, 471,-32768,-32768, - -13,-32768,-32768,-32768,-32768,-32768, -12,-32768, 472, 4, - -32768,-32768, 482, 245, -231,-32768, 292, 10, 1,-32768, + -32768,-32768, 406, -218, 12,-32768,-32768, 121,-32768,-32768, + -32768, -326,-32768,-32768, -16, -357,-32768, -8, -1,-32768, + -185,-32768,-32768,-32768,-32768,-32768,-32768, 125, 5, 231, + -338, -161,-32768, -181,-32768, 242, -377, -200, 131,-32768, + 126, -64,-32768, 140, 37,-32768,-32768, 432,-32768,-32768, + -11,-32768,-32768,-32768,-32768,-32768, -10,-32768, 439, 4, + -32768,-32768, 440, 198, -239,-32768, 243, 10, 1,-32768, 3,-32768 }; -#define YYLAST 892 +#define YYLAST 934 static const short yytable[] = { - 20, 181, 78, 65, 37, 32, 22, 149, 150, 266, - 304, 35, 270, 271, 320, 321, 274, 293, 276, 14, - 176, 177, 332, 333, 435, 244, 299, 401, 77, 4, - 80, 188, -168, 282, 301, 67, 436, 144, 213, 281, - 144, 281, 286, 165, 341, 73, 332, 333, 4, 426, - 357, 4, 283, 309, 323, 74, 214, 254, 342, 255, - 256, 8, 189, -168, 358, 453, 450, 427, 332, 333, - 414, 457, 13, 357, 184, 77, 80, 178, -35, 187, - 8, 332, 333, 8, 422, 145, 146, 360, 13, 146, - 155, 385, -35, 327, 328, 329, 330, 152, 368, 313, - 153, 332, 333, 314, 13, 313, 313, 68, 69, 324, - 13, 13, 179, 332, 333, 70, 71, 451, 171, 241, - 242, 245, 455, 175, 169, 170, 253, 157, 172, 380, - 167, 454, 159, 456, 180, 414, 437, 458, 277, 161, - 403, 217, 217, 75, 76, 37, 37, 22, 22, 332, - 333, 405, 35, 35, 257, 340, 166, 71, 399, 154, - 216, 216, 336, 337, 338, 339, 156, 390, 391, 392, - 393, 394, 395, 396, 397, 398, 417, 332, 333, 340, - 258, 158, 259, 162, 260, 163, 338, 339, 182, 261, - 173, 71, 281, 164, 425, 334, 335, 336, 337, 338, - 339, 340, 185, 444, 149, 150, 183, 361, 225, 287, - 288, 186, 449, 292, 340, 334, 335, 336, 337, 338, - 339, 296, 190, 300, 412, 174, 71, 388, 335, 336, - 337, 338, 339, 191, 340, 315, 223, 224, 37, 228, - 22, 192, 316, 300, 315, 35, 340, 241, 419, 281, - 254, 316, 255, 256, 265, 328, 254, 193, 255, 256, - 269, 439, 331, 334, 335, 336, 337, 338, 339, 194, - 445, 226, 227, 232, 233, 447, 295, 13, 195, 196, - 413, 197, 340, 373, 13, 198, 199, 200, 230, 201, - 202, 334, 335, 336, 337, 338, 339, 38, 203, 204, - 369, 371, 234, 205, 206, 207, 208, 37, 377, 22, - 340, 209, 210, 39, 35, 40, 371, 211, 381, 212, - -168, 41, 410, 251, 41, 42, 237, 387, 236, 267, - 268, 254, 272, 255, 256, 43, 273, 275, 278, 44, - 45, 289, 290, 46, 298, 47, 294, 257, 303, 311, - 310, 312, 48, 257, 322, 48, 176, 177, 356, 325, - 326, 332, 333, 49, 50, 343, 49, 50, 365, 51, - 344, 345, 51, 258, 346, 259, 347, 260, 348, 258, - 349, 259, 261, 260, 350, 244, 351, 352, 261, 52, - 53, 54, 52, 353, 55, 354, 355, 55, 56, 359, - 362, 363, 364, 366, 57, 367, 58, 7, 37, 372, - 22, 428, 60, 178, 370, 35, 378, 382, 383, 38, - 340, 384, 433, 386, 389, 400, 402, 406, 257, 404, - 411, 408, 13, 423, 443, 39, 418, 40, 315, 414, - 440, 433, 441, 41, 315, 316, 446, 42, 179, 433, - 459, 316, 460, 433, 258, 462, 259, 43, 260, 215, - 442, 44, 45, 261, 463, 46, 143, 47, 448, 375, - 180, 379, 25, 31, 48, 334, 335, 336, 337, 338, - 339, 245, 2, 34, 285, 49, 50, 3, 246, 319, - 4, 51, 452, 252, 340, 374, 5, 284, 0, 6, - 254, 38, 255, 256, 0, 0, 254, 0, 255, 256, - 0, 52, 53, 54, 7, 0, 55, 39, 0, 40, - 56, 0, 8, 0, 0, 41, 57, 0, 58, 42, - 0, 0, 0, 59, 60, 0, 0, 0, 0, 43, - 0, 0, 0, 44, 45, 0, 0, 46, 0, 47, - 0, 0, 0, 0, 13, 9, 48, 0, 0, 0, - 10, 11, 0, 0, 2, 0, 0, 49, 50, 3, - 0, 0, 4, 51, 0, 0, 0, 0, 5, 0, - 0, 6, 0, 0, 12, 0, 0, 0, 0, 13, - 0, 0, 0, 52, 53, 54, 7, 257, 55, 0, - 0, 0, 56, 257, 8, 0, 38, 0, 57, 0, - 58, 0, 0, 0, 0, 59, 60, 0, 0, 0, - 0, 0, 39, 258, 40, 259, 0, 260, 0, 258, - 41, 420, 261, 260, 42, 0, 0, 9, 261, 0, - 0, 0, 10, 11, 43, 2, 0, 0, 44, 45, - 3, 0, 46, 4, 47, 0, 0, 0, 0, 5, - 0, 48, 6, 0, 0, 0, 12, 0, 0, 0, - 222, 13, 49, 50, 0, 0, 2, 7, 51, 0, - 0, 3, 0, 0, 0, 8, 0, 2, 0, 0, - 5, 0, 3, 6, 0, 0, 0, 2, 52, 53, - 54, 5, 3, 55, 6, 0, 0, 56, 7, 0, - 0, 5, 0, 57, 6, 58, 0, 0, 9, 7, - 59, 60, 0, 10, 11, 0, 0, 0, 0, 7, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 12, 0, 9, - 0, 0, 13, 0, 10, 11, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 10, 11, 0, 0, 0, - 9, 0, 0, 0, 0, 10, 11, 0, 12, 0, - 0, 0, 305, 13, 0, 0, 0, 0, 81, 12, - 82, 0, 0, 376, 13, 0, 83, 0, 84, 12, - 0, 0, 0, 416, 13, 85, 86, 87, 88, 0, - 89, 90, 0, 91, 0, 92, 93, 94, 0, 0, - 95, 0, 0, 96, 0, 97, 98, 99, 100, 101, - 102, 0, 103, 104, 105, 106, 0, 0, 107, 0, - 0, 108, 0, 0, 0, 109, 0, 110, 0, 0, - 0, 111, 112, 113, 114, 115, 116, 117, 0, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 0, 0, - 0, 127, 0, 0, 128, 0, 129, 0, 0, 130, - 131, 132, 0, 0, 133, 0, 134, 135, 136, 137, - 0, 0, 138 + 20, 182, 78, 65, 37, 32, 22, 321, 322, 149, + 150, 35, 267, 14, 436, 271, 272, 305, 300, 275, + 402, 277, 4, 245, 176, 177, 437, 333, 334, 294, + 189, 283, 302, 68, 69, -168, 67, 178, 333, 334, + 144, 214, 427, 165, 282, 73, 282, 287, 333, 334, + 284, 4, 324, 342, 8, 358, 310, 358, 74, 215, + 428, 190, 255, 41, 256, 257, -168, 343, -35, 359, + 454, 361, 167, 314, 185, 144, 458, 423, 13, 188, + 13, 179, -35, 8, 386, 145, 4, 314, 452, 146, + 171, 315, 13, 456, 48, 175, 70, 71, 328, 329, + 330, 331, 333, 334, 314, 49, 50, 13, 325, 13, + 369, 51, 155, 451, 333, 334, 180, 415, 8, 246, + 242, 243, 75, 76, 146, 457, 438, 254, 152, 459, + 455, 52, 381, 404, 415, 77, 55, 80, 181, 278, + 153, 218, 218, 154, 157, 37, 37, 22, 22, 166, + 71, 161, 35, 35, 217, 217, 339, 340, 406, 258, + 341, 400, 335, 336, 337, 338, 339, 340, 156, 418, + 158, 341, 391, 392, 393, 394, 395, 396, 397, 398, + 399, 341, 77, 80, 159, 259, 162, 260, 163, 261, + 164, 169, 170, 183, 262, 172, 445, 282, 184, 426, + 173, 71, 174, 71, 186, 450, 187, 149, 150, 191, + 288, 289, 224, 225, 293, 192, 335, 336, 337, 338, + 339, 340, 297, 193, 301, 227, 228, 226, 362, 413, + 337, 338, 339, 340, 194, 341, 316, 233, 234, 37, + 38, 22, 195, 317, 301, 316, 35, 341, 242, 296, + 13, 196, 317, 420, 282, 197, 39, 198, 40, 199, + 329, 374, 13, 332, 41, 200, 440, 201, 42, 202, + 203, 204, 205, 206, 207, 446, 208, 209, 43, 2, + 448, 229, 44, 45, 3, 210, 46, 211, 47, 212, + 213, 231, 268, 5, 235, 48, 6, -168, 237, 238, + 252, 370, 372, 269, 273, 274, 49, 50, 37, 378, + 22, 7, 51, 276, 279, 35, 290, 372, 291, 382, + 295, 299, 304, 411, 312, 311, 313, 326, 388, 323, + 176, 177, 52, 53, 54, 327, 357, 55, 366, 344, + 345, 56, 346, 178, 347, 373, 348, 57, 349, 58, + 350, 351, 9, 352, 429, 60, 353, 10, 11, 245, + 371, 354, 355, 356, 38, 360, 363, 333, 334, 364, + 403, 365, 379, 333, 334, 13, 367, 368, 7, 383, + 39, 12, 40, 384, 385, 306, 13, 179, 41, 387, + 390, 401, 42, 333, 334, 341, 407, 405, 333, 334, + 409, 412, 43, 415, 419, 424, 44, 45, 441, 37, + 46, 22, 47, 442, 443, 447, 35, 460, 461, 48, + 463, 464, 180, 434, 143, 376, 255, 449, 256, 257, + 49, 50, 253, 25, 375, 444, 51, 380, 286, 316, + 31, 34, 434, 320, 181, 316, 317, 0, 0, 285, + 434, 0, 317, 0, 434, 246, 52, 53, 54, 0, + 0, 55, 247, 0, 0, 56, 0, 0, 0, 0, + 0, 57, 255, 58, 256, 257, 266, 0, 59, 60, + 0, 335, 336, 337, 338, 339, 340, 335, 336, 337, + 338, 339, 340, 389, 0, 0, 0, 0, 0, 13, + 341, 0, 0, 0, 414, 0, 341, 335, 336, 337, + 338, 339, 340, 336, 337, 338, 339, 340, 255, 38, + 256, 257, 0, 258, 453, 0, 341, 0, 0, 0, + 255, 341, 256, 257, 270, 39, 0, 40, 255, 0, + 256, 257, 0, 41, 0, 0, 0, 42, 0, 259, + 0, 260, 0, 261, 0, 0, 0, 43, 262, 0, + 0, 44, 45, 0, 0, 46, 0, 47, 0, 258, + 0, 0, 0, 0, 48, 0, 0, 216, 0, 0, + 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, + 0, 51, 0, 0, 0, 259, 0, 260, 0, 261, + 2, 0, 0, 0, 262, 3, 0, 0, 4, 0, + 0, 52, 53, 54, 5, 258, 55, 6, 0, 0, + 56, 0, 0, 0, 0, 0, 57, 258, 58, 0, + 0, 0, 7, 59, 60, 258, 0, 0, 0, 0, + 8, 259, 0, 260, 0, 261, 0, 0, 38, 0, + 262, 0, 0, 259, 0, 260, 0, 261, 0, 0, + 0, 259, 262, 421, 39, 261, 40, 0, 0, 0, + 262, 0, 41, 9, 0, 0, 42, 0, 10, 11, + 0, 0, 0, 0, 0, 0, 43, 2, 0, 0, + 44, 45, 3, 0, 46, 4, 47, 0, 0, 0, + 0, 5, 12, 48, 6, 0, 0, 13, 0, 0, + 0, 0, 0, 0, 49, 50, 0, 0, 2, 7, + 51, 0, 0, 3, 0, 0, 4, 8, 0, 2, + 0, 0, 5, 0, 3, 6, 0, 0, 0, 2, + 52, 53, 54, 5, 3, 55, 6, 0, 0, 56, + 7, 0, 0, 5, 0, 57, 6, 58, 8, 0, + 9, 7, 59, 60, 0, 10, 11, 0, 0, 0, + 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 0, 9, 0, 223, 13, 0, 10, 11, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 10, 11, 0, + 0, 0, 9, 0, 0, 0, 0, 10, 11, 0, + 12, 0, 0, 0, 0, 13, 0, 0, 0, 0, + 81, 12, 82, 0, 0, 377, 13, 0, 83, 0, + 84, 12, 0, 0, 0, 417, 13, 85, 86, 87, + 88, 0, 89, 90, 0, 91, 0, 92, 93, 94, + 0, 0, 95, 0, 0, 96, 0, 97, 98, 99, + 100, 101, 102, 0, 103, 104, 105, 106, 0, 0, + 107, 0, 0, 108, 0, 0, 0, 109, 0, 110, + 0, 0, 0, 111, 112, 113, 114, 115, 116, 117, + 0, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 0, 0, 0, 127, 0, 0, 128, 0, 129, 0, + 0, 130, 131, 132, 0, 0, 133, 0, 134, 135, + 136, 137, 0, 0, 138 }; static const short yycheck[] = { - 1, 65, 10, 2, 1, 1, 1, 20, 20, 192, - 234, 1, 195, 196, 245, 246, 199, 213, 201, 1, - 3, 4, 10, 11, 26, 32, 77, 357, 9, 40, - 11, 106, 106, 93, 231, 135, 38, 29, 122, 204, - 29, 206, 207, 42, 122, 32, 10, 11, 40, 122, - 122, 40, 112, 236, 251, 7, 140, 3, 136, 5, - 6, 72, 137, 137, 136, 446, 135, 140, 10, 11, - 139, 452, 139, 122, 73, 56, 57, 60, 122, 78, - 72, 10, 11, 72, 414, 74, 78, 136, 139, 78, - 137, 322, 136, 258, 259, 260, 261, 134, 294, 134, - 134, 10, 11, 138, 139, 134, 134, 3, 4, 138, - 139, 139, 95, 10, 11, 3, 4, 444, 53, 183, - 184, 128, 449, 58, 51, 52, 190, 137, 55, 312, - 70, 135, 141, 450, 117, 139, 138, 454, 202, 137, - 371, 142, 143, 3, 4, 142, 143, 142, 143, 10, - 11, 375, 142, 143, 100, 143, 3, 4, 341, 134, - 142, 143, 126, 127, 128, 129, 134, 332, 333, 334, - 335, 336, 337, 338, 339, 340, 407, 10, 11, 143, - 126, 134, 128, 134, 130, 134, 128, 129, 7, 135, - 3, 4, 357, 134, 140, 124, 125, 126, 127, 128, - 129, 143, 134, 434, 217, 217, 137, 136, 3, 208, - 209, 137, 443, 212, 143, 124, 125, 126, 127, 128, - 129, 229, 135, 231, 389, 3, 4, 136, 125, 126, - 127, 128, 129, 135, 143, 243, 3, 4, 235, 137, - 235, 135, 243, 251, 252, 235, 143, 311, 413, 414, - 3, 252, 5, 6, 7, 420, 3, 135, 5, 6, - 7, 426, 261, 124, 125, 126, 127, 128, 129, 135, - 435, 3, 4, 3, 4, 440, 138, 139, 135, 135, - 141, 135, 143, 138, 139, 135, 135, 135, 86, 135, - 135, 124, 125, 126, 127, 128, 129, 4, 135, 135, - 296, 300, 137, 135, 135, 135, 135, 304, 307, 304, - 143, 135, 135, 20, 304, 22, 315, 135, 315, 135, - 137, 28, 386, 135, 28, 32, 136, 326, 142, 7, - 7, 3, 7, 5, 6, 42, 7, 7, 52, 46, - 47, 8, 5, 50, 141, 52, 139, 100, 137, 122, - 138, 142, 59, 100, 122, 59, 3, 4, 3, 136, - 135, 10, 11, 70, 71, 136, 70, 71, 144, 76, - 136, 136, 76, 126, 136, 128, 136, 130, 136, 126, - 136, 128, 135, 130, 136, 32, 136, 136, 135, 96, - 97, 98, 96, 136, 101, 136, 136, 101, 105, 136, - 136, 136, 136, 136, 111, 136, 113, 64, 405, 134, - 405, 118, 119, 60, 141, 405, 134, 134, 134, 4, - 143, 136, 423, 136, 136, 136, 5, 103, 100, 134, - 136, 134, 139, 135, 433, 20, 137, 22, 446, 139, - 139, 442, 136, 28, 452, 446, 141, 32, 95, 450, - 136, 452, 136, 454, 126, 0, 128, 42, 130, 9, - 122, 46, 47, 135, 0, 50, 18, 52, 442, 303, - 117, 311, 1, 1, 59, 124, 125, 126, 127, 128, - 129, 128, 32, 1, 206, 70, 71, 37, 135, 244, - 40, 76, 141, 189, 143, 302, 46, 205, -1, 49, - 3, 4, 5, 6, -1, -1, 3, -1, 5, 6, - -1, 96, 97, 98, 64, -1, 101, 20, -1, 22, - 105, -1, 72, -1, -1, 28, 111, -1, 113, 32, - -1, -1, -1, 118, 119, -1, -1, -1, -1, 42, - -1, -1, -1, 46, 47, -1, -1, 50, -1, 52, - -1, -1, -1, -1, 139, 105, 59, -1, -1, -1, - 110, 111, -1, -1, 32, -1, -1, 70, 71, 37, - -1, -1, 40, 76, -1, -1, -1, -1, 46, -1, - -1, 49, -1, -1, 134, -1, -1, -1, -1, 139, - -1, -1, -1, 96, 97, 98, 64, 100, 101, -1, - -1, -1, 105, 100, 72, -1, 4, -1, 111, -1, - 113, -1, -1, -1, -1, 118, 119, -1, -1, -1, - -1, -1, 20, 126, 22, 128, -1, 130, -1, 126, - 28, 128, 135, 130, 32, -1, -1, 105, 135, -1, - -1, -1, 110, 111, 42, 32, -1, -1, 46, 47, - 37, -1, 50, 40, 52, -1, -1, -1, -1, 46, - -1, 59, 49, -1, -1, -1, 134, -1, -1, -1, - 138, 139, 70, 71, -1, -1, 32, 64, 76, -1, - -1, 37, -1, -1, -1, 72, -1, 32, -1, -1, - 46, -1, 37, 49, -1, -1, -1, 32, 96, 97, - 98, 46, 37, 101, 49, -1, -1, 105, 64, -1, - -1, 46, -1, 111, 49, 113, -1, -1, 105, 64, - 118, 119, -1, 110, 111, -1, -1, -1, -1, 64, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 134, -1, 105, - -1, -1, 139, -1, 110, 111, -1, -1, -1, -1, - 105, -1, -1, -1, -1, 110, 111, -1, -1, -1, - 105, -1, -1, -1, -1, 110, 111, -1, 134, -1, - -1, -1, 138, 139, -1, -1, -1, -1, 16, 134, - 18, -1, -1, 138, 139, -1, 24, -1, 26, 134, - -1, -1, -1, 138, 139, 33, 34, 35, 36, -1, - 38, 39, -1, 41, -1, 43, 44, 45, -1, -1, - 48, -1, -1, 51, -1, 53, 54, 55, 56, 57, - 58, -1, 60, 61, 62, 63, -1, -1, 66, -1, - -1, 69, -1, -1, -1, 73, -1, 75, -1, -1, - -1, 79, 80, 81, 82, 83, 84, 85, -1, 87, - 88, 89, 90, 91, 92, 93, 94, 95, -1, -1, - -1, 99, -1, -1, 102, -1, 104, -1, -1, 107, - 108, 109, -1, -1, 112, -1, 114, 115, 116, 117, - -1, -1, 120 + 1, 65, 10, 2, 1, 1, 1, 246, 247, 20, + 20, 1, 193, 1, 26, 196, 197, 235, 77, 200, + 358, 202, 40, 32, 3, 4, 38, 10, 11, 214, + 106, 93, 232, 3, 4, 106, 135, 16, 10, 11, + 29, 122, 122, 42, 205, 32, 207, 208, 10, 11, + 112, 40, 252, 122, 72, 122, 237, 122, 7, 140, + 140, 137, 3, 28, 5, 6, 137, 136, 122, 136, + 447, 136, 70, 134, 73, 29, 453, 415, 139, 78, + 139, 60, 136, 72, 323, 74, 40, 134, 445, 78, + 53, 138, 139, 450, 59, 58, 3, 4, 259, 260, + 261, 262, 10, 11, 134, 70, 71, 139, 138, 139, + 295, 76, 137, 135, 10, 11, 95, 139, 72, 128, + 184, 185, 3, 4, 78, 451, 138, 191, 134, 455, + 135, 96, 313, 372, 139, 9, 101, 11, 117, 203, + 134, 142, 143, 134, 137, 142, 143, 142, 143, 3, + 4, 137, 142, 143, 142, 143, 128, 129, 376, 100, + 143, 342, 124, 125, 126, 127, 128, 129, 134, 408, + 134, 143, 333, 334, 335, 336, 337, 338, 339, 340, + 341, 143, 56, 57, 141, 126, 134, 128, 134, 130, + 134, 51, 52, 7, 135, 55, 435, 358, 137, 140, + 3, 4, 3, 4, 134, 444, 137, 218, 218, 135, + 209, 210, 3, 4, 213, 135, 124, 125, 126, 127, + 128, 129, 230, 135, 232, 3, 4, 3, 136, 390, + 126, 127, 128, 129, 135, 143, 244, 3, 4, 236, + 4, 236, 135, 244, 252, 253, 236, 143, 312, 138, + 139, 135, 253, 414, 415, 135, 20, 135, 22, 135, + 421, 138, 139, 262, 28, 135, 427, 135, 32, 135, + 135, 135, 135, 135, 135, 436, 135, 135, 42, 32, + 441, 137, 46, 47, 37, 135, 50, 135, 52, 135, + 135, 86, 7, 46, 137, 59, 49, 137, 142, 136, + 135, 297, 301, 7, 7, 7, 70, 71, 305, 308, + 305, 64, 76, 7, 52, 305, 8, 316, 5, 316, + 139, 141, 137, 387, 122, 138, 142, 136, 327, 122, + 3, 4, 96, 97, 98, 135, 3, 101, 144, 136, + 136, 105, 136, 16, 136, 134, 136, 111, 136, 113, + 136, 136, 105, 136, 118, 119, 136, 110, 111, 32, + 141, 136, 136, 136, 4, 136, 136, 10, 11, 136, + 5, 136, 134, 10, 11, 139, 136, 136, 64, 134, + 20, 134, 22, 134, 136, 138, 139, 60, 28, 136, + 136, 136, 32, 10, 11, 143, 103, 134, 10, 11, + 134, 136, 42, 139, 137, 135, 46, 47, 139, 406, + 50, 406, 52, 136, 122, 141, 406, 136, 136, 59, + 0, 0, 95, 424, 18, 304, 3, 443, 5, 6, + 70, 71, 190, 1, 303, 434, 76, 312, 207, 447, + 1, 1, 443, 245, 117, 453, 447, -1, -1, 206, + 451, -1, 453, -1, 455, 128, 96, 97, 98, -1, + -1, 101, 135, -1, -1, 105, -1, -1, -1, -1, + -1, 111, 3, 113, 5, 6, 7, -1, 118, 119, + -1, 124, 125, 126, 127, 128, 129, 124, 125, 126, + 127, 128, 129, 136, -1, -1, -1, -1, -1, 139, + 143, -1, -1, -1, 141, -1, 143, 124, 125, 126, + 127, 128, 129, 125, 126, 127, 128, 129, 3, 4, + 5, 6, -1, 100, 141, -1, 143, -1, -1, -1, + 3, 143, 5, 6, 7, 20, -1, 22, 3, -1, + 5, 6, -1, 28, -1, -1, -1, 32, -1, 126, + -1, 128, -1, 130, -1, -1, -1, 42, 135, -1, + -1, 46, 47, -1, -1, 50, -1, 52, -1, 100, + -1, -1, -1, -1, 59, -1, -1, 9, -1, -1, + -1, -1, -1, -1, -1, 70, 71, -1, -1, -1, + -1, 76, -1, -1, -1, 126, -1, 128, -1, 130, + 32, -1, -1, -1, 135, 37, -1, -1, 40, -1, + -1, 96, 97, 98, 46, 100, 101, 49, -1, -1, + 105, -1, -1, -1, -1, -1, 111, 100, 113, -1, + -1, -1, 64, 118, 119, 100, -1, -1, -1, -1, + 72, 126, -1, 128, -1, 130, -1, -1, 4, -1, + 135, -1, -1, 126, -1, 128, -1, 130, -1, -1, + -1, 126, 135, 128, 20, 130, 22, -1, -1, -1, + 135, -1, 28, 105, -1, -1, 32, -1, 110, 111, + -1, -1, -1, -1, -1, -1, 42, 32, -1, -1, + 46, 47, 37, -1, 50, 40, 52, -1, -1, -1, + -1, 46, 134, 59, 49, -1, -1, 139, -1, -1, + -1, -1, -1, -1, 70, 71, -1, -1, 32, 64, + 76, -1, -1, 37, -1, -1, 40, 72, -1, 32, + -1, -1, 46, -1, 37, 49, -1, -1, -1, 32, + 96, 97, 98, 46, 37, 101, 49, -1, -1, 105, + 64, -1, -1, 46, -1, 111, 49, 113, 72, -1, + 105, 64, 118, 119, -1, 110, 111, -1, -1, -1, + -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 134, + -1, 105, -1, 138, 139, -1, 110, 111, -1, -1, + -1, -1, 105, -1, -1, -1, -1, 110, 111, -1, + -1, -1, 105, -1, -1, -1, -1, 110, 111, -1, + 134, -1, -1, -1, -1, 139, -1, -1, -1, -1, + 16, 134, 18, -1, -1, 138, 139, -1, 24, -1, + 26, 134, -1, -1, -1, 138, 139, 33, 34, 35, + 36, -1, 38, 39, -1, 41, -1, 43, 44, 45, + -1, -1, 48, -1, -1, 51, -1, 53, 54, 55, + 56, 57, 58, -1, 60, 61, 62, 63, -1, -1, + 66, -1, -1, 69, -1, -1, -1, 73, -1, 75, + -1, -1, -1, 79, 80, 81, 82, 83, 84, 85, + -1, 87, 88, 89, 90, 91, 92, 93, 94, 95, + -1, -1, -1, 99, -1, -1, 102, -1, 104, -1, + -1, 107, 108, 109, -1, -1, 112, -1, 114, 115, + 116, 117, -1, -1, 120 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison/bison.simple" @@ -2283,19 +2295,23 @@ { yyval.var = make_var(yyvsp[0].str); } break; case 175: -#line 553 "./parser.y" -{ yyval.type = make_type(RPC_FC_BYTE, NULL); } +#line 551 "./parser.y" +{ yyval.var = make_var(yyvsp[0].str); } break; case 176: #line 554 "./parser.y" +{ yyval.type = make_type(RPC_FC_BYTE, NULL); } + break; +case 177: +#line 555 "./parser.y" { yyval.type = make_type(RPC_FC_WCHAR, NULL); } break; -case 178: -#line 556 "./parser.y" +case 179: +#line 557 "./parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = 1; } break; -case 179: -#line 557 "./parser.y" +case 180: +#line 558 "./parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = -1; switch (yyval.type->type) { case RPC_FC_CHAR: break; @@ -2309,13 +2325,9 @@ } } break; -case 180: -#line 569 "./parser.y" -{ yyval.type = make_type(RPC_FC_ULONG, &std_int); yyval.type->sign = -1; } - break; case 181: #line 570 "./parser.y" -{ yyval.type = make_type(RPC_FC_FLOAT, NULL); } +{ yyval.type = make_type(RPC_FC_ULONG, &std_int); yyval.type->sign = -1; } break; case 182: #line 571 "./parser.y" @@ -2323,92 +2335,96 @@ break; case 183: #line 572 "./parser.y" -{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); } +{ yyval.type = make_type(RPC_FC_FLOAT, NULL); } break; case 184: #line 573 "./parser.y" -{ yyval.type = make_type(RPC_FC_SMALL, &std_bool); } +{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); } break; case 185: #line 574 "./parser.y" -{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); } +{ yyval.type = make_type(RPC_FC_SMALL, &std_bool); } break; case 186: #line 575 "./parser.y" +{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); } + break; +case 187: +#line 576 "./parser.y" { yyval.type = make_type(RPC_FC_IGNORE, NULL); } break; -case 189: -#line 582 "./parser.y" -{ yyval.type = make_type(RPC_FC_LONG, &std_int); } - break; case 190: #line 583 "./parser.y" -{ yyval.type = make_type(RPC_FC_SMALL, NULL); } +{ yyval.type = make_type(RPC_FC_LONG, &std_int); } break; case 191: #line 584 "./parser.y" -{ yyval.type = make_type(RPC_FC_SHORT, NULL); } +{ yyval.type = make_type(RPC_FC_SMALL, NULL); } break; case 192: #line 585 "./parser.y" -{ yyval.type = make_type(RPC_FC_LONG, NULL); } +{ yyval.type = make_type(RPC_FC_SHORT, NULL); } break; case 193: #line 586 "./parser.y" [truncated at 1000 lines; 366 more skipped]

1 0

[gvg] 16469: Sync to Wine-20050628:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

Sync to Wine-20050628: Mike McCormack <mike(a)codeweavers.com> - Move function prototypes to header. Eric Pouech <pouech-eric(a)wanadoo.fr> - Const correctness fixes. Modified: trunk/reactos/tools/wrc/parser.y Modified: trunk/reactos/tools/wrc/translation.c Modified: trunk/reactos/tools/wrc/wrc.c Modified: trunk/reactos/tools/wrc/wrc.h Modified: trunk/reactos/tools/wrc/y.tab.c Modified: trunk/reactos/tools/wrc/y.tab.h _____ Modified: trunk/reactos/tools/wrc/parser.y --- trunk/reactos/tools/wrc/parser.y 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/parser.y 2005-07-06 21:40:07 UTC (rev 16469) @@ -2571,7 +2571,7 @@ } /* qsort sorting function for string table entries */ -#define STE(p) ((stt_entry_t *)(p)) +#define STE(p) ((const stt_entry_t *)(p)) static int sort_stt_entry(const void *e1, const void *e2) { return STE(e1)->id - STE(e2)->id; _____ Modified: trunk/reactos/tools/wrc/translation.c --- trunk/reactos/tools/wrc/translation.c 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/translation.c 2005-07-06 21:40:07 UTC (rev 16469) @@ -20,6 +20,7 @@ #include <stdlib.h> #include "dumpres.h" +#include "wrc.h" #define MASTER_LANGUAGE LANG_ENGLISH #define NB_LANG 0x94 _____ Modified: trunk/reactos/tools/wrc/wrc.c --- trunk/reactos/tools/wrc/wrc.c 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/wrc.c 2005-07-06 21:40:07 UTC (rev 16469) @@ -107,12 +107,6 @@ " 1994 Martin von Loewis\n"; /* - * External functions - */ -void write_resfile(char *outname, resource_t *top); -void verify_translations(resource_t *top); - -/* * Set if compiling in 32bit mode (default). */ int win32 = 1; _____ Modified: trunk/reactos/tools/wrc/wrc.h --- trunk/reactos/tools/wrc/wrc.h 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/wrc.h 2005-07-06 21:40:07 UTC (rev 16469) @@ -66,4 +66,7 @@ extern resource_t *resource_top; extern language_t *currentlanguage; +void verify_translations(resource_t *top); +void write_resfile(char *outname, resource_t *top); + #endif _____ Modified: trunk/reactos/tools/wrc/y.tab.c --- trunk/reactos/tools/wrc/y.tab.c 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/y.tab.c 2005-07-06 21:40:07 UTC (rev 16469) @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875. */ +/* A Bison parser, made by GNU Bison 1.875c. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -523,7 +523,7 @@ ani_any_t *ani; } YYSTYPE; /* Line 191 of yacc.c. */ -#line 526 "y.tab.c" +#line 527 "parser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -535,22 +535,29 @@ /* Line 214 of yacc.c. */ -#line 538 "y.tab.c" +#line 539 "parser.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE +# ifndef YYFREE +# define YYFREE free +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# endif + /* The parser invokes alloca or malloc; define the necessary symbols. */ -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif # else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -563,15 +570,15 @@ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ #if (! defined (yyoverflow) \ && (! defined (__cplusplus) \ - || (YYSTYPE_IS_TRIVIAL))) + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -592,7 +599,7 @@ /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if 1 < __GNUC__ +# if defined (__GNUC__) && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else @@ -866,38 +873,38 @@ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "tNL", "tNUMBER", "tLNUMBER", "tSTRING", - "tIDENT", "tFILENAME", "tRAWDATA", "tACCELERATORS", "tBITMAP", - "tCURSOR", "tDIALOG", "tDIALOGEX", "tMENU", "tMENUEX", "tMESSAGETABLE", - "tRCDATA", "tVERSIONINFO", "tSTRINGTABLE", "tFONT", "tFONTDIR", "tICON", - "tAUTO3STATE", "tAUTOCHECKBOX", "tAUTORADIOBUTTON", "tCHECKBOX", - "tDEFPUSHBUTTON", "tPUSHBUTTON", "tRADIOBUTTON", "tSTATE3", "tGROUPBOX", - "tCOMBOBOX", "tLISTBOX", "tSCROLLBAR", "tCONTROL", "tEDITTEXT", - "tRTEXT", "tCTEXT", "tLTEXT", "tBLOCK", "tVALUE", "tSHIFT", "tALT", - "tASCII", "tVIRTKEY", "tGRAYED", "tCHECKED", "tINACTIVE", "tNOINVERT", - "tPURE", "tIMPURE", "tDISCARDABLE", "tLOADONCALL", "tPRELOAD", "tFIXED", - "tMOVEABLE", "tCLASS", "tCAPTION", "tCHARACTERISTICS", "tEXSTYLE", - "tSTYLE", "tVERSION", "tLANGUAGE", "tFILEVERSION", "tPRODUCTVERSION", - "tFILEFLAGSMASK", "tFILEOS", "tFILETYPE", "tFILEFLAGS", "tFILESUBTYPE", - "tMENUBARBREAK", "tMENUBREAK", "tMENUITEM", "tPOPUP", "tSEPARATOR", - "tHELP", "tTOOLBAR", "tBUTTON", "tBEGIN", "tEND", "tDLGINIT", "'|'", - "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'~'", "tNOT", "pUPM", "','", - "'('", "')'", "$accept", "resource_file", "resources", "resource", "@1", - "usrcvt", "nameid", "nameid_s", "resource_definition", "filename", - "bitmap", "cursor", "icon", "font", "fontdir", "messagetable", "rcdata", - "dlginit", "userres", "usertype", "accelerators", "events", "acc_opt", - "accs", "acc", "dialog", "dlg_attributes", "ctrls", "lab_ctrl", - "ctrl_desc", "iconinfo", "gen_ctrl", "opt_font", "optional_style_pair", - "style", "ctlclass", "dialogex", "dlgex_attribs", "exctrls", - "gen_exctrl", "lab_exctrl", "exctrl_desc", "opt_data", "helpid", - "opt_exfont", "opt_expr", "menu", "menu_body", "item_definitions", - "item_options", "menuex", "menuex_body", "itemex_definitions", - "itemex_options", "itemex_p_options", "stringtable", "stt_head", - "strings", "opt_comma", "versioninfo", "fix_version", "ver_blocks", - "ver_block", "ver_values", "ver_value", "ver_words", "toolbar", - "toolbar_items", "loadmemopts", "lamo", "lama", "opt_lvc", - "opt_language", "opt_characts", "opt_version", "raw_data", - "raw_elements", "file_raw", "e_expr", "expr", "xpr_no_not", "xpr", + "$end", "error", "$undefined", "tNL", "tNUMBER", "tLNUMBER", "tSTRING", + "tIDENT", "tFILENAME", "tRAWDATA", "tACCELERATORS", "tBITMAP", "tCURSOR", + "tDIALOG", "tDIALOGEX", "tMENU", "tMENUEX", "tMESSAGETABLE", "tRCDATA", + "tVERSIONINFO", "tSTRINGTABLE", "tFONT", "tFONTDIR", "tICON", + "tAUTO3STATE", "tAUTOCHECKBOX", "tAUTORADIOBUTTON", "tCHECKBOX", + "tDEFPUSHBUTTON", "tPUSHBUTTON", "tRADIOBUTTON", "tSTATE3", "tGROUPBOX", + "tCOMBOBOX", "tLISTBOX", "tSCROLLBAR", "tCONTROL", "tEDITTEXT", "tRTEXT", + "tCTEXT", "tLTEXT", "tBLOCK", "tVALUE", "tSHIFT", "tALT", "tASCII", + "tVIRTKEY", "tGRAYED", "tCHECKED", "tINACTIVE", "tNOINVERT", "tPURE", + "tIMPURE", "tDISCARDABLE", "tLOADONCALL", "tPRELOAD", "tFIXED", + "tMOVEABLE", "tCLASS", "tCAPTION", "tCHARACTERISTICS", "tEXSTYLE", + "tSTYLE", "tVERSION", "tLANGUAGE", "tFILEVERSION", "tPRODUCTVERSION", + "tFILEFLAGSMASK", "tFILEOS", "tFILETYPE", "tFILEFLAGS", "tFILESUBTYPE", + "tMENUBARBREAK", "tMENUBREAK", "tMENUITEM", "tPOPUP", "tSEPARATOR", + "tHELP", "tTOOLBAR", "tBUTTON", "tBEGIN", "tEND", "tDLGINIT", "'|'", + "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'~'", "tNOT", "pUPM", "','", + "'('", "')'", "$accept", "resource_file", "resources", "resource", "@1", + "usrcvt", "nameid", "nameid_s", "resource_definition", "filename", + "bitmap", "cursor", "icon", "font", "fontdir", "messagetable", "rcdata", + "dlginit", "userres", "usertype", "accelerators", "events", "acc_opt", + "accs", "acc", "dialog", "dlg_attributes", "ctrls", "lab_ctrl", + "ctrl_desc", "iconinfo", "gen_ctrl", "opt_font", "optional_style_pair", + "style", "ctlclass", "dialogex", "dlgex_attribs", "exctrls", + "gen_exctrl", "lab_exctrl", "exctrl_desc", "opt_data", "helpid", + "opt_exfont", "opt_expr", "menu", "menu_body", "item_definitions", + "item_options", "menuex", "menuex_body", "itemex_definitions", + "itemex_options", "itemex_p_options", "stringtable", "stt_head", + "strings", "opt_comma", "versioninfo", "fix_version", "ver_blocks", + "ver_block", "ver_values", "ver_value", "ver_words", "toolbar", + "toolbar_items", "loadmemopts", "lamo", "lama", "opt_lvc", + "opt_language", "opt_characts", "opt_version", "raw_data", + "raw_elements", "file_raw", "e_expr", "expr", "xpr_no_not", "xpr", "any_num", 0 }; #endif @@ -1388,8 +1395,9 @@ #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYERROR goto yyerrorlab + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ @@ -1422,11 +1430,11 @@ are run). */ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.first_line = Rhs[1].first_line; \ - Current.first_column = Rhs[1].first_column; \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + ((Current).first_line = (Rhs)[1].first_line, \ + (Current).first_column = (Rhs)[1].first_column, \ + (Current).last_line = (Rhs)[N].last_line, \ + (Current).last_column = (Rhs)[N].last_column) #endif /* YYLEX -- calling `yylex' with the right arguments. */ @@ -1470,7 +1478,7 @@ /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (cinluded). | +| TOP (included). | `------------------------------------------------------------------*/ #if defined (__STDC__) || defined (__cplusplus) @@ -1510,9 +1518,9 @@ #endif { int yyi; - unsigned int yylineno = yyrline[yyrule]; + unsigned int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", - yyrule - 1, yylineno); + yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); @@ -1549,7 +1557,7 @@ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 # undef YYMAXDEPTH #endif @@ -4146,8 +4154,8 @@ } -/* Line 991 of yacc.c. */ -#line 4150 "y.tab.c" +/* Line 1000 of yacc.c. */ +#line 4159 "parser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4188,18 +4196,33 @@ { YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); + const char* yyprefix; char *yymsg; - int yyx, yycount; + int yyx; - yycount = 0; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 0; + + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("syntax error, unexpected ") + 1; - yysize += yystrlen (yytname[yytype]); + { + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } + } + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { @@ -4208,16 +4231,13 @@ if (yycount < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yyprefix); yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + yyprefix = " or "; } } yyerror (yymsg); @@ -4238,51 +4258,56 @@ /* If just tried and failed to reuse lookahead token after an error, discard it. */ - /* Return failure if at end of input. */ - if (yychar == YYEOF) + if (yychar <= YYEOF) { - /* Pop the error token. */ - YYPOPSTACK; - /* Pop the rest of the stack. */ - while (yyss < yyssp) - { - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - YYPOPSTACK; - } - YYABORT; + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ + if (yychar == YYEOF) + for (;;) + { + YYPOPSTACK; + if (yyssp == yyss) + YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + } } + else + { + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); - yychar = YYEMPTY; - + } } /* Else will try to reuse lookahead token after shifting the error token. */ - goto yyerrlab2; + goto yyerrlab1; -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: - /* Suppress GCC warning that yyerrlab1 is unused when no action - invokes YYERROR. */ -#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) - __attribute__ ((__unused__)) +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) + goto yyerrorlab; #endif + yyvsp -= yylen; + yyssp -= yylen; + yystate = *yyssp; + goto yyerrlab1; - goto yyerrlab2; - -/*---------------------------------------------------------------. -| yyerrlab2 -- pop states until the error token can be shifted. | -`---------------------------------------------------------------*/ -yyerrlab2: +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -4305,9 +4330,8 @@ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); yydestruct (yystos[yystate], yyvsp); - yyvsp--; - yystate = *--yyssp; - + YYPOPSTACK; + yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -5082,7 +5106,7 @@ } /* qsort sorting function for string table entries */ -#define STE(p) ((stt_entry_t *)(p)) +#define STE(p) ((const stt_entry_t *)(p)) static int sort_stt_entry(const void *e1, const void *e2) { return STE(e1)->id - STE(e2)->id; _____ Modified: trunk/reactos/tools/wrc/y.tab.h --- trunk/reactos/tools/wrc/y.tab.h 2005-07-06 21:32:16 UTC (rev 16468) +++ trunk/reactos/tools/wrc/y.tab.h 2005-07-06 21:40:07 UTC (rev 16469) @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875. */ +/* A Bison parser, made by GNU Bison 1.875c. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -243,8 +243,8 @@ style_t *style; ani_any_t *ani; } YYSTYPE; -/* Line 1248 of yacc.c. */ -#line 247 "y.tab.h" +/* Line 1275 of yacc.c. */ +#line 248 "parser.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1

1 0

[hpoussin] 16468: SetupDiGetClassDevsExW: implement DIGCF_ALLCLASSES and DIGCF_DEVICEINTERFACE. use deviceset and enumstr parameters if provided
by hpoussin＠svn.reactos.com 06 Jul '05

06 Jul '05

SetupDiGetClassDevsExW: implement DIGCF_ALLCLASSES and DIGCF_DEVICEINTERFACE. use deviceset and enumstr parameters if provided Set right last error (if needed) in SetupDiCreateDeviceInfoListExW, SetupDiEnumDeviceInfo, SetupDiEnumDeviceInterfaces, SetupDiGetDeviceRegistryPropertyW Replace some constants by constant names Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-06 21:24:11 UTC (rev 16467) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-06 21:32:16 UTC (rev 16468) @@ -76,7 +76,21 @@ PWSTR InterfaceName; /* "COMx:" */ LPGUID InterfaceGuid; /* GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR */ #else - WCHAR DeviceInstance[0]; + BOOL IsDevice; /* This entry is a device or an interface */ + union + { + struct + { + GUID ClassGuid; + WCHAR RegistryKey[0]; /* "0000", "0001"... */ + } Device; + struct + { + GUID ClassGuid; + GUID InterfaceGuid; + WCHAR DeviceInstance[0]; /* "ACPI\PNP0501\4&2658d0a0&0"... */ + } Interface; + }; #endif } DeviceInfo; @@ -85,7 +99,7 @@ typedef struct _DeviceInfoList { DWORD magic; - GUID ClassGuid; + GUID ClassGuid; /* Only devices related of this class are in the device list */ HWND hWnd; HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ DWORD numberOfEntries; @@ -154,7 +168,7 @@ LPCWSTR MachineName, PVOID Reserved) { - WCHAR szKeyName[40]; + WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; HKEY hClassesKey; HKEY hClassKey; DWORD dwLength; @@ -179,7 +193,7 @@ for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = MAX_GUID_STRING_LEN + 1; lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -359,7 +373,7 @@ LPCWSTR MachineName, PVOID Reserved) { - WCHAR szKeyName[40]; + WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; WCHAR szClassName[256]; HKEY hClassesKey; HKEY hClassKey; @@ -383,7 +397,7 @@ for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = MAX_GUID_STRING_LEN + 1; lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -636,7 +650,10 @@ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfoList)); if (!list) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return (HDEVINFO)INVALID_HANDLE_VALUE; + } list->magic = SETUP_DEV_INFO_LIST_MAGIC; list->hWnd = hwndParent; @@ -676,7 +693,7 @@ if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_USER_BUFFER); else if (MemberIndex >= list->numberOfEntries) SetLastError(ERROR_NO_MORE_ITEMS); else @@ -686,20 +703,27 @@ while (MemberIndex-- > 0) ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; + if (DevInfo->IsDevice) + { #ifdef __WINE__ - memcpy(&DeviceInfoData->ClassGuid, - DevInfo->InterfaceGuid, - sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; + memcpy(&DeviceInfoData->ClassGuid, + DevInfo->InterfaceGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; #else - memcpy(&DeviceInfoData->ClassGuid, - &list->ClassGuid, /* FIXME */ - sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; + memcpy(&DeviceInfoData->ClassGuid, + &DevInfo->Device.ClassGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; #endif - ret = TRUE; + ret = TRUE; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } } } else @@ -1125,28 +1149,25 @@ } #endif /* __WINE__ */ -static HDEVINFO SETUP_CreateDevListFromClass( +static LONG SETUP_CreateDevListFromClass( + DeviceInfoList *list, PCWSTR MachineName, - LPGUID class) + LPGUID class, + PCWSTR Enumerator) { - HDEVINFO hDeviceInfo; HKEY KeyClass; LONG rc; DWORD subKeys = 0, maxSubKey; DeviceInfo* deviceInfo; DWORD i; - hDeviceInfo = SetupDiCreateDeviceInfoListExW(class, NULL, MachineName, NULL); - if (hDeviceInfo == INVALID_HANDLE_VALUE) - return INVALID_HANDLE_VALUE; - KeyClass = SetupDiOpenClassRegKeyExW(class, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, NULL); if (KeyClass == INVALID_HANDLE_VALUE) - { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } + return GetLastError(); + if (Enumerator) + FIXME("Enumerator parameter ignored\n"); + rc = RegQueryInfoKeyW( KeyClass, NULL, NULL, @@ -1157,35 +1178,185 @@ if (rc != ERROR_SUCCESS) { RegCloseKey(KeyClass); - SetLastError(rc); - return INVALID_HANDLE_VALUE; + return rc; } for (i = 0; i < subKeys; i++) { - deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfo) + maxSubKey * sizeof(WCHAR)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.RegistryKey) + maxSubKey * sizeof(WCHAR)); if (!deviceInfo) { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(ERROR_NO_SYSTEM_RESOURCES); - return INVALID_HANDLE_VALUE; + RegCloseKey(KeyClass); + return ERROR_NO_SYSTEM_RESOURCES; } - rc = RegEnumKeyW(KeyClass, i, &deviceInfo->DeviceInstance[0], maxSubKey); + rc = RegEnumKeyW(KeyClass, i, &deviceInfo->Device.RegistryKey[0], maxSubKey); if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(rc); - return INVALID_HANDLE_VALUE; + RegCloseKey(KeyClass); + return rc; } - InsertTailList(&((DeviceInfoList*)hDeviceInfo)->ListHead, &deviceInfo->ItemEntry); - ((DeviceInfoList*)hDeviceInfo)->numberOfEntries++; + deviceInfo->IsDevice = TRUE; + memcpy(&deviceInfo->Device.ClassGuid, class, sizeof(GUID)); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; } RegCloseKey(KeyClass); + return ERROR_SUCCESS; +} - return hDeviceInfo; +static LONG SETUP_CreateInterfaceList( + DeviceInfoList *list, + PCWSTR MachineName, + LPGUID InterfaceGuid, + PCWSTR DeviceInstance /* OPTIONAL */) +{ + HKEY hInterfaceKey, hEnumKey, hKey; + LONG rc; + WCHAR KeyBuffer[max(MAX_PATH, MAX_GUID_STRING_LEN) + 1]; + DWORD i; + DWORD dwLength, dwRegType; + DeviceInfo *deviceInfo; + + /* Open registry key related to this interface */ + hInterfaceKey = SetupDiOpenClassRegKeyExW(InterfaceGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, MachineName, NULL); + if (hInterfaceKey == INVALID_HANDLE_VALUE) + return GetLastError(); + + /* Enumerate sub keys */ + i = 0; + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hInterfaceKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hInterfaceKey); + return rc; + } + i++; + + /* Open sub key */ + rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hInterfaceKey); + return rc; + } + + /* Read DeviceInstance value */ + rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS ) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + if (dwRegType != REG_SZ) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return ERROR_GEN_FAILURE; + } + + /* Allocate memory for list entry and read DeviceInstance */ + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.DeviceInstance) + dwLength + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return ERROR_NO_SYSTEM_RESOURCES; + } + rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, NULL, (LPBYTE)&deviceInfo->Interface.DeviceInstance[0], &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + deviceInfo->Interface.DeviceInstance[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + TRACE("DeviceInstance %S\n", deviceInfo->Interface.DeviceInstance); + RegCloseKey(hKey); + + if (DeviceInstance) + { + /* Check if device enumerator is not the right one */ + if (wcscmp(DeviceInstance, deviceInfo->Interface.DeviceInstance) != 0) + { + HeapFree(GetProcessHeap(), 0, deviceInfo);; + continue; + } + } + + /* Find class GUID associated to the device instance */ + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Enum", + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hInterfaceKey); + return rc; + } + rc = RegOpenKeyEx( + hEnumKey, + deviceInfo->Interface.DeviceInstance, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hInterfaceKey); + return rc; + } + dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW(hKey, L"ClassGUID", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + KeyBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + RegCloseKey(hKey); + KeyBuffer[37] = UNICODE_NULL; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &deviceInfo->Interface.ClassGuid) != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + return ERROR_GEN_FAILURE; + } + TRACE("ClassGUID %S\n", KeyBuffer); + + /* If current device matches the list GUID (if any), append the entry to the list */ + if (IsEqualIID(&list->ClassGuid, &GUID_NULL) || IsEqualIID(&list->ClassGuid, &deviceInfo->Interface.ClassGuid)) + { + TRACE("Entry found\n"); + deviceInfo->IsDevice = FALSE; + memcpy( + &deviceInfo->Interface.InterfaceGuid, + InterfaceGuid, + sizeof(deviceInfo->Interface.InterfaceGuid)); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; + } + else + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + } + } + RegCloseKey(hInterfaceKey); + return ERROR_SUCCESS; } /*********************************************************************** @@ -1200,38 +1371,141 @@ LPCWSTR machine, PVOID reserved) { - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; + HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; + DeviceInfoList *list; + LPGUID pClassGuid; + LPGUID ClassGuidList; + DWORD RequiredSize; + LONG i; + LONG rc; TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine), reserved); + /* Create the deviceset if not set */ + if (deviceset) + { + list = (DeviceInfoList *)deviceset; + if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + hDeviceInfo = deviceset; + } + else + { + hDeviceInfo = SetupDiCreateDeviceInfoListExW( + flags & DIGCF_DEVICEINTERFACE ? NULL : class, + NULL, machine, NULL); + if (hDeviceInfo == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + list = (DeviceInfoList *)hDeviceInfo; + } + + if (IsEqualIID(&list->ClassGuid, &GUID_NULL)) + pClassGuid = NULL; + else + pClassGuid = &list->ClassGuid; + if (flags & DIGCF_PRESENT) FIXME(": flag DIGCF_PRESENT ignored\n"); if (flags & DIGCF_PROFILE) FIXME(": flag DIGCF_PROFILE ignored\n"); - if (deviceset) - FIXME(": deviceset ignored\n"); - if (enumstr) - FIXME(": unimplemented for enumerator strings (%s)\n", - debugstr_w(enumstr)); - else if (flags & DIGCF_ALLCLASSES) - FIXME(": unimplemented for DIGCF_ALLCLASSES\n"); + if (flags & DIGCF_ALLCLASSES) + { + /* Get list of device classes */ + SetupDiBuildClassInfoList(0, NULL, 0, &RequiredSize); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + ClassGuidList = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(GUID)); + if (!ClassGuidList) + { + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + if (!SetupDiBuildClassInfoListExW(0, ClassGuidList, RequiredSize, &RequiredSize, machine, NULL)) + { + HeapFree(GetProcessHeap(), 0, ClassGuidList); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + + /* Enumerate devices in each device class */ + for (i = 0; i < RequiredSize; i++) + { + if (pClassGuid == NULL || IsEqualIID(pClassGuid, &ClassGuidList[i])) + { + rc = SETUP_CreateDevListFromClass(list, machine, &ClassGuidList[i], enumstr); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, ClassGuidList); + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + } + } + HeapFree(GetProcessHeap(), 0, ClassGuidList); + return hDeviceInfo; + } else if (flags & DIGCF_DEVICEINTERFACE) - FIXME(": unimplemented for DIGCF_DEVICEINTERFACE\n"); - else { + if (class == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + #ifdef __WINE__ - if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) - ret = SETUP_CreateSerialDeviceList(); - else -#else + /* Special case: find serial ports by calling QueryDosDevice */ + if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR) { - ret = SETUP_CreateDevListFromClass(machine, (LPGUID)class); + rc = SETUP_CreateSerialDeviceList(); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; } #endif + + rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; } - return ret; + else + { + rc = SETUP_CreateDevListFromClass(list, machine, (LPGUID)class, enumstr); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; + } } /*********************************************************************** @@ -1268,25 +1542,32 @@ ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; - DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!DevInfo->IsDevice) + { + DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); /* FIXME: verify instead of setting */ #ifdef __WINE__ - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - memcpy(&DeviceInterfaceData->InterfaceClassGuid, - DevInfo->InterfaceGuid, - sizeof(DeviceInterfaceData->InterfaceClassGuid)); - DeviceInterfaceData->Flags = 0; - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ - DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; + /* FIXME: this assumes the only possible enumeration is of serial + * ports. + */ + memcpy(&DeviceInterfaceData->InterfaceClassGuid, + DevInfo->InterfaceGuid, + sizeof(DeviceInterfaceData->InterfaceClassGuid)); + DeviceInterfaceData->Flags = 0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; #else - FIXME("implemented\n"); + FIXME("unimplemented\n"); #endif - ret = TRUE; + ret = TRUE; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } } } else @@ -1513,6 +1794,7 @@ FIXME("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); + SetLastError(ERROR_GEN_FAILURE); return FALSE; }

1 0

[gvg] 16467: zebasoftis <zebasoftis@gmail.com>:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

zebasoftis <zebasoftis(a)gmail.com>: Polish Resource File for control.exe Added: trunk/reactos/lib/cpl/control/Pl.rc Modified: trunk/reactos/lib/cpl/control/control.rc _____ Added: trunk/reactos/lib/cpl/control/Pl.rc --- trunk/reactos/lib/cpl/control/Pl.rc 2005-07-06 21:21:30 UTC (rev 16466) +++ trunk/reactos/lib/cpl/control/Pl.rc 2005-07-06 21:24:11 UTC (rev 16467) @@ -0,0 +1,28 @@ +// Polish language resource file (Sebastian Gasiorek, 2005-07-06) + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "&Zamknij", IDM_CLOSE + END + POPUP "&Widok" + BEGIN + MENUITEM "Du?e ikony", IDM_LARGEICONS + MENUITEM "Ma?e ikony", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Szczeg¾?y", IDM_DETAILS + END + POPUP "Pomoc" + BEGIN + MENUITEM "O programie", IDM_ABOUT + END +END + Property changes on: trunk/reactos/lib/cpl/control/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-07-06 21:21:30 UTC (rev 16466) +++ trunk/reactos/lib/cpl/control/control.rc 2005-07-06 21:24:11 UTC (rev 16467) @@ -31,9 +31,10 @@ * a neutral version. This is to get localized bitmaps for example. */ +#include "En.rc" #include "Cz.rc" -#include "En.rc" #include "De.rc" #include "Dk.rc" +#include "Pl.rc" #include "Ru.rc" #include "Sv.rc"

1 0

[gvg] 16466: zebasoftis <zebasoftis@gmail.com>
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

zebasoftis <zebasoftis(a)gmail.com> Polish Resource File for timedate.cpl Added: trunk/reactos/lib/cpl/timedate/Pl.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Added: trunk/reactos/lib/cpl/timedate/Pl.rc --- trunk/reactos/lib/cpl/timedate/Pl.rc 2005-07-06 20:50:21 UTC (rev 16465) +++ trunk/reactos/lib/cpl/timedate/Pl.rc 2005-07-06 21:21:30 UTC (rev 16466) @@ -0,0 +1,44 @@ +// Polish translation by Sebastian Gasiorek + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Data i godzina" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Data", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&Godzina", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Strefa czasowa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "&Automatycznie uwzglÛdnij zmiany czasu", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Data/Godzina" + IDS_CPLDESCRIPTION "Ustaw datÛ, godzinÛ i strefÛ czasow? komputera." + IDS_TIMEZONETEXT "Aktualna strefa czasowa: %s" + IDS_TIMEZONEINVALID "Nieprawid?owa" + IDS_TIMEZONEUNKNOWN "Nieznana" +END Property changes on: trunk/reactos/lib/cpl/timedate/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-07-06 20:50:21 UTC (rev 16465) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-07-06 21:21:30 UTC (rev 16466) @@ -16,11 +16,12 @@ IDC_CPLICON ICON "resources/applet.ico" +#include "En.rc" #include "Cz.rc" -#include "En.rc" #include "De.rc" #include "Dk.rc" #include "Es.rc" #include "Fr.rc" +#include "Pl.rc" #include "Ru.rc" #include "Sv.rc"

1 0

[greatlrd] 16465: adding %errorlevel% code for date
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

adding %errorlevel% code for date it is always 0 Modified: trunk/reactos/subsys/system/cmd/date.c _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-07-06 20:20:02 UTC (rev 16464) +++ trunk/reactos/subsys/system/cmd/date.c 2005-07-06 20:50:21 UTC (rev 16465) @@ -195,6 +195,8 @@ ConOutResPuts(STRING_DATE_HELP4); return 0; } + + nErrorLevel = 0; /* build parameter array */ arg = split (param, &argc, FALSE);

1 0

[ekohl] 16464: Move undocumented GUIDs to a new NDK header file.
by ekohl＠svn.reactos.com 06 Jul '05

06 Jul '05

Move undocumented GUIDs to a new NDK header file. Added: trunk/reactos/include/ndk/sysguid.h Modified: trunk/reactos/lib/wdmguid/wdmguid.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/wdmguid.h _____ Added: trunk/reactos/include/ndk/sysguid.h --- trunk/reactos/include/ndk/sysguid.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/include/ndk/sysguid.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/sysguid.h + * PURPOSE: GUIDs not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _SYSGUID_H +#define _SYSGUID_H + +DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, + 0x03B21C13, 0x18D6, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, + 0x14689B54, 0x0703, 0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, + 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, + 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, + 0x60DBD5FA, 0xDDD2, 0x11D2, 0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, + 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_BATTERY, + 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, + 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); + +DEFINE_GUID(GUID_DEVICE_ARRIVAL, + 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATED, + 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, + 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_START_REQUEST, + 0xCB3A400C, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, + 0xCB3A400D, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, + 0xCB3A400E, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_EJECT, + 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_NOOP, + 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, + 0xCBF4C1F9, 0x18D5, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, + 0xCE5AF000, 0x80DD, 0x11D2, 0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B); +DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, + 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_EVENT_RBC, + 0xD0744792, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); + +#endif _____ Modified: trunk/reactos/lib/wdmguid/wdmguid.c --- trunk/reactos/lib/wdmguid/wdmguid.c 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/lib/wdmguid/wdmguid.c 2005-07-06 20:20:02 UTC (rev 16464) @@ -5,5 +5,6 @@ #include "initguid.h" #include <ddk/wdmguid.h> +#include <ndk/sysguid.h> /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -18,6 +18,7 @@ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/wdmguid.h> +#include <ndk/sysguid.h> #include <ndk/ntndk.h> #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-06 20:20:02 UTC (rev 16464) @@ -29,6 +29,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <ndk/sysguid.h> #include <ddk/wdmguid.h> #include <rpc.h> _____ Modified: trunk/reactos/w32api/include/ddk/wdmguid.h --- trunk/reactos/w32api/include/ddk/wdmguid.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/w32api/include/ddk/wdmguid.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -115,26 +115,4 @@ DEFINE_GUID(GUID_POWER_DEVICE_WAKE_ENABLE, 0xa9546a82L, 0xfeb0, 0x11d0, 0xbd, 0x26, 0x00, 0xaa, 0x00, 0xb7, 0xb3, 0x2a); -DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x18D6, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x0703, 0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); -DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); -DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0xDDD2, 0x11D2, 0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); -DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); - -DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x18D5, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x80DD, 0x11D2, 0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B); -DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); - #endif /* __WDMGUID_H */

1 0

[greatlrd] 16463: set right errorlevel for cd / chdir, left to do we do not have /d param that are new in win2k maby in older windows also
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

set right errorlevel for cd / chdir, left to do we do not have /d param that are new in win2k maby in older windows also Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-06 19:42:41 UTC (rev 16462) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-06 20:15:36 UTC (rev 16463) @@ -172,6 +172,8 @@ return 0; } + nErrorLevel = 0; + /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */ @@ -258,13 +260,14 @@ { hSearch = FindFirstFile(dir, &FileData); - if (hSearch == INVALID_HANDLE_VALUE) - { + if (hSearch == INVALID_HANDLE_VALUE) + { ConOutFormatMessage(GetLastError()); - free (lpOldPath); - lpOldPath = NULL; - return 1; - } + free (lpOldPath); + lpOldPath = NULL; + nErrorLevel = 1; + return 1; + } while (!fFinished) @@ -282,6 +285,7 @@ ConOutFormatMessage(GetLastError()); free (lpOldPath); lpOldPath = NULL; + nErrorLevel = 1; return 1; } @@ -293,6 +297,7 @@ { FindClose(hSearch); ConOutFormatMessage(GetLastError()); + nErrorLevel = 1; free (lpOldPath); lpOldPath = NULL; return 1; @@ -301,6 +306,7 @@ //ErrorMessage (GetLastError(), _T("CD")); ConOutFormatMessage(GetLastError()); + nErrorLevel = 1; /* throw away current directory */ free (lpOldPath);

1 0

[greatlrd] 16462: remove rem errorlevel it was never set stupied mistake by me.fix call setting errorlevel to 1
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

remove rem errorlevel it was never set stupied mistake by me.fix call setting errorlevel to 1 Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-07-06 19:13:24 UTC (rev 16461) +++ trunk/reactos/subsys/system/cmd/call.c 2005-07-06 19:42:41 UTC (rev 16462) @@ -54,6 +54,8 @@ return 0; } + nErrorLevel = 1; + n = (LPBATCH_CONTEXT)malloc (sizeof (BATCH_CONTEXT)); if (n == NULL) _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 19:13:24 UTC (rev 16461) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 19:42:41 UTC (rev 16462) @@ -71,8 +71,7 @@ lpnFlags = 0; *ifn=('\0'); *ofn=('\0'); - *efn=_T('\0'); - nErrorLevel = 9009; + *efn=_T('\0'); return 1; } #endif

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005