November 2009 - Wine-commits

Alexandre Julliard : ntdll: Make the various directory info size functions depend on the info class.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 551ddfe4028f5b63ddda703956a1132a59def666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551ddfe4028f5b63ddda70395… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:54:06 2009 +0100 ntdll: Make the various directory info size functions depend on the info class. --- dlls/ntdll/directory.c | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index ef5b17e..602b08c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -154,8 +154,6 @@ union file_directory_info FILE_BOTH_DIRECTORY_INFORMATION both; }; -static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); - static int show_dot_files = -1; /* at some point we may want to allow Winelib apps to set this */ @@ -221,6 +219,23 @@ static inline BOOL is_ignored_file( const struct stat *st ) return FALSE; } +static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned int len ) +{ + switch (class) + { + case FileBothDirectoryInformation: + return (FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[len] ) + 3) & ~3; + default: + assert(0); + } +} + +static inline unsigned int max_dir_info_size( FILE_INFORMATION_CLASS class ) +{ + return dir_info_size( class, MAX_DIR_ENTRY_LEN ); +} + + /*********************************************************************** * get_default_com_device * @@ -990,7 +1005,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK if (!show_dot_files && long_name[0] == '.' && long_name[1] && (long_name[1] != '.' || long_name[2])) attributes |= FILE_ATTRIBUTE_HIDDEN; - total_len = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[long_len]) + 3) & ~3; + total_len = dir_info_size( class, long_len ); if (io->Information + total_len > max_length) { total_len = max_length - io->Information; @@ -1082,7 +1097,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG if (restart_scan) lseek( fd, 0, SEEK_SET ); - if (length < max_dir_info_size) /* we may have to return a partial entry here */ + if (length < max_dir_info_size(class)) /* we may have to return a partial entry here */ { off_t old_pos = lseek( fd, 0, SEEK_CUR ); @@ -1132,7 +1147,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG last_info = info; if (single_entry) break; /* check if we still have enough space for the largest possible entry */ - if (io->Information + max_dir_info_size > length) break; + if (io->Information + max_dir_info_size(class) > length) break; } if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) break; } @@ -1169,7 +1184,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U } if (restart_scan) lseek( fd, 0, SEEK_SET ); - else if (length < max_dir_info_size) /* we may have to return a partial entry here */ + else if (length < max_dir_info_size(class)) /* we may have to return a partial entry here */ { old_pos = lseek( fd, 0, SEEK_CUR ); if (old_pos == -1 && errno == ENOENT) @@ -1209,8 +1224,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U /* make sure we have enough room for both entries */ if (fake_dot_dot) { - static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + const ULONG min_info_size = dir_info_size( class, 1 ) + dir_info_size( class, 2 ); if (length < min_info_size || single_entry) { FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); @@ -1226,7 +1240,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U last_info = info; /* check if we still have enough space for the largest possible entry */ - if (last_info && io->Information + max_dir_info_size > length) + if (last_info && io->Information + max_dir_info_size(class) > length) { lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ res = 0; @@ -1248,7 +1262,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U break; } /* check if we still have enough space for the largest possible entry */ - if (single_entry || io->Information + max_dir_info_size > length) + if (single_entry || io->Information + max_dir_info_size(class) > length) { if (res > 0) lseek( fd, de->d_off, SEEK_SET ); /* set pos to next entry */ break; @@ -1372,8 +1386,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff /* make sure we have enough room for both entries */ if (fake_dot_dot) { - static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + const ULONG min_info_size = dir_info_size( class, 1 ) + dir_info_size( class, 2 ); if (length < min_info_size || single_entry) { FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); @@ -1392,7 +1405,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff restart_info_pos = io->Information; /* check if we still have enough space for the largest possible entry */ - if (last_info && io->Information + max_dir_info_size > length) + if (last_info && io->Information + max_dir_info_size(class) > length) { lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ res = 0; @@ -1426,7 +1439,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff goto restart; } /* if we have to return but the buffer contains more data, restart with a smaller size */ - if (res > 0 && (single_entry || io->Information + max_dir_info_size > length)) + if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { lseek( fd, (unsigned long)restart_pos, SEEK_SET ); size = (char *)de - data; @@ -1444,7 +1457,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff if (size < initial_size) break; /* already restarted once, give up now */ size = min( size, length - io->Information ); /* if size is too small don't bother to continue */ - if (size < max_dir_info_size && last_info) break; + if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart: @@ -1530,7 +1543,7 @@ static void read_directory_readdir( int fd, IO_STATUS_BLOCK *io, void *buffer, U } if (single_entry) break; /* check if we still have enough space for the largest possible entry */ - if (io->Information + max_dir_info_size > length) break; + if (io->Information + max_dir_info_size(class) > length) break; } } @@ -1638,7 +1651,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, switch (info_class) { case FileBothDirectoryInformation: - if (length < sizeof(FILE_BOTH_DIR_INFORMATION)) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; break; default: FIXME( "Unsupported file info class %d\n", info_class );

1 0

Alexandre Julliard : ntdll: Add support for the different info classes in NtQueryDirectoryFile.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 74ae7d358f786740e44ff184d432a42b57291a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ae7d358f786740e44ff184d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 18:07:30 2009 +0100 ntdll: Add support for the different info classes in NtQueryDirectoryFile. --- dlls/ntdll/directory.c | 59 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 602b08c..a09aab1 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -151,7 +151,11 @@ static int ignored_files_count; union file_directory_info { ULONG next; + FILE_DIRECTORY_INFORMATION dir; FILE_BOTH_DIRECTORY_INFORMATION both; + FILE_FULL_DIRECTORY_INFORMATION full; + FILE_ID_BOTH_DIRECTORY_INFORMATION id_both; + FILE_ID_FULL_DIRECTORY_INFORMATION id_full; }; static int show_dot_files = -1; @@ -223,8 +227,16 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned { switch (class) { + case FileDirectoryInformation: + return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; case FileBothDirectoryInformation: - return (FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileFullDirectoryInformation: + return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileIdBothDirectoryInformation: + return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileIdFullDirectoryInformation: + return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; default: assert(0); } @@ -953,6 +965,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK struct stat st; WCHAR long_nameW[MAX_DIR_ENTRY_LEN]; WCHAR short_nameW[12]; + WCHAR *filename; UNICODE_STRING str; ULONG attributes = 0; @@ -1012,25 +1025,51 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK io->u.Status = STATUS_BUFFER_OVERFLOW; } info = (union file_directory_info *)((char *)info_ptr + io->Information); + /* all the structures start with a FileDirectoryInformation layout */ + fill_stat_info( &st, info, class ); + info->dir.NextEntryOffset = total_len; + info->dir.FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ + info->dir.FileAttributes |= attributes; switch (class) { + case FileDirectoryInformation: + info->dir.FileNameLength = long_len * sizeof(WCHAR); + filename = info->dir.FileName; + break; + + case FileFullDirectoryInformation: + info->full.EaSize = 0; /* FIXME */ + info->full.FileNameLength = long_len * sizeof(WCHAR); + filename = info->full.FileName; + break; + + case FileIdFullDirectoryInformation: + info->id_full.EaSize = 0; /* FIXME */ + info->id_full.FileNameLength = long_len * sizeof(WCHAR); + filename = info->id_full.FileName; + break; + case FileBothDirectoryInformation: - fill_stat_info( &st, &info->both, class ); - info->both.NextEntryOffset = total_len; - info->both.FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ - info->both.FileAttributes |= attributes; info->both.EaSize = 0; /* FIXME */ info->both.ShortNameLength = short_len * sizeof(WCHAR); for (i = 0; i < short_len; i++) info->both.ShortName[i] = toupperW(short_nameW[i]); info->both.FileNameLength = long_len * sizeof(WCHAR); - memcpy( info->both.FileName, long_nameW, - min( info->both.FileNameLength, - total_len - FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName ))); + filename = info->both.FileName; + break; + + case FileIdBothDirectoryInformation: + info->id_both.EaSize = 0; /* FIXME */ + info->id_both.ShortNameLength = short_len * sizeof(WCHAR); + for (i = 0; i < short_len; i++) info->id_both.ShortName[i] = toupperW(short_nameW[i]); + info->id_both.FileNameLength = long_len * sizeof(WCHAR); + filename = info->id_both.FileName; break; + default: assert(0); } + memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); io->Information += total_len; return info; } @@ -1650,7 +1689,11 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, } switch (info_class) { + case FileDirectoryInformation: case FileBothDirectoryInformation: + case FileFullDirectoryInformation: + case FileIdBothDirectoryInformation: + case FileIdFullDirectoryInformation: if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; break; default:

1 0

Roderick Colenbrander : wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3 .2.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9a8542638989c6ced3393e8a225810eff59a26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8542638989c6ced3393e8a2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Nov 17 11:50:25 2009 +0100 wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3.2. --- dlls/winex11.drv/opengl.c | 7 +++++++ include/wine/wgl.h | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index de56bd9..19e3fe3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2249,6 +2249,10 @@ HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareCon pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = pAttribList[1]; break; + case WGL_CONTEXT_PROFILE_MASK_ARB: + pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; + pContextAttribList[1] = pAttribList[1]; + break; default: ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]); } @@ -3540,6 +3544,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_ARB_create_context")) { register_extension(&WGL_ARB_create_context); + + if(glxRequireExtension("GLX_ARB_create_context_profile")) + register_extension_string("WGL_ARB_create_context_profile"); } if(glxRequireExtension("GLX_ARB_fbconfig_float")) diff --git a/include/wine/wgl.h b/include/wine/wgl.h index a102109..7a99de2 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -200,7 +200,11 @@ #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define ERROR_INVALID_VERSION_ARB 0x2095 +#define ERROR_INVALID_PROFILE_ARB 0x2096 #ifndef GLX_ARB_create_context #define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 @@ -208,6 +212,11 @@ #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 #endif +#ifndef GLX_ARB_create_context_profile +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#endif /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float

