October 2006 - Wine-Commits

Mike McCormack : msi: Work around what appears to be a bug in native MSI' s generation of transform data.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 92cc0bc0c273c7691b564f4ff731c7efec5ffcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cc0bc0c273c7691b564f4ff… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 6 17:36:37 2006 +0900 msi: Work around what appears to be a bug in native MSI's generation of transform data. --- dlls/msi/table.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a01a538..d5e6332 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1830,6 +1830,7 @@ static UINT msi_table_load_transform( MS MSITABLEVIEW *tv = NULL; UINT r, n, sz, i, mask; MSIRECORD *rec = NULL; + UINT colcol = 0; TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); @@ -1911,6 +1912,20 @@ static UINT msi_table_load_transform( MS if( rawdata[n] & 1) { TRACE("insert [%d]: ", row); + + /* + * Native msi seems writes nul into the + * Number (2nd) column of the _Columns table. + * Not sure that it's deliberate... + */ + if (!lstrcmpW(name, szColumns)) + { + if ( MSI_RecordIsNull( rec, 2 ) ) + MSI_RecordSetInteger( rec, 2, ++colcol ); + else + ERR("_Columns has non-null data...\n"); + } + TABLE_insert_row( &tv->view, rec ); } else if( mask & 0xff )

1 0

Mike McCormack : msi: Transform the _Columns and _Tables tables first so the table metadata is present for new tables .
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: f53ba3ca583869352b104c8ccb682ae9478ed64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53ba3ca583869352b104c8cc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 6 17:35:44 2006 +0900 msi: Transform the _Columns and _Tables tables first so the table metadata is present for new tables. --- dlls/msi/table.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bab4191..a01a538 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1833,6 +1833,13 @@ static UINT msi_table_load_transform( MS TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); + read_stream_data( stg, name, &rawdata, &rawsize ); + if ( !rawdata ) + { + TRACE("table %s empty\n", debugstr_w(name) ); + return ERROR_INVALID_TABLE; + } + /* create a table view */ r = TABLE_CreateView( db, name, (MSIVIEW**) &tv ); if( r != ERROR_SUCCESS ) @@ -1958,6 +1965,18 @@ UINT msi_table_apply_transform( MSIDATAB if( FAILED( r ) ) goto end; + /* + * Apply _Tables and _Coluimns transforms first so that + * the table metadata is correct, and empty tables exist. + */ + ret = msi_table_load_transform( db, stg, strings, szTables ); + if (ret != ERROR_SUCCESS && ret != ERROR_INVALID_TABLE) + goto end; + + ret = msi_table_load_transform( db, stg, strings, szColumns ); + if (ret != ERROR_SUCCESS && ret != ERROR_INVALID_TABLE) + goto end; + ret = ERROR_SUCCESS; while( r == ERROR_SUCCESS ) @@ -1968,12 +1987,15 @@ UINT msi_table_apply_transform( MSIDATAB break; decode_streamname( stat.pwcsName, name ); - TRACE("transform contains stream %s\n", debugstr_w(name)); - if ( name[0] != 0x4840 ) continue; - if ( !lstrcmpW(name+1, szStringPool ) || !lstrcmpW(name+1, szStringData) ) + TRACE("transform contains stream %s\n", debugstr_w(name)); + + if ( !lstrcmpW( name+1, szStringPool ) || + !lstrcmpW( name+1, szStringData ) || + !lstrcmpW( name+1, szColumns ) || + !lstrcmpW( name+1, szTables ) ) continue; ret = msi_table_load_transform( db, stg, strings, name+1 );

1 0

Mike McCormack : msi: Handle null integers properly in transforms.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 2c626c9d81a09029a3628b069bbd4e5dddf71524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c626c9d81a09029a3628b069… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 6 17:35:13 2006 +0900 msi: Handle null integers properly in transforms. --- dlls/msi/table.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0a228dc..bab4191 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1679,15 +1679,15 @@ static MSIRECORD *msi_get_transform_reco } else { - val ^= 0x8000; - MSI_RecordSetInteger( rec, i+1, val ); + if (val) + MSI_RecordSetInteger( rec, i+1, val^0x8000 ); TRACE("[0x%04x]", val ); } break; case 4: - val = rawdata[ofs] + (rawdata[ofs + 1]<<16); - /* val ^= 0x80000000; */ - MSI_RecordSetInteger( rec, i+1, val ); + val = (rawdata[ofs] + (rawdata[ofs + 1]<<16)); + if (val) + MSI_RecordSetInteger( rec, i+1, val^0x80000000 ); TRACE("[0x%08x]", val ); break; default:

1 0

Paul Vriens : cabinet: Make tests run on Win98 again.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 5bbc6323dcd9190424119bbee68ce82c5fe9dc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bbc6323dcd9190424119bbee… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Oct 6 11:41:36 2006 +0200 cabinet: Make tests run on Win98 again. --- dlls/cabinet/tests/extract.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index a0139e5..ad2fbb5 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -148,7 +148,8 @@ static INT_PTR fci_open(char *pszFile, i DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING;

1 0

Paul Vriens : advpack: Make tests run on Win98 again.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 06e076691096a10dc0b9342b8212614621a46096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e076691096a10dc0b9342b8… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Oct 6 11:41:28 2006 +0200 advpack: Make tests run on Win98 again. --- dlls/advpack/tests/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 6699617..8e0ea73 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -239,7 +239,8 @@ static INT_PTR fci_open(char *pszFile, i DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING;

1 0

Paul Vriens : crypt32: Cast-qual warnings fix.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 5c898585390eb0a3e2037ae326ccaeaa8c24cdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c898585390eb0a3e2037ae32… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Oct 5 17:57:26 2006 +0200 crypt32: Cast-qual warnings fix. --- dlls/crypt32/tests/protectdata.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index d5d6f1f..8ea0158 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -27,9 +27,9 @@ #include <wincrypt.h> #include "wine/test.h" -static const char * secret = "I am a super secret string that no one can see!"; -static const char * secret2 = "I am a super secret string indescribable string"; -static const char * key = "Wibble wibble wibble"; +static char secret[] = "I am a super secret string that no one can see!"; +static char secret2[] = "I am a super secret string indescribable string"; +static char key[] = "Wibble wibble wibble"; static const WCHAR desc[] = {'U','l','t','r','a',' ','s','e','c','r','e','t',' ','t','e','s','t',' ','m','e','s','s','a','g','e',0}; static BOOL protected = FALSE; /* if true, the unprotect tests can run */ static DATA_BLOB cipher;

1 0

Stefan Dösinger : wined3d: Pitch alignment for the pow2Size.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 6bcc5ae9f75ce4adc8650329f76b5aff7d654cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcc5ae9f75ce4adc8650329f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 21:38:00 2006 +0200 wined3d: Pitch alignment for the pow2Size. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ad28f8..13ea67a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1053,7 +1053,8 @@ static HRESULT WINAPI IWineD3DDeviceImp if (WINED3DFMT_UNKNOWN != Format) { object->bytesPerPixel = tableEntry->bpp; - object->pow2Size = (pow2Width * object->bytesPerPixel) * pow2Height; + object->pow2Size = ((pow2Width * object->bytesPerPixel) + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); + object->pow2Size *= pow2Height; } else { object->bytesPerPixel = 0; object->pow2Size = 0;

1 0

Stefan Dösinger : wined3d: Define the surface alignment in the header.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: d45c16ba98421633fbf9067207619146fd6b8f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45c16ba98421633fbf906720… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 21:36:19 2006 +0200 wined3d: Define the surface alignment in the header. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 82c8044..3ad28f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1016,7 +1016,7 @@ static HRESULT WINAPI IWineD3DDeviceImp Size = ((max(pow2Width,4) * tableEntry->bpp) * max(pow2Height,4)); } else { /* The pitch is a multiple of 4 bytes */ - Size = ((pow2Width * tableEntry->bpp) + 3) & ~3; + Size = ((pow2Width * tableEntry->bpp) + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); Size *= pow2Height; } @@ -1866,10 +1866,10 @@ #endif } /* Set the surface alignment. This never changes, so we are safe to set it once per context*/ - glPixelStorei(GL_PACK_ALIGNMENT, 4); - checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, 4);"); - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 4);"); + glPixelStorei(GL_PACK_ALIGNMENT, SURFACE_ALIGNMENT); + checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, SURFACE_ALIGNMENT);"); + glPixelStorei(GL_UNPACK_ALIGNMENT, SURFACE_ALIGNMENT); + checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, SURFACE_ALIGNMENT);"); LEAVE_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index be10b37..f78d651 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3021,7 +3021,7 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc ret = This->bytesPerPixel * This->pow2Width; } /* Surfaces are 32 bit aligned */ - ret = (ret + 3) & ~3; + ret = (ret + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); } TRACE("(%p) Returning %d\n", This, ret); return ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9fb365..208ffa4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -996,6 +996,9 @@ #define SFLAG_DONOTFREE (SFLAG_OVERSIZE BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]); +/* Alignment of the pitch */ +#define SURFACE_ALIGNMENT 4 + /***************************************************************************** * IWineD3DVertexDeclaration implementation structure */

1 0

Stefan Dösinger : wined3d: Honor the pitch in a few more places.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 90f097f83556c109e3a80baf15d37c9be562c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f097f83556c109e3a80baf1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 21:35:10 2006 +0200 wined3d: Honor the pitch in a few more places. --- dlls/wined3d/surface.c | 75 +++++++++++++++++++++++++++++------------------- 1 files changed, 46 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fba597f..be10b37 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,7 +47,7 @@ typedef enum { CONVERT_RGB32_888 } CONVERT_TYPES; -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, unsigned long len, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); +HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void surface_download_data(IWineD3DSurfaceImpl *This) { if (This->resource.format == WINED3DFMT_DXT1 || @@ -990,7 +990,9 @@ static void flush_to_framebuffer_drawpix } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, - pitch*height, + pitch, + height, + pitch * 4, CONVERT_PALETTED, This); } @@ -1330,14 +1332,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC if( (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET)) { b_info->bmiHeader.biWidth = This->currentDesc.Width; b_info->bmiHeader.biHeight = -This->currentDesc.Height -extraline; - b_info->bmiHeader.biSizeImage = This->currentDesc.Width * This->currentDesc.Height * This->bytesPerPixel; + b_info->bmiHeader.biSizeImage = ( This->currentDesc.Height + extraline) * IWineD3DSurface_GetPitch(iface); /* Use the full pow2 image size(assigned below) because LockRect * will need it for a full glGetTexImage call */ } else { b_info->bmiHeader.biWidth = This->pow2Width; b_info->bmiHeader.biHeight = -This->pow2Height -extraline; - b_info->bmiHeader.biSizeImage = This->resource.size; + b_info->bmiHeader.biSizeImage = This->resource.size + extraline * IWineD3DSurface_GetPitch(iface); } b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = This->bytesPerPixel * 8; @@ -1570,13 +1572,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceI return WINED3D_OK; } -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, unsigned long len, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) { - TRACE("(%p)->(%p),(%ld,%d,%p)\n", src, dst, len, convert, surf); +HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) { + BYTE *dest; + TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert, surf); switch (convert) { case NO_CONVERSION: { - memcpy(dst, src, len * surf->bytesPerPixel); + memcpy(dst, src, pitch * height); break; } case CONVERT_PALETTED: @@ -1585,7 +1588,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src IWineD3DPaletteImpl* pal = surf->palette; BYTE table[256][4]; unsigned int i; - unsigned int x; + unsigned int x, y; if( pal == NULL) { /* TODO: If we are a sublevel, try to get the palette from level 0 */ @@ -1631,12 +1634,17 @@ HRESULT d3dfmt_convert_surface(BYTE *src } } - for (x = 0; x < len; x++) { - BYTE color = *src++; - *dst++ = table[color][0]; - *dst++ = table[color][1]; - *dst++ = table[color][2]; - *dst++ = table[color][3]; + for (y = 0; y < height; y++) + { + dest = dst + outpitch * y; + /* This is an 1 bpp format, using the pitch here is fine */ + for (x = 0; x < pitch; x++) { + BYTE color = *src++; + *dest++ = table[color][0]; + *dest++ = table[color][1]; + *dest++ = table[color][2]; + *dest++ = table[color][3]; + } } } break; @@ -1653,20 +1661,24 @@ HRESULT d3dfmt_convert_surface(BYTE *src Note2: Nvidia documents say that their driver does not support alpha + color keying on the same surface and disables color keying in such a case */ - unsigned int x; - WORD *Source = (WORD *) src; - WORD *Dest = (WORD *) dst; + unsigned int x, y; + WORD *Source; + WORD *Dest; TRACE("Color keyed 565\n"); - for (x = 0; x < len; x++ ) { - WORD color = *Source++; - *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); - if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || - (color > surf->SrcBltCKey.dwColorSpaceHighValue)) { - *Dest |= 0x0001; + for (y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < pitch / 2; x++ ) { + WORD color = *Source++; + *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); + if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || + (color > surf->SrcBltCKey.dwColorSpaceHighValue)) { + *Dest |= 0x0001; + } + Dest++; } - Dest++; } } break; @@ -1674,7 +1686,6 @@ HRESULT d3dfmt_convert_surface(BYTE *src default: ERR("Unsupported conversation type %d\n", convert); } - return WINED3D_OK; } @@ -1735,7 +1746,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp GLenum format, internal, type; CONVERT_TYPES convert; int bpp; - int width; + int width, pitch, outpitch; BYTE *mem; if (This->Flags & SFLAG_INTEXTURE) { @@ -1824,15 +1835,21 @@ static HRESULT WINAPI IWineD3DSurfaceImp else width = This->pow2Width; + pitch = IWineD3DSurface_GetPitch(iface); + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->glRect.bottom - This->glRect.top; - mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); + /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ + outpitch = width * bpp; + outpitch = (outpitch + 3) & ~3; + + mem = HeapAlloc(GetProcessHeap(), 0, outpitch * height); if(!mem) { - ERR("Out of memory %d, %d!\n", width, height); + ERR("Out of memory %d, %d!\n", outpitch, height); return WINED3DERR_OUTOFVIDEOMEMORY; } - d3dfmt_convert_surface(This->resource.allocatedMemory, mem, width * height, convert, This); + d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, height, outpitch, convert, This); This->Flags |= SFLAG_CONVERTED; } else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) {

1 0

Stefan Dösinger : wined3d: No color keying on surfaces with an alpha channel.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 49deec6139eb07e29dd9e6f70236aa1787fb7738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49deec6139eb07e29dd9e6f70… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 21:31:50 2006 +0200 wined3d: No color keying on surfaces with an alpha channel. --- dlls/wined3d/surface.c | 65 +----------------------------------------------- 1 files changed, 2 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbdfb10..fba597f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1562,34 +1562,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceI *type = GL_UNSIGNED_INT_8_8_8_8; } break; -#if 0 - /* Not sure if we should do color keying on Alpha-Enabled surfaces */ - case WINED3DFMT_A4R4G4B4: - if (colorkey_active) - { - *convert = CONVERT_CK_4444_ARGB; - *format = GL_RGBA; - *internal = GL_RGBA; - *type = GL_UNSIGNED_SHORT_4_4_4_4; - } - break; - case WINED3DFMT_A1R5G5B5: - if (colorkey_active) - { - *convert = CONVERT_CK_1555; - } - - case WINED3DFMT_A8R8G8B8: - if (colorkey_active) - { - *convert = CONVERT_CK_8888_ARGB; - *format = GL_RGBA; - *internal = GL_RGBA; - *type = GL_UNSIGNED_INT_8_8_8_8; - } - break; -#endif default: break; } @@ -1677,8 +1650,8 @@ HRESULT d3dfmt_convert_surface(BYTE *src prevent 'color bleeding'. This will be done later on if ever it is too visible. - Note2: when using color-keying + alpha, are the alpha bits part of the - color-space or not ? + Note2: Nvidia documents say that their driver does not support alpha + color keying + on the same surface and disables color keying in such a case */ unsigned int x; WORD *Source = (WORD *) src; @@ -1698,40 +1671,6 @@ HRESULT d3dfmt_convert_surface(BYTE *src } break; - case CONVERT_CK_1555: - { - unsigned int x; - WORD *Source = (WORD *) src; - WORD *Dest = (WORD *) dst; - - for (x = 0; x < len * sizeof(WORD); x+=sizeof(WORD)) { - WORD color = *Source++; - *Dest = (color & 0x7FFF); - if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || - (color > surf->SrcBltCKey.dwColorSpaceHighValue)) - *Dest |= (color & 0x8000); - Dest++; - } - } - break; - - case CONVERT_CK_4444_ARGB: - { - /* Move the four Alpha bits... */ - unsigned int x; - WORD *Source = (WORD *) src; - WORD *Dest = (WORD *) dst; - - for (x = 0; x < len; x++) { - WORD color = *Source++; - *dst = (color & 0x0FFF) << 4; - if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || - (color > surf->SrcBltCKey.dwColorSpaceHighValue)) - *Dest |= (color & 0xF000) >> 12; - Dest++; - } - } break; - default: ERR("Unsupported conversation type %d\n", convert); }

1 0