November 2011 - Wine-commits

Alexandre Julliard : gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 0c5d619bd38554d406b11973cdd5653192137025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5d619bd38554d406b11973c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:06:57 2011 +0100 gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush. --- dlls/gdi32/bitmap.c | 53 ---------------------------------------------- dlls/gdi32/brush.c | 16 +++++++++++++- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9042b88..282e22b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -510,59 +510,6 @@ LONG WINAPI SetBitmapBits( return count; } -/********************************************************************** - * BITMAP_CopyBitmap - * - */ -HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) -{ - HBITMAP res; - DIBSECTION dib; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - if (bmp->dib) - { - void *bits; - BITMAPINFO *bi; - HDC dc; - - dib = *bmp->dib; - GDI_ReleaseObj( hbitmap ); - dc = CreateCompatibleDC( NULL ); - - if (!dc) return 0; - if (!(bi = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - { - DeleteDC( dc ); - return 0; - } - bi->bmiHeader = dib.dsBmih; - - /* Get the color table or the color masks */ - GetDIBits( dc, hbitmap, 0, 0, NULL, bi, DIB_RGB_COLORS ); - bi->bmiHeader.biHeight = dib.dsBmih.biHeight; - - res = CreateDIBSection( dc, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); - if (res) SetDIBits( dc, res, 0, dib.dsBm.bmHeight, dib.dsBm.bmBits, bi, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bi ); - DeleteDC( dc ); - return res; - } - dib.dsBm = bmp->bitmap; - dib.dsBm.bmBits = NULL; - GDI_ReleaseObj( hbitmap ); - - res = CreateBitmapIndirect( &dib.dsBm ); - if(res) { - char *buf = HeapAlloc( GetProcessHeap(), 0, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight ); - GetBitmapBits (hbitmap, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - SetBitmapBits (res, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - HeapFree( GetProcessHeap(), 0, buf ); - } - return res; -} - static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index ccd1369..579e9fd 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -99,8 +99,22 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) if (!bmp->dib) { + if ((brush->bitmap = CreateBitmap( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, + bmp->bitmap.bmPlanes, bmp->bitmap.bmBitsPixel, NULL ))) + { + if (bmp->funcs->pCopyBitmap( bitmap, brush->bitmap )) + { + BITMAPOBJ *copy = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + copy->funcs = bmp->funcs; + GDI_ReleaseObj( copy ); + } + else + { + DeleteObject( brush->bitmap ); + brush->bitmap = 0; + } + } GDI_ReleaseObj( bitmap ); - brush->bitmap = BITMAP_CopyBitmap( bitmap ); return brush->bitmap != 0; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ab5cf25..3b3022a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -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;

1 0

Alexandre Julliard : gdi32: Don' t set the bitmap owner when selecting a pattern brush.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5e1599d8c0a7549a7807e63c20652e896f9f50e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1599d8c0a7549a7807e63c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:21:37 2011 +0100 gdi32: Don't set the bitmap owner when selecting a pattern brush. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 10 ---------- dlls/gdi32/gdi_private.h | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 282e22b..45c3011 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -530,7 +530,7 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) * bitmap is selected into a device to initialize the bitmap function * table. */ -BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) +static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) { BITMAPOBJ *bitmap; BOOL ret = TRUE; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 579e9fd..a360a1d 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -488,16 +488,6 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp ); GDI_ReleaseObj( bitmap ); } - if (brush->logbrush.lbStyle == BS_PATTERN) - { - PHYSDEV pattern_dev = physdev; - /* FIXME: This will go away once the dib driver implements - pattern brushes */ - if(pattern_dev == dc->dibdrv) - pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); - - BITMAP_SetOwnerDC( bitmap, pattern_dev ); - } info = brush->info; bits = brush->bits.ptr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3b3022a..c23a5cc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -228,9 +228,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; -/* bitmap.c */ -extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; - +/* brush.c */ extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */

1 0

