Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 17346: - Fix all line endings
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

- Fix all line endings - Finish Wine-20050725 merge Deleted: vendor/wine/dlls/cabinet/Wine-20050628/ Added: vendor/wine/dlls/cabinet/Wine-20050725/ Modified: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.h Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.rc Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.spec Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet_main.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/fci.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/fdi.c Modified: vendor/wine/dlls/cabinet/current/Makefile.in Modified: vendor/wine/dlls/cabinet/current/cabextract.c Modified: vendor/wine/dlls/cabinet/current/cabinet.h Modified: vendor/wine/dlls/cabinet/current/cabinet.rc Modified: vendor/wine/dlls/cabinet/current/cabinet.spec Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c Modified: vendor/wine/dlls/cabinet/current/fci.c Modified: vendor/wine/dlls/cabinet/current/fdi.c Deleted: vendor/wine/dlls/comctl32/Wine-20050628/ Added: vendor/wine/dlls/comctl32/Wine-20050725/ Modified: vendor/wine/dlls/comctl32/Wine-20050725/Makefile.in Modified: vendor/wine/dlls/comctl32/Wine-20050725/animate.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comboex.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32.h Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32.spec Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Cn.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Cs.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_De.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_En.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Es.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Fr.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_It.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ja.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ko.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Nl.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Pl.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Pt.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ru.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Si.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Th.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Uk.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/commctrl.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/datetime.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/draglist.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/flatsb.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/header.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/hotkey.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/imagelist.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/imagelist.h Modified: vendor/wine/dlls/comctl32/Wine-20050725/ipaddress.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/listview.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/monthcal.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/nativefont.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/pager.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/progress.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/propsheet.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/rebar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/rsrc.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/smoothscroll.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/status.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/string.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/syslink.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/tab.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/toolbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/tooltips.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/trackbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/treeview.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/updown.c Modified: vendor/wine/dlls/comctl32/current/Makefile.in Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32.h Modified: vendor/wine/dlls/comctl32/current/comctl32.spec 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_Th.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Uk.rc Modified: vendor/wine/dlls/comctl32/current/commctrl.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/draglist.c Modified: vendor/wine/dlls/comctl32/current/flatsb.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/hotkey.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/imagelist.h Modified: vendor/wine/dlls/comctl32/current/ipaddress.c [truncated at 100 lines; 749 more skipped] _____ Copied: vendor/wine/dlls/cabinet/Wine-20050725 (from rev 17342, vendor/wine/dlls/cabinet/current) _____ Modified: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in --- vendor/wine/dlls/cabinet/current/Makefile.in 2005-08-12 18:22:47 UTC (rev 17342) +++ vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in 2005-08-12 19:05:45 UTC (rev 17346) @@ -1,19 +1,19 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = cabinet.dll -IMPORTLIB = libcabinet.$(IMPLIBEXT) -IMPORTS = kernel32 - -C_SRCS = \ - cabextract.c \ - cabinet_main.c \ - fci.c \ - fdi.c - -RC_SRCS = cabinet.rc - -@MAKE_DLL_RULES@ - -### Dependencies: +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cabinet.dll +IMPORTLIB = libcabinet.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = \ + cabextract.c \ + cabinet_main.c \ + fci.c \ + fdi.c + +RC_SRCS = cabinet.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c --- vendor/wine/dlls/cabinet/current/cabextract.c 2005-08-12 18:22:47 UTC (rev 17342) +++ vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c 2005-08-12 19:05:45 UTC (rev 17346) @@ -1,2654 +1,2654 @@ -/* - * cabextract.c - * - * Copyright 2000-2002 Stuart Caie - * - * 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 - * - * Principal author: Stuart Caie <kyzer(a)4u.net> - * - * Based on specification documents from Microsoft Corporation - * Quantum decompression researched and implemented by Matthew Russoto - * Huffman code adapted from unlzx by Dave Tritscher. - * InfoZip team's INFLATE implementation adapted to MSZIP by Dirk Stoecker. - * Major LZX fixes by Jae Jung. - */ - -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" - -#include "cabinet.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); - -THOSE_ZIP_CONSTS; - -/* all the file IO is abstracted into these routines: - * cabinet_(open|close|read|seek|skip|getoffset) - * file_(open|close|write) - */ - -/* try to open a cabinet file, returns success */ -static BOOL cabinet_open(struct cabinet *cab) -{ - const char *name = cab->filename; - HANDLE fh; - - TRACE("(cab == ^%p)\n", cab); - - if ((fh = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL )) == INVALID_HANDLE_VALUE) { - ERR("Couldn't open %s\n", debugstr_a(name)); - return FALSE; - } - - /* seek to end of file and get the length */ - if ((cab->filelen = SetFilePointer(fh, 0, NULL, FILE_END)) == INVALID_SET_FILE_POINTER) { - if (GetLastError() != NO_ERROR) { - ERR("Seek END failed: %s\n", debugstr_a(name)); - CloseHandle(fh); - return FALSE; - } - } - - /* return to the start of the file */ - if (SetFilePointer(fh, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - ERR("Seek BEGIN failed: %s\n", debugstr_a(name)); - CloseHandle(fh); - return FALSE; - } - - cab->fh = fh; - return TRUE; -} - -/******************************************************************* - * cabinet_close (internal) - * - * close the file handle in a struct cabinet. - */ -static void cabinet_close(struct cabinet *cab) { - TRACE("(cab == ^%p)\n", cab); - if (cab->fh) CloseHandle(cab->fh); - cab->fh = 0; -} - -/******************************************************* - * ensure_filepath2 (internal) - */ -static BOOL ensure_filepath2(char *path) { - BOOL ret = TRUE; - int len; - char *new_path; - - new_path = HeapAlloc(GetProcessHeap(), 0, (strlen(path) + 1)); - strcpy(new_path, path); - - while((len = strlen(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; - - TRACE("About to try to create directory %s\n", debugstr_a(new_path)); - while(!CreateDirectoryA(new_path, NULL)) { - char *slash; - DWORD last_error = GetLastError(); - - if(last_error == ERROR_ALREADY_EXISTS) - break; - - if(last_error != ERROR_PATH_NOT_FOUND) { - ret = FALSE; - break; - } - - if(!(slash = strrchr(new_path, '\\'))) { - ret = FALSE; - break; - } - - len = slash - new_path; - new_path[len] = 0; - if(! ensure_filepath2(new_path)) { - ret = FALSE; - break; - } - new_path[len] = '\\'; - TRACE("New path in next iteration: %s\n", debugstr_a(new_path)); - } - - HeapFree(GetProcessHeap(), 0, new_path); - return ret; -} - - -/********************************************************************** - * ensure_filepath (internal) - * - * ensure_filepath("a\b\c\d.txt") ensures a, a\b and a\b\c exist as dirs - */ -static BOOL ensure_filepath(char *path) { - char new_path[MAX_PATH]; - int len, i, lastslashpos = -1; - - TRACE("(path == %s)\n", debugstr_a(path)); - - strcpy(new_path, path); - /* remove trailing slashes (shouldn't need to but wth...) */ - while ((len = strlen(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; - /* find the position of the last '\\' */ - for (i=0; i<MAX_PATH; i++) { - if (new_path[i] == 0) break; - if (new_path[i] == '\\') - lastslashpos = i; - } - if (lastslashpos > 0) { - new_path[lastslashpos] = 0; - /* may be trailing slashes but ensure_filepath2 will chop them */ - return ensure_filepath2(new_path); - } else - return TRUE; /* ? */ -} - -/******************************************************************* - * file_open (internal) - * - * opens a file for output, returns success - */ -static BOOL file_open(struct cab_file *fi, BOOL lower, LPCSTR dir) -{ - char c, *d, *name; - BOOL ok = FALSE; - const char *s; - - TRACE("(fi == ^%p, lower == %s, dir == %s)\n", fi, lower ? "TRUE" : "FALSE", debugstr_a(dir)); - - if (!(name = malloc(strlen(fi->filename) + (dir ? strlen(dir) : 0) + 2))) { - ERR("out of memory!\n"); - return FALSE; - } - - /* start with blank name */ - *name = 0; - - /* add output directory if needed */ - if (dir) { - strcpy(name, dir); - strcat(name, "\\"); - } - - /* remove leading slashes */ - s = (char *) fi->filename; - while (*s == '\\') s++; - - /* copy from fi->filename to new name. - * lowercases characters if needed. - */ - d = &name[strlen(name)]; - do { - c = *s++; - *d++ = (lower ? tolower((unsigned char) c) : c); - } while (c); - - /* create directories if needed, attempt to write file */ - if (ensure_filepath(name)) { - fi->fh = CreateFileA(name, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (fi->fh != INVALID_HANDLE_VALUE) - ok = TRUE; - else { - ERR("CreateFileA returned INVALID_HANDLE_VALUE\n"); - fi->fh = 0; - } - } else - ERR("Couldn't ensure filepath for %s\n", debugstr_a(name)); - - if (!ok) { - ERR("Couldn't open file %s for writing\n", debugstr_a(name)); - } - - /* as full filename is no longer needed, free it */ - free(name); - - return ok; -} - -/******************************************************** - * close_file (internal) - * - * closes a completed file - */ -static void file_close(struct cab_file *fi) -{ - TRACE("(fi == ^%p)\n", fi); - - if (fi->fh) { - CloseHandle(fi->fh); - } - fi->fh = 0; -} - -/****************************************************************** - * file_write (internal) - * - * writes from buf to a file specified as a cab_file struct. - * returns success/failure - */ -static BOOL file_write(struct cab_file *fi, cab_UBYTE *buf, cab_off_t length) -{ - DWORD bytes_written; - - TRACE("(fi == ^%p, buf == ^%p, length == %u)\n", fi, buf, length); - - if ((!WriteFile( fi->fh, (LPCVOID) buf, length, &bytes_written, FALSE) || - (bytes_written != length))) { - ERR("Error writing file: %s\n", debugstr_a(fi->filename)); - return FALSE; - } - return TRUE; -} - - -/******************************************************************* - * cabinet_skip (internal) - * - * advance the file pointer associated with the cab structure - * by distance bytes - */ -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) { - if (distance != INVALID_SET_FILE_POINTER) - ERR("%s\n", debugstr_a(cab->filename)); - } -} - -/******************************************************************* - * cabinet_seek (internal) - * - * seek to the specified absolute offset in a cab - */ -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)); -} - -/******************************************************************* - * cabinet_getoffset (internal) - * - * returns the file pointer position of a cab - */ -static cab_off_t cabinet_getoffset(struct cabinet *cab) -{ - return SetFilePointer(cab->fh, 0, NULL, FILE_CURRENT); -} - -/******************************************************************* - * cabinet_read (internal) - * - * read data from a cabinet, returns success - */ -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); - - TRACE("(cab == ^%p, buf == ^%p, length == %u)\n", cab, buf, length); - - if (length > avail) { - WARN("%s: WARNING; cabinet is truncated\n", debugstr_a(cab->filename)); - length = avail; - } - - if (! ReadFile( cab->fh, (LPVOID) buf, length, &bytes_read, NULL )) { - ERR("%s read error\n", debugstr_a(cab->filename)); - return FALSE; - } else if (bytes_read != length) { - ERR("%s read size mismatch\n", debugstr_a(cab->filename)); - return FALSE; - } - - return TRUE; -} - -/********************************************************************** - * cabinet_read_string (internal) - * - * allocate and read an aribitrarily long string from the cabinet - */ -static char *cabinet_read_string(struct cabinet *cab) -{ - cab_off_t len=256, base = cabinet_getoffset(cab), maxlen = cab->filelen - base; - BOOL ok = FALSE; - unsigned int i; - cab_UBYTE *buf = NULL; - - TRACE("(cab == ^%p)\n", cab); - - do { - if (len > maxlen) len = maxlen; - if (!(buf = realloc(buf, (size_t) len))) break; - if (!cabinet_read(cab, buf, (size_t) len)) break; - - /* search for a null terminator in what we've just read */ - for (i=0; i < len; i++) { - if (!buf[i]) {ok=TRUE; break;} - } - - if (!ok) { - if (len == maxlen) { - ERR("%s: WARNING; cabinet is truncated\n", debugstr_a(cab->filename)); - break; - } - len += 256; - cabinet_seek(cab, base); - } - } while (!ok); - - if (!ok) { - if (buf) - free(buf); - else - ERR("out of memory!\n"); - return NULL; - } - - /* otherwise, set the stream to just after the string and return */ - cabinet_seek(cab, base + ((cab_off_t) strlen((char *) buf)) + 1); - - return (char *) buf; -} - -/****************************************************************** - * cabinet_read_entries (internal) - * - * reads the header and all folder and file entries in this cabinet - */ -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; - struct cab_file *file, *linkfile = NULL; - cab_off_t base_offset; - cab_UBYTE buf[64]; - - TRACE("(cab == ^%p)\n", cab); - - /* read in the CFHEADER */ - base_offset = cabinet_getoffset(cab); - if (!cabinet_read(cab, buf, cfhead_SIZEOF)) { - return FALSE; - } - - /* check basic MSCF signature */ - if (EndGetI32(buf+cfhead_Signature) != 0x4643534d) { - ERR("%s: not a Microsoft cabinet file\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* get the number of folders */ - num_folders = EndGetI16(buf+cfhead_NumFolders); - if (num_folders == 0) { - ERR("%s: no folders in cabinet\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* get the number of files */ - num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files == 0) { - ERR("%s: no files in cabinet\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* just check the header revision */ - if ((buf[cfhead_MajorVersion] > 1) || - (buf[cfhead_MajorVersion] == 1 && buf[cfhead_MinorVersion] > 3)) - { - WARN("%s: WARNING; cabinet format version > 1.3\n", debugstr_a(cab->filename)); - } - - /* read the reserved-sizes part of header, if present */ - cab->flags = EndGetI16(buf+cfhead_Flags); - if (cab->flags & cfheadRESERVE_PRESENT) { - if (!cabinet_read(cab, buf, cfheadext_SIZEOF)) return FALSE; - header_resv = EndGetI16(buf+cfheadext_HeaderReserved); - folder_resv = buf[cfheadext_FolderReserved]; - cab->block_resv = buf[cfheadext_DataReserved]; - - if (header_resv > 60000) { - WARN("%s: WARNING; header reserved space > 60000\n", debugstr_a(cab->filename)); - } - - /* skip the reserved header */ - if (header_resv) - if (SetFilePointer(cab->fh, (cab_off_t) header_resv, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) - ERR("seek failure: %s\n", debugstr_a(cab->filename)); - } - - if (cab->flags & cfheadPREV_CABINET) { - cab->prevname = cabinet_read_string(cab); - if (!cab->prevname) return FALSE; - cab->previnfo = cabinet_read_string(cab); - } - - if (cab->flags & cfheadNEXT_CABINET) { - cab->nextname = cabinet_read_string(cab); - if (!cab->nextname) return FALSE; - cab->nextinfo = cabinet_read_string(cab); - } - - /* read folders */ - for (i = 0; i < num_folders; i++) { - if (!cabinet_read(cab, buf, cffold_SIZEOF)) return FALSE; - if (folder_resv) cabinet_skip(cab, folder_resv); - - fol = (struct cab_folder *) calloc(1, sizeof(struct cab_folder)); - if (!fol) { - ERR("out of memory!\n"); - return FALSE; - } - - fol->cab[0] = cab; - fol->offset[0] = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset); - fol->num_blocks = EndGetI16(buf+cffold_NumBlocks); - fol->comp_type = EndGetI16(buf+cffold_CompType); - - if (!linkfol) - cab->folders = fol; - else - linkfol->next = fol; - - linkfol = fol; - } - - /* read files */ - for (i = 0; i < num_files; i++) { - if (!cabinet_read(cab, buf, cffile_SIZEOF)) - return FALSE; - - file = (struct cab_file *) calloc(1, sizeof(struct cab_file)); - if (!file) { - ERR("out of memory!\n"); - return FALSE; - } - - file->length = EndGetI32(buf+cffile_UncompressedSize); - file->offset = EndGetI32(buf+cffile_FolderOffset); - file->index = EndGetI16(buf+cffile_FolderIndex); - file->time = EndGetI16(buf+cffile_Time); - file->date = EndGetI16(buf+cffile_Date); - file->attribs = EndGetI16(buf+cffile_Attribs); - file->filename = cabinet_read_string(cab); - - if (!file->filename) { - free(file); - return FALSE; - } - - if (!linkfile) - cab->files = file; - else - linkfile->next = file; - - linkfile = file; - } - return TRUE; -} - -/*********************************************************** - * load_cab_offset (internal) - * - * validates and reads file entries from a cabinet at offset [offset] in - * file [name]. Returns a cabinet structure if successful, or NULL - * otherwise. - */ -static struct cabinet *load_cab_offset(LPCSTR name, cab_off_t offset) -{ - struct cabinet *cab = (struct cabinet *) calloc(1, sizeof(struct cabinet)); - int ok; - - TRACE("(name == %s, offset == %u)\n", debugstr_a(name), offset); - - if (!cab) return NULL; - - cab->filename = name; - if ((ok = cabinet_open(cab))) { - cabinet_seek(cab, offset); - ok = cabinet_read_entries(cab); - cabinet_close(cab); - } - - if (ok) return cab; - free(cab); - return NULL; -} - -/* MSZIP decruncher */ - -/* Dirk Stoecker wrote the ZIP decoder, based on the InfoZip deflate code */ - -/******************************************************** - * Ziphuft_free (internal) - */ -static void Ziphuft_free(struct Ziphuft *t) -{ - register struct Ziphuft *p, *q; - - /* Go through linked list, freeing from the allocated (t[-1]) address. */ - p = t; - while (p != (struct Ziphuft *)NULL) - { - q = (--p)->v.t; - free(p); - p = q; - } -} - -/********************************************************* - * Ziphuft_build (internal) - */ -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 */ - cab_ULONG el; /* length of EOB code (value 256) */ - cab_ULONG f; /* i repeats in table every f entries */ - cab_LONG g; /* maximum code length */ - cab_LONG h; /* table level */ - register cab_ULONG i; /* counter, current code */ - register cab_ULONG j; /* counter */ - register cab_LONG k; /* number of bits in current code */ - cab_LONG *l; /* stack of bits per table */ - register cab_ULONG *p; /* pointer into ZIP(c)[],ZIP(b)[],ZIP(v)[] */ - register struct Ziphuft *q; /* points to current table */ - struct Ziphuft r; /* table entry for structure assignment */ - register cab_LONG w; /* bits before this table == (l * h) */ - cab_ULONG *xp; /* pointer into x */ - cab_LONG y; /* number of dummy codes added */ - cab_ULONG z; /* number of entries in current table */ - - l = ZIP(lx)+1; - - /* Generate counts for each bit length */ - el = n > 256 ? b[256] : ZIPBMAX; /* set length of EOB code, if any */ - - for(i = 0; i < ZIPBMAX+1; ++i) - ZIP(c)[i] = 0; - p = b; i = n; - do - { - ZIP(c)[*p]++; p++; /* assume all entries <= ZIPBMAX */ - } while (--i); - if (ZIP(c)[0] == n) /* null input--all zero length codes */ - { - *t = (struct Ziphuft *)NULL; - *m = 0; - return 0; - } - - /* Find minimum and maximum length, bound *m by those */ - for (j = 1; j <= ZIPBMAX; j++) - if (ZIP(c)[j]) - break; - k = j; /* minimum code length */ - if ((cab_ULONG)*m < j) - *m = j; - for (i = ZIPBMAX; i; i--) - if (ZIP(c)[i]) - break; - g = i; /* maximum code length */ - if ((cab_ULONG)*m > i) - *m = i; - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= ZIP(c)[j]) < 0) - return 2; /* bad input: more codes than bits */ - if ((y -= ZIP(c)[i]) < 0) - return 2; - ZIP(c)[i] += y; - - /* Generate starting offsets LONGo the value table for each length */ - ZIP(x)[1] = j = 0; - p = ZIP(c) + 1; xp = ZIP(x) + 2; - while (--i) - { /* note that i == g from above */ - *xp++ = (j += *p++); - } - - /* Make a table of values in order of bit lengths */ - p = b; i = 0; - do{ - if ((j = *p++) != 0) - ZIP(v)[ZIP(x)[j]++] = i; - } while (++i < n); - - - /* Generate the Huffman codes and for each, make the table entries */ - ZIP(x)[0] = i = 0; /* first Huffman code is zero */ - p = ZIP(v); /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = l[-1] = 0; /* no bits decoded yet */ - ZIP(u)[0] = (struct Ziphuft *)NULL; /* just to keep compilers happy */ - q = (struct Ziphuft *)NULL; /* ditto */ - z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) - { - a = ZIP(c)[k]; - while (a--) - { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ - while (k > w + l[h]) - { - w += l[h++]; /* add bits already decoded */ - - /* compute minimum size table less than or equal to *m bits */ - z = (z = g - w) > (cab_ULONG)*m ? *m : z; /* upper limit */ - if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ - { /* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ - xp = ZIP(c) + k; - while (++j < z) /* try smaller tables up to z bits */ - { - if ((f <<= 1) <= *++xp) - break; /* enough codes to use up j bits */ - f -= *xp; /* else deduct codes from patterns */ - } - } - if ((cab_ULONG)w + j > el && (cab_ULONG)w < el) - j = el - w; /* make EOB code end at table */ - z = 1 << j; /* table entries for j-bit table */ - l[h] = j; /* set table size in stack */ - - /* allocate and link in new table */ - if (!(q = (struct Ziphuft *) malloc((z + 1)*sizeof(struct Ziphuft)))) - { - if(h) - Ziphuft_free(ZIP(u)[0]); - return 3; /* not enough memory */ - } - *t = q + 1; /* link to list for Ziphuft_free() */ - *(t = &(q->v.t)) = (struct Ziphuft *)NULL; - ZIP(u)[h] = ++q; /* table starts after link */ - - /* connect to last table, if there is one */ - if (h) - { - ZIP(x)[h] = i; /* save pattern for backing up */ - r.b = (cab_UBYTE)l[h-1]; /* bits to dump before this table */ - r.e = (cab_UBYTE)(16 + j); /* bits in this table */ - r.v.t = q; /* pointer to this table */ - j = (i & ((1 << w) - 1)) >> (w - l[h-1]); - ZIP(u)[h-1][j] = r; /* connect to last table */ - } - } - - /* set up table entry in r */ - r.b = (cab_UBYTE)(k - w); - if (p >= ZIP(v) + n) - r.e = 99; /* out of values--invalid code */ - else if (*p < s) - { - r.e = (cab_UBYTE)(*p < 256 ? 16 : 15); /* 256 is end-of-block code */ - r.v.n = *p++; /* simple code is just the value */ - } - else - { - r.e = (cab_UBYTE)e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } - - /* fill code-like entries with r */ - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - /* backwards increment the k-bit code i */ - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != ZIP(x)[h]) - w -= l[--h]; /* don't need to update q */ - } - } - - /* return actual size of base table */ - *m = l[0]; - - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; -} - -/********************************************************* - * Zipinflate_codes (internal) - */ -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 */ - cab_ULONG n, d; /* length and index for copy */ - cab_ULONG w; /* current window position */ - struct Ziphuft *t; /* pointer to table entry */ - cab_ULONG ml, md; /* masks for bl and bd bits */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local copies of globals */ - b = ZIP(bb); /* initialize bit buffer */ - k = ZIP(bk); - w = ZIP(window_posn); /* initialize window position */ - - /* inflate the coded data */ - ml = Zipmask[bl]; /* precompute masks for speed */ - md = Zipmask[bd]; - - for(;;) - { - ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) - do - { - if (e == 99) - return 1; - ZIPDUMPBITS(t->b) - e -= 16; - ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); - ZIPDUMPBITS(t->b) - if (e == 16) /* then it's a literal */ - CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; - else /* it's an EOB or a length */ - { - /* exit if end of block */ - if(e == 15) - break; - - /* get length of block to copy */ - ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); - ZIPDUMPBITS(e); - - /* decode distance of block to copy */ - ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) - do { - if (e == 99) - return 1; - ZIPDUMPBITS(t->b) - e -= 16; - ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); - ZIPDUMPBITS(t->b) - ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); - ZIPDUMPBITS(e) - do - { - n -= (e = (e = ZIPWSIZE - ((d &= ZIPWSIZE-1) > w ? d : w)) > n ?n:e); - do - { - CAB(outbuf)[w++] = CAB(outbuf)[d++]; - } while (--e); - } while (n); - } - } - - /* restore the globals from the locals */ - ZIP(window_posn) = w; /* restore global window pointer */ - ZIP(bb) = b; /* restore global bit buffer */ - ZIP(bk) = k; - - /* done */ - return 0; -} - -/*********************************************************** - * Zipinflate_stored (internal) - */ -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 */ - cab_ULONG w; /* current window position */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local copies of globals */ - b = ZIP(bb); /* initialize bit buffer */ - k = ZIP(bk); - w = ZIP(window_posn); /* initialize window position */ - - /* go to byte boundary */ - n = k & 7; - ZIPDUMPBITS(n); - - /* get the length and its complement */ - ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); - ZIPDUMPBITS(16) - ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) - return 1; /* error in compressed data */ - ZIPDUMPBITS(16) - - /* read and output the compressed data */ - while(n--) - { - ZIPNEEDBITS(8) - CAB(outbuf)[w++] = (cab_UBYTE)b; - ZIPDUMPBITS(8) - } - - /* restore the globals from the locals */ - ZIP(window_posn) = w; /* restore global window pointer */ - ZIP(bb) = b; /* restore global bit buffer */ - ZIP(bk) = k; - return 0; -} - -/****************************************************** - * Zipinflate_fixed (internal) - */ -static cab_LONG Zipinflate_fixed(cab_decomp_state *decomp_state) -{ - struct Ziphuft *fixed_tl; - struct Ziphuft *fixed_td; - cab_LONG fixed_bl, fixed_bd; - cab_LONG i; /* temporary variable */ - cab_ULONG *l; - - l = ZIP(ll); - - /* literal table */ - for(i = 0; i < 144; i++) - l[i] = 8; - for(; i < 256; i++) - l[i] = 9; - for(; i < 280; i++) - l[i] = 7; - for(; i < 288; i++) /* make a complete, but wrong code set */ - l[i] = 8; - fixed_bl = 7; - if((i = Ziphuft_build(l, 288, 257, (cab_UWORD *) Zipcplens, - (cab_UWORD *) Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) - return i; - - /* distance table */ - for(i = 0; i < 30; i++) /* make an incomplete code set */ - l[i] = 5; - fixed_bd = 5; - if((i = Ziphuft_build(l, 30, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &fixed_td, &fixed_bd, decomp_state)) > 1) - { - Ziphuft_free(fixed_tl); - return i; - } - - /* decompress until an end-of-block code */ - i = Zipinflate_codes(fixed_tl, fixed_td, fixed_bl, fixed_bd, decomp_state); - - Ziphuft_free(fixed_td); - Ziphuft_free(fixed_tl); - return i; -} - -/************************************************************** - * Zipinflate_dynamic (internal) - */ -static cab_LONG Zipinflate_dynamic(cab_decomp_state *decomp_state) - /* decompress an inflated type 2 (dynamic Huffman codes) block. */ -{ - cab_LONG i; /* temporary variables */ - cab_ULONG j; - cab_ULONG *ll; - cab_ULONG l; /* last length */ - cab_ULONG m; /* mask for bit lengths table */ - cab_ULONG n; /* number of lengths to get */ - struct Ziphuft *tl; /* literal/length code table */ - struct Ziphuft *td; /* distance code table */ - cab_LONG bl; /* lookup bits for tl */ - cab_LONG bd; /* lookup bits for td */ - cab_ULONG nb; /* number of bit length codes */ - cab_ULONG nl; /* number of literal/length codes */ - cab_ULONG nd; /* number of distance codes */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local bit buffer */ - b = ZIP(bb); - k = ZIP(bk); [truncated at 1000 lines; 1230077 more skipped]

