June 2009 - Wine-Commits - list.winehq.org

Austin English : wine.desktop: Allow start to execute lnk files.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: ea09e4afe8aa602b7f8e76a3d32e841a509c2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea09e4afe8aa602b7f8e76a3d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 11 01:20:09 2009 -0500 wine.desktop: Allow start to execute lnk files. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 52f91c6..db4254d 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -16,6 +16,6 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; NoDisplay=true StartupNotify=true

1 0

Henri Verbeet : wined3d: Remove some redundant s3tc extension checks.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: b052c6e8aa96823451624c99333b5eb8f867b137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b052c6e8aa96823451624c993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Remove some redundant s3tc extension checks. If the extension isn't available to surface shouldn't have been created. We don't do extension checks for all the other formats either. --- dlls/wined3d/device.c | 32 ++++++++------- dlls/wined3d/surface.c | 99 +++++++++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe084ca..e6b4681 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5987,22 +5987,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DFMT_DXT3 == destFormat || WINED3DFMT_DXT4 == destFormat || WINED3DFMT_DXT5 == destFormat) { - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) { - /* FIXME: The easy way to do this is to lock the destination, and copy the bits across */ - FIXME("Updating part of a compressed texture is not supported at the moment\n"); - } if (destFormat != srcFormat) { - FIXME("Updating mixed format compressed texture is not curretly support\n"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, - dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); - } - } else { - FIXME("Attempting to update a DXT compressed texture without hardware support\n"); - } - - } else { + if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) + { + /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ + FIXME("Updating part of a compressed texture is not supported.\n"); + } + if (destFormat != srcFormat) + { + FIXME("Updating mixed format compressed textures is not supported.\n"); + } + else + { + GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, + dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); + } + } + else + { glTexSubImage2D(glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a20ecd2..c81dab3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -150,25 +150,26 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* We can assume this as the texture would not have been created otherwise */ - FIXME("(%p) : Attempting to lock a compressed texture when texture compression isn't supported by opengl\n", This); - } else { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", - This, This->glDescription.level, format_desc->glFormat, format_desc->glType, - This->resource.allocatedMemory); - - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); - checkGLcall("glGetCompressedTexImageARB()"); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); - } + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", + This, This->glDescription.level, format_desc->glFormat, format_desc->glType, + This->resource.allocatedMemory); + + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); + checkGLcall("glGetCompressedTexImageARB()"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } + else + { + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, + This->glDescription.level, This->resource.allocatedMemory)); + checkGLcall("glGetCompressedTexImageARB()"); + } + LEAVE_GL(); } else { void *mem; @@ -297,35 +298,41 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - FIXME("Using DXT1/3/5 without advertized support\n"); - } else { - /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) - * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this - * function uses glCompressedTexImage2D instead of the SubImage call - */ - TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); - ENTER_GL(); + /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for + * allocating does not work well on some drivers (r200 dri, MacOS ATI + * driver). glCompressedTexImage2D() does not accept NULL pointers. So + * for compressed textures surface_allocate_surface() does nothing, + * and this function uses glCompressedTexImage2D() instead of + * glCompressedTexSubImage2D(). */ + TRACE("(%p) : Calling glCompressedTexImage2DARB w %u, h %u, data %p.\n", This, width, height, data); + + ENTER_GL(); - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, NULL)); - checkGLcall("glCompressedTexSubImage2D"); + TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); - } - LEAVE_GL(); + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, NULL)); + checkGLcall("glCompressedTexImage2DARB"); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } - } else { + else + { + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2D"); + } + + LEAVE_GL(); + } + else + { TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p\n", This, width, height, data); ENTER_GL();

1 0

Guy Albertelli : kernel32/tests: Fix tests to pass on Win9x and WinME.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: 7c4939cbaaa945ee497ec63cb5970baeb9a936ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4939cbaaa945ee497ec63cb… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Jun 6 20:56:01 2009 -0400 kernel32/tests: Fix tests to pass on Win9x and WinME. --- dlls/kernel32/tests/file.c | 72 ++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4cdeade..e2ad49d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -55,10 +55,11 @@ static const char sillytext[] = "sdlkfjasdlkfj a dslkj adsklf \n \nasdklf askldfa sdlkf \nsadklf asdklf asdf "; struct test_list { - const char *file; - const DWORD err; - const DWORD options; - const BOOL todo_flag; + const char *file; /* file string to test */ + const DWORD err; /* Win NT and further error code */ + const LONG err2; /* Win 9x & ME error code or -1 */ + const DWORD options; /* option flag to use for open */ + const BOOL todo_flag; /* todo_wine indicator */ } ; static void InitFunctionPointers(void) @@ -717,19 +718,19 @@ static void test_CreateFileA(void) static const char nt_drive[] = "\\\\?\\A:"; DWORD i, ret, len; struct test_list p[] = { - {"", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ - {"", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ - {"a", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ - {"a\\", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ - {"removeme", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ - {"removeme\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ - {"c:", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ - {"c:", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ - {"c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ - {"c:\\", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ - {"\\\\?\\c:", ERROR_SUCCESS, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ - {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ - {NULL, 0, 0, FALSE} + {"", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ + {"", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ + {"a", ERROR_FILE_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ + {"a\\", ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ + {"removeme", ERROR_ACCESS_DENIED, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ + {"removeme\\", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ + {"c:", ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ + {"c:", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ + {"c:\\", ERROR_PATH_NOT_FOUND, ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ + {"c:\\", ERROR_SUCCESS, ERROR_ACCESS_DENIED, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ + {"\\\\?\\c:", ERROR_SUCCESS, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ + {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ + {NULL, 0, -1, 0, FALSE} }; BY_HANDLE_FILE_INFORMATION Finfo; @@ -829,13 +830,17 @@ static void test_CreateFileA(void) } /* otherwise validate results with expectations */ else if (p[i].todo_flag) - todo_wine ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || + todo_wine ok( + (hFile == INVALID_HANDLE_VALUE && + (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", filename, hFile, GetLastError(), p[i].err); else - ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || - (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), + ok( + (hFile == INVALID_HANDLE_VALUE && + (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || + (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", filename, hFile, GetLastError(), p[i].err); if (hFile != INVALID_HANDLE_VALUE) @@ -852,21 +857,26 @@ static void test_CreateFileA(void) NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); - ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_SUCCESS, + if (hFile != INVALID_HANDLE_VALUE && GetLastError() != ERROR_PATH_NOT_FOUND) + { + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_SUCCESS, "CreateFileA did not work, last error %u on volume <%s>\n", GetLastError(), temp_path ); - if (hFile != INVALID_HANDLE_VALUE) - { - ret = GetFileInformationByHandle( hFile, &Finfo ); - if (ret) + if (hFile != INVALID_HANDLE_VALUE) { - ok(Finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY, - "CreateFileA probably did not open temp directory %s correctly\n file information does not include FILE_ATTRIBUTE_DIRECTORY, actual=0x%08x\n", + ret = GetFileInformationByHandle( hFile, &Finfo ); + if (ret) + { + ok(Finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY, + "CreateFileA probably did not open temp directory %s correctly\n file information does not include FILE_ATTRIBUTE_DIRECTORY, actual=0x%08x\n", temp_path, Finfo.dwFileAttributes); + } + CloseHandle( hFile ); } - CloseHandle( hFile ); } + else + skip("Probable Win9x, got ERROR_PATH_NOT_FOUND w/ FILE_FLAG_BACKUP_SEMANTICS or %s\n", temp_path); /* *** Test opening volumes/devices using drive letter *** */ @@ -879,7 +889,8 @@ static void test_CreateFileA(void) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); - if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) + if (hFile != INVALID_HANDLE_VALUE || + (GetLastError() != ERROR_ACCESS_DENIED && GetLastError() != ERROR_BAD_NETPATH)) { /* if we have adm rights to volume, then try rest of tests */ ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", @@ -946,6 +957,9 @@ static void test_CreateFileA(void) if (hFile != INVALID_HANDLE_VALUE) CloseHandle( hFile ); } + /* If we see ERROR_BAD_NETPATH then on Win9x or WinME, so skip */ + else if (GetLastError() == ERROR_BAD_NETPATH) + skip("Probable Win9x, got ERROR_BAD_NETPATH (53)\n"); else skip("Do not have authority to access volumes. Tests skipped\n");

1 0

Henri Verbeet : wined3d: Use the format info to calculate compressed surface size in IWineD3DBaseSurfaceImpl_SetFormat ().
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: da12ac05a4a5fe857fa317fbdbbb2ccce12b838a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da12ac05a4a5fe857fa317fbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Use the format info to calculate compressed surface size in IWineD3DBaseSurfaceImpl_SetFormat(). --- dlls/wined3d/surface_base.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 407a6db..f0acb87 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -521,14 +521,15 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); if (format == WINED3DFMT_UNKNOWN) { This->resource.size = 0; - } else if (format == WINED3DFMT_DXT1) { - /* DXT1 is half byte per pixel */ - This->resource.size = ((max(This->pow2Width, 4) * format_desc->byte_count) * max(This->pow2Height, 4)) >> 1; - - } else if (format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 || - format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) { - This->resource.size = ((max(This->pow2Width, 4) * format_desc->byte_count) * max(This->pow2Height, 4)); - } else { + } + else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count = (This->pow2Width + format_desc->block_width - 1) / format_desc->block_width; + UINT row_count = (This->pow2Height + format_desc->block_height - 1) / format_desc->block_height; + This->resource.size = row_count * row_block_count * format_desc->block_byte_count; + } + else + { unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; This->resource.size = ((This->pow2Width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1); This->resource.size *= This->pow2Height;

1 0

Henri Verbeet : wined3d: Improve some TRACEs in init_format_fbo_compat_info ().
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: 1ad485ff83950a99f19ad95058b34842219dc5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad485ff83950a99f19ad9505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Improve some TRACEs in init_format_fbo_compat_info(). --- dlls/wined3d/utils.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 55c806b..211e717 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -598,13 +598,15 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + TRACE("Checking if format %s is supported as FBO color attachment...\n", debug_d3dformat(desc->format)); + /* Check if the default internal format is supported as a frame buffer target, otherwise * fall back to the render target internal. * * Try to stick to the standard format if possible, this limits precision differences. */ if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(desc->format)); desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; desc->rtInternal = desc->glInternal; } @@ -614,15 +616,19 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) { if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) { - FIXME("Internal format of %s not supported as FBO target, and no fallback specified.\n", - debug_d3dformat(desc->format)); + FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," + " and no fallback specified.\n", debug_d3dformat(desc->format)); desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; } + else + { + TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(desc->format)); + } desc->rtInternal = desc->glInternal; } else { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead.\n", + TRACE("Format %s is not supported as FBO color attachment, using rtInternal format as fallback.\n", debug_d3dformat(desc->format)); } }

1 0

Roderick Colenbrander : opengl32: Sync with the latest opengl 3. 1 extensions and don't export opengl32 1.2 functions.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: 16439a430c37eb1bc3251deae42c03d63385cdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16439a430c37eb1bc3251deae… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 10 21:43:01 2009 +0200 opengl32: Sync with the latest opengl 3.1 extensions and don't export opengl32 1.2 functions. --- dlls/opengl32/opengl32.spec | 42 +--- dlls/opengl32/opengl_ext.c | 630 +++++++++++++++++++++++++++++++++++-------- dlls/opengl32/opengl_norm.c | 380 -------------------------- 3 files changed, 522 insertions(+), 530 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16439a430c37eb1bc3251…

1 0

Nikolay Sivov : comctl32/listview: Update some ListView structures with recently added members.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: ee015b8cd493397ba289fea5069099310ec7766e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee015b8cd493397ba289fea50… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 22:11:40 2009 +0400 comctl32/listview: Update some ListView structures with recently added members. --- include/commctrl.h | 73 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 15 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7d77faa..849fa46 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3301,10 +3301,15 @@ typedef struct tagLVITEMA INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMA, *LPLVITEMA; typedef struct tagLVITEMW @@ -3318,10 +3323,15 @@ typedef struct tagLVITEMW INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMW, *LPLVITEMW; #define LVITEM WINELIB_NAME_AW(LVITEM) @@ -3331,6 +3341,10 @@ typedef struct tagLVITEMW #define LVITEM_V1_SIZEW CCSIZEOF_STRUCT(LVITEMW, lParam) #define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE) +#define LVITEMA_V5_SIZE CCSIZEOF_STRUCT(LVITEMA, puColumns) +#define LVITEMW_V5_SIZE CCSIZEOF_STRUCT(LVITEMW, puColumns) +#define LVITEM_V5_SIZE WINELIB_NAME_AW(LVITEM_V5_SIZE) + #define LV_ITEM LVITEM #define LV_ITEMA LVITEMA #define LV_ITEMW LVITEMW @@ -3394,8 +3408,13 @@ typedef struct tagLVCOLUMNA LPSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNA, *LPLVCOLUMNA; typedef struct tagLVCOLUMNW @@ -3406,8 +3425,13 @@ typedef struct tagLVCOLUMNW LPWSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNW, *LPLVCOLUMNW; #define LVCOLUMN WINELIB_NAME_AW(LVCOLUMN) @@ -3513,6 +3537,8 @@ typedef struct tagLVHITTESTINFO UINT flags; INT iItem; INT iSubItem; + /* (_WIN32_WINNT >= 0x0600) */ + INT iGroup; } LVHITTESTINFO, *LPLVHITTESTINFO; #define LV_HITTESTINFO LVHITTESTINFO @@ -3551,15 +3577,32 @@ typedef struct LVGROUP UINT cbSize; UINT mask; LPWSTR pszHeader; - int cchHeader; + INT cchHeader; LPWSTR pszFooter; - int cchFooter; - int iGroupId; + INT cchFooter; + INT iGroupId; UINT stateMask; UINT state; UINT uAlign; + /* (_WIN32_WINNT >= 0x0600) */ + LPWSTR pszSubtitle; + UINT cchSubtitle; + LPWSTR pszTask; + UINT cchTask; + LPWSTR pszDescriptionTop; + UINT cchDescriptionTop; + LPWSTR pszDescriptionBottom; + UINT cchDescriptionBottom; + INT iTitleImage; + INT iExtendedImage; + INT iFirstItem; + UINT cItems; + LPWSTR pszSubsetTitle; + UINT cchSubsetTitle; } LVGROUP, *PLVGROUP; +#define LVGROUP_V5_SIZE CCSIZEOF_STRUCT(LVGROUP, uAlign) + typedef struct LVGROUPMETRICS { UINT cbSize;

1 0

Alexandre Julliard : opengl32: Make the script default to version 1.1. Remove the glGetLevelParameter stubs.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: cd8f5c86ef04d353d519f14bdef615f423b2ed52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8f5c86ef04d353d519f14bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 11 11:53:40 2009 +0200 opengl32: Make the script default to version 1.1. Remove the glGetLevelParameter stubs. --- dlls/opengl32/make_opengl | 8 +++----- dlls/opengl32/opengl32.spec | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 752ac87..b2966dc 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -22,7 +22,7 @@ use strict; # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry… # # - opengl_version is the OpenGL version emulated by the library -# (can be 1.0 to 1.5). The default is 1.2. +# (can be 1.0 to 1.5). The default is 1.1. # # This script generates the three following files : # @@ -314,7 +314,7 @@ if (@ARGV > 1) { $name0=~s%^.*/%%; die "Usage: $name0 [version]\n"; } -my $version = $ARGV[0] || "1.2"; +my $version = $ARGV[0] || "1.1"; if ($version eq "1.0") { %norm_categories = %cat_1_0; } elsif ($version eq "1.1") { @@ -644,9 +644,7 @@ foreach (sort keys %norm_functions) { print SPEC ") wine_$func_name\n"; } -print SPEC "@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv -@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat +print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateLayerContext(long long) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 09ddf47..a965771 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -334,8 +334,6 @@ @ stdcall glVertex4sv( ptr ) wine_glVertex4sv @ stdcall glVertexPointer( long long long ptr ) wine_glVertexPointer @ stdcall glViewport( long long long long ) wine_glViewport -@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext

1 0

Andrew Talbot : credui: Constify a variable.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: c495df68835b94b2f1d0aa467fbb1cd24ec03c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c495df68835b94b2f1d0aa467… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jun 10 20:54:55 2009 +0100 credui: Constify a variable. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 7e3c8a0..a6bbde6 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -138,7 +138,7 @@ struct cred_dialog_params BOOL fBalloonTipActive; }; -static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_params *params) +static void CredDialogFillUsernameCombo(HWND hwndUsername, const struct cred_dialog_params *params) { DWORD count; DWORD i;

1 0

Roderick Colenbrander : opengl32: Get rid of glext.h.
by Alexandre Julliard June 11, 2009

June 11, 2009

Module: wine Branch: master Commit: ab20785b1ba81e34067e9572aca0244ea03d70bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab20785b1ba81e34067e9572a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 10 21:54:22 2009 +0200 opengl32: Get rid of glext.h. --- dlls/opengl32/opengl_ext.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 8ae7c2f..988317f 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -24,11 +24,7 @@ #undef WINAPI #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#define GL_GLEXT_PROTOTYPES #include <GL/gl.h> -#ifdef HAVE_GL_GLEXT_H -# include <GL/glext.h> -#endif #undef XMD_H #undef APIENTRY

1 0