August 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi: Fixed buffer overflow in GetCharABCWidthsI.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 0e5f29ba92452450529d1f143f72da7f5638cec8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e5f29ba92452450529d1f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 17:52:48 2006 +0200 gdi: Fixed buffer overflow in GetCharABCWidthsI. --- dlls/gdi/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index c444191..16e7f7b 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2385,7 +2385,7 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, if (ret) { /* convert device units to logical */ - for( i = firstChar; i <= count; i++, abc++ ) { + for( i = 0; i < count; i++, abc++ ) { abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC);

1 0

Alexandre Julliard : makedep: Always search for includes in the standard directories, even without -I option.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: ded32d5194eede2aa2f41c1554584c5e7dfdefe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ded32d5194eede2aa2f41c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 12:37:18 2006 +0200 makedep: Always search for includes in the standard directories, even without -I option. --- Make.rules.in | 2 - tools/makedep.c | 115 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 81 insertions(+), 36 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 6ba20df..57e6ba7 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -203,7 +203,7 @@ # Rules for dependencies cd `dirname $@` && $(MAKE) depend depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) - $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(INCLUDES) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) + $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/tools/makedep.c b/tools/makedep.c index dd12380..0b9fa67 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -128,6 +128,29 @@ static char *xstrdup( const char *str ) /******************************************************************* + * strmake + */ +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc (size); + va_start(ap, fmt); + n = vsnprintf (p, size, fmt, ap); + va_end(ap); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free(p); + } +} + + +/******************************************************************* * get_extension */ static char *get_extension( char *filename ) @@ -305,10 +328,7 @@ static FILE *open_src_file( INCL_FILE *p /* now try in source dir */ if (src_dir) { - pFile->filename = xmalloc( strlen(src_dir) + strlen(pFile->name) + 2 ); - strcpy( pFile->filename, src_dir ); - strcat( pFile->filename, "/" ); - strcat( pFile->filename, pFile->name ); + pFile->filename = strmake( "%s/%s", src_dir, pFile->name ); file = fopen( pFile->filename, "r" ); } if (!file) @@ -326,52 +346,73 @@ static FILE *open_src_file( INCL_FILE *p static FILE *open_include_file( INCL_FILE *pFile ) { FILE *file = NULL; + char *filename, *p; INCL_PATH *path; errno = ENOENT; + /* first try name as is */ + if ((file = fopen( pFile->name, "r" ))) + { + pFile->filename = xstrdup( pFile->name ); + return file; + } + + /* now try in source dir */ + if (src_dir) + { + filename = strmake( "%s/%s", src_dir, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); + } + + /* now try in global includes */ + if (top_obj_dir) + { + filename = strmake( "%s/include/%s", top_obj_dir, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); + } + if (top_src_dir) + { + filename = strmake( "%s/include/%s", top_src_dir, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); + } + + /* now search in include paths */ LIST_FOR_EACH_ENTRY( path, &paths, INCL_PATH, entry ) { - char *filename = xmalloc(strlen(path->name) + strlen(pFile->name) + 2); - strcpy( filename, path->name ); - strcat( filename, "/" ); - strcat( filename, pFile->name ); - if ((file = fopen( filename, "r" ))) - { - pFile->filename = filename; - break; - } + filename = strmake( "%s/%s", path->name, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; free( filename ); } - if (!file && pFile->system) return NULL; /* ignore system files we cannot find */ + if (pFile->system) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if (!file) + if ((p = strrchr(pFile->included_by->filename, '/'))) { - char *p = strrchr(pFile->included_by->filename, '/'); - if (p) - { - int l = p - pFile->included_by->filename + 1; - char *filename = xmalloc(l + strlen(pFile->name) + 1); - memcpy( filename, pFile->included_by->filename, l ); - strcpy( filename + l, pFile->name ); - if ((file = fopen( filename, "r" ))) pFile->filename = filename; - else free( filename ); - } + int l = p - pFile->included_by->filename + 1; + filename = xmalloc(l + strlen(pFile->name) + 1); + memcpy( filename, pFile->included_by->filename, l ); + strcpy( filename + l, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); } - if (!file) + if (pFile->included_by->system) return NULL; /* ignore if included by a system file */ + + perror( pFile->name ); + while (pFile->included_by) { - if (pFile->included_by->system) return NULL; /* ignore if included by a system file */ - perror( pFile->name ); - while (pFile->included_by) - { - fprintf( stderr, " %s was first included from %s:%d\n", - pFile->name, pFile->included_by->name, pFile->included_line ); - pFile = pFile->included_by; - } - exit(1); + fprintf( stderr, " %s was first included from %s:%d\n", + pFile->name, pFile->included_by->name, pFile->included_line ); + pFile = pFile->included_by; } + exit(1); + +found: + pFile->filename = filename; return file; } @@ -630,6 +671,10 @@ int main( int argc, char *argv[] ) else i++; } + /* ignore redundant source paths */ + if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; + if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + /* get rid of absolute paths that don't point into the source dir */ LIST_FOR_EACH_ENTRY_SAFE( path, next, &paths, INCL_PATH, entry ) {

1 0

Alexandre Julliard : makedep: Don't add dependencies for system headers.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: dea28ee4a68585c5957ada48fc23b7f3972098a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dea28ee4a68585c5957ada4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 12:27:22 2006 +0200 makedep: Don't add dependencies for system headers. --- Make.rules.in | 2 +- tools/makedep.c | 57 ++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ee8754b..6ba20df 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -203,7 +203,7 @@ # Rules for dependencies cd `dirname $@` && $(MAKE) depend depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) - $(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) + $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(INCLUDES) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/tools/makedep.c b/tools/makedep.c index fa3555b..dd12380 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -60,7 +60,9 @@ typedef struct _INCL_PATH static struct list paths = LIST_INIT(paths); -static const char *SrcDir = NULL; +static const char *src_dir; +static const char *top_src_dir; +static const char *top_obj_dir; static const char *OutputFileName = "Makefile"; static const char *Separator = "### Dependencies"; static const char *ProgramName; @@ -71,6 +73,8 @@ static const char Usage[] = "Options:\n" " -Idir Search for include files in directory 'dir'\n" " -Cdir Search for source files in directory 'dir'\n" + " -Sdir Set the top source directory\n" + " -Sdir Set the top object directory\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n" " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; @@ -299,10 +303,10 @@ static FILE *open_src_file( INCL_FILE *p return file; } /* now try in source dir */ - if (SrcDir) + if (src_dir) { - pFile->filename = xmalloc( strlen(SrcDir) + strlen(pFile->name) + 2 ); - strcpy( pFile->filename, SrcDir ); + pFile->filename = xmalloc( strlen(src_dir) + strlen(pFile->name) + 2 ); + strcpy( pFile->filename, src_dir ); strcat( pFile->filename, "/" ); strcat( pFile->filename, pFile->name ); file = fopen( pFile->filename, "r" ); @@ -580,8 +584,13 @@ static void parse_option( const char *op if (opt[2]) add_include_path( opt + 2 ); break; case 'C': - if (opt[2]) SrcDir = opt + 2; - else SrcDir = NULL; + src_dir = opt + 2; + break; + case 'S': + top_src_dir = opt + 2; + break; + case 'T': + top_obj_dir = opt + 2; break; case 'f': if (opt[2]) OutputFileName = opt + 2; @@ -604,18 +613,40 @@ static void parse_option( const char *op int main( int argc, char *argv[] ) { INCL_FILE *pFile; + INCL_PATH *path, *next; + int i, j; ProgramName = argv[0]; - while (argc > 1) + + i = 1; + while (i < argc) { - if (*argv[1] == '-') parse_option( argv[1] ); - else + if (argv[i][0] == '-') + { + parse_option( argv[i] ); + for (j = i; j < argc; j++) argv[j] = argv[j+1]; + argc--; + } + else i++; + } + + /* get rid of absolute paths that don't point into the source dir */ + LIST_FOR_EACH_ENTRY_SAFE( path, next, &paths, INCL_PATH, entry ) + { + if (path->name[0] != '/') continue; + if (top_src_dir) { - pFile = add_src_file( argv[1] ); - parse_file( pFile, 1 ); + if (!strncmp( path->name, top_src_dir, strlen(top_src_dir) )) continue; + if (path->name[strlen(top_src_dir)] == '/') continue; } - argc--; - argv++; + list_remove( &path->entry ); + free( path ); + } + + for (i = 1; i < argc; i++) + { + pFile = add_src_file( argv[i] ); + parse_file( pFile, 1 ); } LIST_FOR_EACH_ENTRY( pFile, &includes, INCL_FILE, entry ) parse_file( pFile, 0 ); if (!list_empty( &sources )) output_dependencies();

1 0

Alexandre Julliard : makedep: Get rid of restrictions on line lengths. Merge lines that end in a backslash.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: b7ef1b2e203d67e3849badc3e44f6f162b56f718 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7ef1b2e203d67e3849badc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 12:16:29 2006 +0200 makedep: Get rid of restrictions on line lengths. Merge lines that end in a backslash. --- tools/makedep.c | 88 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 71 insertions(+), 17 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 268fdb3..fa3555b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -22,6 +22,7 @@ #include "config.h" #define NO_LIBWINE_PORT #include "wine/port.h" +#include <assert.h> #include <ctype.h> #include <errno.h> #include <stdio.h> @@ -63,6 +64,7 @@ static const char *SrcDir = NULL; static const char *OutputFileName = "Makefile"; static const char *Separator = "### Dependencies"; static const char *ProgramName; +static int input_line; static const char Usage[] = "Usage: %s [options] [files]\n" @@ -89,7 +91,7 @@ static void fatal_error( const char *msg /******************************************************************* * xmalloc */ -static void *xmalloc( int size ) +static void *xmalloc( size_t size ) { void *res; if (!(res = malloc (size ? size : 1))) @@ -99,6 +101,18 @@ static void *xmalloc( int size ) /******************************************************************* + * xrealloc + */ +void *xrealloc (void *ptr, size_t size) +{ + void *res; + assert( size ); + if (!(res = realloc( ptr, size ))) + fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + return res; +} + +/******************************************************************* * xstrdup */ static char *xstrdup( const char *str ) @@ -121,6 +135,50 @@ static char *get_extension( char *filena /******************************************************************* + * get_line + */ +static char *get_line( FILE *file ) +{ + static char *buffer; + static unsigned int size; + + if (!size) + { + size = 1024; + buffer = xmalloc( size ); + } + if (!fgets( buffer, size, file )) return NULL; + input_line++; + + for (;;) + { + char *p = buffer + strlen(buffer); + /* if line is larger than buffer, resize buffer */ + while (p == buffer + size - 1 && p[-1] != '\n') + { + buffer = xrealloc( buffer, size * 2 ); + fgets( buffer + size - 1, size + 1, file ); + p = buffer + strlen(buffer); + size *= 2; + } + if (p > buffer && p[-1] == '\n') + { + *(--p) = 0; + if (p > buffer && p[-1] == '\r') *(--p) = 0; + if (p > buffer && p[-1] == '\\') + { + *(--p) = 0; + /* line ends in backslash, read continuation line */ + fgets( p, size - (p - buffer), file ); + input_line++; + continue; + } + } + return buffer; + } +} + +/******************************************************************* * is_generated * * Test if a given file type is generated during the make process @@ -319,15 +377,13 @@ static FILE *open_include_file( INCL_FIL */ static void parse_idl_file( INCL_FILE *pFile, FILE *file ) { - char buffer[1024]; - char *include; - int line = 0; + char *buffer, *include; - while (fgets( buffer, sizeof(buffer)-1, file )) + input_line = 0; + while ((buffer = get_line( file ))) { char quote; char *p = buffer; - line++; while (*p && isspace(*p)) p++; if (!strncmp( p, "import", 6 )) @@ -351,9 +407,9 @@ static void parse_idl_file( INCL_FILE *p include = p; while (*p && (*p != quote)) p++; if (!*p) fatal_error( "%s:%d: Malformed #include or import directive\n", - pFile->filename, line ); + pFile->filename, input_line ); *p = 0; - add_include( pFile, include, line, (quote == '>') ); + add_include( pFile, include, input_line, (quote == '>') ); } } @@ -362,15 +418,13 @@ static void parse_idl_file( INCL_FILE *p */ static void parse_c_file( INCL_FILE *pFile, FILE *file ) { - char buffer[1024]; - char *include; - int line = 0; + char *buffer, *include; - while (fgets( buffer, sizeof(buffer)-1, file )) + input_line = 0; + while ((buffer = get_line( file ))) { char quote; char *p = buffer; - line++; while (*p && isspace(*p)) p++; if (*p++ != '#') continue; while (*p && isspace(*p)) p++; @@ -383,9 +437,9 @@ static void parse_c_file( INCL_FILE *pFi include = p; while (*p && (*p != quote)) p++; if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", - pFile->filename, line ); + pFile->filename, input_line ); *p = 0; - add_include( pFile, include, line, (quote == '>') ); + add_include( pFile, include, input_line, (quote == '>') ); } } @@ -485,11 +539,11 @@ static void output_dependencies(void) INCL_FILE *pFile; int i, column; FILE *file = NULL; - char buffer[1024]; + char *buffer; if (Separator && ((file = fopen( OutputFileName, "r+" )))) { - while (fgets( buffer, sizeof(buffer), file )) + while ((buffer = get_line( file ))) if (!strncmp( buffer, Separator, strlen(Separator) )) break; ftruncate( fileno(file), ftell(file) ); fseek( file, 0L, SEEK_END );

1 0

Alexandre Julliard : makedep: Convert to standard Wine lists.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: f25c4d47d64d2482324c4a2130e3242f7bc145d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f25c4d47d64d2482324c4a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 12:13:57 2006 +0200 makedep: Convert to standard Wine lists. --- tools/makedep.c | 65 ++++++++++++++++++++++++++----------------------------- 1 files changed, 31 insertions(+), 34 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1945404..268fdb3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -23,6 +23,7 @@ #define NO_LIBWINE_PORT #include "wine/port.h" #include <ctype.h> +#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -30,13 +31,14 @@ #include <string.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#include "wine/list.h" /* Max first-level includes per file */ #define MAX_INCLUDES 200 typedef struct _INCL_FILE { - struct _INCL_FILE *next; + struct list entry; char *name; char *filename; struct _INCL_FILE *included_by; /* file that included this one */ @@ -46,16 +48,16 @@ typedef struct _INCL_FILE struct _INCL_FILE *files[MAX_INCLUDES]; } INCL_FILE; -static INCL_FILE *firstSrc; -static INCL_FILE *firstInclude; +static struct list sources = LIST_INIT(sources); +static struct list includes = LIST_INIT(includes); typedef struct _INCL_PATH { - struct _INCL_PATH *next; - const char *name; + struct list entry; + const char *name; } INCL_PATH; -static INCL_PATH *firstPath; +static struct list paths = LIST_INIT(paths); static const char *SrcDir = NULL; static const char *OutputFileName = "Makefile"; @@ -143,10 +145,7 @@ static int is_generated( const char *nam static void add_include_path( const char *name ) { INCL_PATH *path = xmalloc( sizeof(*path) ); - INCL_PATH **p = &firstPath; - while (*p) p = &(*p)->next; - *p = path; - path->next = NULL; + list_add_tail( &paths, &path->entry ); path->name = name; } @@ -158,12 +157,10 @@ static void add_include_path( const char */ static INCL_FILE *add_src_file( const char *name ) { - INCL_FILE **p = &firstSrc; INCL_FILE *file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); - while (*p) p = &(*p)->next; - *p = file; + list_add_tail( &sources, &file->entry ); return file; } @@ -175,7 +172,7 @@ static INCL_FILE *add_src_file( const ch */ static INCL_FILE *add_include( INCL_FILE *pFile, const char *name, int line, int system ) { - INCL_FILE **p = &firstInclude; + INCL_FILE *include; char *ext; int pos; @@ -214,18 +211,19 @@ static INCL_FILE *add_include( INCL_FILE pFile->filename, line ); } - while (*p && strcmp( name, (*p)->name )) p = &(*p)->next; - if (!*p) - { - *p = xmalloc( sizeof(INCL_FILE) ); - memset( *p, 0, sizeof(INCL_FILE) ); - (*p)->name = xstrdup(name); - (*p)->included_by = pFile; - (*p)->included_line = line; - (*p)->system = system || pFile->system; - } - pFile->files[pos] = *p; - return *p; + LIST_FOR_EACH_ENTRY( include, &includes, INCL_FILE, entry ) + if (!strcmp( name, include->name )) goto found; + + include = xmalloc( sizeof(INCL_FILE) ); + memset( include, 0, sizeof(INCL_FILE) ); + include->name = xstrdup(name); + include->included_by = pFile; + include->included_line = line; + include->system = system || pFile->system; + list_add_tail( &includes, &include->entry ); +found: + pFile->files[pos] = include; + return include; } @@ -268,7 +266,9 @@ static FILE *open_include_file( INCL_FIL FILE *file = NULL; INCL_PATH *path; - for (path = firstPath; path; path = path->next) + errno = ENOENT; + + LIST_FOR_EACH_ENTRY( path, &paths, INCL_PATH, entry ) { char *filename = xmalloc(strlen(path->name) + strlen(pFile->name) + 2); strcpy( filename, path->name ); @@ -301,9 +301,7 @@ static FILE *open_include_file( INCL_FIL if (!file) { if (pFile->included_by->system) return NULL; /* ignore if included by a system file */ - if (firstPath) perror( pFile->name ); - else fprintf( stderr, "%s: %s: File not found\n", - ProgramName, pFile->name ); + perror( pFile->name ); while (pFile->included_by) { fprintf( stderr, " %s was first included from %s:%d\n", @@ -504,7 +502,7 @@ static void output_dependencies(void) exit(1); } } - for( pFile = firstSrc; pFile; pFile = pFile->next) + LIST_FOR_EACH_ENTRY( pFile, &sources, INCL_FILE, entry ) { column = 0; output_src( file, pFile, &column ); @@ -565,8 +563,7 @@ int main( int argc, char *argv[] ) argc--; argv++; } - for (pFile = firstInclude; pFile; pFile = pFile->next) - parse_file( pFile, 0 ); - if( firstSrc ) output_dependencies(); + LIST_FOR_EACH_ENTRY( pFile, &includes, INCL_FILE, entry ) parse_file( pFile, 0 ); + if (!list_empty( &sources )) output_dependencies(); return 0; }

1 0

Robert Shearman : msxml3: Add progids for MSXML.DOMDocument and MSXML. FreeThreadedDOMDocument.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 2afa60205981a181d31c55f7f9aa017a286c35b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2afa60205981a181d31c55f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:20:30 2006 +0100 msxml3: Add progids for MSXML.DOMDocument and MSXML.FreeThreadedDOMDocument. Don't delete the progid key when unregistering coclasses - this is now done in unregister_progids. --- dlls/msxml3/regsvr.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 76d8a8a..570a3e8 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -342,11 +342,6 @@ static HRESULT unregister_coclasses(stru StringFromGUID2(list->clsid, buf, 39); res = recursive_delete_keyW(coclass_key, buf); if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } } error_close_coclass_key: @@ -589,6 +584,11 @@ static struct progid const progid_list[] &CLSID_DOMDocument, NULL }, + { "MSXML.DOMDocument", + "XML DOM Document", + &CLSID_DOMDocument, + "Microsoft.XMLDOM.1.0" + }, { "Microsoft.FreeThreadedXMLDOM", "Free threaded XML DOM Document", &CLSID_DOMFreeThreadedDocument, @@ -599,6 +599,11 @@ static struct progid const progid_list[] &CLSID_DOMFreeThreadedDocument, NULL }, + { "MSXML.FreeThreadedDOMDocument", + "Free threaded XML DOM Document", + &CLSID_DOMFreeThreadedDocument, + "Microsoft.FreeThreadedXMLDOM.1.0" + }, { "Microsoft.XMLHTTP", "XML HTTP Request", &CLSID_XMLHTTPRequest,

1 0

Robert Shearman : msxml3: Separate the writing of progids from the writing of classes.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 1933135f0d41972cd7d2b5ca440b74c87bfd5056 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1933135f0d41972cd7d2b5c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:20:06 2006 +0100 msxml3: Separate the writing of progids from the writing of classes. This allows writing multiple progids that refer to one class. Support writing out Version and VersionIndependentProgId keys for classes. --- dlls/msxml3/regsvr.c | 187 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 162 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index eafeeac..76d8a8a 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -66,13 +66,24 @@ struct regsvr_coclass LPCSTR ips; /* can be NULL to omit */ LPCSTR ips32; /* can be NULL to omit */ LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ + LPCSTR version; /* can be NULL to omit */ }; static HRESULT register_coclasses(struct regsvr_coclass const *list); static HRESULT unregister_coclasses(struct regsvr_coclass const *list); +struct progid +{ + LPCSTR name; /* NULL for end of list */ + LPCSTR description; /* can be NULL to omit */ + CLSID const *clsid; + LPCSTR curver; /* can be NULL to omit */ +}; + +static HRESULT register_progids(struct progid const *list); +static HRESULT unregister_progids(struct progid const *list); + /*********************************************************************** * static string constants */ @@ -99,6 +110,14 @@ static WCHAR const ips32_keyname[15] = { '3', '2', 0 }; static WCHAR const progid_keyname[7] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const versionindependentprogid_keyname[] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', + 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const version_keyname[] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; +static WCHAR const curver_keyname[] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; /*********************************************************************** @@ -260,26 +279,37 @@ static HRESULT register_coclasses(struct if (res != ERROR_SUCCESS) goto error_close_clsid_key; } - if (list->clsid_str) { - res = register_key_defvalueA(clsid_key, clsid_keyname, - list->clsid_str); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - if (list->progid) { - HKEY progid_key; - + char *buffer = NULL; + LPCSTR progid; + + if (list->version) { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(list->progid) + strlen(list->version) + 2); + if (!buffer) { + res = ERROR_OUTOFMEMORY; + goto error_close_clsid_key; + } + strcpy(buffer, list->progid); + strcat(buffer, "."); + strcat(buffer, list->version); + progid = buffer; + } else + progid = list->progid; res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); + progid); + HeapFree(GetProcessHeap(), 0, buffer); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; + if (list->version) { + res = register_key_defvalueA(clsid_key, versionindependentprogid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + } - res = register_key_defvalueW(progid_key, clsid_keyname, buf); - RegCloseKey(progid_key); + if (list->version) { + res = register_key_defvalueA(clsid_key, version_keyname, + list->version); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -326,6 +356,58 @@ error_return: } /*********************************************************************** + * register_progids + */ +static HRESULT register_progids(struct progid const *list) +{ + LONG res = ERROR_SUCCESS; + + for (; res == ERROR_SUCCESS && list->name; ++list) { + WCHAR buf[39]; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->name, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->description, + strlen(list->description) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + if (list->curver) { + res = register_key_defvalueA(progid_key, curver_keyname, list->curver); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(progid_key); + } + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_progids + */ +static HRESULT unregister_progids(struct progid const *list) +{ + LONG res = ERROR_SUCCESS; + + for (; res == ERROR_SUCCESS && list->name; ++list) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->name); + } + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** * regsvr_key_guid */ static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) @@ -449,39 +531,38 @@ static struct regsvr_coclass const cocla NULL, "msxml3.dll", "Both", - "XML DOM Document", - "Microsoft.XMLDOM" + "Microsoft.XMLDOM", + "1.0" }, { &CLSID_DOMFreeThreadedDocument, "Free threaded XML DOM Document", NULL, "msxml3.dll", "Free", - "Free threaded XML DOM Document", - "Microsoft.FreeThreadedXMLDOM" + "Microsoft.FreeThreadedXMLDOM", + "1.0" }, { &CLSID_XMLHTTPRequest, "XML HTTP Request", NULL, "msxml3.dll", "Apartment", - "XML HTTP Request", - "Microsoft.XMLHTTP" + "Microsoft.XMLHTTP", + "1.0" }, { &CLSID_XMLDSOControl, "XML Data Source Object", NULL, "msxml3.dll", "Apartment", - "XML Data Source Object", - "Microsoft.XMLDSO" + "Microsoft.XMLDSO", + "1.0" }, { &CLSID_XMLDocument, "Msxml", NULL, "msxml3.dll", "Both", - "Msxml", "Msxml" }, { NULL } /* list terminator */ @@ -495,6 +576,58 @@ static struct regsvr_interface const int }; /*********************************************************************** + * progid list + */ +static struct progid const progid_list[] = { + { "Microsoft.XMLDOM", + "XML DOM Document", + &CLSID_DOMDocument, + "Microsoft.XMLDOM.1.0" + }, + { "Microsoft.XMLDOM.1.0", + "XML DOM Document", + &CLSID_DOMDocument, + NULL + }, + { "Microsoft.FreeThreadedXMLDOM", + "Free threaded XML DOM Document", + &CLSID_DOMFreeThreadedDocument, + "Microsoft.FreeThreadedXMLDOM.1.0" + }, + { "Microsoft.FreeThreadedXMLDOM.1.0", + "Free threaded XML DOM Document", + &CLSID_DOMFreeThreadedDocument, + NULL + }, + { "Microsoft.XMLHTTP", + "XML HTTP Request", + &CLSID_XMLHTTPRequest, + "Microsoft.XMLHTTP.1.0" + }, + { "Microsoft.XMLHTTP.1.0", + "XML HTTP Request", + &CLSID_XMLHTTPRequest, + NULL + }, + { "Microsoft.XMLDSO", + "XML Data Source Object", + &CLSID_XMLDSOControl, + "Microsoft.XMLDSO.1.0" + }, + { "Microsoft.XMLDSO.1.0", + "XML Data Source Object", + &CLSID_XMLDSOControl, + NULL + }, + { "Msxml", + "Msxml", + &CLSID_XMLDocument, + NULL + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** * DllRegisterServer (OLEAUT32.@) */ HRESULT WINAPI DllRegisterServer(void) @@ -506,6 +639,8 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = register_progids(progid_list); return hr; } @@ -521,5 +656,7 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = unregister_progids(progid_list); return hr; }

1 0

Michael Stefaniuc : kernel: Wsign-compare warning fix.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: cd5072f89c088aa6e9eda8f0b7fa7831a8f572c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd5072f89c088aa6e9eda8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 28 00:00:06 2006 +0200 kernel: Wsign-compare warning fix. --- dlls/kernel/format_msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c index 26ffcec..ecca98b 100644 --- a/dlls/kernel/format_msg.c +++ b/dlls/kernel/format_msg.c @@ -181,7 +181,7 @@ #if defined(__i386__) || defined(__sparc #define ADD_TO_T(c) do { \ *t++=c;\ - if (t-target == talloced) {\ + if ((DWORD)(t-target) == talloced) {\ target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ t = target+talloced;\ talloced*=2;\ @@ -395,7 +395,7 @@ #if defined(__i386__) || defined(__sparc #define ADD_TO_T(c) do {\ *t++=c;\ - if (t-target == talloced) {\ + if ((DWORD)(t-target) == talloced) {\ target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ t = target+talloced;\ talloced*=2;\

1 0

Robert Reif : advapi32: LsaQueryInformationPolicy update.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 3879fef21d505783c7e8ce362928b4504971c26f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3879fef21d505783c7e8ce3… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jul 31 17:53:32 2006 -0400 advapi32: LsaQueryInformationPolicy update. Update LsaQueryInformationPolicy to use correct computer name and SID. Add support for PolicyDnsDomainInformation. --- dlls/advapi32/lsa.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 62b2075..44ae295 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -394,10 +394,9 @@ NTSTATUS WINAPI LsaQueryInformationPolic { POLICY_PRIMARY_DOMAIN_INFO ppdi; SID sid; + DWORD padding[3]; }; - SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; - struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); HKEY key; BOOL useDefault = TRUE; @@ -431,15 +430,111 @@ NTSTATUS WINAPI LsaQueryInformationPolic RegCloseKey(key); } if (useDefault) - RtlCreateUnicodeStringFromAsciiz(&(xdi->ppdi.Name), "DOMAIN"); - + { + DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; + LPWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); + if (GetComputerNameW(buf, &dwSize)) + { + xdi->ppdi.Name.Buffer = buf; + xdi->ppdi.Name.Length = dwSize * sizeof(WCHAR); + } + } + TRACE("setting domain to %s\n", debugstr_w(xdi->ppdi.Name.Buffer)); - + xdi->ppdi.Sid = &(xdi->sid); - xdi->sid.Revision = SID_REVISION; - xdi->sid.SubAuthorityCount = 1; - xdi->sid.IdentifierAuthority = localSidAuthority; - xdi->sid.SubAuthority[0] = SECURITY_LOCAL_SYSTEM_RID; + + /* read the computer SID from the registry */ + if (!ADVAPI_GetComputerSid(&(xdi->sid))) + { + SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; + + xdi->sid.Revision = SID_REVISION; + xdi->sid.SubAuthorityCount = 4; + xdi->sid.IdentifierAuthority = localSidAuthority; + xdi->sid.SubAuthority[0] = SECURITY_NT_NON_UNIQUE; + xdi->sid.SubAuthority[1] = 0; + xdi->sid.SubAuthority[2] = 0; + xdi->sid.SubAuthority[3] = 0; + } + + TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + + *Buffer = xdi; + } + break; + case PolicyDnsDomainInformation: /* 12 (0xc) */ + { + struct di + { + POLICY_DNS_DOMAIN_INFO pddi; + SID sid; + DWORD padding[3]; + }; + + struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); + HKEY key; + BOOL useDefault = TRUE; + LONG ret; + + if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, + KEY_READ, &key)) == ERROR_SUCCESS) + { + DWORD size = 0; + static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; + + ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); + if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) + { + xdi->pddi.Name.Buffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, size); + + if ((ret = RegQueryValueExW(key, wg, NULL, NULL, + (LPBYTE)xdi->pddi.Name.Buffer, &size)) == ERROR_SUCCESS) + { + xdi->pddi.Name.Length = (USHORT)size; + useDefault = FALSE; + } + else + { + HeapFree(GetProcessHeap(), 0, xdi->pddi.Name.Buffer); + xdi->pddi.Name.Buffer = NULL; + } + } + RegCloseKey(key); + } + if (useDefault) + { + DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; + LPWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); + if (GetComputerNameW(buf, &dwSize)) + { + xdi->pddi.Name.Buffer = buf; + xdi->pddi.Name.Length = dwSize * sizeof(WCHAR); + } + } + + TRACE("setting domain to %s\n", debugstr_w(xdi->pddi.Name.Buffer)); + + xdi->pddi.Sid = &(xdi->sid); + + /* read the computer SID from the registry */ + if (!ADVAPI_GetComputerSid(&(xdi->sid))) + { + SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; + + xdi->sid.Revision = SID_REVISION; + xdi->sid.SubAuthorityCount = 4; + xdi->sid.IdentifierAuthority = localSidAuthority; + xdi->sid.SubAuthority[0] = SECURITY_NT_NON_UNIQUE; + xdi->sid.SubAuthority[1] = 0; + xdi->sid.SubAuthority[2] = 0; + xdi->sid.SubAuthority[3] = 0; + } + + TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + *Buffer = xdi; } break; @@ -451,7 +546,6 @@ NTSTATUS WINAPI LsaQueryInformationPolic case PolicyModificationInformation: case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: - case PolicyDnsDomainInformation: { FIXME("category not implemented\n"); return STATUS_UNSUCCESSFUL;

1 0

Mike McCormack : hlink: Add a short test case.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: a430db9e39f4c875fbebf54d1ad87adf19c17e5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a430db9e39f4c875fbebf54… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 02:19:15 2006 +0900 hlink: Add a short test case. --- configure | 3 +- configure.ac | 1 + dlls/.gitignore | 1 + dlls/Makefile.in | 4 ++ dlls/hlink/Makefile.in | 3 ++ dlls/hlink/tests/Makefile.in | 14 ++++++++ dlls/hlink/tests/hlink.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 97 insertions(+), 1 deletions(-) create mode 100644 dlls/hlink/tests/Makefile.in create mode 100644 dlls/hlink/tests/hlink.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a430db9e39f4c875fbe…

1 0