October 2009 - Wine-commits

Alexandre Julliard : setupapi: Use a global buffer to read fake dll files and free it only once we are done with all the fake dlls .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 11d66a87887d6155850c1f5f0c889bfefe6add87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d66a87887d6155850c1f5f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 12:20:14 2009 +0200 setupapi: Use a global buffer to read fake dll files and free it only once we are done with all the fake dlls. --- dlls/setupapi/fakedll.c | 86 ++++++++++++++++++++++++------------- dlls/setupapi/install.c | 1 + dlls/setupapi/setupapi_private.h | 1 + 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8613ca3..903fd23 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -50,6 +50,9 @@ static const char fakedll_signature[] = "Wine placeholder DLL"; static const unsigned int file_alignment = 512; static const unsigned int section_alignment = 4096; +static void *file_buffer; +static size_t file_buffer_size; + struct dll_info { HANDLE handle; @@ -105,6 +108,39 @@ static inline void add_directory( struct dll_info *info, unsigned int idx, DWORD info->nt->OptionalHeader.DataDirectory[idx].Size = size; } +/* read in the contents of a file into the global file buffer */ +/* return 1 on success, 0 on nonexistent file, -1 on other error */ +static int read_file( const char *name, void **data, size_t *size ) +{ + static char static_file_buffer[4096]; + struct stat st; + void *buffer = static_file_buffer; + int fd, ret = -1; + + if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return 0; + if (fstat( fd, &st ) == -1) goto done; + *size = st.st_size; + if (st.st_size > sizeof(static_file_buffer)) + { + if (!file_buffer || st.st_size > file_buffer_size) + { + HeapFree( GetProcessHeap(), 0, file_buffer ); + if (!(file_buffer = HeapAlloc( GetProcessHeap(), 0, st.st_size ))) goto done; + file_buffer_size = st.st_size; + } + buffer = file_buffer; + } + + if (pread( fd, buffer, st.st_size, 0 ) == st.st_size) + { + *data = buffer; + ret = 1; + } +done: + close( fd ); + return ret; +} + /* build a complete fake dll from scratch */ static BOOL build_fake_dll( HANDLE file ) { @@ -238,15 +274,15 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) } /* try to load a pre-compiled fake dll */ -static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, unsigned int buf_size ) +static void *load_fake_dll( const WCHAR *name, size_t *size ) { const char *build_dir = wine_get_build_dir(); const char *path; - struct stat st; - char *file, *ptr, *buffer = NULL; + char *file, *ptr; + void *data = NULL; unsigned int i, pos, len, namelen, maxlen = 0; WCHAR *p; - int fd; + int res = 0; if ((p = strrchrW( name, '\\' ))) name = p + 1; @@ -280,7 +316,7 @@ static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, un ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; + if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -289,7 +325,7 @@ static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, un ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; + if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; @@ -297,31 +333,13 @@ static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, un { ptr = prepend( file + pos, "/fakedlls", sizeof("/fakedlls") - 1 ); ptr = prepend( ptr, path, strlen(path) ); - if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; - } - goto done; - -found: - if (!fstat( fd, &st )) - { - *size = st.st_size; - if (st.st_size <= buf_size) buffer = buf; - else buffer = HeapAlloc( GetProcessHeap(), 0, st.st_size ); - if (buffer) - { - if (read( fd, buffer, st.st_size ) != st.st_size) - { - if (buffer != buf) HeapFree( GetProcessHeap(), 0, buffer ); - buffer = NULL; - } - else TRACE( "found %s %u bytes\n", ptr, *size); - } + if ((res = read_file( ptr, &data, size ))) break; } - close( fd ); done: HeapFree( GetProcessHeap(), 0, file ); - return buffer; + if (res == 1) return data; + return NULL; } /*********************************************************************** @@ -332,7 +350,6 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) HANDLE h; BOOL ret; unsigned int size = 0; - char *temp_buffer[4096]; void *buffer; /* check for empty name which means to only create the directory */ @@ -368,13 +385,12 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } } - if ((buffer = load_fake_dll( source, &size, temp_buffer, sizeof(temp_buffer) ))) + if ((buffer = load_fake_dll( source, &size ))) { DWORD written; ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size); if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); - if (buffer != temp_buffer) HeapFree( GetProcessHeap(), 0, buffer ); } else { @@ -386,3 +402,13 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) if (!ret) DeleteFileW( name ); return ret; } + + +/*********************************************************************** + * cleanup_fake_dlls + */ +void cleanup_fake_dlls(void) +{ + HeapFree( GetProcessHeap(), 0, file_buffer ); + file_buffer = NULL; +} diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index f90c2d8..293f977 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -700,6 +700,7 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) HeapFree( GetProcessHeap(), 0, path ); if (!ret) break; } + cleanup_fake_dlls(); return ret; } diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index e505503..70394e2 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -105,5 +105,6 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, U extern OSVERSIONINFOW OsVersionInfo; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ); +extern void cleanup_fake_dlls(void); #endif /* __SETUPAPI_PRIVATE_H */