Thomas Faber : kernel32/tests: Add tests for GetDllDirectory.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5d5fd2fa9b5bd76ebeaf34bd99956108a3cd1c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5fd2fa9b5bd76ebeaf34bd9… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Nov 8 19:42:18 2011 +0100 kernel32/tests: Add tests for GetDllDirectory. --- dlls/kernel32/tests/module.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 07d5892..06cf557 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -21,6 +21,11 @@ #include "wine/test.h" #include <windows.h> +static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); +static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); + +static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); + static BOOL is_unicode_enabled = TRUE; static BOOL cmpStrAW(const char* a, const WCHAR* b, DWORD lenA, DWORD lenB) @@ -386,6 +391,114 @@ static void testLoadLibraryEx(void) } +static void testGetDllDirectory(void) +{ + CHAR bufferA[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + size_t length; + DWORD ret; + int i; + static const char *dll_directories[] = + { + "", + "C:\\Some\\Path", + "C:\\Some\\Path\\", + "Q:\\A\\Long\\Path with spaces that\\probably\\doesn't exist!", + }; + const int test_count = sizeof(dll_directories) / sizeof(dll_directories[0]); + + if (!pGetDllDirectoryA || !pGetDllDirectoryW) + { + win_skip("GetDllDirectory not available\n"); + return; + } + if (!pSetDllDirectoryA) + { + win_skip("SetDllDirectoryA not available\n"); + return; + } + + for (i = 0; i < test_count; i++) + { + length = strlen(dll_directories[i]); + if (!pSetDllDirectoryA(dll_directories[i])) + { + skip("i=%d, SetDllDirectoryA failed\n", i); + continue; + } + + /* no buffer, determine length */ + ret = pGetDllDirectoryA(0, NULL); + ok(ret == length + 1, "Expected %u, got %u\n", length + 1, ret); + + ret = pGetDllDirectoryW(0, NULL); + ok(ret == length + 1, "Expected %u, got %u\n", length + 1, ret); + + /* buffer of exactly the right size */ + bufferA[length] = 'A'; + bufferA[length + 1] = 'A'; + ret = pGetDllDirectoryA(length + 1, bufferA); + ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(bufferA[length + 1] == 'A', "i=%d, Buffer overflow\n", i); + ok(strcmp(bufferA, dll_directories[i]) == 0, "i=%d, Wrong path returned: '%s'\n", i, bufferA); + + bufferW[length] = 'A'; + bufferW[length + 1] = 'A'; + ret = pGetDllDirectoryW(length + 1, bufferW); + ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(bufferW[length + 1] == 'A', "i=%d, Buffer overflow\n", i); + ok(cmpStrAW(dll_directories[i], bufferW, length, length), + "i=%d, Wrong path returned: %s\n", i, wine_dbgstr_w(bufferW)); + + /* zero size buffer + * the A version always null-terminates the buffer, + * the W version doesn't do it on some platforms */ + bufferA[0] = 'A'; + ret = pGetDllDirectoryA(0, bufferA); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + + bufferW[0] = 'A'; + ret = pGetDllDirectoryW(0, bufferW); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferW[0] == 0 || /* XP, 2003 */ + broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); + + /* buffer just one too short */ + bufferA[0] = 'A'; + ret = pGetDllDirectoryA(length, bufferA); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + + bufferW[0] = 'A'; + ret = pGetDllDirectoryW(length, bufferW); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferW[0] == 0 || /* XP, 2003 */ + broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); + + /* no buffer, but too short length */ + ret = pGetDllDirectoryA(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + + ret = pGetDllDirectoryW(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + } + + /* unset whatever we did so following tests won't be affected */ + pSetDllDirectoryA(NULL); +} + +static void init_pointers(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hKernel32, #f)) + MAKEFUNC(GetDllDirectoryA); + MAKEFUNC(GetDllDirectoryW); + MAKEFUNC(SetDllDirectoryA); +#undef MAKEFUNC +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -400,10 +513,14 @@ START_TEST(module) is_unicode_enabled = FALSE; } + init_pointers(); + testGetModuleFileName(NULL); testGetModuleFileName("kernel32.dll"); testGetModuleFileName_Wrong(); + testGetDllDirectory(); + testLoadLibraryA(); testNestedLoadLibraryA(); testLoadLibraryA_Wrong();

1 0

Henri Verbeet : wined3d: Don't print FIXMEs for misaligned surface maps.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: b6c7a3dbc88a02ac0e430624fe8008875e43ed2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7a3dbc88a02ac0e430624f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:55 2011 +0100 wined3d: Don't print FIXMEs for misaligned surface maps. --- dlls/wined3d/surface.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5d32512..06a36b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3719,15 +3719,11 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if ((rect->left & width_mask) || (rect->right & width_mask) || (rect->top & height_mask) || (rect->bottom & height_mask)) { - switch (surface->resource.pool) - { - case WINED3DPOOL_DEFAULT: - WARN("Partial block lock with WINED3DPOOL_DEFAULT\n"); - return WINED3DERR_INVALIDCALL; + WARN("Map rect %s is misaligned for %ux%u blocks.\n", + wine_dbgstr_rect(rect), format->block_width, format->block_height); - default: - FIXME("Partial block lock with %s\n", debug_d3dpool(surface->resource.pool)); - } + if (surface->resource.pool == WINED3DPOOL_DEFAULT) + return WINED3DERR_INVALIDCALL; } }

1 0

Henri Verbeet : wined3d: Get rid of RTL_DISABLE.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 0ba5f7dd983986f40e702f5f775611fbfd6ad088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba5f7dd983986f40e702f5f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:56 2011 +0100 wined3d: Get rid of RTL_DISABLE. --- dlls/wined3d/surface.c | 26 +------------------------- dlls/wined3d/wined3d_main.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06a36b3..f354c11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -868,11 +868,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD && rect->right == surface->resource.width && rect->bottom == surface->resource.height) pass_rect = NULL; - - if (!(wined3d_settings.rendertargetlock_mode == RTL_DISABLE - && ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) - || surface == device->fb.render_targets[0]))) - surface_load_location(surface, SFLAG_INSYSMEM, pass_rect); + surface_load_location(surface, SFLAG_INSYSMEM, pass_rect); } if (surface->flags & SFLAG_PBO) @@ -964,17 +960,6 @@ static void surface_unmap(struct wined3d_surface *surface) if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN || (device->fb.render_targets && surface == device->fb.render_targets[0])) { - if (wined3d_settings.rendertargetlock_mode == RTL_DISABLE) - { - static BOOL warned = FALSE; - if (!warned) - { - ERR("The application tries to write to the render target, but render target locking is disabled.\n"); - warned = TRUE; - } - goto done; - } - if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width && surface->dirtyRect.bottom == surface->resource.height) @@ -4013,15 +3998,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r GLint skipPix = 0; GLint skipRow = 0; - if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { - static BOOL warned = FALSE; - if(!warned) { - ERR("The application tries to lock the render target, but render target locking is disabled\n"); - warned = TRUE; - } - return; - } - context = context_acquire(device, surface); context_apply_blit_state(context, device); gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 282f52d..0533595 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -260,12 +260,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) { - if (!strcmp(buffer,"disabled")) - { - TRACE("Disabling render target locking\n"); - wined3d_settings.rendertargetlock_mode = RTL_DISABLE; - } - else if (!strcmp(buffer,"readdraw")) + if (!strcmp(buffer,"readdraw")) { TRACE("Using glReadPixels for render target reading and glDrawPixels for writing\n"); wined3d_settings.rendertargetlock_mode = RTL_READDRAW; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14fbd2b..48a302a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -246,7 +246,6 @@ static inline float float_24_to_32(DWORD in) #define SHADER_ATI 3 #define SHADER_NONE 4 -#define RTL_DISABLE -1 #define RTL_READDRAW 1 #define RTL_READTEX 2

1 0

Henri Verbeet : wined3d: Simplify context_choose_pixel_format().
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 81ae0cea7c56aa6a472dbf43f6c9d89bfc5ff612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ae0cea7c56aa6a472dbf43f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:57 2011 +0100 wined3d: Simplify context_choose_pixel_format(). Simply rank the formats instead of doing multiple passes over the list. --- dlls/wined3d/context.c | 150 +++++++++++++--------------------------- dlls/wined3d/directx.c | 20 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 49 insertions(+), 122 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 31a604c..355dccf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1124,33 +1124,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - unsigned int matchtry; BYTE redBits, greenBits, blueBits, alphaBits, colorBits; BYTE depthBits=0, stencilBits=0; - - static const struct - { - BOOL require_aux; - BOOL exact_alpha; - BOOL exact_color; - } - matches[] = - { - /* First, try without alpha match buffers. MacOS supports aux buffers only - * on A8R8G8B8, and we prefer better offscreen rendering over an alpha match. - * Then try without aux buffers - this is the most common cause for not - * finding a pixel format. Also some drivers(the open source ones) - * only offer 32 bit ARB pixel formats. First try without an exact alpha - * match, then try without an exact alpha and color match. - */ - { TRUE, TRUE, TRUE }, - { TRUE, FALSE, TRUE }, - { FALSE, TRUE, TRUE }, - { FALSE, FALSE, TRUE }, - { TRUE, FALSE, FALSE }, - { FALSE, FALSE, FALSE }, - }; - + unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; unsigned int i; @@ -1167,84 +1143,56 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC getDepthStencilBits(ds_format, &depthBits, &stencilBits); - for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) - { - for (i = 0; i < cfg_count; ++i) - { - const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; - BOOL exactDepthMatch = TRUE; - - /* For now only accept RGBA formats. Perhaps some day we will - * allow floating point formats for pbuffers. */ - if(cfg->iPixelType != WGL_TYPE_RGBA_ARB) - continue; - - /* In window mode we need a window drawable format and double buffering. */ - if(!(cfg->windowDrawable && cfg->doubleBuffer)) - continue; - - /* We like to have aux buffers in backbuffer mode */ - if(auxBuffers && !cfg->auxBuffers && matches[matchtry].require_aux) - continue; - - if(matches[matchtry].exact_color) { - if(cfg->redSize != redBits) - continue; - if(cfg->greenSize != greenBits) - continue; - if(cfg->blueSize != blueBits) - continue; - } else { - if(cfg->redSize < redBits) - continue; - if(cfg->greenSize < greenBits) - continue; - if(cfg->blueSize < blueBits) - continue; - } - if(matches[matchtry].exact_alpha) { - if(cfg->alphaSize != alphaBits) - continue; - } else { - if(cfg->alphaSize < alphaBits) - continue; - } - - /* We try to locate a format which matches our requirements exactly. In case of - * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if(cfg->depthSize < depthBits) - continue; - else if(cfg->depthSize > depthBits) - exactDepthMatch = FALSE; - - /* In all cases make sure the number of stencil bits matches our requirements - * even when we don't need stencil because it could affect performance EXCEPT - * on cards which don't offer depth formats without stencil like the i915 drivers - * on Linux. */ - if (stencilBits != cfg->stencilSize - && !(device->adapter->brokenStencil && stencilBits <= cfg->stencilSize)) - continue; - - /* Check multisampling support */ - if (cfg->numSamples) - continue; - - /* When we have passed all the checks then we have found a format which matches our - * requirements. Note that we only check for a limit number of capabilities right now, - * so there can easily be a dozen of pixel formats which appear to be the 'same' but - * can still differ in things like multisampling, stereo, SRGB and other flags. - */ - - /* Exit the loop as we have found a format :) */ - if(exactDepthMatch) { - iPixelFormat = cfg->iPixelFormat; - break; - } else if(!iPixelFormat) { - /* In the end we might end up with a format which doesn't exactly match our depth - * requirements. Accept the first format we found because formats with higher iPixelFormat - * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ - iPixelFormat = cfg->iPixelFormat; - } + current_value = 0; + for (i = 0; i < cfg_count; ++i) + { + const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; + unsigned int value; + + /* For now only accept RGBA formats. Perhaps some day we will + * allow floating point formats for pbuffers. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + continue; + /* In window mode we need a window drawable format and double buffering. */ + if (!(cfg->windowDrawable && cfg->doubleBuffer)) + continue; + if (cfg->redSize < redBits) + continue; + if (cfg->greenSize < greenBits) + continue; + if (cfg->blueSize < blueBits) + continue; + if (cfg->alphaSize < alphaBits) + continue; + if (cfg->depthSize < depthBits) + continue; + if (stencilBits && cfg->stencilSize != stencilBits) + continue; + /* Check multisampling support. */ + if (cfg->numSamples) + continue; + + value = 1; + /* We try to locate a format which matches our requirements exactly. In case of + * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ + if (cfg->depthSize == depthBits) + value += 1; + if (cfg->stencilSize == stencilBits) + value += 2; + if (cfg->alphaSize == alphaBits) + value += 4; + /* We like to have aux buffers in backbuffer mode */ + if (auxBuffers && cfg->auxBuffers) + value += 8; + if (cfg->redSize == redBits + && cfg->greenSize == greenBits + && cfg->blueSize == blueBits) + value += 16; + + if (value > current_value) + { + iPixelFormat = cfg->iPixelFormat; + current_value = value; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 44fd88d..ad79276 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5260,7 +5260,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) struct wined3d_pixel_format *cfgs; int iPixelFormat; int res; - int i; DISPLAY_DEVICEW DisplayDevice; HDC hdc; @@ -5439,25 +5438,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) } } - /* D16, D24X8 and D24S8 are common depth / depth+stencil formats. All drivers support them though this doesn't - * mean that the format is offered in hardware. For instance Geforce8 cards don't have offer D16 in hardware - * but just fake it using D24(X8?) which is fine. D3D also allows that. - * Some display drivers (i915 on Linux) only report mixed depth+stencil formats like D24S8. MSDN clearly mentions - * that only on lockable formats (e.g. D16_locked) the bit order is guaranteed and that on other formats the - * driver is allowed to consume more bits EXCEPT for stencil bits. - * - * Mark an adapter with this broken stencil behavior. - */ - adapter->brokenStencil = TRUE; - for (i = 0, cfgs = adapter->cfgs; i < adapter->cfg_count; ++i) - { - /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ - if(cfgs[i].depthSize && !cfgs[i].stencilSize) { - adapter->brokenStencil = FALSE; - break; - } - } - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48a302a..ef09e26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1527,7 +1527,6 @@ struct wined3d_adapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; - BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; LUID luid;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSAMPLER_TEXTURE_TYPE typedef .
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 323a95418ed044a443946fec243278bb907111da URL: http://source.winehq.org/git/wine.git/?a=commit;h=323a95418ed044a443946fec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:58 2011 +0100 wined3d: Get rid of the WINED3DSAMPLER_TEXTURE_TYPE typedef. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b271f5b..db57c72 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2898,7 +2898,7 @@ static void device_map_fixed_function_samplers(struct wined3d_device *device, co static void device_map_psamplers(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) { - const WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = + const enum wined3d_sampler_texture_type *sampler_type = device->stateBlock->state.pixel_shader->reg_maps.sampler_type; unsigned int i; @@ -2915,8 +2915,8 @@ static void device_map_psamplers(struct wined3d_device *device, const struct win } static BOOL device_unit_free_for_vs(const struct wined3d_device *device, - const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_tokens, - const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_tokens, DWORD unit) + const enum wined3d_sampler_texture_type *pshader_sampler_tokens, + const enum wined3d_sampler_texture_type *vshader_sampler_tokens, DWORD unit) { DWORD current_mapping = device->rev_tex_unit_map[unit]; @@ -2941,9 +2941,9 @@ static BOOL device_unit_free_for_vs(const struct wined3d_device *device, static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const struct wined3d_gl_info *gl_info) { - const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_type = + const enum wined3d_sampler_texture_type *vshader_sampler_type = device->stateBlock->state.vertex_shader->reg_maps.sampler_type; - const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_type = NULL; + const enum wined3d_sampler_texture_type *pshader_sampler_type = NULL; int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 32ac385..6ccb94a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1652,7 +1652,7 @@ static inline const char *shader_get_comp_op(DWORD op) static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { - WINED3DSAMPLER_TEXTURE_TYPE sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; + enum wined3d_sampler_texture_type sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = shader_is_pshader_version(ctx->reg_maps->shader_version.type) && (((const struct shader_glsl_ctx_priv *)ctx->backend_data)->cur_ps_args->shadow & (1 << sampler_idx)); @@ -3036,7 +3036,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD flags = (priv->cur_ps_args->tex_transform >> sampler_idx * WINED3D_PSARGS_TEXTRANSFORM_SHIFT) & WINED3D_PSARGS_TEXTRANSFORM_MASK; - WINED3DSAMPLER_TEXTURE_TYPE sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; + enum wined3d_sampler_texture_type sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; /* Projected cube textures don't make a lot of sense, the resulting coordinates stay the same. */ if (flags & WINED3D_PSARGS_PROJECTED && sampler_type != WINED3DSTT_CUBE) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 334a2fd..b708e48 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2157,7 +2157,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, struct wined3d_texture * const *textures) { - WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = reg_maps->sampler_type; + enum wined3d_sampler_texture_type *sampler_type = reg_maps->sampler_type; unsigned int i; if (reg_maps->shader_version.major != 1) return; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ef09e26..07b94f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -277,14 +277,14 @@ struct wined3d_settings extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -typedef enum _WINED3DSAMPLER_TEXTURE_TYPE +enum wined3d_sampler_texture_type { WINED3DSTT_UNKNOWN = 0, WINED3DSTT_1D = 1, WINED3DSTT_2D = 2, WINED3DSTT_CUBE = 3, WINED3DSTT_VOLUME = 4, -} WINED3DSAMPLER_TEXTURE_TYPE; +}; typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { @@ -544,7 +544,7 @@ struct wined3d_shader_reg_maps WORD local_int_consts; /* MAX_CONST_I, 16 */ WORD local_bool_consts; /* MAX_CONST_B, 16 */ - WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + enum wined3d_sampler_texture_type sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ @@ -637,7 +637,7 @@ struct wined3d_shader_semantic { WINED3DDECLUSAGE usage; UINT usage_idx; - WINED3DSAMPLER_TEXTURE_TYPE sampler_type; + enum wined3d_sampler_texture_type sampler_type; struct wined3d_shader_dst_param reg; };

1 0

Henri Verbeet : wined3d: Get rid of the COMPARISON_TYPE typedef.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: adf7c3302387a4000f1a5cde53315feffa277b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf7c3302387a4000f1a5cde5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:59 2011 +0100 wined3d: Get rid of the COMPARISON_TYPE typedef. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 25 +++++++++++++------------ dlls/wined3d/shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a4f2e68..19e565e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2943,34 +2943,34 @@ static void shader_hw_break(const struct wined3d_shader_instruction *ins) } } -static const char *get_compare(COMPARISON_TYPE flags) +static const char *get_compare(enum wined3d_shader_rel_op op) { - switch (flags) + switch (op) { - case COMPARISON_GT: return "GT"; - case COMPARISON_EQ: return "EQ"; - case COMPARISON_GE: return "GE"; - case COMPARISON_LT: return "LT"; - case COMPARISON_NE: return "NE"; - case COMPARISON_LE: return "LE"; + case WINED3D_SHADER_REL_OP_GT: return "GT"; + case WINED3D_SHADER_REL_OP_EQ: return "EQ"; + case WINED3D_SHADER_REL_OP_GE: return "GE"; + case WINED3D_SHADER_REL_OP_LT: return "LT"; + case WINED3D_SHADER_REL_OP_NE: return "NE"; + case WINED3D_SHADER_REL_OP_LE: return "LE"; default: - FIXME("Unrecognized comparison value: %u\n", flags); + FIXME("Unrecognized operator %#x.\n", op); return "(\?\?)"; } } -static COMPARISON_TYPE invert_compare(COMPARISON_TYPE flags) +static enum wined3d_shader_rel_op invert_compare(enum wined3d_shader_rel_op op) { - switch (flags) + switch (op) { - case COMPARISON_GT: return COMPARISON_LE; - case COMPARISON_EQ: return COMPARISON_NE; - case COMPARISON_GE: return COMPARISON_LT; - case COMPARISON_LT: return COMPARISON_GE; - case COMPARISON_NE: return COMPARISON_EQ; - case COMPARISON_LE: return COMPARISON_GT; + case WINED3D_SHADER_REL_OP_GT: return WINED3D_SHADER_REL_OP_LE; + case WINED3D_SHADER_REL_OP_EQ: return WINED3D_SHADER_REL_OP_NE; + case WINED3D_SHADER_REL_OP_GE: return WINED3D_SHADER_REL_OP_LT; + case WINED3D_SHADER_REL_OP_LT: return WINED3D_SHADER_REL_OP_GE; + case WINED3D_SHADER_REL_OP_NE: return WINED3D_SHADER_REL_OP_EQ; + case WINED3D_SHADER_REL_OP_LE: return WINED3D_SHADER_REL_OP_GT; default: - FIXME("Unrecognized comparison value: %u\n", flags); + FIXME("Unrecognized operator %#x.\n", op); return -1; } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ccb94a..fc642c9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1634,17 +1634,18 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in } } -static inline const char *shader_get_comp_op(DWORD op) -{ - switch (op) { - case COMPARISON_GT: return ">"; - case COMPARISON_EQ: return "=="; - case COMPARISON_GE: return ">="; - case COMPARISON_LT: return "<"; - case COMPARISON_NE: return "!="; - case COMPARISON_LE: return "<="; +static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) +{ + switch (op) + { + case WINED3D_SHADER_REL_OP_GT: return ">"; + case WINED3D_SHADER_REL_OP_EQ: return "=="; + case WINED3D_SHADER_REL_OP_GE: return ">="; + case WINED3D_SHADER_REL_OP_LT: return "<"; + case WINED3D_SHADER_REL_OP_NE: return "!="; + case WINED3D_SHADER_REL_OP_LE: return "<="; default: - FIXME("Unrecognized comparison value: %u\n", op); + FIXME("Unrecognized operator %#x.\n", op); return "(\?\?)"; } } @@ -2958,7 +2959,7 @@ static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(ins->ctx->buffer, "if (%s %s %s) {\n", - src0_param.param_str, shader_get_comp_op(ins->flags), src1_param.param_str); + src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } static void shader_glsl_else(const struct wined3d_shader_instruction *ins) @@ -2981,7 +2982,7 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(ins->ctx->buffer, "if (%s %s %s) break;\n", - src0_param.param_str, shader_get_comp_op(ins->flags), src1_param.param_str); + src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } static void shader_glsl_label(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b708e48..42c71ed 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1439,12 +1439,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { switch (ins.flags) { - case COMPARISON_GT: TRACE("_gt"); break; - case COMPARISON_EQ: TRACE("_eq"); break; - case COMPARISON_GE: TRACE("_ge"); break; - case COMPARISON_LT: TRACE("_lt"); break; - case COMPARISON_NE: TRACE("_ne"); break; - case COMPARISON_LE: TRACE("_le"); break; + case WINED3D_SHADER_REL_OP_GT: TRACE("_gt"); break; + case WINED3D_SHADER_REL_OP_EQ: TRACE("_eq"); break; + case WINED3D_SHADER_REL_OP_GE: TRACE("_ge"); break; + case WINED3D_SHADER_REL_OP_LT: TRACE("_lt"); break; + case WINED3D_SHADER_REL_OP_NE: TRACE("_ne"); break; + case WINED3D_SHADER_REL_OP_LE: TRACE("_le"); break; default: TRACE("_(%u)", ins.flags); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07b94f8..11e0297 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -360,15 +360,15 @@ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE #define WINED3DSI_TEXLD_PROJECT 1 #define WINED3DSI_TEXLD_BIAS 2 -typedef enum COMPARISON_TYPE -{ - COMPARISON_GT = 1, - COMPARISON_EQ = 2, - COMPARISON_GE = 3, - COMPARISON_LT = 4, - COMPARISON_NE = 5, - COMPARISON_LE = 6, -} COMPARISON_TYPE; +enum wined3d_shader_rel_op +{ + WINED3D_SHADER_REL_OP_GT = 1, + WINED3D_SHADER_REL_OP_EQ = 2, + WINED3D_SHADER_REL_OP_GE = 3, + WINED3D_SHADER_REL_OP_LT = 4, + WINED3D_SHADER_REL_OP_NE = 5, + WINED3D_SHADER_REL_OP_LE = 6, +}; #define WINED3D_SM1_VS 0xfffe #define WINED3D_SM1_PS 0xffff

1 0

Aric Stewart : usp10: Better handle the absorption of whitespace in bidi runs.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 2781ac1e6d7c6a83f7601aab0def68cd6345f9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2781ac1e6d7c6a83f7601aab0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 14:41:42 2011 -0600 usp10: Better handle the absorption of whitespace in bidi runs. --- dlls/usp10/tests/usp10.c | 6 +++--- dlls/usp10/usp10.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 955e19d..13211de 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -164,7 +164,7 @@ static void test_ScriptItemize( void ) /* leading space */ static const WCHAR test2c[] = {' ',0x0621,0x0623,0x0624,'A','B','C','-','D','E','F',0}; static const itemTest t2c1[5] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; - static const itemTest t2c2[6] = {{{0,0,0,0,1},0,0,0,0,0},{{0,0,0,0,0},1,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; + static const itemTest t2c2[6] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},1,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; static const itemTest t2c3[5] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,2,latn_tag},{{0,0,0,0,0},7,0,0,2,0},{{0,0,0,0,0},8,0,0,2,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; static const itemTest t2c4[3] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,2,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; @@ -188,8 +188,8 @@ static void test_ScriptItemize( void ) static const WCHAR test4[] = {'1','2','3','-','5','2',' ','i','s',' ','7','1','.',0}; static const itemTest t41[6] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},7,0,0,0,latn_tag},{{0,0,0,0,0},10,0,0,0,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t42[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,1},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t43[4] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,1},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t42[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t43[4] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; /* Arabic */ static const WCHAR test5[] = diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a19ed81..c1837d9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -814,7 +814,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } } - while ((pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) + while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) cnt++; if (cnt == cInChars) /* All Spaces */ @@ -858,9 +858,9 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int else if (levels) { int j = 1; - while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ)) + while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ) && levels[cnt] == levels[cnt+j]) j++; - if (cnt + j < cInChars) + if (cnt + j < cInChars && levels[cnt] == levels[cnt+j]) New_Script = get_char_script(pwcInChars[cnt+j]); else New_Script = get_char_script(pwcInChars[cnt]);