1 0

Maarten Lankhorst : include: Fix timer APC callback definition.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 6e0e0dc605d93d709947ced745a8187d9dcf2bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0e0dc605d93d709947ced74… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 18 12:11:36 2009 +0100 include: Fix timer APC callback definition. --- include/winternl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index fe77359..d38f49c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1782,7 +1782,7 @@ typedef struct _KEY_MULTIPLE_VALUE_INFORMATION typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID); -typedef VOID (*PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); +typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); typedef enum _EVENT_TYPE { NotificationEvent,

1 0

Huw Davies : wineps.drv: Rename variable to stride.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 05472017fef284d53a7c7d34a0c68832ed7bffe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05472017fef284d53a7c7d34a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 12:20:17 2009 +0000 wineps.drv: Rename variable to stride. --- dlls/wineps.drv/bitmap.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 0c350d2..9f5f11d 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -228,7 +228,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { LONG fullSrcWidth, fullSrcHeight; - INT widthbytes; + INT stride; WORD bpp, compression; INT line; POINT pt[2]; @@ -241,7 +241,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; - widthbytes = get_dib_width_bytes(fullSrcWidth, bpp); + stride = get_dib_width_bytes(fullSrcWidth, bpp); TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,12 +272,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 7) / 8); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 7) / 8)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 7) / 8)) memcpy(dst_ptr, src_ptr + xSrc / 8, (widthSrc + 7) / 8); break; @@ -287,12 +287,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 1) / 2); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 1) / 2)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 1) / 2)) memcpy(dst_ptr, src_ptr + xSrc/2, (widthSrc+1)/2); break; @@ -302,10 +302,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += widthSrc) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += widthSrc) memcpy(dst_ptr, src_ptr + xSrc, widthSrc); break; @@ -318,11 +318,11 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const WORD *words = (const WORD *)src_ptr + xSrc; int i; for(i = 0; i < widthSrc; i++) { @@ -350,10 +350,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 3; int i; for(i = 0; i < widthSrc; i++) { @@ -372,10 +372,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 4; int i; for(i = 0; i < widthSrc; i++) {

1 0

Huw Davies : wineps.drv: Add support for top-down dibs.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: eed649a5e18aaabef42e58da0e7a557046b665dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed649a5e18aaabef42e58da0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 16:39:27 2009 +0000 wineps.drv: Add support for top-down dibs. --- dlls/wineps.drv/bitmap.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 9f5f11d..c450bca 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -242,6 +242,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; stride = get_dib_width_bytes(fullSrcWidth, bpp); + if(fullSrcHeight < 0) stride = -stride; /* top-down */ TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,6 +273,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); @@ -287,6 +289,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); @@ -302,6 +305,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -318,6 +322,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -350,6 +355,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -372,6 +378,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: f4f7198610efcac150dd8373c9fd9a4e30c40d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f7198610efcac150dd8373c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:07 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling. --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4910605..b949037 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1035,6 +1035,8 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_CY; else if(!lstrcmpiW(type, szBoolean)) V_VT(v) = VT_BOOL; + else if(!lstrcmpiW(type, szI1)) + V_VT(v) = VT_I1; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c8fddf..6e08ca9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -161,6 +161,7 @@ static const CHAR szTypeValueXML[] = " <date dt:dt=\"date\">3721-11-01</date>\n" " <time dt:dt=\"time\">13:57:12.31321</time>\n" " <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" +" <i1 dt:dt=\"i1\">-13</i1>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4159,6 +4160,19 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i1"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I1, "incorrect type\n"); + ok(V_I1(&v) == -13, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Roderick Colenbrander : opengl32: Sync with latest OpenGL extensions.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 21bc1ddf932615c63dd4223fb9c53a5ffba0f41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bc1ddf932615c63dd4223fb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 18 12:58:41 2009 +0100 opengl32: Sync with latest OpenGL extensions. --- dlls/opengl32/make_opengl | 3 + dlls/opengl32/opengl_ext.c | 438 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21bc1ddf932615c63dd42…

1 0

Paul Vriens : crypt32/tests: Fix a test failure on older crypt32.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 7f5b24ed9186d457acd7803a97d4171f332c5fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5b24ed9186d457acd7803a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 18 15:12:52 2009 +0100 crypt32/tests: Fix a test failure on older crypt32. --- dlls/crypt32/tests/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4a1c449..0bc4fda 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2709,7 +2709,9 @@ static void testIsRDNAttrsInCertificateName(void) "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, &name, &rdn); - ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == CRYPT_E_NO_MATCH), /* Older crypt32 */ + "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); /* The values don't match unless they have the same RDN type */ attr[0].dwValueType = CERT_RDN_UNICODE_STRING; attr[0].Value.cbData = lstrlenW(juanW) * sizeof(WCHAR);

1 0

Rob Shearman : rpcrt4: Fix the return value of NdrFullPointerQueryRefId for a pointer ID of 0.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 51dbc8d06b65a45d4507b6ad15d78c4e24af9689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51dbc8d06b65a45d4507b6ad1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:25:20 2009 +0000 rpcrt4: Fix the return value of NdrFullPointerQueryRefId for a pointer ID of 0. --- dlls/rpcrt4/ndr_fullpointer.c | 3 +++ dlls/rpcrt4/tests/ndr_marshall.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index b686683..2bbd2b2 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -161,6 +161,9 @@ int WINAPI NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES pXlatTables, { TRACE("(%p, 0x%x, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer); + if (!RefId) + return 1; + expand_pointer_table_if_necessary(pXlatTables, RefId); pXlatTables->NextRefId = max(RefId + 1, pXlatTables->NextRefId); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index dbf29a5..91f3040 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1047,7 +1047,6 @@ static void test_fullpointer_xlat(void) /* "unmarshaling" phase */ ret = NdrFullPointerQueryRefId(pXlatTables, 0x0, 0, &Pointer); - todo_wine ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 0, &Pointer);

1 0