1 0

[gvg] 17345: Update status
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-08-12 19:03:35 UTC (rev 17344) +++ trunk/reactos/media/doc/README.WINE 2005-08-12 19:08:45 UTC (rev 17345) @@ -26,57 +26,58 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050628 -reactos/tools/wpp # Synced to Wine-20050628 +reactos/tools/unicode # Synced to Wine-20050725 +reactos/tools/wpp # Synced to Wine-20050725 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050628 +reactos/tools/winebuild # Synced to Wine-20050725 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050628 -reactos/tools/widl # Synced to Wine-20050628 (merge back to winehq in progress) +reactos/tools/wrc # Synced to Wine-20050725 +reactos/tools/widl # Forked at Wine-20050628 The following libraries are shared with Wine. -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-20050628 -reactos/lib/icmp # Synced to Wine-20050628 +reactos/lib/cabinet # Synced to Wine-20050725 +reactos/lib/comctl32 # Synced to Wine-20050725 +reactos/lib/comdlg32 # Synced to Wine-20050725 +reactos/lib/dbghelp # +reactos/lib/dinput # Forked at Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050725 +reactos/lib/icmp # Synced to Wine-20050725 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-20050628 +reactos/lib/mpr # Synced to Wine-20050725 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050628 -reactos/lib/msi # Synced to Wine-20050628 +reactos/lib/msimg32 # Synced to Wine-20050725 +reactos/lib/msi # Synced to Wine-20050725 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-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/ole32 # Synced to Wine-20050725 +reactos/lib/oleaut32 # Synced to Wine-20050725 +reactos/lib/oledlg # Synced to Wine-20050725 +reactos/lib/olepro32 # Synced to Wine-20050725 +reactos/lib/riched20 # Synced to Wine-20050725 +reactos/lib/richedit # Synced to Wine-20050725 +reactos/lib/rpcrt4 # Synced to Wine-20050725 +reactos/lib/setupapi # Forked at Wine-20050524 +reactos/lib/shell32 # Synced to Wine-20050725 +reactos/lib/shdocvw # Synced to Wine-20050725 +reactos/lib/shlwapi # Synced to Wine-20050725 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050628 -reactos/lib/uxtheme # Synced to Wine-20050703 +reactos/lib/urlmon # Synced to Wine-20050725 +reactos/lib/uxtheme # Synced to Wine-20050725 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050628 -reactos/lib/winmm/midimap # Synced to Wine-20050628 -reactos/lib/winmm/wavemap # Synced to Wine-20050628 +reactos/lib/winmm # Forked at Wine-20050628 +reactos/lib/winmm/midimap # Forked at Wine-20050628 +reactos/lib/winmm/wavemap # Forked at 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-20050628 +reactos/subsys/system/msiexec # Synced to Wine-20050725 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

1 0

