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 Oct. 15, 2009

Oct. 15, 2009

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: Maintain a list of fake dlls that have been created already.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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 : kernel32: Use the PWD variable to set the initial current directory.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 87894c5f7b5d95d74ae01693dbba25386e872516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87894c5f7b5d95d74ae01693d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 12:05:55 2009 +0200 kernel32: Use the PWD variable to set the initial current directory. --- dlls/kernel32/process.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eca9e38..7f0a218 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -759,6 +759,7 @@ static BOOL build_command_line( WCHAR **argv ) static void init_current_directory( CURDIR *cur_dir ) { UNICODE_STRING dir_str; + const char *pwd; char *cwd; int size; @@ -781,13 +782,25 @@ static void init_current_directory( CURDIR *cur_dir ) break; } + /* try to use PWD if it is valid, so that we don't resolve symlinks */ + + pwd = getenv( "PWD" ); if (cwd) { + struct stat st1, st2; + + if (!pwd || stat( pwd, &st1 ) == -1 || + (!stat( cwd, &st2 ) && (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino))) + pwd = cwd; + } + + if (pwd) + { WCHAR *dirW; - int lenW = MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, NULL, 0 ); + int lenW = MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, NULL, 0 ); if ((dirW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { - MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, dirW, lenW ); + MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, dirW, lenW ); RtlInitUnicodeString( &dir_str, dirW ); RtlSetCurrentDirectory_U( &dir_str ); RtlFreeUnicodeString( &dir_str );

1 0

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

Oct. 15, 2009

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

Charles Davis : ntdll: Shorten an ERR message and change it to a FIXME.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: a54ba8712f20f614c7b39c742981cd6c682fca8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54ba8712f20f614c7b39c742… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 14 10:46:53 2009 -0600 ntdll: Shorten an ERR message and change it to a FIXME. --- dlls/ntdll/cdrom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index b5f2365..94faf13 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1018,7 +1018,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA /* We need IOCDAudioControl for IOCTL_CDROM_CURRENT_POSITION */ if (fmt->Format == IOCTL_CDROM_CURRENT_POSITION) { - ERR("This version of Mac OS X does not support IOCDAudioControl\n"); + FIXME("NIY\n"); return STATUS_NOT_SUPPORTED; } /* No IOCDAudioControl support; just set the audio status to none */

1 0

Charles Davis : ntdll: Use the parent device for everything when processing a storage IOCTL request on Mac OS .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 895be2b0f84dc02098fa623b068cbff34a1c6075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895be2b0f84dc02098fa623b0… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 14 10:46:46 2009 -0600 ntdll: Use the parent device for everything when processing a storage IOCTL request on Mac OS. --- dlls/ntdll/cdrom.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index c0389f9..b5f2365 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2334,6 +2334,31 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, goto error; } +#ifdef __APPLE__ + { + char name[100]; + + /* This is ugly as hell, but Mac OS is unable to do anything from the + * partition fd, it wants an fd for the whole device, and it sometimes + * also requires the device fd to be closed first, so we have to close + * the handle that the caller gave us. + * Also for some reason it wants the fd to be closed before we even + * open the parent if we're trying to eject the disk. + */ + if ((status = get_parent_device( fd, name, sizeof(name) ))) goto error; + if (dwIoControlCode == IOCTL_STORAGE_EJECT_MEDIA) + NtClose( hDevice ); + if (needs_close) close( fd ); + TRACE("opening parent %s\n", name ); + if ((fd = open( name, O_RDONLY )) == -1) + { + status = FILE_GetNtStatus(); + goto error; + } + needs_close = 1; + } +#endif + switch (dwIoControlCode) { case IOCTL_STORAGE_CHECK_VERIFY: @@ -2365,28 +2390,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, if (lpInBuffer != NULL || nInBufferSize != 0 || lpOutBuffer != NULL || nOutBufferSize != 0) status = STATUS_INVALID_PARAMETER; else - { -#ifdef __APPLE__ - char name[100]; - - /* This is ugly as hell, but Mac OS is unable to eject from the device fd, - * it wants an fd for the whole device, and it also requires the device fd - * to be closed first, so we have to close the handle that the caller gave us. - * Also for some reason it wants the fd to be closed before we even open the parent. - */ - if ((status = get_parent_device( fd, name, sizeof(name) ))) break; - NtClose( hDevice ); - if (needs_close) close( fd ); - TRACE("opening parent %s\n", name ); - if ((fd = open( name, O_RDONLY )) == -1) - { - status = FILE_GetNtStatus(); - break; - } - needs_close = 1; -#endif status = CDROM_SetTray(fd, TRUE); - } break; case IOCTL_CDROM_MEDIA_REMOVAL:

1 0

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

Oct. 15, 2009

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

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

Oct. 15, 2009

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

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

Oct. 15, 2009

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 Oct. 15, 2009

Oct. 15, 2009

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