1 0

Alexandre Julliard : setupapi: Check that the source is a valid fake dll and skip wrong 32/64 type dlls.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 76a8f0032a159d8968b565d51e1974b6a201844e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a8f0032a159d8968b565d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 13:25:07 2009 +0200 setupapi: Check that the source is a valid fake dll and skip wrong 32/64 type dlls. --- dlls/setupapi/fakedll.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 903fd23..2f9f80c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -116,6 +116,11 @@ static int read_file( const char *name, void **data, size_t *size ) struct stat st; void *buffer = static_file_buffer; int fd, ret = -1; + size_t header_size; + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + const size_t min_size = sizeof(*dos) + sizeof(fakedll_signature) + + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return 0; if (fstat( fd, &st ) == -1) goto done; @@ -131,7 +136,27 @@ static int read_file( const char *name, void **data, size_t *size ) buffer = file_buffer; } - if (pread( fd, buffer, st.st_size, 0 ) == st.st_size) + /* check for valid fake dll file */ + + if (st.st_size < min_size) goto done; + header_size = min( st.st_size, 4096 ); + if (pread( fd, buffer, header_size, 0 ) != header_size) goto done; + dos = buffer; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; + if (dos->e_lfanew < sizeof(fakedll_signature)) goto done; + if (memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) goto done; + if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) + goto done; + nt = (IMAGE_NT_HEADERS *)((char *)buffer + dos->e_lfanew); + if (nt->Signature == IMAGE_NT_SIGNATURE && nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) + { + /* wrong 32/64 type, pretend it doesn't exist */ + ret = 0; + goto done; + } + if (st.st_size == header_size || + pread( fd, (char *)buffer + header_size, + st.st_size - header_size, header_size ) == st.st_size - header_size) { *data = buffer; ret = 1;

1 0

Alexandre Julliard : setupapi: Abstract the creation of the fake dll destination to a separate function.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: d59a4d189459cff999a60b36e7db7f556c292a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59a4d189459cff999a60b36e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 12:25:11 2009 +0200 setupapi: Abstract the creation of the fake dll destination to a separate function. --- dlls/setupapi/fakedll.c | 51 +++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 2f9f80c..4dd88d7 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -367,32 +367,18 @@ done: return NULL; } -/*********************************************************************** - * create_fake_dll - */ -BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) +/* create the fake dll destination file */ +static HANDLE create_dest_file( const WCHAR *name ) { - HANDLE h; - BOOL ret; - unsigned int size = 0; - void *buffer; - - /* check for empty name which means to only create the directory */ - if (name[strlenW(name) - 1] == '\\') - { - create_directories( name ); - return TRUE; - } - /* first check for an existing file */ - h = CreateFileW( name, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); + HANDLE h = CreateFileW( name, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); if (h != INVALID_HANDLE_VALUE) { if (!is_fake_dll( h )) { TRACE( "%s is not a fake dll, not overwriting it\n", debugstr_w(name) ); CloseHandle( h ); - return TRUE; + return 0; } /* truncate the file */ SetFilePointer( h, 0, NULL, FILE_BEGIN ); @@ -404,11 +390,34 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL ); if (h == INVALID_HANDLE_VALUE) - { ERR( "failed to create %s (error=%u)\n", debugstr_w(name), GetLastError() ); - return FALSE; - } } + return h; +} + +/*********************************************************************** + * create_fake_dll + */ +BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) +{ + HANDLE h; + BOOL ret; + size_t size; + const WCHAR *filename; + void *buffer; + + if (!(filename = strrchrW( name, '\\' ))) filename = name; + else filename++; + + /* check for empty name which means to only create the directory */ + if (!filename[0]) + { + create_directories( name ); + return TRUE; + } + + if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ + if (h == INVALID_HANDLE_VALUE) return FALSE; if ((buffer = load_fake_dll( source, &size ))) {

1 0

Alexandre Julliard : setupapi: Maintain a list of fake dlls that have been created already.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: c94e69c7ff58b74709b0ff68afca1adae278ea59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94e69c7ff58b74709b0ff68a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 13:31:24 2009 +0200 setupapi: Maintain a list of fake dlls that have been created already. --- dlls/setupapi/fakedll.c | 75 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 4dd88d7..fa89ace 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -52,6 +52,9 @@ static const unsigned int section_alignment = 4096; static void *file_buffer; static size_t file_buffer_size; +static unsigned int handled_count; +static unsigned int handled_total; +static char **handled_dlls; struct dll_info { @@ -108,6 +111,66 @@ static inline void add_directory( struct dll_info *info, unsigned int idx, DWORD info->nt->OptionalHeader.DataDirectory[idx].Size = size; } +/* convert a dll name W->A without depending on the current codepage */ +static char *dll_name_WtoA( char *nameA, const WCHAR *nameW, unsigned int len ) +{ + unsigned int i; + + for (i = 0; i < len; i++) + { + char c = nameW[i]; + if (nameW[i] > 127) return NULL; + if (c >= 'A' && c <= 'Z') c += 'a' - 'A'; + nameA[i] = c; + } + nameA[i] = 0; + return nameA; +} + +/* add a dll to the list of dll that have been taken care of */ +static BOOL add_handled_dll( const WCHAR *name ) +{ + unsigned int len = strlenW( name ); + int i, min, max, pos, res; + char *nameA; + + if (!(nameA = HeapAlloc( GetProcessHeap(), 0, len + 1 ))) return FALSE; + if (!dll_name_WtoA( nameA, name, len )) goto failed; + + min = 0; + max = handled_count - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( handled_dlls[pos], nameA ); + if (!res) goto failed; /* already in the list */ + if (res < 0) min = pos + 1; + else max = pos - 1; + } + + if (handled_count >= handled_total) + { + char **new_dlls; + unsigned int new_count = max( 64, handled_total * 2 ); + + if (handled_dlls) new_dlls = HeapReAlloc( GetProcessHeap(), 0, handled_dlls, + new_count * sizeof(*handled_dlls) ); + else new_dlls = HeapAlloc( GetProcessHeap(), 0, new_count * sizeof(*handled_dlls) ); + if (!new_dlls) goto failed; + handled_dlls = new_dlls; + handled_total = new_count; + } + + for (i = handled_count; i > min; i--) handled_dlls[i] = handled_dlls[i - 1]; + handled_dlls[i] = nameA; + handled_count++; + return TRUE; + +failed: + HeapFree( GetProcessHeap(), 0, nameA ); + return FALSE; +} + /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ static int read_file( const char *name, void **data, size_t *size ) @@ -320,14 +383,7 @@ static void *load_fake_dll( const WCHAR *name, size_t *size ) len = strlenW( name ); pos = maxlen - len - sizeof(".fake"); - for (i = 0; i < len; i++) - { - /* we don't want to depend on the current codepage here */ - char c = name[i]; - if (name[i] > 127) goto done; - if (c >= 'A' && c <= 'Z') c += 'a' - 'A'; - file[pos + i] = c; - } + if (!dll_name_WtoA( file + pos, name, len )) goto done; file[--pos] = '/'; if (build_dir) @@ -415,6 +471,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) create_directories( name ); return TRUE; } + add_handled_dll( filename ); if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ if (h == INVALID_HANDLE_VALUE) return FALSE; @@ -445,4 +502,6 @@ void cleanup_fake_dlls(void) { HeapFree( GetProcessHeap(), 0, file_buffer ); file_buffer = NULL; + HeapFree( GetProcessHeap(), 0, handled_dlls ); + handled_count = handled_total = 0; }