[hpoussin] 17344: Implement SetupDiCallClassInstaller (still doesn't support custom class installers/co-installers)
by hpoussin＠svn.reactos.com 12 Aug '05

12 Aug '05

Implement SetupDiCallClassInstaller (still doesn't support custom class installers/co-installers) Implement SetupDiGetDeviceInstallParamsA by calling SetupDiGetDeviceInstallParamsW. Add stub for SetupDiGetDeviceInstallParamsW Basic implementation of SetupDiSelectBestCompatDrv (selects first driver of the list) Add stubs for SetupDiInstallDriverFiles, SetupDiRegisterCoDeviceInstallers, SetupDiInstallDeviceInterfaces, SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:00:04 UTC (rev 17343) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:03:35 UTC (rev 17344) @@ -79,9 +79,33 @@ /* FIXME: header mess */ DEFINE_GUID(GUID_NULL, 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +typedef DWORD +(CALLBACK* CLASS_INSTALL_PROC) ( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL); +typedef BOOL +(WINAPI* DEFAULT_CLASS_INSTALL_PROC) ( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData); +typedef DWORD +(CALLBACK* COINSTALLER_PROC) ( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context); #define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 +struct CoInstallerElement +{ + LIST_ENTRY ListEntry; + + COINSTALLER_PROC Function; + BOOL DoPostProcessing; + PVOID PrivateData; +}; + struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ { LIST_ENTRY ListEntry; @@ -2758,22 +2782,304 @@ * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( - DI_FUNCTION InstallFunction, - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData) + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { - FIXME("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); - return FALSE; + BOOL ret = FALSE; + + TRACE("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { +#define CLASS_COINSTALLER 0x1 +#define DEVICE_COINSTALLER 0x2 +#define CLASS_INSTALLER 0x4 + UCHAR CanHandle = 0; + DEFAULT_CLASS_INSTALL_PROC DefaultHandler = NULL; + + switch (InstallFunction) + { + case DIF_ALLOW_INSTALL: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_DESTROYPRIVATEDATA: + CanHandle = CLASS_INSTALLER; + break; + case DIF_INSTALLDEVICE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDevice; + break; + case DIF_INSTALLDEVICEFILES: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDriverFiles; + break; + case DIF_INSTALLINTERFACES: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDeviceInterfaces; + break; + case DIF_NEWDEVICEWIZARD_FINISHINSTALL: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_NEWDEVICEWIZARD_POSTANALYZE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_NEWDEVICEWIZARD_PREANALYZE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_REGISTER_COINSTALLERS: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiRegisterCoDeviceInstallers; + break; + case DIF_SELECTBESTCOMPATDRV: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiSelectBestCompatDrv; + break; + default: + FIXME("Install function %ld not implemented\n", InstallFunction); + SetLastError(ERROR_INVALID_PARAMETER); + } + + if (CanHandle != 0) + { + LIST_ENTRY ClassCoInstallersListHead; + LIST_ENTRY DeviceCoInstallersListHead; + CLASS_INSTALL_PROC ClassInstaller = NULL; + COINSTALLER_CONTEXT_DATA Context; + PLIST_ENTRY ListEntry; + HKEY hKey; + DWORD dwRegType, dwLength; + DWORD rc = NO_ERROR; + + InitializeListHead(&ClassCoInstallersListHead); + InitializeListHead(&DeviceCoInstallersListHead); + + if (CanHandle & CLASS_COINSTALLER) + { + FIXME("Doesn't use Class co-installers at the moment\n"); + } + if (CanHandle & DEVICE_COINSTALLER) + { + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\CoDeviceInstallers", + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + if (rc == ERROR_SUCCESS) + { + LPWSTR lpGuidString; + if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) == RPC_S_OK) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (KeyBuffer != NULL) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc == ERROR_SUCCESS) + { + LPCWSTR ptr; + for (ptr = KeyBuffer; *ptr; ptr += strlenW(ptr) + 1) + { + /* Add coinstaller to DeviceCoInstallersListHead list */ + FIXME("Device coinstaller is '%S'\n", ptr); + } + } + HeapFree(GetProcessHeap(), 0, KeyBuffer); + } + } + RpcStringFreeW(&lpGuidString); + } + RegCloseKey(hKey); + } + } + if (CanHandle & CLASS_INSTALLER) + { + hKey = SetupDiOpenClassRegKey(&DeviceInfoData->ClassGuid, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (KeyBuffer != NULL) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc == ERROR_SUCCESS) + { + /* Set ClassInstaller function pointer */ + FIXME("Installer is '%S'\n", KeyBuffer); + } + HeapFree(GetProcessHeap(), 0, KeyBuffer); + } + } + RegCloseKey(hKey); + } + } + + /* Call Class co-installers */ + Context.PostProcessing = FALSE; + rc = NO_ERROR; + ListEntry = ClassCoInstallersListHead.Flink; + while (rc == NO_ERROR && ListEntry != &ClassCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + coinstaller->PrivateData = Context.PrivateData; + if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) + { + coinstaller->DoPostProcessing = TRUE; + rc = NO_ERROR; + } + ListEntry = ListEntry->Flink; + } + + /* Call Device co-installers */ + ListEntry = DeviceCoInstallersListHead.Flink; + while (rc == NO_ERROR && ListEntry != &DeviceCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + coinstaller->PrivateData = Context.PrivateData; + if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) + { + coinstaller->DoPostProcessing = TRUE; + rc = NO_ERROR; + } + ListEntry = ListEntry->Flink; + } + + /* Call Class installer */ + if (ClassInstaller) + rc = (*ClassInstaller)(InstallFunction, DeviceInfoSet, DeviceInfoData); + else + rc = ERROR_DI_DO_DEFAULT; + + /* Call default handler */ + if (rc == ERROR_DI_DO_DEFAULT) + { + if (DefaultHandler /*FIXME && DI_NODI_DEFAULTACTION not set */) + { + if ((*DefaultHandler)(DeviceInfoSet, DeviceInfoData)) + rc = NO_ERROR; + else + rc = GetLastError(); + } + else + rc = NO_ERROR; + } + + /* Call Class co-installers that required postprocessing */ + Context.PostProcessing = TRUE; + ListEntry = ClassCoInstallersListHead.Flink; + while (ListEntry != &ClassCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + if (coinstaller->DoPostProcessing) + { + Context.InstallResult = rc; + Context.PrivateData = coinstaller->PrivateData; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + } + ListEntry = ListEntry->Flink; + } + + /* Call Device co-installers that required postprocessing */ + ListEntry = DeviceCoInstallersListHead.Flink; + while (ListEntry != &DeviceCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + if (coinstaller->DoPostProcessing) + { + Context.InstallResult = rc; + Context.PrivateData = coinstaller->PrivateData; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + } + ListEntry = ListEntry->Flink; + } + + /* Free allocated memory */ + while (!IsListEmpty(&ClassCoInstallersListHead)) + { + ListEntry = RemoveHeadList(&ClassCoInstallersListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + while (!IsListEmpty(&DeviceCoInstallersListHead)) + { + ListEntry = RemoveHeadList(&DeviceCoInstallersListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + + ret = (rc == NO_ERROR); + } + } + + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { + SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; + BOOL ret = FALSE; + + TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + if (DeviceInstallParams == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstallParams->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + deviceInstallParamsW.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + ret = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &deviceInstallParamsW); + + if (ret) + { + /* Do W->A conversion */ + memcpy( + DeviceInstallParams, + &deviceInstallParamsW, + FIELD_OFFSET(SP_DEVINSTALL_PARAMS_W, DriverPath)); + if (WideCharToMultiByte(CP_ACP, 0, deviceInstallParamsW.DriverPath, -1, + DeviceInstallParams->DriverPath, MAX_PATH, NULL, NULL) == 0) + { + DeviceInstallParams->DriverPath[0] = '\0'; + ret = FALSE; + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstallParamsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); return FALSE; } @@ -3864,3 +4170,114 @@ TRACE("Returning %d\n", ret); return ret; } + +/********************************************************************** * + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiSelectBestCompatDrv( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + SP_DRVINFO_DATA_W drvInfoData; + BOOL ret; + + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiSelectBestCompatDrv() is selecting the 1st driver...\n"); + + drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + ret = SetupDiEnumDriverInfoW( + DeviceInfoSet, + DeviceInfoData, + SPDIT_COMPATDRIVER, + 0, /* Member index */ + &drvInfoData); + + if (ret) + { + ret = SetupDiSetSelectedDriverW( + DeviceInfoSet, + DeviceInfoData, + &drvInfoData); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiInstallDriverFiles (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDriverFiles( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiInstallDriverFiles not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiRegisterCoDeviceInstallers( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiRegisterCoDeviceInstallers not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiInstallDeviceInterfaces (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDeviceInterfaces( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiInstallDeviceInterfaces not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiInstallDevice (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + /* Steps to follow: + * 0. If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit + * 1. Create driver key and write InfPath and ProviderName + * 2a Process inf sections: {DDInstall}, {DDInstall}.HW [SetupDiOpenDevRegKey] + * b Process {DDInstall}.LogConfigOverride if present [SetupDiOpenDevRegKey] + * c Process {DDInstall}.Services [SetupDiOpenDevRegKey] + * 3. Copy inf file to Inf\ directory [SetupCopyOEMInf] + * 4. Install other waiting files + * 5. Load the driver/Call AddDevice + * 6. Send IRP_MN_START_DEVICE if DI_NEEDRESTART, DI_NEEDREBOOT and DI_DONOTCALLCONFIGMG are not set + */ + + FIXME("SetupDiInstallDevice not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-08-12 19:00:04 UTC (rev 17343) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-08-12 19:03:35 UTC (rev 17344) @@ -321,7 +321,7 @@ @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) -@ stub SetupDiGetDeviceInstallParamsW +@ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stub SetupDiGetDeviceInstanceIdA @ stub SetupDiGetDeviceInstanceIdW @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @@ -350,8 +350,9 @@ @ stub SetupDiInstallClassExA @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) -@ stub SetupDiInstallDevice -@ stub SetupDiInstallDriverFiles +@ stdcall SetupDiInstallDevice(ptr ptr) +@ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) +@ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stub SetupDiLoadClassIcon @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) @@ -363,9 +364,11 @@ @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) +@ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stub SetupDiRegisterDeviceInfo @ stub SetupDiRemoveDevice @ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)

1 0

[hpoussin] 17343: Always set a valid class Guid in CreateDeviceInfoElement
by hpoussin＠svn.reactos.com 12 Aug '05

12 Aug '05

Always set a valid class Guid in CreateDeviceInfoElement Fix interfaces enumeration by not copying cbSize field (it should already be correct) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-12 18:22:47 UTC (rev 17342) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:00:04 UTC (rev 17343) @@ -1204,7 +1204,6 @@ struct DeviceInterface *deviceInterface; *pDeviceInterface = NULL; - if (IsEqualIID(&pInterfaceGuid, &GUID_NULL)) { FIXME("Bad argument!!!"); return FALSE; }/* FIXME: remove */ deviceInterface = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInterface) + (wcslen(SymbolicLink) + 1) * sizeof(WCHAR)); if (!deviceInterface) @@ -1261,6 +1260,8 @@ j = 0; while (TRUE) { + GUID KeyGuid; + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); if (rc == ERROR_NO_MORE_ITEMS) @@ -1302,22 +1303,21 @@ RegCloseKey(hDeviceIdKey); return ERROR_GEN_FAILURE; } - else if (pClassGuid) + + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) { - GUID KeyGuid; - KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) - { - RegCloseKey(hDeviceIdKey); - return GetLastError(); - } - if (!IsEqualIID(&KeyGuid, pClassGuid)) - /* Skip this entry as it is not the right device class */ - continue; + RegCloseKey(hDeviceIdKey); + return GetLastError(); } + if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) + { + /* Skip this entry as it is not the right device class */ + continue; + } /* Add the entry to the list */ - if (!CreateDeviceInfoElement(InstancePath, pClassGuid, &deviceInfo)) + if (!CreateDeviceInfoElement(InstancePath, &KeyGuid, &deviceInfo)) { RegCloseKey(hDeviceIdKey); return GetLastError(); @@ -2904,6 +2904,7 @@ { struct DeviceInfoElement *deviceInfo; + /* FIXME: ClassGuid can be NULL */ if (CreateDeviceInfoElement(DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -3544,7 +3545,7 @@ if (deviceInfo) { - // good one found + /* good one found */ if (DeviceInfoData) { memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); @@ -3580,6 +3581,7 @@ return FALSE; } + /* FIXME: GUID_NULL is not allowed */ if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL /* FIXME */, &deviceInfo)) { RegCloseKey(hKey); @@ -3722,9 +3724,9 @@ struct DriverInfoElement *DrvInfo = (struct DriverInfoElement *)ItemList; memcpy( - DriverInfoData, - &DrvInfo->Info, - DriverInfoData->cbSize); + &DriverInfoData->DriverType, + &DrvInfo->Info.DriverType, + DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); ret = TRUE; } } @@ -3770,9 +3772,9 @@ else { memcpy( - DriverInfoData, - &driverInfo->Info, - DriverInfoData->cbSize); + &DriverInfoData->DriverType, + &driverInfo->Info.DriverType, + DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); ret = TRUE; } }

1 0

[gvg] 17342: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Thomas Weidenmueller <wine-patches(a)reactsoft.com> - IsThemeDialogTextureEnabled should have one parameter to match the prototype in the official headers. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes (Reg* functions). Stefan Huehner <stefan(a)huehner.org> - Make some function static. - Fix -Wmissing-declarations warnings. Frank Richter <frank.richter(a)gmail.com> - Enable/disable "flat menus" based on the setting from the active theme. - Have the theme INI file parsed upon theme activation and not just when the first theme data is requested; that way, the themed system colors are set correctly from the start, and not just after some theme data was requested. - GetThemeBackgroundContentRect() does not use the content margins alone, it also falls back to the border size or sizing margins, and if it can't find any possible margins at all, it returns the original rectangle. - Make dialog theme texture setting non-global (ie a per-window setting). - Better viewport origin in DrawThemeParentBackground(). - OpenThemeData() now always sets the window theme to the handle returned (even if that is NULL) - previously, it could happen that when no theme was active or the theme data could not be opened that the window theme remained became then-dangling (and hence subsequent calls to GetWindowTheme() would return that bogus theme). - Correct border rectangle drawing. - Don't crash if NULL is passed as the class list to OpenThemeData(). - UXTHEME_LoadImage(): Set default image count to 1 to avoid division by zero in case image count property is not given. Properly support 0 state IDs. - Every window needs to receive WM_THEMECHANGED (esp. controls), so also send it to child windows. - Changed the default transparent color in case none was explicitly specified from the upper left pixel color to magenta. Empirically gives better results. - Write WCHAR strings to registry with correct size. - Opening some theme class data now also increases the reference count of the theme file, so as long as theme class data is still opened somewhere, the theme file won't get freed. Otherwise, it could happen that invalid class data was used, which could lead to problems. Modified: trunk/reactos/lib/uxtheme/draw.c Modified: trunk/reactos/lib/uxtheme/msstyles.c Modified: trunk/reactos/lib/uxtheme/msstyles.h Modified: trunk/reactos/lib/uxtheme/system.c _____ Modified: trunk/reactos/lib/uxtheme/draw.c --- trunk/reactos/lib/uxtheme/draw.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/draw.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -41,7 +41,7 @@ * Defines and global variables */ -DWORD dwDialogTextureFlags; +extern ATOM atDialogThemeEnabled; /*********************************************************************** / @@ -50,8 +50,19 @@ */ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) { + static const WCHAR szTab[] = { 'T','a','b',0 }; + HRESULT hr; + TRACE("(%p,0x%08lx\n", hwnd, dwFlags); - dwDialogTextureFlags = dwFlags; + hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), + (HANDLE)(dwFlags|0x80000000)); + /* 0x80000000 serves as a "flags set" flag */ + if (FAILED(hr)) + return hr; + if (dwFlags & ETDT_USETABTEXTURE) + return SetWindowTheme (hwnd, NULL, szTab); + else + return SetWindowTheme (hwnd, NULL, NULL); return S_OK; } @@ -60,7 +71,15 @@ */ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) { + DWORD dwDialogTextureFlags; TRACE("(%p)\n", hwnd); + + dwDialogTextureFlags = (DWORD)GetPropW (hwnd, + MAKEINTATOMW (atDialogThemeEnabled)); + if (dwDialogTextureFlags == 0) + /* Means EnableThemeDialogTexture wasn't called for this dialog */ + return TRUE; + return (dwDialogTextureFlags & ETDT_ENABLE) && !(dwDialogTextureFlags & ETDT_DISABLE); } @@ -95,7 +114,7 @@ MapWindowPoints(hParent, NULL, (LPPOINT)&rt, 2); } - SetViewportOrgEx(hdc, rt.left, rt.top, &org); + OffsetViewportOrgEx(hdc, -rt.left, -rt.top, &org); SendMessageW(hParent, WM_ERASEBKGND, (WPARAM)hdc, 0); SendMessageW(hParent, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); @@ -190,7 +209,7 @@ HBITMAP *hBmp, RECT *bmpRect) { int imagelayout = IL_VERTICAL; - int imagecount = 0; + int imagecount = 1; BITMAP bmp; WCHAR szPath[MAX_PATH]; PTHEME_PROPERTY tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph); @@ -213,12 +232,12 @@ int height = bmp.bmHeight/imagecount; bmpRect->left = 0; bmpRect->right = bmp.bmWidth; - bmpRect->top = (min(imagecount, iStateId)-1) * height; + bmpRect->top = (max(min(imagecount, iStateId), 1)-1) * height; bmpRect->bottom = bmpRect->top + height; } else { int width = bmp.bmWidth/imagecount; - bmpRect->left = (min(imagecount, iStateId)-1) * width; + bmpRect->left = (max(min(imagecount, iStateId), 1)-1) * width; bmpRect->right = bmpRect->left + width; bmpRect->top = 0; bmpRect->bottom = bmp.bmHeight; @@ -302,8 +321,8 @@ 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); + /* If image is transparent, but no color was specified, use magenta */ + transparentcolor = RGB(255, 0, 255); } } GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); @@ -588,15 +607,17 @@ GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); if(bordersize > 0) { - POINT ptCorners[4]; + POINT ptCorners[5]; ptCorners[0].x = pRect->left; ptCorners[0].y = pRect->top; - ptCorners[1].x = pRect->right; + ptCorners[1].x = pRect->right-1; ptCorners[1].y = pRect->top; - ptCorners[2].x = pRect->right; - ptCorners[2].y = pRect->bottom; + ptCorners[2].x = pRect->right-1; + ptCorners[2].y = pRect->bottom-1; ptCorners[3].x = pRect->left; - ptCorners[3].y = pRect->bottom; + ptCorners[3].y = pRect->bottom-1; + ptCorners[4].x = pRect->left; + ptCorners[4].y = pRect->top; InflateRect(pRect, -bordersize, -bordersize); if(pOptions->dwFlags & DTBG_OMITBORDER) @@ -607,7 +628,7 @@ return HRESULT_FROM_WIN32(GetLastError()); oldPen = SelectObject(hdc, hPen); - if(!Polyline(hdc, ptCorners, 4)) + if(!Polyline(hdc, ptCorners, 5)) hr = HRESULT_FROM_WIN32(GetLastError()); SelectObject(hdc, oldPen); @@ -855,15 +876,34 @@ if(!hTheme) return E_HANDLE; + /* try content margins property... */ hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); - if(FAILED(hr)) { - TRACE("Margins not found\n"); - return hr; + if(SUCCEEDED(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; + } else { + /* otherwise, try to determine content rect from the background type and props */ + int bgtype = BT_BORDERFILL; + memcpy(pContentRect, pBoundingRect, sizeof(RECT)); + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); + if(bgtype == BT_BORDERFILL) { + int bordersize = 1; + + GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); + InflateRect(pContentRect, -bordersize, -bordersize); + } else if ((bgtype == BT_IMAGEFILE) + && (SUCCEEDED(hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, + TMT_SIZINGMARGINS, NULL, &margin)))) { + pContentRect->left = pBoundingRect->left + margin.cxLeftWidth; + pContentRect->top = pBoundingRect->top + margin.cyTopHeight; + pContentRect->right = pBoundingRect->right - margin.cxRightWidth; + pContentRect->bottom = pBoundingRect->bottom - margin.cyBottomHeight; + } + /* If nothing was found, leave unchanged */ } - 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); _____ Modified: trunk/reactos/lib/uxtheme/msstyles.c --- trunk/reactos/lib/uxtheme/msstyles.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/msstyles.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -253,7 +253,7 @@ * * Retrieve the ini file for the selected color/style */ -PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) +static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) { static const WCHAR szFileResNamesResource[] = { 'F','I','L','E','R','E','S','N','A','M','E','S','\0' @@ -320,7 +320,7 @@ * iPartId Location to store part id * iStateId Location to store state id */ -BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) +static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) { WCHAR sec[255]; WCHAR part[60] = {'\0'}; @@ -423,7 +423,7 @@ * RETURNS * The class added, or a class previously added with the same name */ -PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) +static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) { PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; @@ -480,7 +480,7 @@ * RETURNS * The part/state added, or a part/state previously added with the same IDs */ -PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) +static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) { PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; @@ -507,7 +507,7 @@ * RETURNS * The property found, or NULL */ -PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) +static PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) { PTHEME_PROPERTY cur = tp; while(cur) { @@ -596,7 +596,7 @@ * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) +static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) { PTHEME_PROPERTY cur = MSSTYLES_PSFindProperty(ps, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ @@ -637,7 +637,7 @@ * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) +static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) { PTHEME_PROPERTY cur = MSSTYLES_FFindMetric(tf, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ @@ -709,6 +709,10 @@ FIXME("Invalid color value for %s\n", debugstr_w(szPropertyName)); } } + else if (iPropertyId == TMT_FLATMENUS) { + BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't'); + SystemParametersInfoW (SPI_SETFLATMENU, 0, (PVOID)flatMenus, 0); + } /* Catch all metrics, including colors */ MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen); } @@ -806,6 +810,8 @@ } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); + cls->tf = tfActiveTheme; + cls->tf->dwRefCount++; } return cls; } @@ -819,11 +825,12 @@ * tc Theme class to close * * NOTES - * There is currently no need clean anything up for theme classes, - * so do nothing for now + * The MSSTYLES_CloseThemeFile decreases the refcount of the owning + * theme file and cleans it up, if needed. */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } _____ Modified: trunk/reactos/lib/uxtheme/msstyles.h --- trunk/reactos/lib/uxtheme/msstyles.h 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/msstyles.h 2005-08-12 18:22:47 UTC (rev 17342) @@ -46,8 +46,11 @@ struct _THEME_PARTSTATE *next; } THEME_PARTSTATE, *PTHEME_PARTSTATE; +struct _THEME_FILE; + typedef struct _THEME_CLASS { HMODULE hTheme; + struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; WCHAR szClassName[MAX_THEME_CLASS_NAME]; PTHEME_PARTSTATE partstate; _____ Modified: trunk/reactos/lib/uxtheme/system.c --- trunk/reactos/lib/uxtheme/system.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/system.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -62,6 +62,7 @@ ATOM atWindowTheme; ATOM atSubAppName; ATOM atSubIdList; +ATOM atDialogThemeEnabled; BOOL bThemeActive = FALSE; WCHAR szCurrentTheme[MAX_PATH]; @@ -70,6 +71,27 @@ /*********************************************************************** / +static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) +{ + PostMessageW(hWnd, msg, 0, 0); + return TRUE; +} + +/* Broadcast a message to *all* windows, including children */ +static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) +{ + if (hWnd == NULL) + { + EnumWindows (UXTHEME_broadcast_msg, msg); + } + else + { + PostMessageW(hWnd, msg, 0, 0); + EnumChildWindows (hWnd, UXTHEME_broadcast_msg_enumchild, msg); + } + return TRUE; +} + /*********************************************************************** * UXTHEME_LoadTheme * @@ -78,7 +100,7 @@ static void UXTHEME_LoadTheme(void) { HKEY hKey; - LONG buffsize; + DWORD buffsize; HRESULT hr; WCHAR tmp[10]; PTHEME_FILE pt; @@ -169,9 +191,12 @@ tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); if(bThemeActive) { - RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor, lstrlenW(szCurrentColor)+1); - RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize, lstrlenW(szCurrentSize)+1); - RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme, lstrlenW(szCurrentTheme)+1); + RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor, + (lstrlenW(szCurrentColor)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize, + (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme, + (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); } else { RegDeleteValueW(hKey, szColorName); @@ -200,12 +225,16 @@ static const WCHAR szSubIdList[] = { 'u','x','_','s','u','b','i','d','l','s','t','\0' }; + static const WCHAR szDialogThemeEnabled[] = { + 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0' + }; hDllInst = hInst; - atWindowTheme = GlobalAddAtomW(szWindowTheme); - atSubAppName = GlobalAddAtomW(szSubAppName); - atSubIdList = GlobalAddAtomW(szSubIdList); + atWindowTheme = GlobalAddAtomW(szWindowTheme); + atSubAppName = GlobalAddAtomW(szSubAppName); + atSubIdList = GlobalAddAtomW(szSubIdList); + atDialogThemeEnabled = GlobalAddAtomW(szDialogThemeEnabled); UXTHEME_LoadTheme(); } @@ -247,7 +276,7 @@ RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); } - PostMessageW(HWND_BROADCAST, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); } return S_OK; } @@ -295,20 +324,23 @@ WCHAR szClassBuff[256]; LPCWSTR pszAppName; LPCWSTR pszUseClassList; - HTHEME hTheme; - TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); - if(!bThemeActive) - return NULL; + HTHEME hTheme = NULL; + TRACE("(%p,%s)", hwnd, debugstr_w(pszClassList)); - pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); - /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ - pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0])); - if(!pszUseClassList) - pszUseClassList = pszClassList; + if(bThemeActive) + { + pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); + /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ + pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0])); + if(!pszUseClassList) + pszUseClassList = pszClassList; - hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + if (pszUseClassList) + hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + } if(IsWindow(hwnd)) SetPropW(hwnd, MAKEINTATOMW(atWindowTheme), hTheme); + TRACE(" = %p\n", hTheme); return hTheme; } @@ -338,7 +370,7 @@ if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - PostMessageW(hwnd, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); return hr; } @@ -554,7 +586,7 @@ HRESULT hr; TRACE("(%p,%s,%p)\n", hThemeFile, unknown, hWnd); hr = UXTHEME_SetActiveTheme(hThemeFile); - PostMessageW(HWND_BROADCAST, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); return hr; }

1 0

[gvg] 17341: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Felix Nawothnig <felix.nawothnig(a)t-online.de> - Fix misuse of UrlCombineW. Mike McCormack <mike(a)codeweavers.com> - Fix -Wpointer-sign warnings. Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - URLMonikerImpl_BindToStorage: Don't use a HeapAllocated pointer for other purposes. - URLMonikerImpl_BindToStorage: Escape special characters. Jacek Caban <jack(a)itma.pwr.wroc.pl> - Register protocols. - Better module locking. - Fix handling of pmkContext in CreateURLMoniker. Modified: trunk/reactos/lib/urlmon/Makefile.in Modified: trunk/reactos/lib/urlmon/regsvr.c Added: trunk/reactos/lib/urlmon/rsrc.rc Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/umstream.c Added: trunk/reactos/lib/urlmon/urlmon.inf Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h Added: trunk/reactos/w32api/include/advpub.h _____ Modified: trunk/reactos/lib/urlmon/Makefile.in --- trunk/reactos/lib/urlmon/Makefile.in 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/Makefile.in 2005-08-12 18:17:37 UTC (rev 17341) @@ -14,6 +14,8 @@ umstream.c \ urlmon_main.c +RC_SRCS = rsrc.rc + SUBDIRS = tests @MAKE_DLL_RULES@ _____ Modified: trunk/reactos/lib/urlmon/regsvr.c --- trunk/reactos/lib/urlmon/regsvr.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/regsvr.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -20,6 +20,7 @@ #define COM_NO_WINDOWS_H #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" @@ -28,6 +29,7 @@ #include "wingdi.h" #include "winreg.h" #include "winerror.h" +#include "advpub.h" #include "objbase.h" @@ -35,6 +37,9 @@ #include "wine/debug.h" +#include "initguid.h" +#include "urlmon_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); /* @@ -511,6 +516,48 @@ "urlmon.dll", "Apartment" }, + { &CLSID_CdlProtocol, + "CDL: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_FileProtocol, + "file:, local: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_FtpProtocol, + "ftp: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_GopherProtocol, + "gopher: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_HttpProtocol, + "http: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_HttpsProtocol, + "https: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_MkProtocol, + "mk: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, { NULL } /* list terminator */ }; @@ -523,6 +570,58 @@ }; /*********************************************************************** + * register_inf + */ + +#define INF_SET_CLSID(clsid) \ + pse[i].pszName = "CLSID_" #clsid; \ + clsids[i++] = &CLSID_ ## clsid; + +static HRESULT register_inf(BOOL doregister) +{ + HRESULT hres; + HMODULE hAdvpack; + typeof(RegInstall) *pRegInstall; + STRTABLE strtable; + STRENTRY pse[7]; + static CLSID const *clsids[34]; + int i = 0; + + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + INF_SET_CLSID(CdlProtocol); + INF_SET_CLSID(FileProtocol); + INF_SET_CLSID(FtpProtocol); + INF_SET_CLSID(GopherProtocol); + INF_SET_CLSID(HttpProtocol); + INF_SET_CLSID(HttpsProtocol); + INF_SET_CLSID(MkProtocol); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (typeof(RegInstall)*)GetProcAddress(hAdvpack, "RegInstall"); + + hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + +/********************************************************************** * * DllRegisterServer (URLMON.@) */ HRESULT WINAPI URLMON_DllRegisterServer(void) @@ -534,7 +633,9 @@ hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); - return hr; + if(FAILED(hr)) + return hr; + return register_inf(TRUE); } /*********************************************************************** @@ -549,5 +650,7 @@ hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); - return hr; + if(FAILED(hr)) + return hr; + return register_inf(FALSE); } _____ Copied: trunk/reactos/lib/urlmon/rsrc.rc (from rev 17340, vendor/wine/dlls/urlmon/current/rsrc.rc) Property changes on: trunk/reactos/lib/urlmon/rsrc.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -43,7 +43,7 @@ const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ - ULONG ref; /* reference counter for this object */ + LONG ref; /* reference counter for this object */ } SecManagerImpl; @@ -82,8 +82,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -97,10 +95,9 @@ /* destroy the object if there's no more reference on it */ if (!refCount){ HeapFree(GetProcessHeap(),0,This); + URLMON_UnlockModule(); } - URLMON_UnlockModule(); - return refCount; } @@ -201,6 +198,9 @@ This->ref = 1; *ppobj = This; + + URLMON_LockModule(); + return S_OK; } @@ -210,7 +210,7 @@ */ typedef struct { const IInternetZoneManagerVtbl* lpVtbl; - ULONG ref; + LONG ref; } ZoneMgrImpl; /******************************************************************** @@ -247,8 +247,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -262,10 +260,10 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); - if(!refCount) + if(!refCount) { HeapFree(GetProcessHeap(), 0, This); - - URLMON_UnlockModule(); + URLMON_UnlockModule(); + } return refCount; } @@ -457,6 +455,8 @@ ret->ref = 1; *ppobj = (IInternetZoneManager*)ret; + URLMON_LockModule(); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/umon.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -51,7 +51,7 @@ typedef struct { const IBindingVtbl *lpVtbl; - ULONG ref; + LONG ref; LPWSTR URLName; @@ -291,7 +291,7 @@ const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ - ULONG ref; /* reference counter for this object */ + LONG ref; /* reference counter for this object */ LPOLESTR URLName; /* URL string identified by this URLmoniker */ } URLMonikerImpl; @@ -340,8 +340,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -359,10 +357,10 @@ if (!refCount) { HeapFree(GetProcessHeap(),0,This->URLName); HeapFree(GetProcessHeap(),0,This); + + URLMON_UnlockModule(); } - URLMON_UnlockModule(); - return refCount; } @@ -600,7 +598,7 @@ if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *user, *pass; + WCHAR *host, *path, *partial_path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -638,7 +636,7 @@ memset(&url, 0, sizeof(url)); url.dwStructSize = sizeof(url); url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = url.dwUserNameLength = url.dwPasswordLength = 1; - InternetCrackUrlW(urlcopy, 0, 0, &url); + InternetCrackUrlW(urlcopy, 0, ICU_ESCAPE, &url); host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); host[url.dwHostNameLength] = '\0'; @@ -799,9 +797,9 @@ break; case INTERNET_SCHEME_FILE: - path = bind->URLName + 5; /* Skip the "file:" part */ - if ((path[0] != '/' && path[0] != '\\') || - (path[1] != '/' && path[1] != '\\')) + partial_path = bind->URLName + 5; /* Skip the "file:" part */ + if ((partial_path[0] != '/' && partial_path[0] != '\\') || + (partial_path[1] != '/' && partial_path[1] != '\\')) { hres = E_FAIL; } @@ -809,10 +807,10 @@ { HANDLE h; - path += 2; - if (path[0] == '/' || path[0] == '\\') - ++path; - h = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + partial_path += 2; + if (partial_path[0] == '/' || partial_path[0] == '\\') + ++partial_path; + h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); if (h == (HANDLE) HFILE_ERROR) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -1136,7 +1134,7 @@ static HRESULT URLMonikerImpl_Construct(URLMonikerImpl* This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { HRESULT hres; - DWORD sizeStr; + DWORD sizeStr = INTERNET_MAX_URL_LENGTH; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURL Name)); memset(This, 0, sizeof(*This)); @@ -1170,6 +1168,8 @@ else strcpyW(This->URLName,lpszURLName); + URLMON_LockModule(); + return S_OK; } @@ -1255,11 +1255,12 @@ return E_OUTOFMEMORY; if(pmkContext) { - CLSID clsid; IBindCtx* bind; - IMoniker_GetClassID(pmkContext, &clsid); - if(IsEqualCLSID(&clsid, &CLSID_StdURLMoniker) && SUCCEEDED(CreateBindCtx(0, &bind))) { - URLMonikerImpl_GetDisplayName(pmkContext, bind, NULL, &lefturl); + DWORD dwMksys = 0; + IMoniker_IsSystemMoniker(pmkContext, &dwMksys); + if(dwMksys == MKSYS_URLMONIKER && SUCCEEDED(CreateBindCtx(0, &bind))) { + IMoniker_GetDisplayName(pmkContext, bind, NULL, &lefturl); + TRACE("lefturl = %s\n", debugstr_w(lefturl)); IBindCtx_Release(bind); } } _____ Modified: trunk/reactos/lib/urlmon/umstream.c --- trunk/reactos/lib/urlmon/umstream.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/umstream.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -253,7 +253,8 @@ DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { - DWORD pos, newposlo, newposhi; + DWORD pos, newposlo; + LONG newposhi; IUMCacheStream *This = (IUMCacheStream *)iface; @@ -262,7 +263,7 @@ pos = dlibMove.QuadPart; /* FIXME: truncates */ newposhi = 0; newposlo = SetFilePointer( This->handle, pos, &newposhi, dwOrigin ); - if( newposlo == INVALID_SET_FILE_POINTER ) + if( newposlo == INVALID_SET_FILE_POINTER && GetLastError()) return E_FAIL; if (plibNewPosition) _____ Copied: trunk/reactos/lib/urlmon/urlmon.inf (from rev 17340, vendor/wine/dlls/urlmon/current/urlmon.inf) Property changes on: trunk/reactos/lib/urlmon/urlmon.inf ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/urlmon.xml --- trunk/reactos/lib/urlmon/urlmon.xml 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon.xml 2005-08-12 18:17:37 UTC (rev 17341) @@ -23,5 +23,6 @@ <file>umon.c</file> <file>umstream.c</file> <file>urlmon_main.c</file> + <file>rsrc.rc</file> <file>urlmon.spec</file> </module> _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -89,7 +89,7 @@ typedef struct { IClassFactory ITF_IClassFactory; - DWORD ref; + LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; @@ -125,8 +125,6 @@ static ULONG WINAPI CF_AddRef(LPCLASSFACTORY iface) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - URLMON_LockModule(); - return InterlockedIncrement(&This->ref); } @@ -136,11 +134,11 @@ ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This); + URLMON_UnlockModule(); + } - URLMON_UnlockModule(); - return ref; } @@ -229,10 +227,12 @@ factory->ITF_IClassFactory.lpVtbl = &CF_Vtbl; factory->ref = 1; - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; *ppv = &(factory->ITF_IClassFactory); + + URLMON_LockModule(); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-12 18:17:37 UTC (rev 17341) @@ -40,7 +40,7 @@ typedef struct { const IStreamVtbl *lpVtbl; - DWORD ref; + LONG ref; HANDLE handle; BOOL closed; WCHAR *pszFileName; @@ -50,4 +50,13 @@ HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); +DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02); +DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_FtpProtocol, 0x79EAC9E3, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_GopherProtocol, 0x79EAC9E4, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_HttpProtocol, 0x79EAC9E2, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_HttpsProtocol, 0x79EAC9E5, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_MkProtocol, 0x79EAC9E6, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); + + #endif /* __WINE_URLMON_MAIN_H */ _____ Added: trunk/reactos/w32api/include/advpub.h --- trunk/reactos/w32api/include/advpub.h 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/w32api/include/advpub.h 2005-08-12 18:17:37 UTC (rev 17341) @@ -0,0 +1,77 @@ +/* + * Copyright 2004 Huw D M Davies + * + * 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 + */ +#ifndef __WINE_ADVPUB_H +#define __WINE_ADVPUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _CabInfo { + PSTR pszCab; + PSTR pszInf; + PSTR pszSection; + char szSrcPath[MAX_PATH]; + DWORD dwFlags; +} CABINFO, *PCABINFO; + +typedef struct _StrEntry { + LPSTR pszName; + LPSTR pszValue; +} STRENTRY, *LPSTRENTRY; + +typedef const STRENTRY CSTRENTRY; +typedef CSTRENTRY *LPCSTRENTRY; + +typedef struct _StrTable { + DWORD cEntries; + LPSTRENTRY pse; +} STRTABLE, *LPSTRTABLE; + +typedef const STRTABLE CSTRTABLE; +typedef CSTRTABLE *LPCSTRTABLE; + +/* Flags for RunSetupCommand */ +#define RSC_FLAG_INF 0x00000001 +#define RSC_FLAG_SKIPDISKSPACECHECK 0x00000002 +#define RSC_FLAG_QUIET 0x00000004 +#define RSC_FLAG_NGCONV 0x00000008 +#define RSC_FLAG_UPDHLPDLLS 0x00000010 +#define RSC_FLAG_DELAYREGISTEROCX 0x00000200 +#define RSC_FLAG_SETUPAPI 0x00000400 + +/* Flags for DelNode */ +#define ADN_DEL_IF_EMPTY 0x00000001 +#define ADN_DONT_DEL_SUBDIRS 0x00000002 +#define ADN_DONT_DEL_DIR 0x00000004 + +HRESULT WINAPI RunSetupCommand(HWND hWnd, + LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, + HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); +HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); +DWORD WINAPI NeedRebootInit(VOID); +BOOL WINAPI NeedReboot(DWORD dwRebootCheck); +HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable); +HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); +HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ADVPUB_H */ Property changes on: trunk/reactos/w32api/include/advpub.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[gvg] 17340: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes (Reg* functions). Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/reg.c _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-08-12 18:06:58 UTC (rev 17339) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-08-12 18:09:06 UTC (rev 17340) @@ -139,7 +139,7 @@ The reason for these functions to be there is to provide a wrapper for unicode functions to provide these functions on systems without unicode functions eg. win95/win98. Since we have such functions we just - call these. If running Wine with native DLL's, some late bound calls may + call these. If running Wine with native DLLs, some late bound calls may fail. However, it is better to implement the functions in the forward DLL and recommend the builtin rather than reimplementing the calls here! */ _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-08-12 18:06:58 UTC (rev 17339) +++ trunk/reactos/lib/shlwapi/reg.c 2005-08-12 18:09:06 UTC (rev 17340) @@ -935,7 +935,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, LPVOID pvData, DWORD cbData, DWORD dwFlags) { - LONG dummy; + DWORD dummy; LPSHUSKEY hKey = (LPSHUSKEY)hUSKey; LONG ret = ERROR_SUCCESS;

