wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

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: 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: Get rid of the code to build fake dlls from existing modules.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: f1dc1d35a0c72fd18064be26c7fffc269e0299d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dc1d35a0c72fd18064be26c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 17:07:32 2009 +0200 setupapi: Get rid of the code to build fake dlls from existing modules. --- dlls/setupapi/fakedll.c | 120 ++++++++-------------------------------------- 1 files changed, 21 insertions(+), 99 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 1b39d2e..8613ca3 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -105,82 +105,11 @@ static inline void add_directory( struct dll_info *info, unsigned int idx, DWORD info->nt->OptionalHeader.DataDirectory[idx].Size = size; } -/* find the limits of the resource data */ -static void get_resource_data( const IMAGE_RESOURCE_DIRECTORY *dir, const BYTE *root, - DWORD *rva_start, DWORD *rva_end ) -{ - const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - int i; - - entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) - { - const void *ptr = root + entry->u2.s3.OffsetToDirectory; - if (entry->u2.s3.DataIsDirectory) get_resource_data( ptr, root, rva_start, rva_end ); - else - { - const IMAGE_RESOURCE_DATA_ENTRY *data = ptr; - *rva_start = min( *rva_start, data->OffsetToData ); - *rva_end = max( *rva_end, data->OffsetToData + data->Size ); - } - } -} - -/* fixup RVAs of resource data */ -static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int delta ) -{ - IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - int i; - - entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) - { - void *ptr = root + entry->u2.s3.OffsetToDirectory; - if (entry->u2.s3.DataIsDirectory) fixup_resources( ptr, root, delta ); - else - { - IMAGE_RESOURCE_DATA_ENTRY *data = ptr; - if (data->OffsetToData) data->OffsetToData += delta; - } - } -} - -/* add version resources to the dll by copying them from the source module */ -static BOOL add_version_resource( HMODULE module, struct dll_info *dll_info ) -{ - BOOL ret = FALSE; - DWORD rva_start = ~0U, rva_end = 0, dir_size, total_size; - const IMAGE_RESOURCE_DIRECTORY *basedir; - const BYTE *data_start, *root; - BYTE *buffer; - - if (!module) return TRUE; - if (LdrFindResourceDirectory_U( module, NULL, 0, &basedir ) != STATUS_SUCCESS) return TRUE; - root = (const BYTE *)basedir; - get_resource_data( basedir, root, &rva_start, &rva_end ); - data_start = (const BYTE *)module + rva_start; - if (data_start <= root) return FALSE; - dir_size = data_start - root; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, dir_size ))) return FALSE; - memcpy( buffer, root, dir_size ); - fixup_resources( (IMAGE_RESOURCE_DIRECTORY *)buffer, buffer, dll_info->mem_pos + dir_size - rva_start ); - if (!xwrite( dll_info, buffer, dir_size, dll_info->file_pos )) goto done; - if (!xwrite( dll_info, data_start, rva_end - rva_start, dll_info->file_pos + dir_size )) goto done; - total_size = dir_size + rva_end - rva_start; - add_directory( dll_info, IMAGE_DIRECTORY_ENTRY_RESOURCE, dll_info->mem_pos, total_size ); - add_section( dll_info, ".rsrc", total_size, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ ); - ret = TRUE; -done: - HeapFree( GetProcessHeap(), 0, buffer ); - return ret; -} - -/* build a complete fake dll, optionally using module as a source */ -static BOOL build_fake_dll( HANDLE file, HMODULE module ) +/* build a complete fake dll from scratch */ +static BOOL build_fake_dll( HANDLE file ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const IMAGE_NT_HEADERS *src_nt = NULL; struct dll_info info; BYTE *buffer; BOOL ret = FALSE; @@ -204,28 +133,25 @@ static BOOL build_fake_dll( HANDLE file, HMODULE module ) memcpy( dos + 1, fakedll_signature, sizeof(fakedll_signature) ); nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); - if (module) src_nt = RtlImageNtHeader( module ); /* some fields are copied from the source dll */ -#define SET(field,def) nt->field = src_nt ? src_nt->field : def - SET( FileHeader.Machine, IMAGE_FILE_MACHINE_I386 ); - SET( FileHeader.TimeDateStamp, 0 ); - SET( FileHeader.Characteristics, IMAGE_FILE_DLL ); - SET( OptionalHeader.MajorLinkerVersion, 1 ); - SET( OptionalHeader.MinorLinkerVersion, 0 ); - SET( OptionalHeader.MajorOperatingSystemVersion, 1 ); - SET( OptionalHeader.MinorOperatingSystemVersion, 0 ); - SET( OptionalHeader.MajorImageVersion, 1 ); - SET( OptionalHeader.MinorImageVersion, 0 ); - SET( OptionalHeader.MajorSubsystemVersion, 4 ); - SET( OptionalHeader.MinorSubsystemVersion, 0 ); - SET( OptionalHeader.Win32VersionValue, 0 ); - SET( OptionalHeader.Subsystem, IMAGE_SUBSYSTEM_WINDOWS_GUI ); - SET( OptionalHeader.DllCharacteristics, 0 ); - SET( OptionalHeader.SizeOfStackReserve, 0 ); - SET( OptionalHeader.SizeOfStackCommit, 0 ); - SET( OptionalHeader.SizeOfHeapReserve, 0 ); - SET( OptionalHeader.SizeOfHeapCommit, 0 ); -#undef SET + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; + nt->FileHeader.TimeDateStamp = 0; + nt->FileHeader.Characteristics = IMAGE_FILE_DLL; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.Win32VersionValue = 0; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.DllCharacteristics = 0; + nt->OptionalHeader.SizeOfStackReserve = 0; + nt->OptionalHeader.SizeOfStackCommit = 0; + nt->OptionalHeader.SizeOfHeapReserve = 0; + nt->OptionalHeader.SizeOfHeapCommit = 0; /* other fields have fixed values */ nt->Signature = IMAGE_NT_SIGNATURE; nt->FileHeader.NumberOfSections = 0; @@ -261,8 +187,6 @@ static BOOL build_fake_dll( HANDLE file, HMODULE module ) add_section( &info, ".reloc", sizeof(reloc_section), IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_MEM_READ ); - if (!add_version_resource( module, &info )) goto done; - header_size += nt->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER); nt->OptionalHeader.SizeOfHeaders = ALIGN( header_size, file_alignment ); nt->OptionalHeader.SizeOfImage = ALIGN( info.mem_pos, section_alignment ); @@ -454,10 +378,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } else { - HMODULE module = LoadLibraryW( source ); WARN( "fake dll %s not found for %s\n", debugstr_w(source), debugstr_w(name) ); - ret = build_fake_dll( h, module ); - if (module) FreeLibrary( module ); + ret = build_fake_dll( h ); } CloseHandle( h );

1 0

Alexandre Julliard : kernel32: Use the PWD variable to set the initial current directory.
by Alexandre Julliard 15 Oct '09

15 Oct '09

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

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

15 Oct '09

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 15 Oct '09

15 Oct '09

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

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

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

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009