1 0

Alexandre Julliard : setupapi: Add support for using a wildcard in fake dll creation.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 7acd74ee0743974b5e500f43d340560899ba9eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acd74ee0743974b5e500f43d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 13:53:14 2009 +0200 setupapi: Add support for using a wildcard in fake dll creation. This creates fake dlls for all the files we can't find and that haven't been created already. --- dlls/setupapi/fakedll.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 78 +----------------------------- 2 files changed, 123 insertions(+), 76 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index fa89ace..6397950 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -23,6 +23,9 @@ #include <stdarg.h> #include <fcntl.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -49,6 +52,7 @@ static const char fakedll_signature[] = "Wine placeholder DLL"; static const unsigned int file_alignment = 512; static const unsigned int section_alignment = 4096; +static const unsigned int max_dll_name_len = 64; static void *file_buffer; static size_t file_buffer_size; @@ -127,6 +131,16 @@ static char *dll_name_WtoA( char *nameA, const WCHAR *nameW, unsigned int len ) return nameA; } +/* convert a dll name A->W without depending on the current codepage */ +static WCHAR *dll_name_AtoW( WCHAR *nameW, const char *nameA, unsigned int len ) +{ + unsigned int i; + + for (i = 0; i < len; i++) nameW[i] = nameA[i]; + nameW[i] = 0; + return nameW; +} + /* add a dll to the list of dll that have been taken care of */ static BOOL add_handled_dll( const WCHAR *name ) { @@ -451,6 +465,111 @@ static HANDLE create_dest_file( const WCHAR *name ) return h; } +/* copy a fake dll file to the dest directory */ +static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) +{ + int ret; + size_t size; + void *data; + DWORD written; + WCHAR *destname = dest + strlenW(dest); + char *name = strrchr( file, '/' ) + 1; + char *end = name + strlen(name); + + if (ext) strcpy( end, ext ); + if (!(ret = read_file( file, &data, &size ))) return; + + if (end > name + 2 && !strncmp( end - 2, "16", 2 )) end -= 2; /* remove "16" suffix */ + dll_name_AtoW( destname, name, end - name ); + if (!add_handled_dll( destname )) ret = -1; + + if (ret != -1) + { + HANDLE h = create_dest_file( dest ); + + if (h && h != INVALID_HANDLE_VALUE) + { + TRACE( "%s -> %s\n", debugstr_a(file), debugstr_w(dest) ); + + ret = (WriteFile( h, data, size, &written, NULL ) && written == size); + if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() ); + CloseHandle( h ); + if (!ret) DeleteFileW( dest ); + } + } + *destname = 0; /* restore it for next file */ +} + +/* find and install all fake dlls in a given lib directory */ +static void install_lib_dir( WCHAR *dest, char *file, const char *default_ext ) +{ + DIR *dir; + struct dirent *de; + char *name; + + if (!(dir = opendir( file ))) return; + name = file + strlen(file); + *name++ = '/'; + while ((de = readdir( dir ))) + { + if (strlen( de->d_name ) > max_dll_name_len) continue; + if (!strcmp( de->d_name, "." )) continue; + if (!strcmp( de->d_name, ".." )) continue; + strcpy( name, de->d_name ); + if (default_ext) /* inside build dir */ + { + strcat( name, "/" ); + strcat( name, de->d_name ); + if (!strchr( de->d_name, '.' )) strcat( name, default_ext ); + install_fake_dll( dest, file, ".fake" ); + } + else install_fake_dll( dest, file, NULL ); + } + closedir( dir ); +} + +/* create fake dlls in dirname for all the files we can find */ +static BOOL create_wildcard_dlls( const WCHAR *dirname ) +{ + const char *build_dir = wine_get_build_dir(); + const char *path; + unsigned int i, maxlen = 0; + char *file; + WCHAR *dest; + + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/"); + for (i = 0; (path = wine_dll_enum_load_path(i)); i++) maxlen = max( maxlen, strlen(path) ); + maxlen += 2 * max_dll_name_len + 2 + sizeof(".dll.fake"); + if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen ))) return FALSE; + + if (!(dest = HeapAlloc( GetProcessHeap(), 0, (strlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, file ); + return FALSE; + } + strcpyW( dest, dirname ); + dest[strlenW(dest) - 1] = 0; /* remove wildcard */ + + if (build_dir) + { + strcpy( file, build_dir ); + strcat( file, "/dlls" ); + install_lib_dir( dest, file, ".dll" ); + strcpy( file, build_dir ); + strcat( file, "/programs" ); + install_lib_dir( dest, file, ".exe" ); + } + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + { + strcpy( file, path ); + strcat( file, "/fakedlls" ); + install_lib_dir( dest, file, NULL ); + } + HeapFree( GetProcessHeap(), 0, file ); + HeapFree( GetProcessHeap(), 0, dest ); + return TRUE; +} + /*********************************************************************** * create_fake_dll */ @@ -471,6 +590,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) create_directories( name ); return TRUE; } + if (filename[0] == '*' && !filename[1]) return create_wildcard_dlls( name ); + add_handled_dll( filename ); if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6b6acf9..9f0a2de 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2446,93 +2446,19 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,hh.exe 10,,notepad.exe 10,,regedit.exe +10,,twain.dll,twain.dll16 10,,twain_32.dll 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe -11,,actxprxy.dll -11,,advapi32.dll -11,,advpack.dll -11,,appwiz.cpl -11,,cabinet.dll -11,,cmd.exe -11,,comctl32.dll -11,,comdlg32.dll -11,,control.exe -11,,crypt32.dll -11,,d3d8.dll -11,,d3d9.dll -11,,dbghelp.dll -11,,ddeml.dll,ddeml.dll16 11,,ddhelp.exe -11,,ddraw.dll -11,,dinput8.dll 11,,dosx.exe -11,,dsound.dll 11,,dsound.vxd -11,,dxdiagn.dll -11,,gdi32.dll -11,,glu32.dll -11,,hal.dll -11,,hhctrl.ocx -11,,imaadp32.acm -11,,imagehlp.dll -11,,itircl.dll -11,,itss.dll -11,,kernel32.dll -11,,mapi32.dll -11,,msadp32.acm -11,,msg711.acm -11,,msgsm32.acm -11,,mshtml.dll -11,,msi.dll -11,,msiexec.exe -11,,msvcrt.dll -11,,msxml3.dll 11,,notepad.exe -11,,ntdll.dll -11,,ntoskrnl.exe -11,,ole32.dll -11,,oleaut32.dll -11,,oledlg.dll -11,,olepro32.dll -11,,opengl32.dll -11,,progman.exe -11,,psapi.dll -11,,pstorec.dll -11,,quartz.dll -11,,regsvr32.exe -11,,reg.exe -11,,riched20.dll -11,,riched32.dll -11,,rpcrt4.dll -11,,rsabase.dll -11,,rsaenh.dll -11,,rundll32.exe -11,,schannel.dll -11,,sensapi.dll -11,,setupapi.dll -11,,shdocvw.dll -11,,shell32.dll -11,,shfolder.dll -11,,shlwapi.dll -11,,stdole2.tlb -11,,urlmon.dll -11,,user32.dll -11,,version.dll -11,,windowscodecs.dll -11,,winebrowser.exe 11,,winhlp32.exe -11,,wininet.dll -11,,winmm.dll -11,,winspool.drv -11,,wintab32.dll -11,,winver.exe -11,,wordpad.exe -11,,ws2_32.dll -11,,wsock32.dll 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe +11,,* [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz32.dll"

1 0

Juan Lang : crypt32: Let CRYPT_AsnDecodeArray allocate memory for its callers.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: faa451628a40e7f5b5f7b9733c202875c5b8c1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa451628a40e7f5b5f7b9733… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:09:10 2009 -0700 crypt32: Let CRYPT_AsnDecodeArray allocate memory for its callers. --- dlls/crypt32/decode.c | 204 +++---------------------------------------------- 1 files changed, 12 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faa451628a40e7f5b5f7b…

1 0

Wilfried Pasquazzo : oleaut32/tests: Testcase for IPicture_Render with icons, check for drawing size and position.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 57b55a661de1d31dd07c5fb10a1e88250efc6785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b55a661de1d31dd07c5fb10… Author: Wilfried Pasquazzo <wilfried.pasquazzo(a)gmail.com> Date: Wed Oct 14 18:54:39 2009 +0200 oleaut32/tests: Testcase for IPicture_Render with icons, check for drawing size and position. --- dlls/oleaut32/tests/olepicture.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 2dc1b05..150fcf8 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -594,6 +594,9 @@ static void test_Render(void) HRESULT hres; short type; PICTDESC desc; + OLE_XSIZE_HIMETRIC pWidth; + OLE_YSIZE_HIMETRIC pHeight; + COLORREF result; HDC hdc = GetDC(0); /* test IPicture::Render return code on uninitialized picture */ @@ -646,8 +649,28 @@ static void test_Render(void) ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - IPicture_Release(pic); + /* Check if target size and position is respected */ + IPicture_get_Width(pic, &pWidth); + IPicture_get_Height(pic, &pHeight); + + SetPixelV(hdc, 0, 0, 0x00F0F0F0); + SetPixelV(hdc, 5, 5, 0x00F0F0F0); + SetPixelV(hdc, 10, 10, 0x00F0F0F0); + + IPicture_Render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + + result = GetPixel(hdc, 0, 0); + ok(result == 0x00F0F0F0, + "Color at 0,0 should be unchanged 0xF0F0F0, but was 0x%06X\n", result); + result = GetPixel(hdc, 5, 5); + ok(result != 0x00F0F0F0, + "Color at 5,5 should have changed, but still was 0x%06X\n", result); + result = GetPixel(hdc, 10, 10); + todo_wine ok(result == 0x00F0F0F0, + "Color at 10,10 should be unchanged 0xF0F0F0, but was 0x%06X\n", result); + + IPicture_Release(pic); ReleaseDC(NULL, hdc); }