1 0

[gvg] 17339: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Mike McCormack <mike(a)codeweavers.com> - Interlocked LONG* gcc warning fixes. Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-12 18:04:51 UTC (rev 17338) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-12 18:06:58 UTC (rev 17339) @@ -42,7 +42,7 @@ { /* IUnknown fields */ const IClassFactoryVtbl *lpVtbl; - DWORD ref; + LONG ref; } IClassFactoryImpl; extern IClassFactoryImpl SHDOCVW_ClassFactory; @@ -55,7 +55,7 @@ { /* IUnknown fields */ const IOleObjectVtbl *lpVtbl; - DWORD ref; + LONG ref; } IOleObjectImpl; extern IOleObjectImpl SHDOCVW_OleObject; @@ -67,7 +67,7 @@ { /* IUnknown fields */ const IWebBrowserVtbl *lpVtbl; - DWORD ref; + LONG ref; } IWebBrowserImpl; extern IWebBrowserImpl SHDOCVW_WebBrowser; @@ -80,7 +80,7 @@ { /* IUnknown fields */ const IProvideClassInfoVtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfoImpl; extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; @@ -93,7 +93,7 @@ { /* IUnknown fields */ const IProvideClassInfo2Vtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfo2Impl; extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; @@ -106,7 +106,7 @@ { /* IUnknown fields */ const IPersistStorageVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStorageImpl; extern IPersistStorageImpl SHDOCVW_PersistStorage; @@ -119,7 +119,7 @@ { /* IUnknown fields */ const IPersistStreamInitVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStreamInitImpl; extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; @@ -132,7 +132,7 @@ { /* IUnknown fields */ const IQuickActivateVtbl *lpVtbl; - DWORD ref; + LONG ref; } IQuickActivateImpl; extern IQuickActivateImpl SHDOCVW_QuickActivate; @@ -145,7 +145,7 @@ { /* IUnknown fields */ const IConnectionPointContainerVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointContainerImpl; extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; @@ -158,7 +158,7 @@ { /* IUnknown fields */ const IConnectionPointVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointImpl; /********************************************************************** _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-12 18:04:51 UTC (rev 17338) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-12 18:06:58 UTC (rev 17339) @@ -152,7 +152,7 @@ */ typedef struct _IBindStatusCallbackImpl { const IBindStatusCallbackVtbl *vtbl; - DWORD ref; + LONG ref; HWND hDialog; BOOL *pbCancelled; } IBindStatusCallbackImpl;

1 0

[gvg] 17338: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Initial support for the IPersistFolder3 interface. - Use CP_UNIXCP instead of CP_ACP when converting paths (Pointed out by Troy Rollo). - Add file type column in detailed shell view. - Make the order of shell view columns 'prefix-compatible' with shfldr_fs. - Don't remove filename extensions for path pidls in GetDisplayNameOf. - Do filename postprocessing in GetDisplayNameOf (Hide filename extensions if appropriate). - Don't cache child pidls in UnixFolder, but create them on the fly. - Don't use unix filesystem specific attributes in UnixFolder's pidls. - Partially implemented UnixFolder's ISFHelper::CopyItems method. - Return correct HRESULT code in UnixFolder's IEnumIDList::Next. - Corresponding test. - Release shell folders only if they were successfully acquired. - Implemented UnixFolder's ISFHelper::DeleteItems interface. - Fail in SHGetDataFromIDList when called on special folder. - Return correct attributes in ParseDisplayName. - Register unixfs at desktop level in DllRegisterServer. - Fix two more corner cases in UNIXFS_get_unix_path and UNIXFS_path_to_pidl. - If the unixfs is rooted at the Desktop folder, forward ParseDisplayName calls to it instead of to MyComputer. - Only initialize shell folders via the IPersistFolder3 interface in SHELL32_CoCreateInitSF if the pidl which specifies the child is of type 'Folder'. Otherwise fall back to IPersistFolder. - Append filename extension if necessary in IShellFolder::SetNameOf. - Release parent shell folder in GetAttributesOf. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Robert Shearman <rob(a)codeweavers.com> - Implement ShellDDEInit. Michael Lin <mlin(a)corvu.com.au> Michael Jung <mjung(a)iss.tu-darmstadt.de> - Implemented UnixFolder's ISFHelper::AddFolder. - ISFHelper interface support for UnixFolder (currently only stubs). - Implemented UnixFolder's IShellFolder::SetNameOf. Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Remove multiple declarations of the same function, keeping the public one as reference. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes (Reg* functions). - -Wpointer-sign fixes. Troy Rollo <wine(a)troy.rollo.name> - Return attributes for the correct file in the unixfs ParseDisplayName. - When using PATHMODE_UNIX, all files are in the file system. Marcelo Duarte <marcelotduarte(a)gmail.com> - Update shell32 resources for Portuguese. Detlef Riekenberg <wine.dev(a)web.de> - Printers_RegisterWindowW / Printers_UnregisterWindow implemented as stub. - Show the FIXME in Printer_LoadIconsW only when needed. - Printer_LoadIconsW: implemented minimal version. Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/autocomplete.c Modified: trunk/reactos/lib/shell32/classes.c Modified: trunk/reactos/lib/shell32/cpanelfolder.c Modified: trunk/reactos/lib/shell32/dataobject.c Added: trunk/reactos/lib/shell32/dde.c Modified: trunk/reactos/lib/shell32/dialogs.c Modified: trunk/reactos/lib/shell32/dragdrophelper.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/folders.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/regsvr.c Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32.xml Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellole.c Modified: trunk/reactos/lib/shell32/shfldr.h Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_fs.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlfolder.c Modified: trunk/reactos/lib/shell32/shlfsbind.c Modified: trunk/reactos/lib/shell32/shlview.c Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c Modified: trunk/reactos/lib/shell32/undocshell.h _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/Makefile.in 2005-08-12 18:04:51 UTC (rev 17338) @@ -18,6 +18,7 @@ clipboard.c \ control.c \ cpanelfolder.c \ + dde.c \ dataobject.c \ debughlp.c \ dialogs.c \ _____ Modified: trunk/reactos/lib/shell32/autocomplete.c --- trunk/reactos/lib/shell32/autocomplete.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/autocomplete.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -64,7 +64,7 @@ { const IAutoCompleteVtbl *lpVtbl; const IAutoComplete2Vtbl *lpvtblAutoComplete2; - DWORD ref; + LONG ref; BOOL enabled; HWND hwndEdit; HWND hwndListBox; _____ Modified: trunk/reactos/lib/shell32/classes.c --- trunk/reactos/lib/shell32/classes.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/classes.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -49,7 +49,7 @@ #define MAX_EXTENSION_LENGTH 20 -BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL bPrependDot) +BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot) { HKEY hkey; WCHAR szTemp[MAX_EXTENSION_LENGTH + 2]; @@ -83,7 +83,7 @@ return TRUE; } -BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, DWORD len, BOOL bPrependDot) +BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot) { HKEY hkey; char szTemp[MAX_EXTENSION_LENGTH + 2]; @@ -194,7 +194,7 @@ char sTemp[MAX_PATH]; char sNum[5]; - if (!RegQueryValueExA(hkey, NULL, 0, &dwType, szDest, &len)) + if (!RegQueryValueExA(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) { if (dwType == REG_EXPAND_SZ) { @@ -319,7 +319,7 @@ szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegQueryValueExA(hkey,"",0,NULL,szDest,&len)) + if (!RegQueryValueExA(hkey,"",0,NULL,(LPBYTE)szDest,&len)) { ret = TRUE; } @@ -404,10 +404,10 @@ (LPVOID*)&psfFolder); if (SUCCEEDED(hr)) { hr = IShellFolder_GetAttributesOf(psfFolder, 0, NULL, pdwAttributes); + IShellFolder_Release(psfFolder); } + IShellFolder_Release(psfDesktop); } - IShellFolder_Release(psfFolder); - IShellFolder_Release(psfDesktop); if (FAILED(hr)) return FALSE; } else { lResult = RegQueryValueExW(hSFKey, wszAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); _____ Modified: trunk/reactos/lib/shell32/cpanelfolder.c --- trunk/reactos/lib/shell32/cpanelfolder.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/cpanelfolder.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -59,7 +59,7 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; - DWORD ref; + LONG ref; const IPersistFolder2Vtbl *lpVtblPersistFolder2; const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; _____ Modified: trunk/reactos/lib/shell32/dataobject.c --- trunk/reactos/lib/shell32/dataobject.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/dataobject.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -43,7 +43,7 @@ { /* IUnknown fields */ const IEnumFORMATETCVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IEnumFORMATETC fields */ UINT posFmt; UINT countFmt; @@ -205,7 +205,7 @@ { /* IUnknown fields */ const IDataObjectVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IDataObject fields */ LPITEMIDLIST pidl; _____ Copied: trunk/reactos/lib/shell32/dde.c (from rev 17337, vendor/wine/dlls/shell32/current/dde.c) Property changes on: trunk/reactos/lib/shell32/dde.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shell32/dialogs.c --- trunk/reactos/lib/shell32/dialogs.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/dialogs.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -255,7 +255,7 @@ if (icList > 0) { pszList = HeapAlloc( GetProcessHeap(), 0, icList) ; - if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, pszList, &icList)) + if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, (LPBYTE)pszList, &icList)) MessageBoxA (hCb, "Unable to grab MRUList !", "Nix", MB_OK) ; } else @@ -278,7 +278,7 @@ pszCmd = HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ; else pszCmd = HeapAlloc(GetProcessHeap(), 0, icCmd) ; - if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, pszCmd, &icCmd)) + if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd)) MessageBoxA (hCb, "Unable to grab index", "Nix", MB_OK) ; if (NULL != pszLatest) @@ -328,7 +328,7 @@ memmove (&pszList[1], pszList, Nix) ; pszList[0] = cMatch ; szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, pszLatest, strlen (pszLatest) + 1) ; + RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; } } @@ -350,10 +350,10 @@ memmove (&pszList[1], pszList, icList - 1) ; pszList[0] = cMatch ; szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, pszLatest, strlen (pszLatest) + 1) ; + RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; } - RegSetValueExA (hkey, "MRUList", 0, REG_SZ, pszList, strlen (pszList) + 1) ; + RegSetValueExA (hkey, "MRUList", 0, REG_SZ, (LPBYTE)pszList, strlen (pszList) + 1) ; HeapFree( GetProcessHeap(), 0, pszCmd) ; HeapFree( GetProcessHeap(), 0, pszList) ; _____ Modified: trunk/reactos/lib/shell32/dragdrophelper.c --- trunk/reactos/lib/shell32/dragdrophelper.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/dragdrophelper.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -49,7 +49,7 @@ typedef struct { const IDropTargetHelperVtbl *lpVtbl; - DWORD ref; + LONG ref; } IDropTargetHelperImpl; static const IDropTargetHelperVtbl vt_IDropTargetHelper; _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -46,7 +46,7 @@ typedef struct { const IEnumIDListVtbl *lpVtbl; - DWORD ref; + LONG ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; LPENUMLIST mpCurrent; _____ Modified: trunk/reactos/lib/shell32/folders.c --- trunk/reactos/lib/shell32/folders.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/folders.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -50,7 +50,7 @@ typedef struct { const IExtractIconWVtbl *lpVtbl; - DWORD ref; + LONG ref; const IPersistFileVtbl *lpvtblPersistFile; const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/pidl.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -1113,7 +1113,7 @@ case SHGDFIL_FINDDATA: pfd = dest; - if (_ILIsDrive(pidl)) + if (_ILIsDrive(pidl) || _ILIsSpecialFolder(pidl)) return E_INVALIDARG; if (len < sizeof(WIN32_FIND_DATAA)) @@ -1488,7 +1488,7 @@ * ************************************************************************ * */ -LPITEMIDLIST _ILAlloc(PIDLTYPE type, size_t size) +LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size) { LPITEMIDLIST pidlOut = NULL; _____ Modified: trunk/reactos/lib/shell32/pidl.h --- trunk/reactos/lib/shell32/pidl.h 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/pidl.h 2005-08-12 18:04:51 UTC (rev 17338) @@ -206,7 +206,7 @@ * - two bytes are the NULL PIDL terminator * Sets type of the returned PIDL to type. */ -LPITEMIDLIST _ILAlloc(PIDLTYPE type, size_t size); +LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size); /* Creates a PIDL with guid format and type type, which must be one of PT_GUID, * PT_SHELLEXT, or PT_YAGUID. _____ Modified: trunk/reactos/lib/shell32/regsvr.c --- trunk/reactos/lib/shell32/regsvr.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/regsvr.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -30,6 +31,7 @@ #include "ole2.h" #include "shlguid.h" #include "shell32_main.h" +#include "shfldr.h" #include "wine/debug.h" @@ -79,6 +81,16 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list); static HRESULT unregister_coclasses(struct regsvr_coclass const *list); +struct regsvr_namespace +{ + CLSID const *clsid; /* CLSID of the namespace extension. NULL for end of list */ + LPCWSTR parent; /* Mount point (MyComputer, Desktop, ..). */ + LPCWSTR value; /* Display name of the extension. */ +}; + +static HRESULT register_namespace_extensions(struct regsvr_namespace const *list); +static HRESULT unregister_namespace_extensions(struct regsvr_namespace const *list); + /*********************************************************************** * static string constants */ @@ -377,6 +389,66 @@ return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; } +/********************************************************************** + * register_namespace_extensions + */ +static WCHAR *get_namespace_key(struct regsvr_namespace const *list) { + static const WCHAR wszExplorerKey[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t' ,'\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r' ,'s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\',0 }; + static const WCHAR wszNamespace[] = { '\\','N','a','m','e','s','p','a','c','e','\\',0 }; + WCHAR *pwszKey, *pwszCLSID; + + pwszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszExplorerKey)+sizeof(wszNamespace)+ + sizeof(WCHAR)*(lstrlenW(list->parent)+CHARS_IN_GUID)); + if (!pwszKey) + return NULL; + + lstrcpyW(pwszKey, wszExplorerKey); + lstrcatW(pwszKey, list->parent); + lstrcatW(pwszKey, wszNamespace); + if (FAILED(StringFromCLSID(list->clsid, &pwszCLSID))) { + HeapFree(GetProcessHeap(), 0, pwszKey); + return NULL; + } + lstrcatW(pwszKey, pwszCLSID); + CoTaskMemFree(pwszCLSID); + + return pwszKey; +} + +static HRESULT register_namespace_extensions(struct regsvr_namespace const *list) { + WCHAR *pwszKey; + HKEY hKey; + + for (; list->clsid; list++) { + pwszKey = get_namespace_key(list); + + /* Create the key and set the value. */ + if (pwszKey && ERROR_SUCCESS == + RegCreateKeyExW(HKEY_LOCAL_MACHINE, pwszKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)) + { + RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1)); + RegCloseKey(hKey); + } + + HeapFree(GetProcessHeap(), 0, pwszKey); + } + return S_OK; +} + +static HRESULT unregister_namespace_extensions(struct regsvr_namespace const *list) { + WCHAR *pwszKey; + + for (; list->clsid; list++) { + pwszKey = get_namespace_key(list); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, pwszKey); + HeapFree(GetProcessHeap(), 0, pwszKey); + } + return S_OK; +} + /*********************************************************************** * regsvr_key_guid */ @@ -545,6 +617,16 @@ }; /*********************************************************************** + * namespace extensions list + */ +static const WCHAR wszDesktop[] = { 'D','e','s','k','t','o','p',0 }; +static const WCHAR wszSlash[] = { '/', 0 }; + +static struct regsvr_namespace const namespace_extensions_list[] = { + { NULL } +}; + +/********************************************************************** * * DllRegisterServer (SHELL32.@) */ HRESULT WINAPI SHELL32_DllRegisterServer() @@ -558,6 +640,8 @@ hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) hr = SHELL_RegisterShellFolders(); + if (SUCCEEDED(hr)) + hr = register_namespace_extensions(namespace_extensions_list); return hr; } @@ -573,5 +657,7 @@ hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = unregister_namespace_extensions(namespace_extensions_list); return hr; } _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shell32.spec 2005-08-12 18:04:51 UTC (rev 17338) @@ -189,7 +189,7 @@ 202 stub SHLocalReAlloc 203 stub AddCommasW 204 stub ShortSizeFormatW - 205 stub Printer_LoadIconsW + 205 stdcall Printer_LoadIconsW(wstr ptr ptr) 206 stub Link_AddExtraDataSection 207 stub Link_ReadExtraDataSection 208 stub Link_RemoveExtraDataSection @@ -197,8 +197,8 @@ 210 stub LargeIntegerToString 211 stub Printers_GetPidl 212 stub Printers_AddPrinterPropPages - 213 stub Printers_RegisterWindowW - 214 stub Printers_UnregisterWindow + 213 stdcall Printers_RegisterWindowW(wstr long ptr ptr) + 214 stdcall Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) 243 stdcall @(long long) shell32_243 244 stdcall -noname SHInitRestricted(ptr ptr) _____ Modified: trunk/reactos/lib/shell32/shell32.xml --- trunk/reactos/lib/shell32/shell32.xml 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shell32.xml 2005-08-12 18:04:51 UTC (rev 17338) @@ -28,6 +28,7 @@ <file>control.c</file> <file>cpanelfolder.c</file> <file>dataobject.c</file> + <file>dde.c</file> <file>debughlp.c</file> <file>dialogs.c</file> <file>dragdrophelper.c</file> _____ Modified: trunk/reactos/lib/shell32/shell32_Pt.rc --- trunk/reactos/lib/shell32/shell32_Pt.rc 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shell32_Pt.rc 2005-08-12 18:04:51 UTC (rev 17338) @@ -132,30 +132,33 @@ PUSHBUTTON "&Procurar...", 12288, 170, 63, 50, 14, WS_TABSTOP } -/* - special folders -*/ STRINGTABLE DISCARDABLE { + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Arquivo" + IDS_SHV_COLUMN2 "Tamanho" + IDS_SHV_COLUMN3 "Tipo" + IDS_SHV_COLUMN4 "Modificado" + IDS_SHV_COLUMN5 "Atributos" + IDS_SHV_COLUMN6 "Tamanho" + IDS_SHV_COLUMN7 "DisponÝvel" + IDS_SHV_COLUMN8 "Nome" + IDS_SHV_COLUMN9 "Comentßrios" + IDS_SHV_COLUMN10 "Dono" + IDS_SHV_COLUMN11 "Grupo" + + /* special folders */ IDS_DESKTOP "?rea de trabalho" IDS_MYCOMPUTER "Meu computador" -} -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ + /* context menus */ IDS_VIEW_LARGE "?cones &grandes" IDS_VIEW_SMALL "?cones &pequenos" IDS_VIEW_LIST "&Lista" IDS_VIEW_DETAILS "&Detalhes" IDS_SELECT "Selecionar" IDS_OPEN "Abrir" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "NÒo pode criar nova pasta: PermissÒo negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criaþÒo da nova pasta" IDS_DELETEITEM_CAPTION "Confirmar exclusÒo de arquivo" @@ -164,34 +167,14 @@ IDS_DELETEMULTIPLE_TEXT "VocÛ tem certeza que deseja excluir estes %1 itens?" IDS_OVERWRITEFILE_TEXT "Sobreescrever arquivo %1?" IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" -} -/* colunas no shellview */ -STRINGTABLE -BEGIN - IDS_SHV_COLUMN1 "Arquivo" - IDS_SHV_COLUMN2 "Tamanho" - IDS_SHV_COLUMN3 "Tipo" - IDS_SHV_COLUMN4 "Modificado" - IDS_SHV_COLUMN5 "Atributos" - IDS_SHV_COLUMN6 "Tamanho" - IDS_SHV_COLUMN7 "DisponÝvel" - IDS_SHV_COLUMN8 "Nome" - IDS_SHV_COLUMN9 "Comentßrios" -END + /* message box strings */ + IDS_RESTART_TITLE "Reiniciar" + IDS_RESTART_PROMPT "VocÛ quer simular a reinicializaþÒo do Windows?" + IDS_SHUTDOWN_TITLE "Desligar" + IDS_SHUTDOWN_PROMPT "VocÛ quer finalizar a sessÒo no ReactOS?" -/* message box strings */ -STRINGTABLE DISCARDABLE -{ - IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "VocÛ quer simular a reinicializaþÒo do Windows?" - IDS_SHUTDOWN_TITLE "Desligar" - IDS_SHUTDOWN_PROMPT "VocÛ quer finalizar a sessÒo no ReactOS?" -} - -/* shell folder path default values - */ -STRINGTABLE DISCARDABLE -{ + /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" IDS_PERSONAL "Meus Documentos" IDS_FAVORITES "Favoritos" _____ Modified: trunk/reactos/lib/shell32/shell32_main.c --- trunk/reactos/lib/shell32/shell32_main.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shell32_main.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -718,6 +718,63 @@ return NULL; } +/********************************************************************** *** + * Printer_LoadIconsW [SHELL32.205] + */ +VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * pLargeIcon, HICON * pSmallIcon) +{ + INT iconindex=IDI_SHELL_PRINTER; + + TRACE("(%s, %p, %p)\n", debugstr_w(wsPrinterName), pLargeIcon, pSmallIcon); + + /* We should check if wsPrinterName is + 1. the Default Printer or not + 2. connected or not + 3. a Local Printer or a Network-Printer + and use different Icons + */ + if((wsPrinterName != NULL) && (wsPrinterName[0] != 0)) + { + FIXME("(select Icon by PrinterName %s not implemented)\n", debugstr_w(wsPrinterName)); + } + + if(pLargeIcon != NULL) + *pLargeIcon = LoadImageW(shell32_hInstance, + (LPCWSTR) MAKEINTRESOURCE(iconindex), IMAGE_ICON, + 0, 0, LR_DEFAULTCOLOR|LR_DEFAULTSIZE); + + if(pSmallIcon != NULL) + *pSmallIcon = LoadImageW(shell32_hInstance, + (LPCWSTR) MAKEINTRESOURCE(iconindex), IMAGE_ICON, + 16, 16, LR_DEFAULTCOLOR); +} + +/********************************************************************** *** + * Printers_RegisterWindowW [SHELL32.213] + * used by "printui.dll": + * find the Window of the given Type for the specific Printer and + * return the already existent hwnd or open a new window + */ +BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType, + HANDLE * phClassPidl, HWND * phwnd) +{ + FIXME("(%s, %lx, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType, + phClassPidl, (phClassPidl != NULL) ? *(phClassPidl) : NULL, + phwnd, (phwnd != NULL) ? *(phwnd) : NULL); + + return FALSE; +} + +/********************************************************************** *** + * Printers_UnregisterWindow [SHELL32.214] + */ +VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) +{ + FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); +} + +/********************************************************************** ***/ + typedef struct { LPCWSTR szApp; @@ -985,14 +1042,6 @@ } -/********************************************************************** *** - * ShellDDEInit (SHELL32.@) - */ -void WINAPI ShellDDEInit(BOOL start) -{ - FIXME("stub: %d\n", start); -} - /*********************************************************************** * DllGetVersion [SHELL32.@] * _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-08-12 18:04:51 UTC (rev 17338) @@ -56,14 +56,14 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ); /* Classes Root */ -BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL bPrependDot); +BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot); BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, LPDWORD dwNr); BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, LPDWORD dwNr); BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len); /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */ -BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, DWORD len, BOOL bPrependDot); +BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot); BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr); BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len); @@ -223,6 +223,7 @@ extern WCHAR swShell32Name[MAX_PATH]; +BOOL UNIXFS_is_rooted_at_desktop(void); extern const GUID CLSID_UnixFolder; extern const GUID CLSID_UnixDosFolder; _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shelllink.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -133,7 +133,7 @@ const IShellExtInitVtbl *lpvtblShellExtInit; const IContextMenuVtbl *lpvtblContextMenu; - DWORD ref; + LONG ref; /* data structures according to the informations in the link */ LPITEMIDLIST pPidl; @@ -660,7 +660,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, volume_info *volume, LPWSTR *path ) { - unsigned char *p = NULL; + char *p = NULL; LOCATION_INFO *loc; HRESULT r; int n; _____ Modified: trunk/reactos/lib/shell32/shellole.c --- trunk/reactos/lib/shell32/shellole.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shellole.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -500,11 +500,11 @@ typedef struct { const IClassFactoryVtbl *lpVtbl; - DWORD ref; + LONG ref; CLSID *rclsid; LPFNCREATEINSTANCE lpfnCI; const IID * riidInst; - ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ + LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ } IDefClFImpl; static const IClassFactoryVtbl dclfvt; _____ Modified: trunk/reactos/lib/shell32/shfldr.h --- trunk/reactos/lib/shell32/shfldr.h 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shfldr.h 2005-08-12 18:04:51 UTC (rev 17338) @@ -70,3 +70,4 @@ } void SHELL_FS_ProcessDisplayFilename(LPSTR szPath, DWORD dwFlags); +BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -61,7 +61,7 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; - DWORD ref; + LONG ref; CLSID *pclsid; _____ Modified: trunk/reactos/lib/shell32/shfldr_fs.c --- trunk/reactos/lib/shell32/shfldr_fs.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shfldr_fs.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -61,7 +61,7 @@ typedef struct { const IUnknownVtbl *lpVtbl; - DWORD ref; + LONG ref; const IShellFolder2Vtbl *lpvtblShellFolder; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; @@ -590,8 +590,10 @@ LPCITEMIDLIST rpidl = NULL; hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); - if(SUCCEEDED(hr)) + if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); + IShellFolder_Release(psfParent); + } } else { while (cidl > 0 && *apidl) { @@ -698,7 +700,20 @@ static const WCHAR NeverShowExtW[] = { 'N','e','v','e','r','S','h','o','w','E', 'x','t',0 }; -static BOOL hide_extension(LPWSTR szPath) +/********************************************************************** ******** + * SHELL_FS_HideExtension [Internal] + * + * Query the registry if the filename extension of a given path should be + * hidden. + * + * PARAMS + * szPath [I] Relative or absolute path of a file + * + * RETURNS + * TRUE, if the filename's extension should be hidden + * FALSE, otherwise. + */ +BOOL SHELL_FS_HideExtension(LPWSTR szPath) { HKEY hKey; DWORD dwData; @@ -737,7 +752,7 @@ if (!(dwFlags & SHGDN_FORPARSING) && ((dwFlags & SHGDN_INFOLDER) || (dwFlags == SHGDN_NORMAL))) { MultiByteToWideChar(CP_ACP, 0, szPath, -1, pathW, MAX_PATH); - if (hide_extension(pathW) && szPath[0] != '.') + if (SHELL_FS_HideExtension(pathW) && szPath[0] != '.') PathRemoveExtensionA (szPath); } } @@ -842,7 +857,7 @@ } else lstrcpynW(szDest, lpName, MAX_PATH); - if(!(dwFlags & SHGDN_FORPARSING) && hide_extension(szSrc)) { + if(!(dwFlags & SHGDN_FORPARSING) && SHELL_FS_HideExtension(szSrc)) { WCHAR *ext = PathFindExtensionW(szSrc); if(*ext != '\0') { INT len = strlenW(szDest); _____ Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c --- trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -56,7 +56,7 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; - DWORD ref; + LONG ref; const IPersistFolder2Vtbl *lpVtblPersistFolder2; /* both paths are parsible from the desktop */ @@ -443,8 +443,10 @@ LPCITEMIDLIST rpidl = NULL; hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); - if(SUCCEEDED(hr)) + if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); + IShellFolder_Release(psfParent); + } } else { while (cidl > 0 && *apidl) { pdump (*apidl); _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shlexec.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -743,7 +743,7 @@ /****************************************************************** * dde_cb * - * callback for the DDE connection. not really usefull + * callback for the DDE connection. not really useful */ static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, _____ Modified: trunk/reactos/lib/shell32/shlfolder.c --- trunk/reactos/lib/shell32/shlfolder.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shlfolder.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -204,7 +204,9 @@ IPersistFolder *pPF; IPersistFolder3 *ppf; - if (SUCCEEDED (IUnknown_QueryInterface ((IUnknown *) * ppvOut, &IID_IPersistFolder3, (LPVOID *) & ppf))) { + if (_ILIsFolder(pidlChild) && + SUCCEEDED (IUnknown_QueryInterface ((IUnknown *) * ppvOut, &IID_IPersistFolder3, (LPVOID *) & ppf))) + { PERSIST_FOLDER_TARGET_INFO ppfti; char szDestPath[MAX_PATH]; _____ Modified: trunk/reactos/lib/shell32/shlfsbind.c --- trunk/reactos/lib/shell32/shlfsbind.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shlfsbind.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -43,7 +43,7 @@ typedef struct { const IFileSystemBindDataVtbl *lpVtbl; - DWORD ref; + LONG ref; WIN32_FIND_DATAW findFile; } IFileSystemBindDataImpl; _____ Modified: trunk/reactos/lib/shell32/shlview.c --- trunk/reactos/lib/shell32/shlview.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shlview.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -77,7 +77,7 @@ typedef struct { const IShellViewVtbl* lpVtbl; - DWORD ref; + LONG ref; const IOleCommandTargetVtbl* lpvtblOleCommandTarget; const IDropTargetVtbl* lpvtblDropTarget; const IDropSourceVtbl* lpvtblDropSource; _____ Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c --- trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -45,7 +45,7 @@ { const IContextMenu2Vtbl *lpVtbl; IShellFolder* pSFParent; - DWORD ref; + LONG ref; BOOL bDesktop; } BgCmImpl; _____ Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c --- trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-08-12 18:04:51 UTC (rev 17338) @@ -44,7 +44,7 @@ */ typedef struct { const IContextMenu2Vtbl *lpVtbl; - DWORD ref; + LONG ref; IShellFolder* pSFParent; LPITEMIDLIST pidl; /* root pidl */ LPITEMIDLIST *apidl; /* array of child pidls */ _____ Modified: trunk/reactos/lib/shell32/undocshell.h --- trunk/reactos/lib/shell32/undocshell.h 2005-08-12 17:50:33 UTC (rev 17337) +++ trunk/reactos/lib/shell32/undocshell.h 2005-08-12 18:04:51 UTC (rev 17338) @@ -65,9 +65,6 @@ LPITEMIDLIST * ppidl, DWORD *attributes); -LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR path); -LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR path); - /* string functions */ @@ -124,15 +121,6 @@ void WINAPI ExitWindowsDialog(HWND hwndOwner); -BOOL WINAPI GetFileNameFromBrowse( - HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPCSTR lpstrInitialDir, - LPCSTR lpstrDefExt, - LPCSTR lpstrFilter, - LPCSTR lpstrTitle); - BOOL WINAPI SHFindComputer( LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch);

1 0

[gvg] 17337: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Francois Gouget <fgouget(a)free.fr> - Fix the NdrVaryingArrayUnmarshall prototype (reported by winapi_check). - Assorted spelling fixes. Robert Shearman <rob(a)codeweavers.com> - Add stubs for most of the NDR marshaling functions. - IRpcStubBuffer_Disconnect can be called more than once. Mike McCormack <mike(a)codeweavers.com> - Interlocked LONG* gcc warning fixes. Stefan Huehner <stefan(a)huehner.org> - Fix -Wmissing-declarations warnings. - Fix some missing-declarations warnings. Modified: trunk/reactos/lib/rpcrt4/cstub.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.h Modified: trunk/reactos/lib/rpcrt4/rpc_message.c Modified: trunk/reactos/lib/rpcrt4/rpc_message.h Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Modified: trunk/reactos/lib/rpcrt4/cstub.c --- trunk/reactos/lib/rpcrt4/cstub.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/cstub.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -100,8 +100,7 @@ TRACE("(%p)->Release()\n",This); if (!--(This->RefCount)) { - if(This->pvServerObject) - IUnknown_Release(This->pvServerObject); + IRpcStubBuffer_Disconnect(iface); if(This->pPSFactory) IPSFactoryBuffer_Release(This->pPSFactory); HeapFree(GetProcessHeap(),0,This); @@ -123,7 +122,11 @@ { CStdStubBuffer *This = (CStdStubBuffer *)iface; TRACE("(%p)->Disconnect()\n",This); - This->pvServerObject = NULL; + if (This->pvServerObject) + { + IUnknown_Release(This->pvServerObject); + This->pvServerObject = NULL; + } } HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -114,16 +114,23 @@ NdrPointerMarshall, NdrPointerMarshall, /* 0x15 */ NdrSimpleStructMarshall, NdrSimpleStructMarshall, - 0, 0, 0, + NdrConformantStructMarshall, NdrConformantStructMarshall, + NdrConformantVaryingStructMarshall, NdrComplexStructMarshall, /* 0x1b */ - NdrConformantArrayMarshall, 0, 0, 0, 0, 0, + NdrConformantArrayMarshall, + NdrConformantVaryingArrayMarshall, + NdrFixedArrayMarshall, NdrFixedArrayMarshall, + NdrVaryingArrayMarshall, NdrVaryingArrayMarshall, NdrComplexArrayMarshall, /* 0x22 */ NdrConformantStringMarshall, 0, 0, NdrConformantStringMarshall, 0, 0, 0, 0, /* 0x2a */ - 0, 0, 0, 0, 0, + NdrEncapsulatedUnionMarshall, + NdrNonEncapsulatedUnionMarshall, + 0, + NdrXmitOrRepAsMarshall, NdrXmitOrRepAsMarshall, /* 0x2f */ NdrInterfacePointerMarshall, /* 0xb0 */ @@ -140,16 +147,23 @@ NdrPointerUnmarshall, NdrPointerUnmarshall, /* 0x15 */ NdrSimpleStructUnmarshall, NdrSimpleStructUnmarshall, - 0, 0, 0, + NdrConformantStructUnmarshall, NdrConformantStructUnmarshall, + NdrConformantVaryingStructUnmarshall, NdrComplexStructUnmarshall, /* 0x1b */ - NdrConformantArrayUnmarshall, 0, 0, 0, 0, 0, + NdrConformantArrayUnmarshall, + NdrConformantVaryingArrayUnmarshall, + NdrFixedArrayUnmarshall, NdrFixedArrayUnmarshall, + NdrVaryingArrayUnmarshall, NdrVaryingArrayUnmarshall, NdrComplexArrayUnmarshall, /* 0x22 */ NdrConformantStringUnmarshall, 0, 0, NdrConformantStringUnmarshall, 0, 0, 0, 0, /* 0x2a */ - 0, 0, 0, 0, 0, + NdrEncapsulatedUnionUnmarshall, + NdrNonEncapsulatedUnionUnmarshall, + 0, + NdrXmitOrRepAsUnmarshall, NdrXmitOrRepAsUnmarshall, /* 0x2f */ NdrInterfacePointerUnmarshall, /* 0xb0 */ @@ -166,16 +180,23 @@ NdrPointerBufferSize, NdrPointerBufferSize, /* 0x15 */ NdrSimpleStructBufferSize, NdrSimpleStructBufferSize, - 0, 0, 0, + NdrConformantStructBufferSize, NdrConformantStructBufferSize, + NdrConformantVaryingStructBufferSize, NdrComplexStructBufferSize, /* 0x1b */ - NdrConformantArrayBufferSize, 0, 0, 0, 0, 0, + NdrConformantArrayBufferSize, + NdrConformantVaryingArrayBufferSize, + NdrFixedArrayBufferSize, NdrFixedArrayBufferSize, + NdrVaryingArrayBufferSize, NdrVaryingArrayBufferSize, NdrComplexArrayBufferSize, /* 0x22 */ NdrConformantStringBufferSize, 0, 0, NdrConformantStringBufferSize, 0, 0, 0, 0, /* 0x2a */ - 0, 0, 0, 0, 0, + NdrEncapsulatedUnionBufferSize, + NdrNonEncapsulatedUnionBufferSize, + 0, + NdrXmitOrRepAsBufferSize, NdrXmitOrRepAsBufferSize, /* 0x2f */ NdrInterfacePointerBufferSize, /* 0xb0 */ @@ -218,15 +239,23 @@ NdrPointerFree, NdrPointerFree, /* 0x15 */ NdrSimpleStructFree, NdrSimpleStructFree, - 0, 0, 0, + NdrConformantStructFree, NdrConformantStructFree, + NdrConformantVaryingStructFree, NdrComplexStructFree, /* 0x1b */ - NdrConformantArrayFree, 0, 0, 0, 0, 0, + NdrConformantArrayFree, + NdrConformantVaryingArrayFree, + NdrFixedArrayFree, NdrFixedArrayFree, + NdrVaryingArrayFree, NdrVaryingArrayFree, NdrComplexArrayFree, /* 0x22 */ - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, + 0, 0, 0, 0, 0, /* 0x2a */ - 0, 0, 0, 0, 0, + NdrEncapsulatedUnionFree, + NdrNonEncapsulatedUnionFree, + 0, + NdrXmitOrRepAsFree, NdrXmitOrRepAsFree, /* 0x2f */ NdrInterfacePointerFree, /* 0xb0 */ @@ -2191,3 +2220,447 @@ /* FIXME: since this stub doesn't do any converting, the proper behavior is to raise an exception */ } + +/********************************************************************** * + * NdrConformantStructMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrConformantStructUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrConformantStructBufferSize [RPCRT4.@] + */ +void WINAPI NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrConformantStructMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrConformantStructFree [RPCRT4.@] + */ +void WINAPI NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrConformantVaryingStructMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrConformantVaryingStructUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrConformantVaryingStructBufferSize [RPCRT4.@] + */ +void WINAPI NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrConformantVaryingStructMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrConformantVaryingStructFree [RPCRT4.@] + */ +void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrFixedArrayMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrFixedArrayUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrFixedArrayBufferSize [RPCRT4.@] + */ +void WINAPI NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrFixedArrayMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrFixedArrayFree [RPCRT4.@] + */ +void WINAPI NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrVaryingArrayMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrVaryingArrayUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrVaryingArrayBufferSize [RPCRT4.@] + */ +void WINAPI NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrVaryingArrayMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrVaryingArrayFree [RPCRT4.@] + */ +void WINAPI NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrEncapsulatedUnionMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrEncapsulatedUnionUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrEncapsulatedUnionBufferSize [RPCRT4.@] + */ +void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrEncapsulatedUnionMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrEncapsulatedUnionFree [RPCRT4.@] + */ +void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrNonEncapsulatedUnionMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrNonEncapsulatedUnionBufferSize [RPCRT4.@] + */ +void WINAPI NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrNonEncapsulatedUnionMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrNonEncapsulatedUnionFree [RPCRT4.@] + */ +void WINAPI NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrByteCountPointerMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrByteCountPointerUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrByteCountPointerBufferSize [RPCRT4.@] + */ +void WINAPI NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrByteCountPointerMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrByteCountPointerFree [RPCRT4.@] + */ +void WINAPI NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrXmitOrRepAsMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrXmitOrRepAsUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrXmitOrRepAsBufferSize [RPCRT4.@] + */ +void WINAPI NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrXmitOrRepAsMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + +/********************************************************************** * + * NdrXmitOrRepAsFree [RPCRT4.@] + */ +void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrClientContextMarshall + */ +void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_CCONTEXT ContextHandle, + int fCheck) +{ + FIXME("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); +} + +/********************************************************************** * + * NdrClientContextUnmarshall + */ +void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_CCONTEXT * pContextHandle, + RPC_BINDING_HANDLE BindHandle) +{ + FIXME("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); +} _____ Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c --- trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -223,7 +223,7 @@ return (LPSTREAM)This; } -const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) +static const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { const IID *riid; if (!pFormat) return &IID_IUnknown; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -312,7 +312,7 @@ return err; } -RPC_STATUS RPCRT4_AllocBinding(RpcBinding** Binding, BOOL server) +static RPC_STATUS RPCRT4_AllocBinding(RpcBinding** Binding, BOOL server) { RpcBinding* NewBinding; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.h --- trunk/reactos/lib/rpcrt4/rpc_binding.h 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpc_binding.h 2005-08-12 17:50:33 UTC (rev 17337) @@ -41,7 +41,7 @@ /* don't know what MS's structure looks like */ typedef struct _RpcBinding { - DWORD refs; + LONG refs; struct _RpcBinding* Next; BOOL server; UUID ObjectUuid; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_message.c --- trunk/reactos/lib/rpcrt4/rpc_message.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpc_message.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -41,10 +41,11 @@ #include "rpc_binding.h" #include "rpc_misc.h" #include "rpc_defs.h" +#include "rpc_message.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); -DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) +static DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) { static const DWORD header_sizes[] = { sizeof(Header->request), 0, sizeof(Header->response), @@ -67,7 +68,7 @@ return ret; } -VOID RPCRT4_BuildCommonHeader(RpcPktHdr *Header, unsigned char PacketType, +static VOID RPCRT4_BuildCommonHeader(RpcPktHdr *Header, unsigned char PacketType, unsigned long DataRepresentation) { Header->common.rpc_ver = RPC_VER_MAJOR; @@ -83,7 +84,7 @@ /* Flags and fragment length are computed in RPCRT4_Send. */ } -RpcPktHdr *RPCRT4_BuildRequestHeader(unsigned long DataRepresentation, +static RpcPktHdr *RPCRT4_BuildRequestHeader(unsigned long DataRepresentation, unsigned long BufferLength, unsigned short ProcNum, UUID *ObjectUuid) @@ -113,7 +114,7 @@ return header; } -RpcPktHdr *RPCRT4_BuildResponseHeader(unsigned long DataRepresentation, +static RpcPktHdr *RPCRT4_BuildResponseHeader(unsigned long DataRepresentation, unsigned long BufferLength) { RpcPktHdr *header; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_message.h --- trunk/reactos/lib/rpcrt4/rpc_message.h 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpc_message.h 2005-08-12 17:50:33 UTC (rev 17337) @@ -24,9 +24,6 @@ #include "wine/rpcss_shared.h" #include "rpc_defs.h" -VOID RPCRT4_BuildCommonHeader(RpcPktHdr *Header, unsigned char PacketType, unsigned long DataRepresentation); -RpcPktHdr *RPCRT4_BuildRequestHeader(unsigned long DataRepresentation, unsigned long BufferLength, unsigned short ProcNum, UUID *ObjectUuid); -RpcPktHdr *RPCRT4_BuildResponseHeader(unsigned long DataRepresentation, unsigned long BufferLength); RpcPktHdr *RPCRT4_BuildFaultHeader(unsigned long DataRepresentation, RPC_STATUS Status); RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, RPC_SYNTAX_IDENTIFIER *AbstractId, RPC_SYNTAX_IDENTIFIER *TransferId); RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor); _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -117,7 +117,7 @@ static RpcPacket* spacket_tail; static HANDLE server_sem; -static DWORD worker_count, worker_free, worker_tls; +static LONG worker_count, worker_free, worker_tls; static UUID uuid_nil; _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-08-12 17:50:33 UTC (rev 17337) @@ -150,17 +150,17 @@ @ stdcall NdrAllocate(ptr long) @ stub NdrAsyncClientCall @ stub NdrAsyncServerCall -@ stub NdrByteCountPointerBufferSize -@ stub NdrByteCountPointerFree -@ stub NdrByteCountPointerMarshall -@ stub NdrByteCountPointerUnmarshall +@ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) +@ stdcall NdrByteCountPointerFree(ptr ptr ptr) +@ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) +@ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long) @ stub NdrCStdStubBuffer2_Release @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) @ varargs NdrClientCall2(ptr ptr) @ stub NdrClientCall -@ stub NdrClientContextMarshall -@ stub NdrClientContextUnmarshall +@ stdcall NdrClientContextMarshall(ptr ptr long) +@ stdcall NdrClientContextUnmarshall(ptr ptr ptr) @ stub NdrClientInitialize @ stdcall NdrClientInitializeNew(ptr ptr ptr long) @ stdcall NdrComplexArrayBufferSize(ptr ptr ptr) @@ -182,21 +182,21 @@ @ stdcall NdrConformantStringMarshall(ptr ptr ptr) @ stdcall NdrConformantStringMemorySize(ptr ptr) @ stdcall NdrConformantStringUnmarshall(ptr ptr ptr long) -@ stub NdrConformantStructBufferSize -@ stub NdrConformantStructFree -@ stub NdrConformantStructMarshall -@ stub NdrConformantStructMemorySize -@ stub NdrConformantStructUnmarshall +@ stdcall NdrConformantStructBufferSize(ptr ptr ptr) +@ stdcall NdrConformantStructFree(ptr ptr ptr) +@ stdcall NdrConformantStructMarshall(ptr ptr ptr) +@ stdcall NdrConformantStructMemorySize(ptr ptr) +@ stdcall NdrConformantStructUnmarshall(ptr ptr ptr long) @ stdcall NdrConformantVaryingArrayBufferSize(ptr ptr ptr) @ stdcall NdrConformantVaryingArrayFree(ptr ptr ptr) @ stdcall NdrConformantVaryingArrayMarshall(ptr ptr ptr) @ stdcall NdrConformantVaryingArrayMemorySize(ptr ptr) @ stdcall NdrConformantVaryingArrayUnmarshall(ptr ptr ptr long) -@ stub NdrConformantVaryingStructBufferSize -@ stub NdrConformantVaryingStructFree -@ stub NdrConformantVaryingStructMarshall -@ stub NdrConformantVaryingStructMemorySize -@ stub NdrConformantVaryingStructUnmarshall +@ stdcall NdrConformantVaryingStructBufferSize(ptr ptr ptr) +@ stdcall NdrConformantVaryingStructFree(ptr ptr ptr) +@ stdcall NdrConformantVaryingStructMarshall(ptr ptr ptr) +@ stdcall NdrConformantVaryingStructMemorySize(ptr ptr) +@ stdcall NdrConformantVaryingStructUnmarshall(ptr ptr ptr long) @ stub NdrContextHandleInitialize @ stub NdrContextHandleSize @ stdcall NdrConvert2(ptr ptr long) @@ -210,16 +210,16 @@ @ stdcall NdrDllGetClassObject(ptr ptr ptr ptr ptr ptr) @ stdcall NdrDllRegisterProxy(long ptr ptr) @ stdcall NdrDllUnregisterProxy(long ptr ptr) -@ stub NdrEncapsulatedUnionBufferSize -@ stub NdrEncapsulatedUnionFree -@ stub NdrEncapsulatedUnionMarshall -@ stub NdrEncapsulatedUnionMemorySize -@ stub NdrEncapsulatedUnionUnmarshall -@ stub NdrFixedArrayBufferSize -@ stub NdrFixedArrayFree -@ stub NdrFixedArrayMarshall -@ stub NdrFixedArrayMemorySize -@ stub NdrFixedArrayUnmarshall +@ stdcall NdrEncapsulatedUnionBufferSize(ptr ptr ptr) +@ stdcall NdrEncapsulatedUnionFree(ptr ptr ptr) +@ stdcall NdrEncapsulatedUnionMarshall(ptr ptr ptr) +@ stdcall NdrEncapsulatedUnionMemorySize(ptr ptr) +@ stdcall NdrEncapsulatedUnionUnmarshall(ptr ptr ptr long) +@ stdcall NdrFixedArrayBufferSize(ptr ptr ptr) +@ stdcall NdrFixedArrayFree(ptr ptr ptr) +@ stdcall NdrFixedArrayMarshall(ptr ptr ptr) +@ stdcall NdrFixedArrayMemorySize(ptr ptr) +@ stdcall NdrFixedArrayUnmarshall(ptr ptr ptr long) @ stdcall NdrFreeBuffer(ptr) @ stub NdrFullPointerFree @ stub NdrFullPointerInsertRefId @@ -236,11 +236,11 @@ @ stub NdrGetSimpleTypeMemorySize # wxp @ stub NdrGetTypeFlags # wxp @ stub NdrGetUserMarshallInfo -@ stub NdrHardStructBufferSize -@ stub NdrHardStructFree -@ stub NdrHardStructMarshall -@ stub NdrHardStructMemorySize -@ stub NdrHardStructUnmarshall +@ stub NdrHardStructBufferSize #(ptr ptr ptr) +@ stub NdrHardStructFree #(ptr ptr ptr) +@ stub NdrHardStructMarshall #(ptr ptr ptr) +@ stub NdrHardStructMemorySize #(ptr ptr) +@ stub NdrHardStructUnmarshall #(ptr ptr ptr long) @ stdcall NdrInterfacePointerBufferSize(ptr ptr ptr) @ stdcall NdrInterfacePointerFree(ptr ptr ptr) @ stdcall NdrInterfacePointerMarshall(ptr ptr ptr) @@ -261,15 +261,15 @@ @ stub NdrMesTypeEncode2 @ stub NdrMesTypeEncode @ stub NdrMesTypeFree2 -@ stub NdrNonConformantStringBufferSize -@ stub NdrNonConformantStringMarshall -@ stub NdrNonConformantStringMemorySize -@ stub NdrNonConformantStringUnmarshall -@ stub NdrNonEncapsulatedUnionBufferSize -@ stub NdrNonEncapsulatedUnionFree -@ stub NdrNonEncapsulatedUnionMarshall -@ stub NdrNonEncapsulatedUnionMemorySize -@ stub NdrNonEncapsulatedUnionUnmarshall +@ stub NdrNonConformantStringBufferSize #(ptr ptr ptr) +@ stub NdrNonConformantStringMarshall #(ptr ptr ptr) +@ stub NdrNonConformantStringMemorySize #(ptr ptr) +@ stub NdrNonConformantStringUnmarshall #(ptr ptr ptr long) +@ stdcall NdrNonEncapsulatedUnionBufferSize(ptr ptr ptr) +@ stdcall NdrNonEncapsulatedUnionFree(ptr ptr ptr) +@ stdcall NdrNonEncapsulatedUnionMarshall(ptr ptr ptr) +@ stdcall NdrNonEncapsulatedUnionMemorySize(ptr ptr) +@ stdcall NdrNonEncapsulatedUnionUnmarshall(ptr ptr ptr long) @ stub NdrNsGetBuffer @ stub NdrNsSendReceive @ stdcall NdrOleAllocate(long) @@ -341,16 +341,16 @@ @ stdcall NdrUserMarshalMemorySize(ptr ptr) @ stub NdrUserMarshalSimpleTypeConvert @ stdcall NdrUserMarshalUnmarshall(ptr ptr ptr long) -@ stub NdrVaryingArrayBufferSize -@ stub NdrVaryingArrayFree -@ stub NdrVaryingArrayMarshall -@ stub NdrVaryingArrayMemorySize -@ stub NdrVaryingArrayUnmarshall -@ stub NdrXmitOrRepAsBufferSize -@ stub NdrXmitOrRepAsFree -@ stub NdrXmitOrRepAsMarshall -@ stub NdrXmitOrRepAsMemorySize -@ stub NdrXmitOrRepAsUnmarshall +@ stdcall NdrVaryingArrayBufferSize(ptr ptr ptr) +@ stdcall NdrVaryingArrayFree(ptr ptr ptr) +@ stdcall NdrVaryingArrayMarshall(ptr ptr ptr) +@ stdcall NdrVaryingArrayMemorySize(ptr ptr) +@ stdcall NdrVaryingArrayUnmarshall(ptr ptr ptr long) +@ stdcall NdrXmitOrRepAsBufferSize(ptr ptr ptr) +@ stdcall NdrXmitOrRepAsFree(ptr ptr ptr) +@ stdcall NdrXmitOrRepAsMarshall(ptr ptr ptr) +@ stdcall NdrXmitOrRepAsMemorySize(ptr ptr) +@ stdcall NdrXmitOrRepAsUnmarshall(ptr ptr ptr long) @ stub NdrpCreateProxy # wxp @ stub NdrpCreateStub # wxp @ stub NdrpGetProcFormatString # wxp _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c --- trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-08-12 17:43:23 UTC (rev 17336) +++ trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-08-12 17:50:33 UTC (rev 17337) @@ -57,7 +57,7 @@ * * - ORPC is RPC for OLE; once we have a working RPC framework, we can * use it to implement out-of-process OLE client/server communications. - * ATM there is maybe a disconnect between the marshalling in the OLE DLL's + * ATM there is maybe a disconnect between the marshalling in the OLE DLLs * and the marshalling going on here [TODO: well, is there or not?] * * - In-source API Documentation, at least for those functions which we have

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs