wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Stefan Dösinger : d3d9/tests: Test partial block locks .
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7fd752047d918886ebe9cd91028bfd988238cbe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd752047d918886ebe9cd910… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 12:54:37 2011 +0200 d3d9/tests: Test partial block locks. --- dlls/d3d9/tests/surface.c | 173 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 2 +- 2 files changed, 174 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 361e8a3..1c2a2d2 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -633,6 +633,178 @@ static void test_surface_double_unlock(IDirect3DDevice9 *device) } } +static void test_surface_lockrect_blocks(IDirect3DDevice9 *device) +{ + IDirect3DTexture9 *texture; + IDirect3DSurface9 *surface; + IDirect3D9 *d3d; + D3DLOCKED_RECT locked_rect; + unsigned int i, j; + HRESULT hr; + RECT rect; + BOOL surface_only; + + const struct + { + D3DFORMAT fmt; + const char *name; + unsigned int block_width; + unsigned int block_height; + BOOL broken; + } + formats[] = + { + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, FALSE}, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, FALSE}, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, FALSE}, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, FALSE}, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, FALSE}, + /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards, + * which doesn't match the format spec. On newer Nvidia cards + * it has the correct 4x4 block size */ + {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, TRUE}, + }; + static const struct + { + D3DPOOL pool; + const char *name; + /* Don't check the return value, Nvidia returns D3DERR_INVALIDCALL for some formats + * and E_INVALIDARG/DDERR_INVALIDPARAMS for others. */ + BOOL success; + } + pools[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", TRUE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM",TRUE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDirect3D failed (%08x)\n", hr); + + for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) { + surface_only = FALSE; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_DYNAMIC, + D3DRTYPE_TEXTURE, formats[i].fmt); + if (FAILED(hr)) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, formats[i].fmt); + if (FAILED(hr)) + { + skip("Format %s not supported, skipping lockrect offset test\n", formats[i].name); + continue; + } + surface_only = TRUE; + } + + for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++) + { + switch (pools[j].pool) + { + case D3DPOOL_SYSTEMMEM: + case D3DPOOL_MANAGED: + if (surface_only) continue; + /* Fall through */ + case D3DPOOL_DEFAULT: + if (surface_only) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, + pools[j].pool, &surface, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed (%08x)\n", hr); + } + else + { + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, + pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0, + formats[i].fmt, pools[j].pool, &texture, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (%08x)\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed (%08x)\n", hr); + IDirect3DTexture9_Release(texture); + } + break; + + case D3DPOOL_SCRATCH: + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, + pools[j].pool, &surface, 0); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); + break; + + default: + break; + } + + if (formats[i].block_width > 1) + { + SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + } + + if (formats[i].block_height > 1) + { + SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(SUCCEEDED(hr), "Full block lock returned %08x, expected %08x, format %s, pool %s\n", + hr, D3D_OK, formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + IDirect3DSurface9_Release(surface); + } + } + IDirect3D9_Release(d3d); +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -658,6 +830,7 @@ START_TEST(surface) test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); test_surface_double_unlock(device_ptr); + test_surface_lockrect_blocks(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8def5b5..36e1dea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3713,7 +3713,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; } - if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED + if ((format->flags & WINED3DFMT_FLAG_COMPRESSED) && rect && (rect->left || rect->top || rect->right != surface->resource.width || rect->bottom != surface->resource.height))

1 0

Eric Pouech : expand: No longer use Unix stdio functions, but rather the kernel32 equivalent.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: c561b6795036cd294540323d6e05a51d4170c63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c561b6795036cd294540323d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Nov 4 21:14:05 2011 +0100 expand: No longer use Unix stdio functions, but rather the kernel32 equivalent. --- programs/expand/expand.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 3107ff6..2bede08 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -26,6 +26,21 @@ #include <lzexpand.h> #include <setupapi.h> +static int myprintf(const char* format, ...) +{ + va_list va; + char tmp[8192]; + DWORD w; + int len; + + va_start(va, format); + len = vsnprintf(tmp, sizeof(tmp), format, va); + if (len > 0) + WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); + va_end(va); + return w; +} + static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; @@ -83,9 +98,9 @@ int main(int argc, char *argv[]) if (argc < 3) { - fprintf( stderr, "Usage:\n" ); - fprintf( stderr, "\t%s infile outfile\n", argv[0] ); - fprintf( stderr, "\t%s /r infile\n", argv[0] ); + myprintf( "Usage:\n" ); + myprintf( "\t%s infile outfile\n", argv[0] ); + myprintf( "\t%s /r infile\n", argv[0] ); return 1; } @@ -96,7 +111,7 @@ int main(int argc, char *argv[]) if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } @@ -108,7 +123,7 @@ int main(int argc, char *argv[]) outfile_basename[0] = 0; if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) { - fprintf( stderr, "%s: can't determine original name\n", argv[0] ); + myprintf( "%s: can't determine original name\n", argv[0] ); return 1; } GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index ); @@ -119,7 +134,7 @@ int main(int argc, char *argv[]) GetExpandedNameA( infile, outfile_basename ); break; default: - fprintf( stderr, "%s: can't determine original\n", argv[0] ); + myprintf( "%s: can't determine original\n", argv[0] ); return 1; } } @@ -128,7 +143,7 @@ int main(int argc, char *argv[]) if (!lstrcmpiA( infile, outfile )) { - fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + myprintf( "%s: can't expand file to itself\n", argv[0] ); return 1; } @@ -137,7 +152,7 @@ int main(int argc, char *argv[]) case FILE_COMPRESSION_MSZIP: if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) { - fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); + myprintf( "%s: cabinet extraction failed\n", argv[0] ); return 1; } break; @@ -149,13 +164,13 @@ int main(int argc, char *argv[]) if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) { LZClose( hin ); - fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); + myprintf( "%s: can't open output file %s\n", argv[0], outfile ); return 1; } error = LZCopy( hin, hout ); @@ -165,7 +180,7 @@ int main(int argc, char *argv[]) if (error < 0) { - fprintf( stderr, "%s: LZCopy failed, error is %d\n", argv[0], error ); + myprintf( "%s: LZCopy failed, error is %d\n", argv[0], error ); return 1; } break; @@ -173,7 +188,7 @@ int main(int argc, char *argv[]) default: if (!CopyFileA( infile, outfile, FALSE )) { - fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); + myprintf( "%s: CopyFileA failed\n", argv[0] ); return 1; } break;

1 0

Eric Pouech : expand: Remove extraneous curly braces from switch statements .
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 60460147ee89faae1b3f78dd10a2a3a41f0df1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60460147ee89faae1b3f78dd1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Nov 4 21:13:57 2011 +0100 expand: Remove extraneous curly braces from switch statements. --- programs/expand/expand.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 9c78f96..3107ff6 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -105,7 +105,6 @@ int main(int argc, char *argv[]) switch (comp) { case FILE_COMPRESSION_MSZIP: - { outfile_basename[0] = 0; if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) { @@ -116,18 +115,13 @@ int main(int argc, char *argv[]) *basename_index = 0; strcat( outfile, outfile_basename ); break; - } case FILE_COMPRESSION_WINLZA: - { GetExpandedNameA( infile, outfile_basename ); break; - } default: - { fprintf( stderr, "%s: can't determine original\n", argv[0] ); return 1; } - } } else GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); @@ -141,14 +135,12 @@ int main(int argc, char *argv[]) switch (comp) { case FILE_COMPRESSION_MSZIP: - { if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) { fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); return 1; } break; - } case FILE_COMPRESSION_WINLZA: { INT hin, hout; @@ -179,7 +171,6 @@ int main(int argc, char *argv[]) break; } default: - { if (!CopyFileA( infile, outfile, FALSE )) { fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); @@ -187,6 +178,5 @@ int main(int argc, char *argv[]) } break; } - } return ret; }