1 0

Wilfried Pasquazzo : oleaut32: Respect size of icons when drawing with IPicture_Render.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 6a5bd0c2edc6ddb0c13adda93099712613b655e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5bd0c2edc6ddb0c13adda93… Author: Wilfried Pasquazzo <wilfried.pasquazzo(a)gmail.com> Date: Wed Oct 14 19:00:45 2009 +0200 oleaut32: Respect size of icons when drawing with IPicture_Render. --- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/tests/olepicture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 052aa9a..7a5bc29 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -684,7 +684,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, break; case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); - DrawIcon(hdc,x,y,This->desc.u.icon.hicon); + DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); break; case PICTYPE_METAFILE: diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 150fcf8..42f58ae 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -667,7 +667,7 @@ static void test_Render(void) ok(result != 0x00F0F0F0, "Color at 5,5 should have changed, but still was 0x%06X\n", result); result = GetPixel(hdc, 10, 10); - todo_wine ok(result == 0x00F0F0F0, + ok(result == 0x00F0F0F0, "Color at 10,10 should be unchanged 0xF0F0F0, but was 0x%06X\n", result); IPicture_Release(pic);

1 0

Christian Costa : ddraw: Make SetColorKey handle case where dwColorSpaceHighValue < dwColorSpaceLowValue + tests.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: e95ffacde05fc6e0d77c9d2af381b1a99cb0ad3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95ffacde05fc6e0d77c9d2af… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Oct 15 00:06:26 2009 +0200 ddraw: Make SetColorKey handle case where dwColorSpaceHighValue < dwColorSpaceLowValue + tests. --- dlls/ddraw/surface.c | 16 +++++++++++----- dlls/ddraw/tests/dsurface.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3d41d18..bfe83a4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2429,31 +2429,37 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, DDCOLORKEY *CKey) { IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; - struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) CKey, Flags }; + DDCOLORKEY FixedCKey; + struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) (CKey ? &FixedCKey : NULL), Flags }; TRACE("(%p)->(%x,%p)\n", This, Flags, CKey); EnterCriticalSection(&ddraw_cs); if (CKey) { + FixedCKey = *CKey; + /* Handle case where dwColorSpaceHighValue < dwColorSpaceLowValue */ + if (FixedCKey.dwColorSpaceHighValue < FixedCKey.dwColorSpaceLowValue) + FixedCKey.dwColorSpaceHighValue = FixedCKey.dwColorSpaceLowValue; + switch (Flags & ~DDCKEY_COLORSPACE) { case DDCKEY_DESTBLT: - This->surface_desc.ddckCKDestBlt = *CKey; + This->surface_desc.ddckCKDestBlt = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKDESTBLT; break; case DDCKEY_DESTOVERLAY: - This->surface_desc.u3.ddckCKDestOverlay = *CKey; + This->surface_desc.u3.ddckCKDestOverlay = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; break; case DDCKEY_SRCOVERLAY: - This->surface_desc.ddckCKSrcOverlay = *CKey; + This->surface_desc.ddckCKSrcOverlay = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; break; case DDCKEY_SRCBLT: - This->surface_desc.ddckCKSrcBlt = *CKey; + This->surface_desc.ddckCKSrcBlt = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKSRCBLT; break; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c0e84be..1feab9b 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -325,6 +325,37 @@ static void SrcColorKey32BlitTest(void) ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00FF00 && ddsd.ddckCKSrcBlt.dwColorSpaceHighValue == 0x00FF00, "GetSurfaceDesc does not return the colorkey set with SetColorKey\n"); + /* Test SetColorKey with dwColorSpaceHighValue < dwColorSpaceLowValue */ + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x000000; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x000001; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x0000FE; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + IDirectDrawSurface_Release(lpSrc); IDirectDrawSurface_Release(lpDst);

1 0

Colin Fletcher : cmd.exe: Treat tabs as parameter delimiters.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 45905b27db5a3fcd485c0c947ff1246aa85f40cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=45905b27db5a3fcd485c0c947… Author: Colin Fletcher <c0l1n_fl3tch3r(a)yahoo.co.uk> Date: Wed Oct 14 11:22:34 2009 +0100 cmd.exe: Treat tabs as parameter delimiters. --- programs/cmd/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 157ad08..33b54f7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -150,6 +150,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { while (TRUE) { switch (*s) { case ' ': /* Skip leading spaces */ + case '\t': /* Treat tabs as spaces */ s++; break; case '"': @@ -175,7 +176,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { default: /* Only return where if it is for the right parameter */ if (where != NULL && i==n) *where = s; - while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=')) { + while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=') && (*s != '\t')) { *p++ = *s++; } if (i == n && (p!=param)) {

1 0