Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[gvg] 17088: Wine-20050725 vendor drop

by gvg＠svn.reactos.com

Wine-20050725 vendor drop Modified: vendor/wine/dlls/cabinet/current/cabextract.c Modified: vendor/wine/dlls/cabinet/current/fci.c Modified: vendor/wine/dlls/cabinet/current/fdi.c Modified: vendor/wine/dlls/comctl32/current/Makefile.in Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/current/comctl_Cn.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Cs.rc Modified: vendor/wine/dlls/comctl32/current/comctl_De.rc Modified: vendor/wine/dlls/comctl32/current/comctl_En.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Es.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Fr.rc Modified: vendor/wine/dlls/comctl32/current/comctl_It.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ja.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ko.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Nl.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Pl.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Pt.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ru.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Si.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Sv.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Th.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Uk.rc Added: vendor/wine/dlls/comctl32/current/dpa.c Added: vendor/wine/dlls/comctl32/current/dsa.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/propsheet.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/updown.c Modified: vendor/wine/dlls/commdlg/current/Makefile.in Modified: vendor/wine/dlls/commdlg/current/cdlg16.h Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc Modified: vendor/wine/dlls/commdlg/current/colordlg.c Modified: vendor/wine/dlls/commdlg/current/colordlg16.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/filedlg16.c Modified: vendor/wine/dlls/commdlg/current/filedlg31.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.c Modified: vendor/wine/dlls/commdlg/current/filetitle.c Modified: vendor/wine/dlls/commdlg/current/finddlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg16.c Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/commdlg/current/printdlg16.c Modified: vendor/wine/dlls/dinput/current/device_private.h Modified: vendor/wine/dlls/dinput/current/joystick_linux.c Modified: vendor/wine/dlls/dinput/current/joystick_linuxinput.c Modified: vendor/wine/dlls/dsound/current/dsound.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/dsound_private.h Added: vendor/wine/dlls/midimap/ Added: vendor/wine/dlls/midimap/Wine-20050628/ Added: vendor/wine/dlls/midimap/current/ Modified: vendor/wine/dlls/midimap/current/Makefile.in Modified: vendor/wine/dlls/midimap/current/midimap.c Deleted: vendor/wine/dlls/midimap/current/midimap.drv.spec Added: vendor/wine/dlls/midimap/current/midimap.spec Modified: vendor/wine/dlls/mpr/current/pwcache.c Modified: vendor/wine/dlls/msi/current/Makefile.in Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/appsearch.c Modified: vendor/wine/dlls/msi/current/custom.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/events.c Modified: vendor/wine/dlls/msi/current/files.c Modified: vendor/wine/dlls/msi/current/helpers.c Modified: vendor/wine/dlls/msi/current/install.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.spec Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/registry.c Added: vendor/wine/dlls/msi/current/source.c Modified: vendor/wine/dlls/msi/current/string.c Modified: vendor/wine/dlls/msi/current/suminfo.c Modified: vendor/wine/dlls/msi/current/upgrade.c Deleted: vendor/wine/dlls/ole32/Wine-20050524/ Modified: vendor/wine/dlls/ole32/current/antimoniker.c Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj.spec Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/hglobalstream.c Modified: vendor/wine/dlls/ole32/current/ifs.c Modified: vendor/wine/dlls/ole32/current/ifs.h Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/memlockbytes.c Modified: vendor/wine/dlls/ole32/current/memlockbytes16.c [truncated at 100 lines; 134 more skipped] _____ Modified: vendor/wine/dlls/cabinet/current/cabextract.c --- vendor/wine/dlls/cabinet/current/cabextract.c 2005-08-05 21:47:25 UTC (rev 17087) +++ vendor/wine/dlls/cabinet/current/cabextract.c 2005-08-05 21:50:34 UTC (rev 17088) @@ -51,7 +51,7 @@ */ /* try to open a cabinet file, returns success */ -BOOL cabinet_open(struct cabinet *cab) +static BOOL cabinet_open(struct cabinet *cab) { const char *name = cab->filename; HANDLE fh; @@ -89,7 +89,7 @@ * * close the file handle in a struct cabinet. */ -void cabinet_close(struct cabinet *cab) { +static void cabinet_close(struct cabinet *cab) { TRACE("(cab == ^%p)\n", cab); if (cab->fh) CloseHandle(cab->fh); cab->fh = 0; @@ -98,7 +98,7 @@ /******************************************************* * ensure_filepath2 (internal) */ -BOOL ensure_filepath2(char *path) { +static BOOL ensure_filepath2(char *path) { BOOL ret = TRUE; int len; char *new_path; @@ -147,7 +147,7 @@ * * ensure_filepath("a\b\c\d.txt") ensures a, a\b and a\b\c exist as dirs */ -BOOL ensure_filepath(char *path) { +static BOOL ensure_filepath(char *path) { char new_path[MAX_PATH]; int len, i, lastslashpos = -1; @@ -176,7 +176,7 @@ * * opens a file for output, returns success */ -BOOL file_open(struct cab_file *fi, BOOL lower, LPCSTR dir) +static BOOL file_open(struct cab_file *fi, BOOL lower, LPCSTR dir) { char c, *d, *name; BOOL ok = FALSE; @@ -239,7 +239,7 @@ * * closes a completed file */ -void file_close(struct cab_file *fi) +static void file_close(struct cab_file *fi) { TRACE("(fi == ^%p)\n", fi); @@ -255,7 +255,7 @@ * writes from buf to a file specified as a cab_file struct. * returns success/failure */ -BOOL file_write(struct cab_file *fi, cab_UBYTE *buf, cab_off_t length) +static BOOL file_write(struct cab_file *fi, cab_UBYTE *buf, cab_off_t length) { DWORD bytes_written; @@ -276,7 +276,7 @@ * advance the file pointer associated with the cab structure * by distance bytes */ -void cabinet_skip(struct cabinet *cab, cab_off_t distance) +static void cabinet_skip(struct cabinet *cab, cab_off_t distance) { TRACE("(cab == ^%p, distance == %u)\n", cab, distance); if (SetFilePointer(cab->fh, distance, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { @@ -290,7 +290,7 @@ * * seek to the specified absolute offset in a cab */ -void cabinet_seek(struct cabinet *cab, cab_off_t offset) { +static void cabinet_seek(struct cabinet *cab, cab_off_t offset) { TRACE("(cab == ^%p, offset == %u)\n", cab, offset); if (SetFilePointer(cab->fh, offset, NULL, FILE_BEGIN) != offset) ERR("%s seek failure\n", debugstr_a(cab->filename)); @@ -301,7 +301,7 @@ * * returns the file pointer position of a cab */ -cab_off_t cabinet_getoffset(struct cabinet *cab) +static cab_off_t cabinet_getoffset(struct cabinet *cab) { return SetFilePointer(cab->fh, 0, NULL, FILE_CURRENT); } @@ -311,7 +311,7 @@ * * read data from a cabinet, returns success */ -BOOL cabinet_read(struct cabinet *cab, cab_UBYTE *buf, cab_off_t length) +static BOOL cabinet_read(struct cabinet *cab, cab_UBYTE *buf, cab_off_t length) { DWORD bytes_read; cab_off_t avail = cab->filelen - cabinet_getoffset(cab); @@ -339,7 +339,7 @@ * * allocate and read an aribitrarily long string from the cabinet */ -char *cabinet_read_string(struct cabinet *cab) +static char *cabinet_read_string(struct cabinet *cab) { cab_off_t len=256, base = cabinet_getoffset(cab), maxlen = cab->filelen - base; BOOL ok = FALSE; @@ -387,7 +387,7 @@ * * reads the header and all folder and file entries in this cabinet */ -BOOL cabinet_read_entries(struct cabinet *cab) +static BOOL cabinet_read_entries(struct cabinet *cab) { int num_folders, num_files, header_resv, folder_resv = 0, i; struct cab_folder *fol, *linkfol = NULL; @@ -525,7 +525,7 @@ * file [name]. Returns a cabinet structure if successful, or NULL * otherwise. */ -struct cabinet *load_cab_offset(LPCSTR name, cab_off_t offset) +static struct cabinet *load_cab_offset(LPCSTR name, cab_off_t offset) { struct cabinet *cab = (struct cabinet *) calloc(1, sizeof(struct cabinet)); int ok; @@ -553,7 +553,7 @@ /******************************************************** * Ziphuft_free (internal) */ -void Ziphuft_free(struct Ziphuft *t) +static void Ziphuft_free(struct Ziphuft *t) { register struct Ziphuft *p, *q; @@ -570,7 +570,7 @@ /********************************************************* * Ziphuft_build (internal) */ -cab_LONG Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, +static cab_LONG Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, struct Ziphuft **t, cab_LONG *m, cab_decomp_state *decomp_state) { cab_ULONG a; /* counter for codes of length k */ @@ -750,7 +750,7 @@ /********************************************************* * Zipinflate_codes (internal) */ -cab_LONG Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, cab_LONG bl, cab_LONG bd, cab_decomp_state *decomp_state) { register cab_ULONG e; /* table entry flag/number of extra bits */ @@ -833,7 +833,7 @@ /*********************************************************** * Zipinflate_stored (internal) */ -cab_LONG Zipinflate_stored(cab_decomp_state *decomp_state) +static cab_LONG Zipinflate_stored(cab_decomp_state *decomp_state) /* "decompress" an inflated type 0 (stored) block. */ { cab_ULONG n; /* number of bytes in block */ @@ -877,7 +877,7 @@ /****************************************************** * Zipinflate_fixed (internal) */ -cab_LONG Zipinflate_fixed(cab_decomp_state *decomp_state) +static cab_LONG Zipinflate_fixed(cab_decomp_state *decomp_state) { struct Ziphuft *fixed_tl; struct Ziphuft *fixed_td; @@ -923,7 +923,7 @@ /************************************************************** * Zipinflate_dynamic (internal) */ -cab_LONG Zipinflate_dynamic(cab_decomp_state *decomp_state) +static cab_LONG Zipinflate_dynamic(cab_decomp_state *decomp_state) /* decompress an inflated type 2 (dynamic Huffman codes) block. */ { cab_LONG i; /* temporary variables */ @@ -1058,7 +1058,7 @@ /***************************************************** * Zipinflate_block (internal) */ -cab_LONG Zipinflate_block(cab_LONG *e, cab_decomp_state *decomp_state) /* e == last block flag */ +static cab_LONG Zipinflate_block(cab_LONG *e, cab_decomp_state *decomp_state) /* e == last block flag */ { /* decompress an inflated block */ cab_ULONG t; /* block type */ register cab_ULONG b; /* bit buffer */ @@ -1096,7 +1096,7 @@ /**************************************************** * ZIPdecompress (internal) */ -int ZIPdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) +static int ZIPdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { cab_LONG e; /* last block flag */ @@ -1132,7 +1132,7 @@ * * Initialise a model which decodes symbols from [s] to [s]+[n]-1 */ -void QTMinitmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) { +static void QTMinitmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) { int i; m->shiftsleft = 4; m->entries = n; @@ -1149,7 +1149,7 @@ /****************************************************************** * QTMinit (internal) */ -int QTMinit(int window, int level, cab_decomp_state *decomp_state) { +static int QTMinit(int window, int level, cab_decomp_state *decomp_state) { unsigned int wndsize = 1 << window; int msz = window * 2, i; cab_ULONG j; @@ -1256,7 +1256,7 @@ /******************************************************************* * QTMdecompress (internal) */ -int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) +static int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *window = QTM(window); @@ -1438,7 +1438,7 @@ /************************************************************ * LZXinit (internal) */ -int LZXinit(int window, cab_decomp_state *decomp_state) { +static int LZXinit(int window, cab_decomp_state *decomp_state) { cab_ULONG wndsize = 1 << window; int i, j, posn_slots; @@ -1579,7 +1579,7 @@ /************************************************************ * lzx_read_lens (internal) */ -int lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb, +static int lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb, cab_decomp_state *decomp_state) { cab_ULONG i,j, x,y; int z; @@ -1626,7 +1626,7 @@ /******************************************************* * LZXdecompress (internal) */ -int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { +static int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *endinp = inpos + inlen; cab_UBYTE *window = LZX(window); @@ -1949,7 +1949,7 @@ /********************************************************* * find_cabs_in_file (internal) */ -struct cabinet *find_cabs_in_file(LPCSTR name, cab_UBYTE search_buf[]) +static struct cabinet *find_cabs_in_file(LPCSTR name, cab_UBYTE search_buf[]) { struct cabinet *cab, *cab2, *firstcab = NULL, *linkcab = NULL; cab_UBYTE *pstart = &search_buf[0], *pend, *p; @@ -2067,7 +2067,7 @@ * tries to find *cabname, from the directory path of origcab, correcting the * case of *cabname if necessary, If found, writes back to *cabname. */ -void find_cabinet_file(char **cabname, LPCSTR origcab) { +static void find_cabinet_file(char **cabname, LPCSTR origcab) { char *tail, *cab, *name, *nextpart, nametmp[MAX_PATH]; int found = 0; @@ -2156,7 +2156,7 @@ * in CAB.c) for an implementation of this that correctly frees the discarded * file entries. */ -struct cab_file *process_files(struct cabinet *basecab) { +static struct cab_file *process_files(struct cabinet *basecab) { struct cabinet *cab; struct cab_file *outfi = NULL, *linkfi = NULL, *nextfi, *fi, *cfi; struct cab_folder *fol, *firstfol, *lastfol = NULL, *predfol; @@ -2259,7 +2259,7 @@ * * FIXME: use a winapi to do this */ -int convertUTF(cab_UBYTE *in) { +static int convertUTF(cab_UBYTE *in) { cab_UBYTE c, *out = in, *end = in + strlen((char *) in) + 1; cab_ULONG x; @@ -2291,7 +2291,7 @@ /**************************************************** * NONEdecompress (internal) */ -int NONEdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) +static int NONEdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { if (inlen != outlen) return DECR_ILLEGALDATA; memcpy(CAB(outbuf), CAB(inbuf), (size_t) inlen); @@ -2322,7 +2322,7 @@ /********************************************************** * decompress (internal) */ -int decompress(struct cab_file *fi, int savemode, int fix, cab_decomp_state *decomp_state) +static int decompress(struct cab_file *fi, int savemode, int fix, cab_decomp_state *decomp_state) { cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset); struct cabinet *cab = CAB(current)->cab[CAB(split)]; @@ -2412,7 +2412,7 @@ * * workhorse to extract a particular file from a cab */ -void extract_file(struct cab_file *fi, int lower, int fix, LPCSTR dir, cab_decomp_state *decomp_state) +static void extract_file(struct cab_file *fi, int lower, int fix, LPCSTR dir, cab_decomp_state *decomp_state) { struct cab_folder *fol = fi->folder, *oldfol = CAB(current); cab_LONG err = DECR_OK; @@ -2523,7 +2523,7 @@ /********************************************************* * print_fileinfo (internal) */ -void print_fileinfo(struct cab_file *fi) { +static void print_fileinfo(struct cab_file *fi) { char *fname = NULL; if (fi->attribs & cffile_A_NAME_IS_UTF) { _____ Modified: vendor/wine/dlls/cabinet/current/fci.c --- vendor/wine/dlls/cabinet/current/fci.c 2005-08-05 21:47:25 UTC (rev 17087) +++ vendor/wine/dlls/cabinet/current/fci.c 2005-08-05 21:50:34 UTC (rev 17088) @@ -23,7 +23,6 @@ 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 @@ -44,11 +43,22 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "fci.h" #include "cabinet.h" #include "wine/debug.h" + +#ifdef WORDS_BIGENDIAN +#define fci_endian_ulong(x) RtlUlongByteSwap(x) +#define fci_endian_uword(x) RtlUshortByteSwap(x) +#else +#define fci_endian_ulong(x) (x) +#define fci_endian_uword(x) (x) +#endif + + WINE_DEFAULT_DEBUG_CHANNEL(cabinet); typedef struct { @@ -556,7 +566,7 @@ 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 */ + /* that the maximum cabinet size will be exceeded. The remainder */ /* will be stored into the next following cabinet. */ /* The cabinet will be of size "p_fci_internal->oldCCAB.cb". */ @@ -599,12 +609,19 @@ return FALSE; } + /* set little endian */ + pcfdata->cbData=fci_endian_uword(pcfdata->cbData); + pcfdata->cbUncomp=fci_endian_uword(pcfdata->cbUncomp); + /* 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 ) ); + /* set little endian */ + pcfdata->csum=fci_endian_ulong(pcfdata->csum); + /* write cfdata with checksum to p_fci_internal->handleCFDATA2 */ if( PFCI_WRITE(hfci, p_fci_internal->handleCFDATA2, /* file handle */ buffer, /* memory buffer */ @@ -617,6 +634,11 @@ p_fci_internal->sizeFileCFDATA2 += sizeof(CFDATA)+cbReserveCFData; + /* reset little endian */ + pcfdata->cbData=fci_endian_uword(pcfdata->cbData); + pcfdata->cbUncomp=fci_endian_uword(pcfdata->cbUncomp); + pcfdata->csum=fci_endian_ulong(pcfdata->csum); + /* 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 */ @@ -632,7 +654,7 @@ 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 */ + /* write the remainder 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 */ @@ -641,7 +663,7 @@ return FALSE; } - /* set cbData the size of the remainer of the data block */ + /* set cbData to the size of the remainder 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; @@ -649,6 +671,7 @@ /* 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 */ @@ -657,7 +680,7 @@ /* TODO write error */ return FALSE; } - /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + /* TODO error handling of err don't forget PFCI_FREE(hfci, reserved) */ *psizeFileCFDATA1new += sizeof(CFDATA)+cbReserveCFData; @@ -676,7 +699,7 @@ *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 */ + /* don't reset split_data yet, because it is still needed see below */ } /* report status with pfnfcis about copied size of folder */ @@ -721,7 +744,7 @@ /* TODO read error */ return FALSE; } - /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + /* TODO error handling of err don't forget PFCI_FREE(hfci, reserved) */ /* write cfdata with checksum to handleCFDATA1new */ if( PFCI_WRITE(hfci, handleCFDATA1new, /* file handle */ @@ -731,7 +754,7 @@ /* TODO write error */ return FALSE; } - /* TODO error handling of err dont forget PFCI_FREE(hfci, reserved) */ + /* TODO error handling of err don't forget PFCI_FREE(hfci, reserved) */ *psizeFileCFDATA1new += sizeof(CFDATA)+cbReserveCFData; @@ -779,7 +802,7 @@ /* 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 */ + /* the remainder 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; @@ -965,6 +988,14 @@ cffile.iFolder=cffileCONTINUED_TO_NEXT; } + /* set little endian */ + cffile.cbFile=fci_endian_ulong(cffile.cbFile); + cffile.uoffFolderStart=fci_endian_ulong(cffile.uoffFolderStart); + cffile.iFolder=fci_endian_uword(cffile.iFolder); + cffile.date=fci_endian_uword(cffile.date); + cffile.time=fci_endian_uword(cffile.time); + cffile.attribs=fci_endian_uword(cffile.attribs); + /* write cffile to p_fci_internal->handleCFFILE2 */ if( PFCI_WRITE(hfci, p_fci_internal->handleCFFILE2, /* file handle */ &cffile, /* memory buffer */ @@ -977,6 +1008,14 @@ p_fci_internal->sizeFileCFFILE2 += sizeof(cffile); + /* reset little endian */ + cffile.cbFile=fci_endian_ulong(cffile.cbFile); + cffile.uoffFolderStart=fci_endian_ulong(cffile.uoffFolderStart); + cffile.iFolder=fci_endian_uword(cffile.iFolder); + cffile.date=fci_endian_uword(cffile.date); + cffile.time=fci_endian_uword(cffile.time); + cffile.attribs=fci_endian_uword(cffile.attribs); + /* write file name to p_fci_internal->handleCFFILE2 */ if( PFCI_WRITE(hfci, p_fci_internal->handleCFFILE2, /* file handle */ p_fci_internal->data_out, /* memory buffer */ @@ -1580,6 +1619,18 @@ cfheader.iCabinet = p_fci_internal->pccab->iCab-1; } + /* set little endian */ + cfheader.reserved1=fci_endian_ulong(cfheader.reserved1); + cfheader.cbCabinet=fci_endian_ulong(cfheader.cbCabinet); + cfheader.reserved2=fci_endian_ulong(cfheader.reserved2); + cfheader.coffFiles=fci_endian_ulong(cfheader.coffFiles); + cfheader.reserved3=fci_endian_ulong(cfheader.reserved3); + cfheader.cFolders=fci_endian_uword(cfheader.cFolders); + cfheader.cFiles=fci_endian_uword(cfheader.cFiles); + cfheader.flags=fci_endian_uword(cfheader.flags); + cfheader.setID=fci_endian_uword(cfheader.setID); + cfheader.iCabinet=fci_endian_uword(cfheader.iCabinet); + /* write CFHEADER into cabinet file */ if( PFCI_WRITE(hfci, handleCABINET, /* file handle */ &cfheader, /* memory buffer */ @@ -1590,6 +1641,18 @@ } /* TODO error handling of err */ + /* reset little endian */ + cfheader.reserved1=fci_endian_ulong(cfheader.reserved1); + cfheader.cbCabinet=fci_endian_ulong(cfheader.cbCabinet); + cfheader.reserved2=fci_endian_ulong(cfheader.reserved2); + cfheader.coffFiles=fci_endian_ulong(cfheader.coffFiles); + cfheader.reserved3=fci_endian_ulong(cfheader.reserved3); + cfheader.cFolders=fci_endian_uword(cfheader.cFolders); + cfheader.cFiles=fci_endian_uword(cfheader.cFiles); + cfheader.flags=fci_endian_uword(cfheader.flags); + cfheader.setID=fci_endian_uword(cfheader.setID); + cfheader.iCabinet=fci_endian_uword(cfheader.iCabinet); + if( cfheader.flags & cfheadRESERVE_PRESENT ) { /* NOTE: No checks for maximum value overflows as designed by MS!!! */ cfreserved.cbCFHeader = cbReserveCFHeader; @@ -1600,6 +1663,10 @@ } else { cfreserved.cbCFData = p_fci_internal->pccab->cbReserveCFData; } + + /* set little endian */ + cfreserved.cbCFHeader=fci_endian_uword(cfreserved.cbCFHeader); + /* write reserved info into cabinet file */ if( PFCI_WRITE(hfci, handleCABINET, /* file handle */ &cfreserved, /* memory buffer */ @@ -1609,6 +1676,9 @@ return FALSE; } /* TODO error handling of err */ + + /* reset little endian */ + cfreserved.cbCFHeader=fci_endian_uword(cfreserved.cbCFHeader); } /* add optional reserved area */ @@ -1735,6 +1805,11 @@ } } + /* set little endian */ + cffolder.coffCabStart=fci_endian_ulong(cffolder.coffCabStart); + cffolder.cCFData=fci_endian_uword(cffolder.cCFData); + cffolder.typeCompress=fci_endian_uword(cffolder.typeCompress); + /* write cffolder to cabinet file */ if( PFCI_WRITE(hfci, handleCABINET, /* file handle */ &cffolder, /* memory buffer */ @@ -1745,6 +1820,11 @@ } /* TODO error handling of err */ + /* reset little endian */ + cffolder.coffCabStart=fci_endian_ulong(cffolder.coffCabStart); + cffolder.cCFData=fci_endian_uword(cffolder.cCFData); + cffolder.typeCompress=fci_endian_uword(cffolder.typeCompress); + /* add optional reserved area */ /* This allocation and freeing at each CFFolder block is a bit */ _____ Modified: vendor/wine/dlls/cabinet/current/fdi.c --- vendor/wine/dlls/cabinet/current/fdi.c 2005-08-05 21:47:25 UTC (rev 17087) +++ vendor/wine/dlls/cabinet/current/fdi.c 2005-08-05 21:50:34 UTC (rev 17088) @@ -243,7 +243,7 @@ * * returns the file pointer position of a file handle. */ -long FDI_getoffset(HFDI hfdi, INT_PTR hf) +static long FDI_getoffset(HFDI hfdi, INT_PTR hf) { return PFDI_SEEK(hfdi, hf, 0L, SEEK_CUR); } @@ -254,7 +254,7 @@ * we can't use _msize; the user might not be using malloc, so we require * an explicit specification of the previous size. inefficient. */ -void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize) +static void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize) { void *rslt = NULL; char *irslt, *imem; @@ -273,7 +273,7 @@ * * allocate and read an arbitrarily long string from the cabinet */ -char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize) +static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize) { size_t len=256, oldlen = 0, @@ -326,7 +326,7 @@ * process the cabinet header in the style of FDIIsCabinet, but * without the sanity checks (and bug) */ -BOOL FDI_read_entries( +static BOOL FDI_read_entries( HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici, @@ -632,7 +632,7 @@ * * Initialize a model which decodes symbols from [s] to [s]+[n]-1 */ -void QTMfdi_initmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) { +static void QTMfdi_initmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) { int i; m->shiftsleft = 4; m->entries = n; @@ -649,7 +649,7 @@ /****************************************************************** * QTMfdi_init (internal) */ -int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) { +static int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) { unsigned int wndsize = 1 << window; int msz = window * 2, i; cab_ULONG j; @@ -701,7 +701,7 @@ /************************************************************ * LZXfdi_init (internal) */ -int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { +static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { cab_ULONG wndsize = 1 << window; int i, j, posn_slots; @@ -755,7 +755,7 @@ /**************************************************** * NONEfdi_decomp(internal) */ -int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) +static int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { if (inlen != outlen) return DECR_ILLEGALDATA; memcpy(CAB(outbuf), CAB(inbuf), (size_t) inlen); @@ -765,7 +765,7 @@ /******************************************************** * Ziphuft_free (internal) */ -void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t) +static void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t) { register struct Ziphuft *p, *q; @@ -782,7 +782,7 @@ /********************************************************* * fdi_Ziphuft_build (internal) */ -cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, +static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) { cab_ULONG a; /* counter for codes of length k */ @@ -1045,7 +1045,7 @@ /*********************************************************** * Zipinflate_stored (internal) */ -cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state) +static cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state) /* "decompress" an inflated type 0 (stored) block. */ { cab_ULONG n; /* number of bytes in block */ @@ -1089,7 +1089,7 @@ /****************************************************** * fdi_Zipinflate_fixed (internal) */ -cab_LONG fdi_Zipinflate_fixed(fdi_decomp_state *decomp_state) +static cab_LONG fdi_Zipinflate_fixed(fdi_decomp_state *decomp_state) { struct Ziphuft *fixed_tl; struct Ziphuft *fixed_td; @@ -1135,7 +1135,7 @@ /************************************************************** * fdi_Zipinflate_dynamic (internal) */ -cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) +static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) /* decompress an inflated type 2 (dynamic Huffman codes) block. */ { cab_LONG i; /* temporary variables */ @@ -1270,7 +1270,7 @@ /***************************************************** * fdi_Zipinflate_block (internal) */ -cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state) /* e == last block flag */ +static cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state) /* e == last block flag */ { /* decompress an inflated block */ cab_ULONG t; /* block type */ register cab_ULONG b; /* bit buffer */ @@ -1308,7 +1308,7 @@ /**************************************************** * ZIPfdi_decomp(internal) */ -int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) +static int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { cab_LONG e; /* last block flag */ @@ -1336,7 +1336,7 @@ /******************************************************************* * QTMfdi_decomp(internal) */ -int QTMfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) +static int QTMfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *window = QTM(window); @@ -1462,7 +1462,7 @@ /************************************************************ * fdi_lzx_read_lens (internal) */ -int fdi_lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb, +static int fdi_lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb, fdi_decomp_state *decomp_state) { cab_ULONG i,j, x,y; int z; @@ -1509,7 +1509,7 @@ /******************************************************* * LZXfdi_decomp(internal) */ -int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { +static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *endinp = inpos + inlen; cab_UBYTE *window = LZX(window); @@ -1841,7 +1841,7 @@ * is also where we jump to additional cabinets in the case of split * cab's, and provide (some of) the NEXT_CABINET notification semantics. */ -int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, +static int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, char *pszCabPath, PFNFDINOTIFY pfnfdin, void *pvUser) { cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset); _____ Modified: vendor/wine/dlls/comctl32/current/Makefile.in --- vendor/wine/dlls/comctl32/current/Makefile.in 2005-08-05 21:47:25 UTC (rev 17087) +++ vendor/wine/dlls/comctl32/current/Makefile.in 2005-08-05 21:50:34 UTC (rev 17088) @@ -6,7 +6,7 @@ MODULE = comctl32.dll IMPORTLIB = libcomctl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 -DELAYIMPORTS = winmm +DELAYIMPORTS = winmm uxtheme EXTRALIBS = $(LIBUNICODE) C_SRCS = \ @@ -15,7 +15,9 @@ comctl32undoc.c \ commctrl.c \ datetime.c \ + dpa.c \ draglist.c \ + dsa.c \ flatsb.c \ header.c \ hotkey.c \ _____ Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-08-05 21:47:25 UTC (rev 17087) +++ vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-08-05 21:50:34 UTC (rev 17088) @@ -55,314 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -struct _DSA -{ - INT nItemCount; - LPVOID pData; - INT nMaxCount; - INT nItemSize; - INT nGrow; -}; - -struct _DPA -{ - INT nItemCount; - LPVOID *ptrs; - HANDLE hHeap; - INT nGrow; - INT nMaxCount; -}; - -typedef struct _STREAMDATA -{ - DWORD dwSize; - DWORD dwData2; - DWORD dwItems; -} STREAMDATA, *PSTREAMDATA; - -typedef struct _LOADDATA -{ - INT nCount; - PVOID ptr; -} LOADDATA, *LPLOADDATA; - -typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM); - static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 }; /*********************************************************************** *** - * DPA_LoadStream [COMCTL32.9] - * - * Loads a dynamic pointer array from a stream - * - * PARAMS - * phDpa [O] pointer to a handle to a dynamic pointer array - * loadProc [I] pointer to a callback function - * pStream [I] pointer to a stream - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) -{ - HRESULT errCode; - LARGE_INTEGER position; - ULARGE_INTEGER newPosition; - STREAMDATA streamData; - LOADDATA loadData; - ULONG ulRead; - HDPA hDpa; - PVOID *ptr; - - FIXME ("phDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - phDpa, loadProc, pStream, lParam); - - if (!phDpa || !loadProc || !pStream) - return E_INVALIDARG; - - *phDpa = (HDPA)NULL; - - position.QuadPart = 0; - - /* - * Zero out our streamData - */ - memset(&streamData,0,sizeof(STREAMDATA)); - - errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &newPosition); - if (errCode != S_OK) - return errCode; - - errCode = IStream_Read (pStream, &streamData, sizeof(STREAMDATA), &ulRead); - if (errCode != S_OK) - return errCode; - - FIXME ("dwSize=%lu dwData2=%lu dwItems=%lu\n", - streamData.dwSize, streamData.dwData2, streamData.dwItems); - - if ( ulRead < sizeof(STREAMDATA) || - lParam < sizeof(STREAMDATA) || - streamData.dwSize < sizeof(STREAMDATA) || - streamData.dwData2 < 1) { - errCode = E_FAIL; - } - - if (streamData.dwItems > (UINT_MAX / 2 / sizeof(VOID*))) /* 536870911 */ - return E_OUTOFMEMORY; - - /* create the dpa */ - hDpa = DPA_Create (streamData.dwItems); - if (!hDpa) - return E_OUTOFMEMORY; - - if (!DPA_Grow (hDpa, streamData.dwItems)) - return E_OUTOFMEMORY; - - /* load data from the stream into the dpa */ - ptr = hDpa->ptrs; - for (loadData.nCount = 0; loadData.nCount < streamData.dwItems; loadData.nCount++) { - errCode = (loadProc)(&loadData, pStream, lParam); - if (errCode != S_OK) { - errCode = S_FALSE; - break; - } - - *ptr = loadData.ptr; - ptr++; - } - - /* set the number of items */ - hDpa->nItemCount = loadData.nCount; - - /* store the handle to the dpa */ - *phDpa = hDpa; - FIXME ("new hDpa=%p, errorcode=%lx\n", hDpa, errCode); - - return errCode; -} - - -/********************************************************************** **** - * DPA_SaveStream [COMCTL32.10] - * - * Saves a dynamic pointer array to a stream - * - * PARAMS - * hDpa [I] handle to a dynamic pointer array - * loadProc [I] pointer to a callback function - * pStream [I] pointer to a stream - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) -{ - - FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - hDpa, loadProc, pStream, lParam); - - return E_FAIL; -} - - -/********************************************************************** **** - * DPA_Merge [COMCTL32.11] - * - * Merge two dynamic pointers arrays. - * - * PARAMS - * hdpa1 [I] handle to a dynamic pointer array - * hdpa2 [I] handle to a dynamic pointer array - * dwFlags [I] flags - * pfnCompare [I] pointer to sort function - * pfnMerge [I] pointer to merge function - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, - PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, - LPARAM lParam) -{ - INT nCount; - LPVOID *pWork1, *pWork2; - INT nResult, i; - INT nIndex; - - TRACE("%p %p %08lx %p %p %08lx)\n", - hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); - - if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) - return FALSE; - - if (IsBadWritePtr (hdpa2, sizeof(*hdpa2))) - return FALSE; - - if (IsBadCodePtr ((FARPROC)pfnCompare)) - return FALSE; - - if (IsBadCodePtr ((FARPROC)pfnMerge)) - return FALSE; - [truncated at 1000 lines; 20198 more skipped]

19 years, 4 months

[gvg] 17087: Import uxtheme from Wine into vendor branch

by gvg＠svn.reactos.com

Import uxtheme from Wine into vendor branch Added: vendor/wine/dlls/uxtheme/ Added: vendor/wine/dlls/uxtheme/current/ Added: vendor/wine/dlls/uxtheme/current/Makefile.in Added: vendor/wine/dlls/uxtheme/current/draw.c Added: vendor/wine/dlls/uxtheme/current/main.c Added: vendor/wine/dlls/uxtheme/current/metric.c Added: vendor/wine/dlls/uxtheme/current/msstyles.c Added: vendor/wine/dlls/uxtheme/current/msstyles.h Added: vendor/wine/dlls/uxtheme/current/property.c Added: vendor/wine/dlls/uxtheme/current/stylemap.c Added: vendor/wine/dlls/uxtheme/current/system.c Added: vendor/wine/dlls/uxtheme/current/uxini.c Added: vendor/wine/dlls/uxtheme/current/uxtheme.spec Added: vendor/wine/dlls/uxtheme/current/uxthemedll.h Added: vendor/wine/dlls/uxtheme/current/version.rc _____ Added: vendor/wine/dlls/uxtheme/current/Makefile.in --- vendor/wine/dlls/uxtheme/current/Makefile.in 2005-08-05 21:31:11 UTC (rev 17086) +++ vendor/wine/dlls/uxtheme/current/Makefile.in 2005-08-05 21:47:25 UTC (rev 17087) @@ -0,0 +1,25 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = uxtheme.dll +IMPORTLIB = libuxtheme.$(IMPLIBEXT) +IMPORTS = shlwapi user32 gdi32 advapi32 kernel32 ntdll +DELAYIMPORTS = msimg32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + draw.c \ + main.c \ + metric.c \ + msstyles.c \ + property.c \ + stylemap.c \ + system.c \ + uxini.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/uxtheme/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/uxtheme/current/draw.c --- vendor/wine/dlls/uxtheme/current/draw.c 2005-08-05 21:31:11 UTC (rev 17086) +++ vendor/wine/dlls/uxtheme/current/draw.c 2005-08-05 21:47:25 UTC (rev 17087) @@ -0,0 +1,1037 @@ +/* + * Win32 5.1 Theme drawing + * + * Copyright (C) 2003 Kevin Koltzau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "uxtheme.h" +#include "tmschema.h" + +#include "msstyles.h" +#include "uxthemedll.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +/********************************************************************** * + * Defines and global variables + */ + +DWORD dwDialogTextureFlags; + +/********************************************************************** */ + +/********************************************************************** * + * EnableThemeDialogTexture (UXTHEME.@) + */ +HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) +{ + TRACE("(%p,0x%08lx\n", hwnd, dwFlags); + dwDialogTextureFlags = dwFlags; + return S_OK; + } + +/********************************************************************** * + * IsThemeDialogTextureEnabled (UXTHEME.@) + */ +BOOL WINAPI IsThemeDialogTextureEnabled(void) +{ + TRACE("\n"); + return (dwDialogTextureFlags & ETDT_ENABLE) && !(dwDialogTextureFlags & ETDT_DISABLE); +} + +/********************************************************************** * + * DrawThemeParentBackground (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeParentBackground(HWND hwnd, HDC hdc, RECT *prc) +{ + RECT rt; + POINT org; + HWND hParent; + HRGN clip = NULL; + int hasClip = -1; + + TRACE("(%p,%p,%p)\n", hwnd, hdc, prc); + hParent = GetParent(hwnd); + if(!hParent) + hParent = hwnd; + if(prc) { + CopyRect(&rt, prc); + MapWindowPoints(hwnd, NULL, (LPPOINT)&rt, 2); + + clip = CreateRectRgn(0,0,1,1); + hasClip = GetClipRgn(hdc, clip); + if(hasClip == -1) + TRACE("Failed to get original clipping region\n"); + else + IntersectClipRect(hdc, prc->left, prc->top, prc->right, prc->bottom); + } + else { + GetClientRect(hParent, &rt); + MapWindowPoints(hParent, NULL, (LPPOINT)&rt, 2); + } + + SetViewportOrgEx(hdc, rt.left, rt.top, &org); + + SendMessageW(hParent, WM_ERASEBKGND, (WPARAM)hdc, 0); + SendMessageW(hParent, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); + + SetViewportOrgEx(hdc, org.x, org.y, NULL); + if(prc) { + if(hasClip == 0) + SelectClipRgn(hdc, NULL); + else if(hasClip == 1) + SelectClipRgn(hdc, clip); + DeleteObject(clip); + } + return S_OK; +} + + +/********************************************************************** * + * DrawThemeBackground (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + const RECT *pClipRect) +{ + DTBGOPTS opts; + opts.dwSize = sizeof(DTBGOPTS); + opts.dwFlags = 0; + if(pClipRect) { + opts.dwFlags |= DTBG_CLIPRECT; + CopyRect(&opts.rcClip, pClipRect); + } + return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); +} + +/********************************************************************** * + * UXTHEME_SelectImage + * + * Select the image to use + */ +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph) +{ + PTHEME_PROPERTY tp; + int imageselecttype = IST_NONE; + int i; + int image; + if(glyph) + image = TMT_GLYPHIMAGEFILE; + else + image = TMT_IMAGEFILE; + + if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) + return tp; + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); + + if(imageselecttype == IST_DPI) { + int reqdpi = 0; + int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); + for(i=4; i>=0; i--) { + reqdpi = 0; + if(SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, i + TMT_MINDPI1, &reqdpi))) { + if(reqdpi != 0 && screendpi >= reqdpi) { + TRACE("Using %d DPI, image %d\n", reqdpi, i + TMT_IMAGEFILE1); + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + } + } + } + /* If an image couldnt be selected, choose the first one */ + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + } + else if(imageselecttype == IST_SIZE) { + POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; + POINT reqsize; + for(i=4; i>=0; i--) { + if(SUCCEEDED(GetThemePosition(hTheme, iPartId, iStateId, i + TMT_MINSIZE1, &reqsize))) { + if(reqsize.x >= size.x && reqsize.y >= size.y) { + TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + } + } + } + /* If an image couldnt be selected, choose the smallest one */ + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + } + return NULL; +} + +/********************************************************************** * + * UXTHEME_LoadImage + * + * Load image for part/state + */ +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, + HBITMAP *hBmp, RECT *bmpRect) +{ + int imagelayout = IL_VERTICAL; + int imagecount = 0; + BITMAP bmp; + WCHAR szPath[MAX_PATH]; + PTHEME_PROPERTY tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph); + if(!tp) { + FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); + return E_PROP_ID_UNSUPPORTED; + } + lstrcpynW(szPath, tp->lpValue, min(tp->dwValueLen+1, sizeof(szPath)/sizeof(szPath[0]))); + *hBmp = MSSTYLES_LoadBitmap(hdc, hTheme, szPath); + if(!*hBmp) { + TRACE("Failed to load bitmap %s\n", debugstr_w(szPath)); + return HRESULT_FROM_WIN32(GetLastError()); + } + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGELAYOUT, &imagelayout); + GetThemeInt(hTheme, iPartId, iStateId, TMT_IMAGECOUNT, &imagecount); + + GetObjectW(*hBmp, sizeof(bmp), &bmp); + if(imagelayout == IL_VERTICAL) { + int height = bmp.bmHeight/imagecount; + bmpRect->left = 0; + bmpRect->right = bmp.bmWidth; + bmpRect->top = (min(imagecount, iStateId)-1) * height; + bmpRect->bottom = bmpRect->top + height; + } + else { + int width = bmp.bmWidth/imagecount; + bmpRect->left = (min(imagecount, iStateId)-1) * width; + bmpRect->right = bmpRect->left + width; + bmpRect->top = 0; + bmpRect->bottom = bmp.bmHeight; + } + return S_OK; +} + +/********************************************************************** * + * UXTHEME_StretchBlt + * + * Psudo TransparentBlt/StretchBlt + */ +static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginDst, int nWidthDst, int nHeightDst, + HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + BOOL transparent, COLORREF transcolor) +{ + if(transparent) { + /* Ensure we don't pass any negative values to TransparentBlt */ + return TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), + transcolor); + } + /* This should be using AlphaBlend */ + return StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + SRCCOPY); +} + +/********************************************************************** * + * UXTHEME_Blt + * + * Simplify sending same width/height for both source and dest + */ +static inline BOOL UXTHEME_Blt(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, + BOOL transparent, COLORREF transcolor) +{ + return UXTHEME_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthDest, nHeightDest, + transparent, transcolor); +} + + +/********************************************************************** * + * UXTHEME_DrawImageGlyph + * + * Draw an imagefile glyph + */ +static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr; + HBITMAP bmpSrc = NULL; + HDC hdcSrc = NULL; + HGDIOBJ oldSrc = NULL; + RECT rcSrc; + BOOL transparent = FALSE; + COLORREF transparentcolor = 0; + int valign = VA_CENTER; + int halign = HA_CENTER; + POINT dstSize; + POINT srcSize; + POINT topleft; + + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc); + if(FAILED(hr)) return hr; + hdcSrc = CreateCompatibleDC(hdc); + if(!hdcSrc) { + hr = HRESULT_FROM_WIN32(GetLastError()); + DeleteObject(bmpSrc); + return hr; + } + oldSrc = SelectObject(hdcSrc, bmpSrc); + + dstSize.x = pRect->right-pRect->left; + dstSize.y = pRect->bottom-pRect->top; + srcSize.x = rcSrc.right-rcSrc.left; + srcSize.y = rcSrc.bottom-rcSrc.top; + + GetThemeBool(hTheme, iPartId, iStateId, TMT_GLYPHTRANSPARENT, &transparent); + if(transparent) { + if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_GLYPHTRANSPARENTCOLOR, &transparentcolor))) { + /* If image is transparent, but no color was specified, get the color of the upper left corner */ + transparentcolor = GetPixel(hdcSrc, 0, 0); + } + } + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); + + topleft.x = pRect->left; + topleft.y = pRect->top; + if(halign == HA_CENTER) topleft.x += (dstSize.x/2)-(srcSize.x/2); + else if(halign == HA_RIGHT) topleft.x += dstSize.x-srcSize.x; + if(valign == VA_CENTER) topleft.y += (dstSize.y/2)-(srcSize.y/2); + else if(valign == VA_BOTTOM) topleft.y += dstSize.y-srcSize.y; + + if(!UXTHEME_Blt(hdc, topleft.x, topleft.y, srcSize.x, srcSize.y, + hdcSrc, rcSrc.left, rcSrc.top, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + } + + SelectObject(hdcSrc, oldSrc); + DeleteDC(hdcSrc); + DeleteObject(bmpSrc); + return hr; +} + +/********************************************************************** * + * UXTHEME_DrawImageGlyph + * + * Draw glyph on top of background, if appropriate + */ +static HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *pRect, + const DTBGOPTS *pOptions) +{ + int glyphtype = GT_NONE; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_GLYPHTYPE, &glyphtype); + + if(glyphtype == GT_IMAGEGLYPH) { + return UXTHEME_DrawImageGlyph(hTheme, hdc, iPartId, iStateId, pRect, pOptions); + } + else if(glyphtype == GT_FONTGLYPH) { + /* I don't know what a font glyph is, I've never seen it used in any themes */ + FIXME("Font glyph\n"); + } + return S_OK; +} + +/********************************************************************** * + * UXTHEME_DrawImageBackground + * + * Draw an imagefile background + */ +static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr = S_OK; + HBITMAP bmpSrc; + HGDIOBJ oldSrc; + HDC hdcSrc; + RECT rcSrc; + RECT rcDst; + POINT dstSize; + POINT srcSize; + int sizingtype = ST_TRUESIZE; + BOOL uniformsizing = FALSE; + BOOL transparent = FALSE; + COLORREF transparentcolor = 0; + + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc); + if(FAILED(hr)) return hr; + hdcSrc = CreateCompatibleDC(hdc); + if(!hdcSrc) { + hr = HRESULT_FROM_WIN32(GetLastError()); + DeleteObject(bmpSrc); + return hr; + } + oldSrc = SelectObject(hdcSrc, bmpSrc); + + CopyRect(&rcDst, pRect); + + GetThemeBool(hTheme, iPartId, iStateId, TMT_TRANSPARENT, &transparent); + if(transparent) { + if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TRANSPARENTCOLOR, &transparentcolor))) { + /* If image is transparent, but no color was specified, get the color of the upper left corner */ + transparentcolor = GetPixel(hdcSrc, 0, 0); + } + } + + dstSize.x = rcDst.right-rcDst.left; + dstSize.y = rcDst.bottom-rcDst.top; + srcSize.x = rcSrc.right-rcSrc.left; + srcSize.y = rcSrc.bottom-rcSrc.top; + + GetThemeBool(hTheme, iPartId, iStateId, TMT_UNIFORMSIZING, &uniformsizing); + if(uniformsizing) { + /* Scale height and width equally */ + int widthDiff = abs(srcSize.x-dstSize.x); + int heightDiff = abs(srcSize.y-dstSize.x); + if(widthDiff > heightDiff) { + dstSize.y -= widthDiff-heightDiff; + rcDst.bottom = rcDst.top + dstSize.y; + } + else if(heightDiff > widthDiff) { + dstSize.x -= heightDiff-widthDiff; + rcDst.right = rcDst.left + dstSize.x; + } + } + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); + if(sizingtype == ST_TRUESIZE) { + int truesizestretchmark = 0; + + if(dstSize.x < 0 || dstSize.y < 0) { + BOOL mirrorimage = TRUE; + GetThemeBool(hTheme, iPartId, iStateId, TMT_MIRRORIMAGE, &mirrorimage); + if(mirrorimage) { + if(dstSize.x < 0) { + rcDst.left += dstSize.x; + rcDst.right += dstSize.x; + } + if(dstSize.y < 0) { + rcDst.top += dstSize.y; + rcDst.bottom += dstSize.y; + } + } + } + /* Only stretch when target exceeds source by truesizestretchmark percent */ + GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &truesizestretchmark); + if(dstSize.x < 0 || dstSize.y < 0 || + MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark || + MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark) { + if(!UXTHEME_StretchBlt(hdc, rcDst.left, rcDst.top, dstSize.x, dstSize.y, + hdcSrc, rcSrc.left, rcSrc.top, srcSize.x, srcSize.y, + transparent, transparentcolor)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + else { + rcDst.left += (dstSize.x/2)-(srcSize.x/2); + rcDst.top += (dstSize.y/2)-(srcSize.y/2); + rcDst.right = rcDst.left + srcSize.x; + rcDst.bottom = rcDst.top + srcSize.y; + if(!UXTHEME_Blt(hdc, rcDst.left, rcDst.top, srcSize.x, srcSize.y, + hdcSrc, rcSrc.left, rcSrc.top, + transparent, transparentcolor)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + } + else { + HDC hdcDst = NULL; + HBITMAP bmpDst = NULL; + HGDIOBJ oldDst = NULL; + MARGINS sm; + + dstSize.x = abs(dstSize.x); + dstSize.y = abs(dstSize.y); + + GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); + + hdcDst = CreateCompatibleDC(hdc); + if(!hdcDst) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + bmpDst = CreateCompatibleBitmap(hdc, dstSize.x, dstSize.y); + if(!bmpDst) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + oldDst = SelectObject(hdcDst, bmpDst); + + /* Upper left corner */ + if(!BitBlt(hdcDst, 0, 0, sm.cxLeftWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left, rcSrc.top, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Upper right corner */ + if(!BitBlt(hdcDst, dstSize.x-sm.cxRightWidth, 0, sm.cxRightWidth, sm.cyTopHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Lower left corner */ + if(!BitBlt(hdcDst, 0, dstSize.y-sm.cyBottomHeight, sm.cxLeftWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Lower right corner */ + if(!BitBlt(hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight, sm.cxRightWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + + if(sizingtype == ST_TILE) { + FIXME("Tile\n"); + sizingtype = ST_STRETCH; /* Just use stretch for now */ + } + if(sizingtype == ST_STRETCH) { + int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + + if(destCenterWidth > 0) { + /* Center top */ + if(!StretchBlt(hdcDst, sm.cxLeftWidth, 0, destCenterWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, srcCenterWidth, sm.cyTopHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Center bottom */ + if(!StretchBlt(hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, destCenterWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, srcCenterWidth, sm.cyTopHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0) { + /* Left center */ + if(!StretchBlt(hdcDst, 0, sm.cyTopHeight, sm.cxLeftWidth, destCenterHeight, + hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, sm.cxLeftWidth, srcCenterHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Right center */ + if(!StretchBlt(hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, sm.cxRightWidth, destCenterHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, sm.cxRightWidth, srcCenterHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0 && destCenterWidth > 0) { + BOOL borderonly = FALSE; + GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); + if(!borderonly) { + /* Center */ + if(!StretchBlt(hdcDst, sm.cxLeftWidth, sm.cyTopHeight, destCenterWidth, destCenterHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, srcCenterWidth, srcCenterHeight, SRCCOPY)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + } + } + + if(!UXTHEME_Blt(hdc, rcDst.left, rcDst.top, dstSize.x, dstSize.y, + hdcDst, 0, 0, + transparent, transparentcolor)) + hr = HRESULT_FROM_WIN32(GetLastError()); + +draw_error: + if(hdcDst) { + SelectObject(hdcDst, oldDst); + DeleteDC(hdcDst); + } + if(bmpDst) DeleteObject(bmpDst); + } + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); + CopyRect(pRect, &rcDst); + return hr; +} + +/********************************************************************** * + * UXTHEME_DrawBorderRectangle + * + * Draw the bounding rectangle for a borderfill background + */ +static HRESULT UXTHEME_DrawBorderRectangle(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr = S_OK; + HPEN hPen; + HGDIOBJ oldPen; + COLORREF bordercolor = RGB(0,0,0); + int bordersize = 1; + + GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); + if(bordersize > 0) { + POINT ptCorners[4]; + ptCorners[0].x = pRect->left; + ptCorners[0].y = pRect->top; + ptCorners[1].x = pRect->right; + ptCorners[1].y = pRect->top; + ptCorners[2].x = pRect->right; + ptCorners[2].y = pRect->bottom; + ptCorners[3].x = pRect->left; + ptCorners[3].y = pRect->bottom; + + InflateRect(pRect, -bordersize, -bordersize); + if(pOptions->dwFlags & DTBG_OMITBORDER) + return S_OK; + GetThemeColor(hTheme, iPartId, iStateId, TMT_BORDERCOLOR, &bordercolor); + hPen = CreatePen(PS_SOLID, bordersize, bordercolor); + if(!hPen) + return HRESULT_FROM_WIN32(GetLastError()); + oldPen = SelectObject(hdc, hPen); + + if(!Polyline(hdc, ptCorners, 4)) + hr = HRESULT_FROM_WIN32(GetLastError()); + + SelectObject(hdc, oldPen); + DeleteObject(hPen); + } + return hr; +} + +/********************************************************************** * + * UXTHEME_DrawBackgroundFill + * + * Fill a borderfill background rectangle + */ +static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr = S_OK; + int filltype = FT_SOLID; + + TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags); + + if(pOptions->dwFlags & DTBG_OMITCONTENT) + return S_OK; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_FILLTYPE, &filltype); + + if(filltype == FT_SOLID) { + HBRUSH hBrush; + COLORREF fillcolor = RGB(255,255,255); + + GetThemeColor(hTheme, iPartId, iStateId, TMT_FILLCOLOR, &fillcolor); + hBrush = CreateSolidBrush(fillcolor); + if(!FillRect(hdc, pRect, hBrush)) + hr = HRESULT_FROM_WIN32(GetLastError()); + DeleteObject(hBrush); + } + else if(filltype == FT_VERTGRADIENT || filltype == FT_HORZGRADIENT) { + /* FIXME: This only accounts for 2 gradient colors (out of 5) and ignores + the gradient ratios (no idea how those work) + Few themes use this, and the ones I've seen only use 2 colors with + a gradient ratio of 0 and 255 respectivly + */ + + COLORREF gradient1 = RGB(0,0,0); + COLORREF gradient2 = RGB(255,255,255); + TRIVERTEX vert[2]; + GRADIENT_RECT gRect; + + FIXME("Gradient implementation not complete\n"); + + GetThemeColor(hTheme, iPartId, iStateId, TMT_GRADIENTCOLOR1, &gradient1); + GetThemeColor(hTheme, iPartId, iStateId, TMT_GRADIENTCOLOR2, &gradient2); + + vert[0].x = pRect->left; + vert[0].y = pRect->top; + vert[0].Red = GetRValue(gradient1) << 8; + vert[0].Green = GetGValue(gradient1) << 8; + vert[0].Blue = GetBValue(gradient1) << 8; + vert[0].Alpha = 0x0000; + + vert[1].x = pRect->right; + vert[1].y = pRect->bottom; + vert[1].Red = GetRValue(gradient2) << 8; + vert[1].Green = GetGValue(gradient2) << 8; + vert[1].Blue = GetBValue(gradient2) << 8; + vert[1].Alpha = 0x0000; + + gRect.UpperLeft = 0; + gRect.LowerRight = 1; + GradientFill(hdc,vert,2,&gRect,1,filltype==FT_HORZGRADIENT?GRADIENT_FILL _RECT_H:GRADIENT_FILL_RECT_V); + } + else if(filltype == FT_RADIALGRADIENT) { + /* I've never seen this used in a theme */ + FIXME("Radial gradient\n"); + } + else if(filltype == FT_TILEIMAGE) { + /* I've never seen this used in a theme */ + FIXME("Tile image\n"); + } + return hr; +} + +/********************************************************************** * + * UXTHEME_DrawBorderBackground + * + * Draw an imagefile background + */ +static HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr; + RECT rt; + + CopyRect(&rt, pRect); + + hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions); + if(FAILED(hr)) + return hr; + return UXTHEME_DrawBackgroundFill(hTheme, hdc, iPartId, iStateId, &rt, pOptions); +} + +/********************************************************************** * + * DrawThemeBackgroundEx (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + const DTBGOPTS *pOptions) +{ + HRESULT hr; + const DTBGOPTS defaultOpts = {sizeof(DTBGOPTS), 0, {0,0,0,0}}; + const DTBGOPTS *opts; + HRGN clip = NULL; + int hasClip = -1; + int bgtype = BT_BORDERFILL; + RECT rt; + + TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); + if(!hTheme) + return E_HANDLE; + + /* Ensure we have a DTBGOPTS structure available, simplifies some of the code */ + opts = pOptions; + if(!opts) opts = &defaultOpts; + + if(opts->dwFlags & DTBG_CLIPRECT) { + clip = CreateRectRgn(0,0,1,1); + hasClip = GetClipRgn(hdc, clip); + if(hasClip == -1) + TRACE("Failed to get original clipping region\n"); + else + IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom); + } + CopyRect(&rt, pRect); + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); + if(bgtype == BT_IMAGEFILE) + hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts); + else if(bgtype == BT_BORDERFILL) + hr = UXTHEME_DrawBorderBackground(hTheme, hdc, iPartId, iStateId, pRect, opts); + else { + FIXME("Unknown background type\n"); + /* This should never happen, and hence I don't know what to return */ + hr = E_FAIL; + } + if(SUCCEEDED(hr)) + hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rt, opts); + if(opts->dwFlags & DTBG_CLIPRECT) { + if(hasClip == 0) + SelectClipRgn(hdc, NULL); + else if(hasClip == 1) + SelectClipRgn(hdc, clip); + DeleteObject(clip); + } + return hr; +} + +/********************************************************************** * + * DrawThemeEdge (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeEdge(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pDestRect, UINT uEdge, + UINT uFlags, RECT *pContentRect) +{ + FIXME("%d %d 0x%08x 0x%08x: stub\n", iPartId, iStateId, uEdge, uFlags); + if(!hTheme) + return E_HANDLE; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/********************************************************************** * + * DrawThemeIcon (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *pRect, HIMAGELIST himl, int iImageIndex) +{ + FIXME("%d %d: stub\n", iPartId, iStateId); + if(!hTheme) + return E_HANDLE; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/********************************************************************** * + * DrawThemeText (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + LPCWSTR pszText, int iCharCount, DWORD dwTextFlags, + DWORD dwTextFlags2, const RECT *pRect) +{ + HRESULT hr; + HFONT hFont = NULL; + HGDIOBJ oldFont = NULL; + LOGFONTW logfont; + COLORREF textColor; + COLORREF oldTextColor; + int oldBkMode; + RECT rt; + + TRACE("%d %d: stub\n", iPartId, iStateId); + if(!hTheme) + return E_HANDLE; + + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); + if(SUCCEEDED(hr)) { + hFont = CreateFontIndirectW(&logfont); + if(!hFont) + TRACE("Failed to create font\n"); + } + CopyRect(&rt, pRect); + if(hFont) + oldFont = SelectObject(hdc, hFont); + + if(dwTextFlags2 & DTT_GRAYED) + textColor = GetSysColor(COLOR_GRAYTEXT); + else { + if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) + textColor = GetTextColor(hdc); + } + oldTextColor = SetTextColor(hdc, textColor); + oldBkMode = SetBkMode(hdc, TRANSPARENT); + DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + SetBkMode(hdc, oldBkMode); + SetTextColor(hdc, oldTextColor); + + if(hFont) { + SelectObject(hdc, oldFont); + DeleteObject(hFont); + } + return S_OK; +} + +/********************************************************************** * + * GetThemeBackgroundContentRect (UXTHEME.@) + */ +HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, + const RECT *pBoundingRect, + RECT *pContentRect) +{ + MARGINS margin; + HRESULT hr; + + TRACE("(%d,%d)\n", iPartId, iStateId); + if(!hTheme) + return E_HANDLE; + + hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); + if(FAILED(hr)) { + TRACE("Margins not found\n"); + return hr; + } + pContentRect->left = pBoundingRect->left + margin.cxLeftWidth; + pContentRect->top = pBoundingRect->top + margin.cyTopHeight; + pContentRect->right = pBoundingRect->right - margin.cxRightWidth; + pContentRect->bottom = pBoundingRect->bottom - margin.cyBottomHeight; + + TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + + return S_OK; +} + +/********************************************************************** * + * GetThemeBackgroundExtent (UXTHEME.@) + */ +HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pContentRect, + RECT *pExtentRect) +{ + MARGINS margin; + HRESULT hr; + + TRACE("(%d,%d)\n", iPartId, iStateId); + if(!hTheme) + return E_HANDLE; + + hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); + if(FAILED(hr)) { + TRACE("Margins not found\n"); + return hr; + } + pExtentRect->left = pContentRect->left - margin.cxLeftWidth; + pExtentRect->top = pContentRect->top - margin.cyTopHeight; + pExtentRect->right = pContentRect->right + margin.cxRightWidth; + pExtentRect->bottom = pContentRect->bottom + margin.cyBottomHeight; + + TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + + return S_OK; +} + +/********************************************************************** * + * GetThemeBackgroundRegion (UXTHEME.@) + * + * Calculate the background region, taking into consideration transparent areas + * of the background image. + */ +HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + HRGN *pRegion) +{ + HRESULT hr = S_OK; + int bgtype = BT_BORDERFILL; + + TRACE("(%p,%p,%d,%d)\n", hTheme, hdc, iPartId, iStateId); + if(!hTheme) + return E_HANDLE; + if(!pRect || !pRegion) + return E_POINTER; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); + if(bgtype == BT_IMAGEFILE) { + FIXME("Images not handled yet\n"); + hr = ERROR_CALL_NOT_IMPLEMENTED; + } + else if(bgtype == BT_BORDERFILL) { + *pRegion = CreateRectRgn(pRect->left, pRect->top, pRect->right, pRect->bottom); + if(!*pRegion) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + else { + FIXME("Unknown background type\n"); + /* This should never happen, and hence I don't know what to return */ + hr = E_FAIL; + } + return hr; +} + +/********************************************************************** * + * GetThemePartSize (UXTHEME.@) + */ +HRESULT WINAPI GetThemePartSize(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, RECT *prc, THEMESIZE eSize, + SIZE *psz) +{ + FIXME("%d %d %d: stub\n", iPartId, iStateId, eSize); + if(!hTheme) + return E_HANDLE; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** * + * GetThemeTextExtent (UXTHEME.@) + */ +HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId, + int iStateId, LPCWSTR pszText, int iCharCount, + DWORD dwTextFlags, const RECT *pBoundingRect, + RECT *pExtentRect) [truncated at 1000 lines; 4460 more skipped]

19 years, 4 months

[navaraf] 17086: Remove spurious call from I8042BasicDetect.

by navaraf＠svn.reactos.com

Remove spurious call from I8042BasicDetect. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 21:25:52 UTC (rev 17085) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 21:31:11 UTC (rev 17086) @@ -517,9 +517,6 @@ DevExt->MouseExists = FALSE; DevExt->KeyboardExists = FALSE; - if (!I8042Write(DevExt, I8042_DATA_PORT, 0x74)) - return STATUS_TIMEOUT; - I8042Flush(); if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST))

19 years, 4 months

[ion] 17085: - FS Devices don't need a device queue, optimize the call away.

by ion＠svn.reactos.com

- FS Devices don't need a device queue, optimize the call away. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:16:51 UTC (rev 17084) +++ trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:25:52 UTC (rev 17085) @@ -545,7 +545,20 @@ } /* Create the Device Queue */ - KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_NETWORK_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) + { + /* Simple FS Devices, they don't need a real Device Queue */ + InitializeListHead(&CreatedDeviceObject->Queue.ListEntry); + } + else + { + /* An actual Device, initialize its DQ */ + KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + } /* Insert the Object */ Status = ObInsertObject(CreatedDeviceObject,

19 years, 4 months

[ion] 17084: - DeviceExtension should be NULL if the caller didn't specify any size for one.

by ion＠svn.reactos.com

- DeviceExtension should be NULL if the caller didn't specify any size for one. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:05:03 UTC (rev 17083) +++ trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:16:51 UTC (rev 17084) @@ -503,7 +503,9 @@ /* Set Device Object Data */ CreatedDeviceObject->DeviceType = DeviceType; CreatedDeviceObject->Characteristics = DeviceCharacteristics; - CreatedDeviceObject->DeviceExtension = CreatedDeviceObject + 1; + CreatedDeviceObject->DeviceExtension = DeviceExtensionSize ? + CreatedDeviceObject + 1 : + NULL; CreatedDeviceObject->StackSize = 1; CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */

19 years, 4 months

[mbosma] 17083: in ddrawgdi.h

by mbosma＠svn.reactos.com

in ddrawgdi.h - remove #if 0 (Define GdiEntries to thier internal names) - include the right headers instead of defining things on it's own Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/w32api/include/ddrawgdi.h _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-08-05 21:02:28 UTC (rev 17082) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-08-05 21:05:03 UTC (rev 17083) @@ -273,22 +273,22 @@ GdiDrawStream@12 GdiEndDocEMF@4 GdiEndPageEMF@8 -GdiEntry1@8=DdCreateDirectDrawObject@8 -GdiEntry2@44=DdQueryDirectDrawObject@44 -GdiEntry3@4=DdDeleteDirectDrawObject@4 -GdiEntry4@8=DdCreateSurfaceObject@8 -GdiEntry5@4=DdDeleteSurfaceObject@4 -GdiEntry6@8=DdResetVisrgn@8 -GdiEntry7@8=DdGetDC@8 -GdiEntry8@4=DdReleaseDC@4 -GdiEntry9@24=DdCreateDIBSection@24 -GdiEntry10@8=DdReenableDirectDrawObject@8 -GdiEntry11@8=DdAttachSurface@8 -GdiEntry12@8=DdUnattachSurface@8 -GdiEntry13@0=DdQueryDisplaySettingsUniqueness@0 -GdiEntry14@12=DdGetDxHandle@12 -GdiEntry15@12=DdSetGammaRamp@12 -GdiEntry16@12=DdSwapTextureHandles@12 +GdiEntry1@8 +GdiEntry2@44 +GdiEntry3@4 +GdiEntry4@8 +GdiEntry5@4 +GdiEntry6@8 +GdiEntry7@8 +GdiEntry8@4 +GdiEntry9@24 +GdiEntry10@8 +GdiEntry11@8 +GdiEntry12@8 +GdiEntry13@0 +GdiEntry14@12 +GdiEntry15@12 +GdiEntry16@12 GdiFixUpHandle@4 GdiFlush@0 GdiFullscreenControl@20 _____ Modified: trunk/reactos/w32api/include/ddrawgdi.h --- trunk/reactos/w32api/include/ddrawgdi.h 2005-08-05 21:02:28 UTC (rev 17082) +++ trunk/reactos/w32api/include/ddrawgdi.h 2005-08-05 21:05:03 UTC (rev 17083) @@ -16,9 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include <ddk/d3dhal.h> /* Define the real export names */ -#if 0 /* FIXME */ #define DdCreateDirectDrawObject GdiEntry1 #define DdQueryDirectDrawObject GdiEntry2 #define DdDeleteDirectDrawObject GdiEntry3 @@ -35,10 +36,7 @@ #define DdGetDxHandle GdiEntry14 #define DdSetGammaRamp GdiEntry15 #define DdSwapTextureHandles GdiEntry16 -#endif -typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS; -typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA; BOOL STDCALL

19 years, 4 months

[mbosma] 17082: undo my last change

by mbosma＠svn.reactos.com

undo my last change Modified: trunk/reactos/lib/ddraw/regsvr.c _____ Modified: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:58:12 UTC (rev 17081) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 21:02:28 UTC (rev 17082) @@ -495,21 +495,3 @@ hr = unregister_interfaces(interface_list); return hr; } - -BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) -{ - switch(fwdReason) - { - case DLL_PROCESS_ATTACH: - DDRAW_DllRegisterServer(); - break; - case DLL_THREAD_ATTACH: - break; - case DLL_PROCESS_DETACH: - DDRAW_DllUnregisterServer(); - break; - case DLL_THREAD_DETACH: - break; - } - return(TRUE); -}

19 years, 4 months

[gvg] 17081: Finish up Wine-20050628 merge

by gvg＠svn.reactos.com

Finish up Wine-20050628 merge Deleted: vendor/wine/dlls/cabinet/Wine-20050524/ Added: vendor/wine/dlls/cabinet/Wine-20050628/ Deleted: vendor/wine/dlls/comctl32/Wine-20050524/ Added: vendor/wine/dlls/comctl32/Wine-20050628/ Deleted: vendor/wine/dlls/commdlg/Wine-20050524/ Added: vendor/wine/dlls/commdlg/Wine-20050628/ Deleted: vendor/wine/dlls/dinput/Wine-20050524/ Added: vendor/wine/dlls/dinput/Wine-20050628/ Deleted: vendor/wine/dlls/dsound/Wine-20050524/ Added: vendor/wine/dlls/dsound/Wine-20050628/ Deleted: vendor/wine/dlls/icmp/Wine-20050524/ Added: vendor/wine/dlls/icmp/Wine-20050628/ Deleted: vendor/wine/dlls/mpr/Wine-20050524/ Added: vendor/wine/dlls/mpr/Wine-20050628/ Deleted: vendor/wine/dlls/msi/Wine-20050524/ Added: vendor/wine/dlls/msi/Wine-20050628/ Deleted: vendor/wine/dlls/msimg32/Wine-20050524/ Added: vendor/wine/dlls/msimg32/Wine-20050628/ Added: vendor/wine/dlls/ole32/Wine-20050628/ Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/bindctx.c Modified: vendor/wine/dlls/ole32/Wine-20050628/clipboard.c Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.c Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj_private.h Modified: vendor/wine/dlls/ole32/Wine-20050628/compositemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/datacache.c Modified: vendor/wine/dlls/ole32/Wine-20050628/dcom.idl Modified: vendor/wine/dlls/ole32/Wine-20050628/defaulthandler.c Modified: vendor/wine/dlls/ole32/Wine-20050628/errorinfo.c Modified: vendor/wine/dlls/ole32/Wine-20050628/filemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ftmarshal.c Modified: vendor/wine/dlls/ole32/Wine-20050628/git.c Modified: vendor/wine/dlls/ole32/Wine-20050628/hglobalstream.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.h Modified: vendor/wine/dlls/ole32/Wine-20050628/itemmoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/marshal.c Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes.c Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.h Modified: vendor/wine/dlls/ole32/Wine-20050628/ole16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2_16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2conv.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2impl.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2prox.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2stubs.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2thk.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32_main.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32res.rc Modified: vendor/wine/dlls/ole32/Wine-20050628/oleobj.c Modified: vendor/wine/dlls/ole32/Wine-20050628/oleproxy.c Modified: vendor/wine/dlls/ole32/Wine-20050628/olestd.h Modified: vendor/wine/dlls/ole32/Wine-20050628/regsvr.c Modified: vendor/wine/dlls/ole32/Wine-20050628/rpc.c Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_bigblockfile.c Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_stream.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.h Modified: vendor/wine/dlls/ole32/Wine-20050628/stubmanager.c Modified: vendor/wine/dlls/ole32/Wine-20050628/version.rc Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/antimoniker.c Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj.spec Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/dcom.idl Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/git.c Modified: vendor/wine/dlls/ole32/current/hglobalstream.c Modified: vendor/wine/dlls/ole32/current/ifs.c Modified: vendor/wine/dlls/ole32/current/ifs.h Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/memlockbytes.c Modified: vendor/wine/dlls/ole32/current/memlockbytes16.c Modified: vendor/wine/dlls/ole32/current/moniker.c Modified: vendor/wine/dlls/ole32/current/moniker.h Modified: vendor/wine/dlls/ole32/current/ole16.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/ole2.spec Modified: vendor/wine/dlls/ole32/current/ole2_16.c Modified: vendor/wine/dlls/ole32/current/ole2conv.spec Modified: vendor/wine/dlls/ole32/current/ole2impl.c [truncated at 100 lines; 57 more skipped] _____ Copied: vendor/wine/dlls/cabinet/Wine-20050628 (from rev 17041, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-20050628 (from rev 17041, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-20050628 (from rev 17041, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput/Wine-20050628 (from rev 17041, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dsound/Wine-20050628 (from rev 17041, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-20050628 (from rev 17041, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/mpr/Wine-20050628 (from rev 17041, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-20050628 (from rev 17041, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-20050628 (from rev 17041, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/ole32/Wine-20050628 (from rev 17041, vendor/wine/dlls/ole32/current) _____ Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in --- vendor/wine/dlls/ole32/current/Makefile.in 2005-08-04 06:52:58 UTC (rev 17041) +++ vendor/wine/dlls/ole32/Wine-20050628/Makefile.in 2005-08-05 20:58:12 UTC (rev 17081) @@ -1,78 +1,78 @@ -EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = ole32.dll -IMPORTLIB = libole32.$(IMPLIBEXT) -IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll -EXTRALIBS = -luuid $(LIBUNICODE) - -C_SRCS = \ - antimoniker.c \ - bindctx.c \ - clipboard.c \ - compobj.c \ - compositemoniker.c \ - datacache.c \ - defaulthandler.c \ - dictionary.c \ - errorinfo.c \ - filemoniker.c \ - ftmarshal.c \ - git.c \ - hglobalstream.c \ - ifs.c \ - itemmoniker.c \ - marshal.c \ - memlockbytes.c \ - moniker.c \ - ole2.c \ - ole2stubs.c \ - ole2impl.c \ - ole32_main.c \ - oleobj.c \ - oleproxy.c \ - regsvr.c \ - rpc.c \ - stg_bigblockfile.c \ - stg_prop.c \ - stg_stream.c \ - storage32.c \ - stubmanager.c - -C_SRCS16 = \ - memlockbytes16.c \ - ole16.c \ - ole2_16.c \ - ole2nls.c \ - storage.c - -SPEC_SRCS16 = \ - compobj.spec \ - ole2.spec \ - ole2conv.spec \ - ole2nls.spec \ - ole2prox.spec \ - ole2thk.spec \ - storage.spec - -RC_SRCS = ole32res.rc -RC_BINSRC = ole32res.rc -RC_BINARIES = \ - drag_copy.cur \ - drag_link.cur \ - drag_move.cur \ - nodrop.cur - -IDL_SRCS = \ - dcom.idl - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: - -# note: this will get overwritten by make depend -$(ALL_OBJS): $(IDL_SRCS:.idl=.h) +EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole32.dll +IMPORTLIB = libole32.$(IMPLIBEXT) +IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll +EXTRALIBS = -luuid $(LIBUNICODE) + +C_SRCS = \ + antimoniker.c \ + bindctx.c \ + clipboard.c \ + compobj.c \ + compositemoniker.c \ + datacache.c \ + defaulthandler.c \ + dictionary.c \ + errorinfo.c \ + filemoniker.c \ + ftmarshal.c \ + git.c \ + hglobalstream.c \ + ifs.c \ + itemmoniker.c \ + marshal.c \ + memlockbytes.c \ + moniker.c \ + ole2.c \ + ole2stubs.c \ + ole2impl.c \ + ole32_main.c \ + oleobj.c \ + oleproxy.c \ + regsvr.c \ + rpc.c \ + stg_bigblockfile.c \ + stg_prop.c \ + stg_stream.c \ + storage32.c \ + stubmanager.c + +C_SRCS16 = \ + memlockbytes16.c \ + ole16.c \ + ole2_16.c \ + ole2nls.c \ + storage.c + +SPEC_SRCS16 = \ + compobj.spec \ + ole2.spec \ + ole2conv.spec \ + ole2nls.spec \ + ole2prox.spec \ + ole2thk.spec \ + storage.spec + +RC_SRCS = ole32res.rc +RC_BINSRC = ole32res.rc +RC_BINARIES = \ + drag_copy.cur \ + drag_link.cur \ + drag_move.cur \ + nodrop.cur + +IDL_SRCS = \ + dcom.idl + +SUBDIRS = tests + +@MAKE_DLL_RULES@ + +### Dependencies: + +# note: this will get overwritten by make depend +$(ALL_OBJS): $(IDL_SRCS:.idl=.h) Property changes on: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c --- vendor/wine/dlls/ole32/current/antimoniker.c 2005-08-04 06:52:58 UTC (rev 17041) +++ vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c 2005-08-05 20:58:12 UTC (rev 17081) @@ -1,612 +1,612 @@ -/********************************************************************** ***************** - * AntiMonikers implementation - * - * Copyright 1999 Noomen Hamza - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - ************************************************************************ ***************/ - -#include <assert.h> -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "wine/debug.h" -#include "moniker.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -const CLSID CLSID_AntiMoniker = { - 0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - -/* AntiMoniker data structure */ -typedef struct AntiMonikerImpl{ - - const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ - - /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether - * two monikers are equal. That's whay IROTData interface is implemented by monikers. - */ - const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ - - ULONG ref; /* reference counter for this object */ - -} AntiMonikerImpl; - - -/********************************************************************** ********* - * AntiMoniker_QueryInterface - ************************************************************************ *******/ -static HRESULT WINAPI -AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); - - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - else if (IsEqualIID(&IID_IROTData, riid)) - *ppvObject = (IROTData*)&(This->lpvtbl2); - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) - return E_NOINTERFACE; - - /* always increase the reference count by one when it is successful */ - IMoniker_AddRef(iface); - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_AddRef - ************************************************************************ ******/ -static ULONG WINAPI -AntiMonikerImpl_AddRef(IMoniker* iface) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - - TRACE("(%p)\n",This); - - return InterlockedIncrement(&This->ref); -} - -/********************************************************************** ******** - * AntiMoniker_Release - ************************************************************************ ******/ -static ULONG WINAPI -AntiMonikerImpl_Release(IMoniker* iface) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - ULONG ref; - - TRACE("(%p)\n",This); - - ref = InterlockedDecrement(&This->ref); - - /* destroy the object if there's no more reference on it */ - if (ref == 0) HeapFree(GetProcessHeap(),0,This); - - return ref; -} - -/********************************************************************** ******** - * AntiMoniker_GetClassID - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) -{ - TRACE("(%p,%p),stub!\n",iface,pClassID); - - if (pClassID==NULL) - return E_POINTER; - - *pClassID = CLSID_AntiMoniker; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsDirty - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsDirty(IMoniker* iface) -{ - /* Note that the OLE-provided implementations of the IPersistStream::IsDirty - method in the OLE-provided moniker interfaces always return S_FALSE because - their internal state never changes. */ - - TRACE("(%p)\n",iface); - - return S_FALSE; -} - -/********************************************************************** ******** - * AntiMoniker_Load - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) -{ - DWORD constant=1,dwbuffer; - HRESULT res; - - /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); - - if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_Save - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) -{ - DWORD constant=1; - HRESULT res; - - /* data written by this function is only a DWORD constant set to 1 ! */ - res=IStream_Write(pStm,&constant,sizeof(constant),NULL); - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_GetSizeMax - * - * PARAMS - * pcbSize [out] Pointer to size of stream needed to save object - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) -{ - TRACE("(%p,%p)\n",iface,pcbSize); - - if (pcbSize!=NULL) - return E_POINTER; - - /* for more details see AntiMonikerImpl_Save coments */ - - /* - * Normally the sizemax must be sizeof DWORD, but - * I tested this function it usually return 16 bytes - * more than the number of bytes used by AntiMoniker::Save function - */ - pcbSize->u.LowPart = sizeof(DWORD)+16; - - pcbSize->u.HighPart=0; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_BindToObject - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvResult) -{ - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_BindToStorage - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvResult) -{ - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_Reduce - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, IMoniker** ppmkReduced) -{ - TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkRedu ced); - - if (ppmkReduced==NULL) - return E_POINTER; - - AntiMonikerImpl_AddRef(iface); - - *ppmkReduced=iface; - - return MK_S_REDUCED_TO_SELF; -} -/********************************************************************** ******** - * AntiMoniker_ComposeWith - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) -{ - - TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - - if ((ppmkComposite==NULL)||(pmkRight==NULL)) - return E_POINTER; - - *ppmkComposite=0; - - if (fOnlyIfNotGeneric) - return MK_E_NEEDGENERIC; - else - return CreateGenericComposite(iface,pmkRight,ppmkComposite); -} - -/********************************************************************** ******** - * AntiMoniker_Enum - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) -{ - TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); - - if (ppenumMoniker == NULL) - return E_POINTER; - - *ppenumMoniker = NULL; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsEqual - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) -{ - DWORD mkSys; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (pmkOtherMoniker==NULL) - return S_FALSE; - - IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); - - if (mkSys==MKSYS_ANTIMONIKER) - return S_OK; - else - return S_FALSE; -} - -/********************************************************************** ******** - * AntiMoniker_Hash - ************************************************************************ ******/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) -{ - if (pdwHash==NULL) - return E_POINTER; - - *pdwHash=0; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsRunning - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) -{ - IRunningObjectTable* rot; - HRESULT res; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - - if (pbc==NULL) - return E_INVALIDARG; - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); - - IRunningObjectTable_Release(rot); - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_GetTimeOfLastChange - ************************************************************************ ******/ -static HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - FILETIME* pAntiTime) -{ - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_Inverse - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) -{ - TRACE("(%p,%p)\n",iface,ppmk); - - if (ppmk==NULL) - return E_POINTER; - - *ppmk=0; - - return MK_E_NOINVERSE; -} - -/********************************************************************** ******** - * AntiMoniker_CommonPrefixWith - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) -{ - DWORD mkSys; - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - - if(mkSys==MKSYS_ITEMMONIKER){ - - IMoniker_AddRef(iface); - - *ppmkPrefix=iface; - - IMoniker_AddRef(iface); - - return MK_S_US; - } - else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); -} - -/********************************************************************** ******** - * AntiMoniker_RelativePathTo - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) -{ - TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); - - if (ppmkRelPath==NULL) - return E_POINTER; - - IMoniker_AddRef(pmOther); - - *ppmkRelPath=pmOther; - - return MK_S_HIM; -} - -/********************************************************************** ******** - * AntiMoniker_GetDisplayName - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) -{ - static const WCHAR back[]={'\\','.','.',0}; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); - - if (ppszDisplayName==NULL) - return E_POINTER; - - if (pmkToLeft!=NULL){ - FIXME("() pmkToLeft!=NULL not implemented \n"); - return E_NOTIMPL; - } - - *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) - return E_OUTOFMEMORY; - - lstrcpyW(*ppszDisplayName,back); - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_ParseDisplayName - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR pszDisplayName, - ULONG* pchEaten, IMoniker** ppmkOut) -{ - TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEate n,ppmkOut); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_IsSystemMoniker - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) -{ - TRACE("(%p,%p)\n",iface,pwdMksys); - - if (!pwdMksys) - return E_POINTER; - - (*pwdMksys)=MKSYS_ANTIMONIKER; - - return S_OK; -} - -/********************************************************************** ********* - * AntiMonikerIROTData_QueryInterface - ************************************************************************ *******/ -static HRESULT WINAPI -AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); - - return AntiMonikerImpl_QueryInterface(This, riid, ppvObject); -} - -/********************************************************************** * - * AntiMonikerIROTData_AddRef - */ -static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p)\n",iface); - - return AntiMonikerImpl_AddRef(This); -} - -/********************************************************************** * - * AntiMonikerIROTData_Release - */ -static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p)\n",iface); - - return AntiMonikerImpl_Release(This); -} - -/********************************************************************** ******** - * AntiMonikerIROTData_GetComparaisonData - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, BYTE* pbData, - ULONG cbMax, ULONG* pcbData) -{ - FIXME("(),stub!\n"); - return E_NOTIMPL; -} - -/********************************************************************** **********/ -/* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ -static const IMonikerVtbl VT_AntiMonikerImpl = -{ - AntiMonikerImpl_QueryInterface, - AntiMonikerImpl_AddRef, - AntiMonikerImpl_Release, - AntiMonikerImpl_GetClassID, - AntiMonikerImpl_IsDirty, - AntiMonikerImpl_Load, - AntiMonikerImpl_Save, - AntiMonikerImpl_GetSizeMax, - AntiMonikerImpl_BindToObject, - AntiMonikerImpl_BindToStorage, - AntiMonikerImpl_Reduce, - AntiMonikerImpl_ComposeWith, - AntiMonikerImpl_Enum, - AntiMonikerImpl_IsEqual, - AntiMonikerImpl_Hash, - AntiMonikerImpl_IsRunning, - AntiMonikerImpl_GetTimeOfLastChange, - AntiMonikerImpl_Inverse, - AntiMonikerImpl_CommonPrefixWith, - AntiMonikerImpl_RelativePathTo, - AntiMonikerImpl_GetDisplayName, - AntiMonikerImpl_ParseDisplayName, - AntiMonikerImpl_IsSystemMoniker -}; - -/********************************************************************** **********/ -/* Virtual function table for the IROTData class. */ -static const IROTDataVtbl VT_ROTDataImpl = -{ - AntiMonikerROTDataImpl_QueryInterface, - AntiMonikerROTDataImpl_AddRef, - AntiMonikerROTDataImpl_Release, - AntiMonikerROTDataImpl_GetComparaisonData -}; - -/********************************************************************** ******** - * AntiMoniker_Construct (local function) - ************************************************************************ *******/ -static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) -{ - - TRACE("(%p)\n",This); - - /* Initialize the virtual fgunction table. */ - This->lpvtbl1 = &VT_AntiMonikerImpl; - This->lpvtbl2 = &VT_ROTDataImpl; - This->ref = 0; - - return S_OK; -} - -/********************************************************************** ******** - * CreateAntiMoniker [OLE32.@] - ************************************************************************ ******/ -HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) -{ - AntiMonikerImpl* newAntiMoniker = 0; - HRESULT hr = S_OK; - IID riid=IID_IMoniker; - - TRACE("(%p)\n",ppmk); - - newAntiMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(AntiMonikerImpl)); - - if (newAntiMoniker == 0) - return STG_E_INSUFFICIENTMEMORY; - - hr = AntiMonikerImpl_Construct(newAntiMoniker); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(),0,newAntiMoniker); - return hr; - } - - hr = AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&riid,(void**)p pmk); - - return hr; -} +/********************************************************************** ***************** + * AntiMonikers implementation + * + * Copyright 1999 Noomen Hamza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ************************************************************************ ***************/ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "wine/debug.h" +#include "moniker.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +const CLSID CLSID_AntiMoniker = { + 0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} +}; + +/* AntiMoniker data structure */ +typedef struct AntiMonikerImpl{ + + const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + + /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether + * two monikers are equal. That's whay IROTData interface is implemented by monikers. + */ + const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ + + ULONG ref; /* reference counter for this object */ + +} AntiMonikerImpl; + + +/********************************************************************** ********* + * AntiMoniker_QueryInterface + ************************************************************************ *******/ +static HRESULT WINAPI +AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + + /* Perform a sanity check on the parameters.*/ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* Initialize the return parameter */ + *ppvObject = 0; + + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; + else if (IsEqualIID(&IID_IROTData, riid)) + *ppvObject = (IROTData*)&(This->lpvtbl2); + + /* Check that we obtained an interface.*/ + if ((*ppvObject)==0) + return E_NOINTERFACE; + + /* always increase the reference count by one when it is successful */ + IMoniker_AddRef(iface); + + return S_OK; +} + +/********************************************************************** ******** + * AntiMoniker_AddRef + ************************************************************************ ******/ +static ULONG WINAPI +AntiMonikerImpl_AddRef(IMoniker* iface) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + + TRACE("(%p)\n",This); + + return InterlockedIncrement(&This->ref); +} + +/********************************************************************** ******** + * AntiMoniker_Release + ************************************************************************ ******/ +static ULONG WINAPI +AntiMonikerImpl_Release(IMoniker* iface) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + ULONG ref; + + TRACE("(%p)\n",This); + + ref = InterlockedDecrement(&This->ref); + + /* destroy the object if there's no more reference on it */ + if (ref == 0) HeapFree(GetProcessHeap(),0,This); + + return ref; +} + +/********************************************************************** ******** + * AntiMoniker_GetClassID + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) +{ + TRACE("(%p,%p),stub!\n",iface,pClassID); + + if (pClassID==NULL) + return E_POINTER; + + *pClassID = CLSID_AntiMoniker; + + return S_OK; +} + +/********************************************************************** ******** + * AntiMoniker_IsDirty + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_IsDirty(IMoniker* iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +/********************************************************************** ******** + * AntiMoniker_Load + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +{ + DWORD constant=1,dwbuffer; + HRESULT res; + + /* data read by this function is only a DWORD constant (must be 1) ! */ + res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + + if (SUCCEEDED(res)&& dwbuffer!=constant) + return E_FAIL; + + return res; +} + +/********************************************************************** ******** + * AntiMoniker_Save + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +{ + DWORD constant=1; + HRESULT res; + + /* data written by this function is only a DWORD constant set to 1 ! */ + res=IStream_Write(pStm,&constant,sizeof(constant),NULL); + + return res; +} + +/********************************************************************** ******** + * AntiMoniker_GetSizeMax + * + * PARAMS + * pcbSize [out] Pointer to size of stream needed to save object + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) +{ + TRACE("(%p,%p)\n",iface,pcbSize); + + if (pcbSize!=NULL) + return E_POINTER; + + /* for more details see AntiMonikerImpl_Save coments */ + + /* + * Normally the sizemax must be sizeof DWORD, but + * I tested this function it usually return 16 bytes + * more than the number of bytes used by AntiMoniker::Save function [truncated at 1000 lines; 167790 more skipped]

19 years, 4 months

[gvg] 17080: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-08-05 20:48:26 UTC (rev 17079) +++ trunk/reactos/doc/README.WINE 2005-08-05 20:49:13 UTC (rev 17080) @@ -26,57 +26,57 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050419 -reactos/tools/wpp # Synced to Wine-20050419 +reactos/tools/unicode # Synced to Wine-20050628 +reactos/tools/wpp # Synced to Wine-20050628 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050419 +reactos/tools/winebuild # Synced to Wine-20050628 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050419 -reactos/tools/widl # Synced to Wine-20050419 (merge back to winehq in progress) +reactos/tools/wrc # Synced to Wine-20050628 +reactos/tools/widl # Synced to Wine-20050628 (merge back to winehq in progress) The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050419 -reactos/lib/comctl32 # Synced to Wine-20050419 -reactos/lib/comdlg32 # Synced to Wine-20050419 +reactos/lib/cabinet # Synced to Wine-20050628 +reactos/lib/comctl32 # Synced to Wine-20050628 +reactos/lib/comdlg32 # Synced to Wine-20050628 reactos/lib/dinput # Synced to Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050419 -reactos/lib/icmp # Synced to Wine-20050419 +reactos/lib/dinput8 # Synced to Wine-20050628 +reactos/lib/icmp # Synced to Wine-20050628 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050419 +reactos/lib/mpr # Synced to Wine-20050628 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050419 -reactos/lib/msi # Synced to Wine-20050419 +reactos/lib/msimg32 # Synced to Wine-20050628 +reactos/lib/msi # Synced to Wine-20050628 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/objsel # Synced to Wine-20050726 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050419 -reactos/lib/oleaut32 # Synced to Wine-20050419 -reactos/lib/oledlg # Synced to Wine-20050419 -reactos/lib/olepro32 # Synced to Wine-20050419 -reactos/lib/riched20 # Synced to Wine-20050419 -reactos/lib/richedit # Synced to Wine-20050419 -reactos/lib/rpcrt4 # Synced to Wine-20050419 -reactos/lib/setupapi # Synced to Wine-20050419 -reactos/lib/shell32 # Synced to Wine-20050419 -reactos/lib/shdocvw # Synced to Wine-20050419 -reactos/lib/shlwapi # Synced to Wine-20050419 +reactos/lib/ole32 # Synced to Wine-20050628 +reactos/lib/oleaut32 # Synced to Wine-20050628 +reactos/lib/oledlg # Synced to Wine-20050628 +reactos/lib/olepro32 # Synced to Wine-20050628 +reactos/lib/riched20 # Synced to Wine-20050628 +reactos/lib/richedit # Synced to Wine-20050628 +reactos/lib/rpcrt4 # Synced to Wine-20050628 +reactos/lib/setupapi # Synced to Wine-20050524 +reactos/lib/shell32 # Synced to Wine-20050628 +reactos/lib/shdocvw # Synced to Wine-20050628 +reactos/lib/shlwapi # Synced to Wine-20050628 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050419 +reactos/lib/urlmon # Synced to Wine-20050628 reactos/lib/uxtheme # Synced to Wine-20050703 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050419 -reactos/lib/winmm/midimap # Synced to Wine-20050419 -reactos/lib/winmm/wavemap # Synced to Wine-20050419 +reactos/lib/winmm # Synced to Wine-20050628 +reactos/lib/winmm/midimap # Synced to Wine-20050628 +reactos/lib/winmm/wavemap # Synced to Wine-20050628 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050419 +reactos/subsys/system/msiexec # Synced to Wine-20050628 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

19 years, 4 months

[gvg] 17079: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Mike McCormack <mike(a)codeweavers.com> - Stub implementation for GetSoftwareUpdateInfo. - Declare functions and correct prototypes. Maarten Lankhorst <m.b.lankhorst(a)gmail.com> - Improved ObtainUserAgentString stub. Stefan Huehner <stefan(a)huehner.org> - Fix some more -Wstrict-prototypes warnings. Modified: trunk/reactos/include/wine/urlmon.h Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h _____ Modified: trunk/reactos/include/wine/urlmon.h --- trunk/reactos/include/wine/urlmon.h 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/include/wine/urlmon.h 2005-08-05 20:48:26 UTC (rev 17079) @@ -2221,6 +2221,22 @@ #endif /* __IInternetZoneManager_INTERFACE_DEFINED__ */ +typedef struct _tagSOFTDISTINFO { + ULONG cbSize; + DWORD dwFlags; + DWORD dwAdState; + LPWSTR szTitle; + LPWSTR szAbstract; + LPWSTR szHREF; + DWORD dwInstalledVersionMS; + DWORD dwInstalledVersionLS; + DWORD dwUpdateVersionMS; + DWORD dwUpdateVersionLS; + DWORD dwAdvertisedVersionMS; + DWORD dwAdvertisedVersionLS; + DWORD dwReserved; +} SOFTDISTINFO, *LPSOFTDISTINFO; + DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4); DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4); DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B); _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -41,7 +41,7 @@ */ typedef struct SecManagerImpl{ - IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ + const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ ULONG ref; /* reference counter for this object */ @@ -174,7 +174,7 @@ return E_NOTIMPL; } -static IInternetSecurityManagerVtbl VT_SecManagerImpl = +static const IInternetSecurityManagerVtbl VT_SecManagerImpl = { SecManagerImpl_QueryInterface, SecManagerImpl_AddRef, @@ -209,7 +209,7 @@ * */ typedef struct { - IInternetZoneManagerVtbl* lpVtbl; + const IInternetZoneManagerVtbl* lpVtbl; ULONG ref; } ZoneMgrImpl; @@ -430,7 +430,7 @@ /******************************************************************** * IInternetZoneManager_Construct */ -static IInternetZoneManagerVtbl ZoneMgrImplVtbl = { +static const IInternetZoneManagerVtbl ZoneMgrImplVtbl = { ZoneMgrImpl_QueryInterface, ZoneMgrImpl_AddRef, ZoneMgrImpl_Release, _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/umon.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -49,7 +49,7 @@ /*static BOOL registered_wndclass = FALSE;*/ typedef struct { - IBindingVtbl *lpVtbl; + const IBindingVtbl *lpVtbl; ULONG ref; @@ -273,7 +273,7 @@ This->pbscb = 0; } -static IBindingVtbl BindingVtbl = +static const IBindingVtbl BindingVtbl = { Binding_QueryInterface, Binding_AddRef, @@ -289,7 +289,7 @@ /* filemoniker data structure */ typedef struct { - IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ + const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ ULONG ref; /* reference counter for this object */ @@ -1103,7 +1103,7 @@ /*********************************************************************** *********/ /* Virtual function table for the URLMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static IMonikerVtbl VT_URLMonikerImpl = +static const IMonikerVtbl VT_URLMonikerImpl = { URLMonikerImpl_QueryInterface, URLMonikerImpl_AddRef, @@ -1735,3 +1735,12 @@ return HlinkSimpleNavigateToString( szTarget, NULL, NULL, pUnk, NULL, NULL, 0, 0 ); } + +/********************************************************************** * + * GetSoftwareUpdateInfo (URLMON.@) + */ +HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi ) +{ + FIXME("%s %p\n", debugstr_w(szDistUnit), psdi ); + return E_FAIL; +} _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-08-05 20:48:26 UTC (rev 17079) @@ -41,7 +41,7 @@ @ stub GetClassURL @ stub GetComponentIDFromCLSSPEC @ stub GetMarkOfTheWeb -@ stub GetSoftwareUpdateInfo +@ stdcall GetSoftwareUpdateInfo(ptr ptr) @ stub HlinkGoBack @ stub HlinkGoForward @ stub HlinkNavigateMoniker _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -174,7 +174,7 @@ return S_OK; } -static IClassFactoryVtbl CF_Vtbl = +static const IClassFactoryVtbl CF_Vtbl = { CF_QueryInterface, CF_AddRef, @@ -250,7 +250,7 @@ /*********************************************************************** *** * UrlMkSetSessionOption (URLMON.@) */ -HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength, +HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD Reserved) { FIXME("(%#lx, %p, %#lx): stub\n", dwOption, pBuffer, dwBufferLength); @@ -261,7 +261,7 @@ /*********************************************************************** *** * UrlMkGetSessionOption (URLMON.@) */ -HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength, +HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD* pdwBufferLength, DWORD dwReserved) { FIXME("(%#lx, %p, %#lx, %p): stub\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); @@ -269,10 +269,12 @@ return S_OK; } +static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; + /*********************************************************************** *** * ObtainUserAgentString (URLMON.@) */ -HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cbSize) +HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) { FIXME("(%ld, %p, %p): stub\n", dwOption, pcszUAOut, cbSize); @@ -280,6 +282,10 @@ ERR("dwOption: %ld, must be zero\n", dwOption); } + if (sizeof(Agent) < *cbSize) + *cbSize = sizeof(Agent); + lstrcpynA(pcszUAOut, Agent, *cbSize); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-05 20:48:26 UTC (rev 17079) @@ -32,8 +32,8 @@ * Dll lifetime tracking declaration for urlmon.dll */ extern LONG URLMON_refCount; -static inline void URLMON_LockModule() { InterlockedIncrement( &URLMON_refCount ); } -static inline void URLMON_UnlockModule() { InterlockedDecrement( &URLMON_refCount ); } +static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } +static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))

19 years, 4 months

← Newer
1
...
49
50
51
52
53
54
55
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005