1 0

Alistair Leslie-Hughes : mscoree: Move clearing of processes to Terminate.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7ea2e93107a2d48573b5d44402128680ef273962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea2e93107a2d48573b5d4440… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 3 09:35:06 2011 +1100 mscoree: Move clearing of processes to Terminate. --- dlls/mscoree/cordebug.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 8fe7501..498493e 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -180,20 +180,13 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) { CorDebug *This = impl_from_ICorDebug( iface ); ULONG ref = InterlockedDecrement(&This->ref); - struct CorProcess *cursor, *cursor2; TRACE("%p ref=%u\n", This, ref); if (ref == 0) { - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->processes, struct CorProcess, entry) - { - if(cursor->pProcess) - ICorDebugProcess_Release(cursor->pProcess); - - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); - } + if(!list_empty(&This->processes)) + ERR("Processes haven't been removed Correctly\n"); if(This->runtimehost) ICLRRuntimeHost_Release(This->runtimehost); @@ -220,8 +213,19 @@ static HRESULT WINAPI CorDebug_Initialize(ICorDebug *iface) static HRESULT WINAPI CorDebug_Terminate(ICorDebug *iface) { + struct CorProcess *cursor, *cursor2; CorDebug *This = impl_from_ICorDebug( iface ); FIXME("stub %p\n", This); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->processes, struct CorProcess, entry) + { + if(cursor->pProcess) + ICorDebugProcess_Release(cursor->pProcess); + + list_remove(&cursor->entry); + HeapFree(GetProcessHeap(), 0, cursor); + } + return E_NOTIMPL; }

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 03e0d96b9e95629ff26e78d79288ef9d7b7acc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e0d96b9e95629ff26e78d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:06:23 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles. --- dlls/gdi32/enhmfdrv/objects.c | 106 ++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 52e9cb4..027b6a3 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -132,86 +132,54 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) index = 0; } break; - case BS_DIBPATTERN: - { - EMRCREATEDIBPATTERNBRUSHPT *emr; - DWORD bmSize, biSize, size; - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) break; - emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; - emr->emr.nSize = size; - emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - emr->iUsage = LOWORD(logbrush.lbColor); - emr->offBmi = sizeof(EMRCREATEDIBPATTERNBRUSHPT); - emr->cbBmi = biSize; - emr->offBits = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize; - emr->cbBits = bmSize; - memcpy((char *)emr + sizeof(EMRCREATEDIBPATTERNBRUSHPT), info, - biSize + bmSize ); - - if(!EMFDRV_WriteRecord( dev, &emr->emr )) - index = 0; - HeapFree( GetProcessHeap(), 0, emr ); - } - break; - case BS_PATTERN: + case BS_DIBPATTERN: { EMRCREATEDIBPATTERNBRUSHPT *emr; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - DWORD size; + BITMAPINFO *info = (BITMAPINFO *)buffer; + DWORD info_size, image_size; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) break; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to create a color pattern brush\n"); - if (bits.free) bits.free( &bits ); - break; - } + if (!get_brush_bitmap_info( hBrush, info, &bits, &usage )) break; + info_size = bitmap_info_size( info, usage ); + image_size = get_dib_image_size( info ); - /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what its meant to contain. - */ - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + - sizeof(BITMAPINFOHEADER) + src_info->bmiHeader.biSizeImage; + emr = HeapAlloc( GetProcessHeap(), 0, sizeof(EMRCREATEDIBPATTERNBRUSHPT)+info_size+image_size ); + if(!emr) break; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) + if (logbrush.lbStyle == BS_PATTERN && info->bmiHeader.biBitCount == 1) { - if (bits.free) bits.free( &bits ); - break; + /* Presumably to reduce the size of the written EMF, MS supports an + * undocumented iUsage value of 2, indicating a mono bitmap without the + * 8 byte 2 entry black/white palette. Stupidly, they could have saved + * over 20 bytes more by also ignoring the BITMAPINFO fields that are + * irrelevant/constant for monochrome bitmaps. + * FIXME: It may be that the DIB functions themselves accept this value. + */ + emr->emr.iType = EMR_CREATEMONOBRUSH; + usage = DIB_PAL_MONO; + /* FIXME: There is an extra DWORD written by native before the BMI. + * Not sure what its meant to contain. + */ + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); + emr->cbBmi = sizeof( BITMAPINFOHEADER ); } - - dst_info = (BITMAPINFO *)((LPBYTE)(emr + 1) + sizeof(DWORD)); - dst_info->bmiHeader = src_info->bmiHeader; - memcpy( &dst_info->bmiHeader + 1, bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); - - emr->emr.iType = EMR_CREATEMONOBRUSH; - emr->emr.nSize = size; + else + { + emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); + emr->cbBmi = info_size; + } + emr->emr.nSize = emr->offBits + emr->cbBits; emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - /* Presumably to reduce the size of the written EMF, MS supports an - * undocumented iUsage value of 2, indicating a mono bitmap without the - * 8 byte 2 entry black/white palette. Stupidly, they could have saved - * over 20 bytes more by also ignoring the BITMAPINFO fields that are - * irrelevant/constant for monochrome bitmaps. - * FIXME: It may be that the DIB functions themselves accept this value. - */ - emr->iUsage = DIB_PAL_MONO; - emr->offBmi = (LPBYTE)dst_info - (LPBYTE)emr; - emr->cbBmi = sizeof( BITMAPINFOHEADER ); + emr->iUsage = usage; emr->offBits = emr->offBmi + emr->cbBmi; - emr->cbBits = dst_info->bmiHeader.biSizeImage; + emr->cbBits = image_size; + + memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); + memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits ); if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0;

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for metafiles.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7d0b65c4d1b4f070d2c18a7adbba6c6cdec082a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0b65c4d1b4f070d2c18a7ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:05:16 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for metafiles. --- dlls/gdi32/brush.c | 29 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mfdrv/objects.c | 76 ++++++++++--------------------------------- 3 files changed, 49 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 59d0bed..19372d1 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,35 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) +{ + BRUSHOBJ *brush; + BOOL ret = FALSE; + + if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; + + if (!brush->info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + + if (bmp) + { + store_bitmap_bits( brush, bmp ); + GDI_ReleaseObj( brush->bitmap ); + } + } + if (brush->info) + { + memcpy( info, brush->info, bitmap_info_size( brush->info, brush->usage )); + *bits = brush->bits.ptr; + *usage = brush->usage; + ret = TRUE; + } + GDI_ReleaseObj( handle ); + return ret; +} + + /*********************************************************************** * CreateBrushIndirect (GDI32.@) * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0c73a9d..52fb318 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -233,6 +233,8 @@ extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_imag extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; +extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; + /* clipping.c */ extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 599f226..3745ec7 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -174,86 +174,46 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) break; } case BS_PATTERN: + case BS_DIBPATTERN: { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - COLORREF cref; + DWORD info_size, image_size; + char *dst_ptr; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) goto done; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to store a colour pattern brush\n"); - if (bits.free) bits.free( &bits ); - goto done; - } + if (!get_brush_bitmap_info( hBrush, src_info, &bits, &usage )) goto done; - size = FIELD_OFFSET( METARECORD, rdParm[2] ) + - FIELD_OFFSET( BITMAPINFO, bmiColors[2] ) + src_info->bmiHeader.biSizeImage; + info_size = bitmap_info_size( src_info, usage ); + image_size = get_dib_image_size( src_info ); + size = FIELD_OFFSET( METARECORD, rdParm[2] ) + info_size + image_size; - if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) - { - if (bits.free) bits.free( &bits ); - goto done; - } + if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) goto done; mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; - mr->rdParm[0] = BS_PATTERN; - mr->rdParm[1] = DIB_RGB_COLORS; + mr->rdParm[0] = logbrush.lbStyle; + mr->rdParm[1] = usage; dst_info = (BITMAPINFO *)(mr->rdParm + 2); - dst_info->bmiHeader = src_info->bmiHeader; - dst_info->bmiHeader.biClrUsed = 0; - cref = GetTextColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue(cref); - dst_info->bmiColors[0].rgbGreen = GetGValue(cref); - dst_info->bmiColors[0].rgbBlue = GetBValue(cref); - dst_info->bmiColors[0].rgbReserved = 0; - cref = GetBkColor( dev->hdc ); - dst_info->bmiColors[1].rgbRed = GetRValue(cref); - dst_info->bmiColors[1].rgbGreen = GetGValue(cref); - dst_info->bmiColors[1].rgbBlue = GetBValue(cref); - dst_info->bmiColors[1].rgbReserved = 0; + memcpy( dst_info, src_info, info_size ); + if (dst_info->bmiHeader.biClrUsed == 1 << dst_info->bmiHeader.biBitCount) + dst_info->bmiHeader.biClrUsed = 0; + dst_ptr = (char *)dst_info + info_size; /* always return a bottom-up DIB */ if (dst_info->bmiHeader.biHeight < 0) { int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, dst_info->bmiHeader.biBitCount ); - char *dst_ptr = (char *)&dst_info->bmiColors[2]; dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) - memcpy( dst_ptr, (char *)bits.ptr + i * width_bytes, width_bytes ); + memcpy( dst_ptr, (char *)bits + i * width_bytes, width_bytes ); } - else memcpy( &dst_info->bmiColors[2], bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); + else memcpy( dst_ptr, bits, image_size ); break; } - case BS_DIBPATTERN: - { - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - DWORD bmSize, biSize; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(METARECORD) + biSize + bmSize + 2; - mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!mr) - { - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); - goto done; - } - mr->rdFunction = META_DIBCREATEPATTERNBRUSH; - mr->rdSize = size / 2; - *(mr->rdParm) = logbrush.lbStyle; - *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); - memcpy(mr->rdParm + 2, info, biSize + bmSize); - break; - } default: FIXME("Unkonwn brush style %x\n", logbrush.lbStyle); return 0;