1 0

Aric Stewart : usp10: Better understand and handle numbers level in RTL runs.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 65710af292995683537bdf707313e8638da81cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=65710af292995683537bdf707… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 14:41:53 2011 -0600 usp10: Better understand and handle numbers level in RTL runs. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 13211de..a6e75a1 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -153,7 +153,7 @@ static void test_ScriptItemize( void ) /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,0,0,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; - static const itemTest t22[5] = {{{0,0,0,1,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; + static const itemTest t22[5] = {{{0,0,0,0,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; static const itemTest t23[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,1,1,1,0},{{0,0,0,0,0},16,0,0,0,-1}}; static const WCHAR test2b[] = {'A','B','C','-','D','E','F',' ',0x0621,0x0623,0x0624,0}; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c1837d9..a811cad 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -806,10 +806,34 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } else { - if (!psControl->fMergeNeutralItems) + BOOL inNumber = FALSE; + static WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; + + strength = heap_alloc_zero(cInChars * sizeof(WORD)); + if (!strength) + { + heap_free(levels); + return E_OUTOFMEMORY; + } + BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); + + /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ + for (i = 0; i < cInChars; i++) + { + if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) + levels[i] = 2; + else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && get_char_script(pwcInChars[i]) == Script_Numeric) + { + levels[i] = 2; + inNumber = TRUE; + } + else + inNumber = FALSE; + } + if (psControl->fMergeNeutralItems) { - strength = heap_alloc_zero(cInChars * sizeof(WORD)); - BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); + HeapFree(GetProcessHeap(),0,strength); + strength = NULL; } } }

1 0