1 0

Alexandre Julliard : gdi32: Fix positioning of font underlines and strikeouts.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 199409a27bb405774d2837c176098f02c58fea75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199409a27bb405774d2837c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 13:41:18 2011 +0100 gdi32: Fix positioning of font underlines and strikeouts. --- dlls/gdi32/font.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 10a7f1d..97cc2b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2095,20 +2095,23 @@ done: { otm = HeapAlloc(GetProcessHeap(), 0, size); GetOutlineTextMetricsW(hdc, size, otm); - underlinePos = otm->otmsUnderscorePosition; - underlineWidth = otm->otmsUnderscoreSize; - strikeoutPos = otm->otmsStrikeoutPosition; - strikeoutWidth = otm->otmsStrikeoutSize; + underlinePos = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscorePosition )); + if (otm->otmsUnderscorePosition < 0) underlinePos = -underlinePos; + underlineWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscoreSize )); + if (otm->otmsUnderscoreSize < 0) underlineWidth = -underlineWidth; + strikeoutPos = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutPosition )); + if (otm->otmsStrikeoutPosition < 0) strikeoutPos = -strikeoutPos; + strikeoutWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutSize )); HeapFree(GetProcessHeap(), 0, otm); } if (lf.lfUnderline) { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; + pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; + pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[1].y = y + width.y - (underlinePos + underlineWidth / 2) * cosEsc; pts[2].x = pts[1].x + underlineWidth * sinEsc; pts[2].y = pts[1].y + underlineWidth * cosEsc; pts[3].x = pts[0].x + underlineWidth * sinEsc; @@ -2121,10 +2124,10 @@ done: if (lf.lfStrikeOut) { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; + pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[1].y = y + width.y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[2].x = pts[1].x + strikeoutWidth * sinEsc; pts[2].y = pts[1].y + strikeoutWidth * cosEsc; pts[3].x = pts[0].x + strikeoutWidth * sinEsc;

1 0

Andrew Talbot : secur32: Superfluous semicolons fix.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7f17934de2f800ea2f1c7468083ef119d77481cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f17934de2f800ea2f1c74680… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:50 2011 +0000 secur32: Superfluous semicolons fix. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index f865158..4c353c3 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1973,7 +1973,7 @@ static const SecPkgInfoA infoA = { #define NEGO_COMMENT { 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', ' ', \ 'P', 'a', 'c', 'k', 'a', 'g', 'e', ' ', \ - 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0}; + 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0} static CHAR nego_comment_A[] = NEGO_COMMENT; static WCHAR nego_comment_W[] = NEGO_COMMENT;

1 0

Andrew Talbot : msvcp90: Superfluous semicolons fix.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 43bbce728ab60fe24c2ecc19cd55aec036090dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bbce728ab60fe24c2ecc19c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:30 2011 +0000 msvcp90: Superfluous semicolons fix. --- dlls/msvcp90/exception.c | 10 +++++----- dlls/msvcp90/memory.c | 20 ++++++++++---------- dlls/msvcp90/msvcp90.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 100ceed..00fb0f0 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -688,11 +688,11 @@ static const cxx_exception_type invalid_argument_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc) - __ASM_EXCEPTION_STRING_VTABLE(logic_error) - __ASM_EXCEPTION_STRING_VTABLE(length_error) - __ASM_EXCEPTION_STRING_VTABLE(out_of_range) - __ASM_EXCEPTION_STRING_VTABLE(invalid_argument) + __ASM_EXCEPTION_VTABLE(bad_alloc); + __ASM_EXCEPTION_STRING_VTABLE(logic_error); + __ASM_EXCEPTION_STRING_VTABLE(length_error); + __ASM_EXCEPTION_STRING_VTABLE(out_of_range); + __ASM_EXCEPTION_STRING_VTABLE(invalid_argument); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 85d80ae..4ecc379 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -61,7 +61,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy) /* ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z */ /* ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8) void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) { return this; @@ -69,7 +69,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) /* ?deallocate@?$allocator@D@std@@QAEXPADI@Z */ /* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12) void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size) { MSVCRT_operator_delete(ptr); @@ -77,7 +77,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz /* ?allocate@?$allocator@D@std@@QAEPADI@Z */ /* ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { return MSVCRT_operator_new(sizeof(char[count])); @@ -85,7 +85,7 @@ char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) /* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */ /* ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12) char* __thiscall MSVCP_allocator_char_allocate_hint(void *this, MSVCP_size_t count, const void *hint) { @@ -95,7 +95,7 @@ char* __thiscall MSVCP_allocator_char_allocate_hint(void *this, /* ?construct@?$allocator@D@std@@QAEXPADABD@Z */ /* ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12) void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val) { *ptr = *val; @@ -103,14 +103,14 @@ void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char /* ?destroy@?$allocator@D@std@@QAEXPAD@Z */ /* ?destroy@?$allocator@D@std@@QEAAXPEAD@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8) void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) { } /* ?max_size@?$allocator@D@std@@QBEIXZ */ /* ?max_size@?$allocator@D@std@@QEBA_KXZ */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) { return UINT_MAX/sizeof(char); @@ -315,7 +315,7 @@ MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this) /* allocator<void> */ /* ??0?$allocator@X@std@@QAE@XZ */ /* ??0?$allocator@X@std@@QEAA@XZ */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4) void* __thiscall MSVCP_allocator_void_ctor(void *this) { return this; @@ -323,7 +323,7 @@ void* __thiscall MSVCP_allocator_void_ctor(void *this) /* ??0?$allocator@X@std@@QAE@ABV01@@Z */ /* ??0?$allocator@X@std@@QEAA@AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8) void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy) { return this; @@ -331,7 +331,7 @@ void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy) /* ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z */ /* ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8) void* __thiscall MSVCP_allocator_void_assign(void *this, void *assign) { return this; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 1365223..b9000a4 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -73,7 +73,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ "\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); + funcs "\n\t.text") #else @@ -84,7 +84,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ "\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); + funcs "\n\t.text") #endif /* _WIN64 */

1 0

Andrew Talbot : wined3d: Remove extraneous braces from switch statements.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: e0cd19d88dbdd6a8a69989747e5a8335fad4c086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cd19d88dbdd6a8a69989747… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:17 2011 +0000 wined3d: Remove extraneous braces from switch statements. --- dlls/wined3d/glsl_shader.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1f3bff..32ac385 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -426,11 +426,9 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap()"); @@ -501,11 +499,9 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap_clamped()");

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
86
Older →

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 November 2011