March 2011 - Wine-commits - list.winehq.org

Paul Vriens : dxgi: Only cast to a void pointer (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: a01b1a397451a6a95ea318ebae62bfbe7b79c7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01b1a397451a6a95ea318eba… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 13:04:41 2011 +0100 dxgi: Only cast to a void pointer (Coverity). --- dlls/dxgi/dxgi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index ec1b2f0..2ef5072 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -146,7 +146,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) return E_FAIL; } - d3d10core_register_layers = (HRESULT (WINAPI *)(void))GetProcAddress(mod, "D3D10CoreRegisterLayers"); + d3d10core_register_layers = (void *)GetProcAddress(mod, "D3D10CoreRegisterLayers"); hr = d3d10core_register_layers(); if (FAILED(hr)) {

1 0

Jacek Caban : wincodec.h: Fixed a typo.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: cbf9bdcdd2144ad7e3d6580b2962700a420b2f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf9bdcdd2144ad7e3d6580b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 16:20:55 2011 +0100 wincodec.h: Fixed a typo. --- include/wincodec.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4139f51..6a24f5e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -78,7 +78,7 @@ typedef enum WICBitmapInterpolationMode { WICBitmapInterpolationModeNearestNeighbor = 0x00000000, WICBitmapInterpolationModeLinear = 0x00000001, WICBitmapInterpolationModeCubic = 0x00000002, - WICBitmapInterpolationModeFaint = 0x00000003, + WICBitmapInterpolationModeFant = 0x00000003, WICBITMAPINTERPOLATIONMODE_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapInterpolationMode;

1 0

Jacek Caban : mshtml: Fixed type in get_nsdoc_window.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: b411ba3fb060abee87c5f17b697239fc2bc78c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b411ba3fb060abee87c5f17b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 18:35:40 2011 +0100 mshtml: Fixed type in get_nsdoc_window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0e42021..656999e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -94,7 +94,7 @@ nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) } nsres = nsIDOMDocumentView_GetDefaultView(nsdocview, &nsview); - nsIDOMDocumentView_Release(nsview); + nsIDOMDocumentView_Release(nsdocview); if(NS_FAILED(nsres)) { ERR("GetDefaultView failed: %08x\n", nsres); return NULL;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the palette functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0d27e3c0ed5743f35ba9af4f6dfeeb346258f6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d27e3c0ed5743f35ba9af4f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 18:26:55 2011 +0100 gdi32: Add null driver entry points for the palette functions. --- dlls/gdi32/dc.c | 3 +- dlls/gdi32/driver.c | 24 ++++++++++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/palette.c | 93 +++++++++++++++++++++------------------------- 4 files changed, 65 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e7da659..bdaab13 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -274,7 +274,8 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ) */ void DC_InitDC( DC* dc ) { - if (dc->funcs->pRealizeDefaultPalette) dc->funcs->pRealizeDefaultPalette( dc->physDev ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizeDefaultPalette ); + physdev->funcs->pRealizeDefaultPalette( physdev ); SetTextColor( dc->hSelf, dc->textColor ); SetBkColor( dc->hSelf, dc->backgroundColor ); SelectObject( dc->hSelf, dc->hPen ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 969d660..0bd7bdb 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -413,6 +413,12 @@ static INT CDECL nulldrv_GetPixelFormat( PHYSDEV dev ) return 0; } +static UINT CDECL nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, + UINT count, PALETTEENTRY *entries ) +{ + return 0; +} + static BOOL CDECL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) { return TRUE; @@ -456,6 +462,16 @@ static BOOL CDECL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count return TRUE; } +static UINT CDECL nulldrv_RealizeDefaultPalette( PHYSDEV dev ) +{ + return 0; +} + +static UINT CDECL nulldrv_RealizePalette( PHYSDEV dev, HPALETTE palette, BOOL primary ) +{ + return 0; +} + static BOOL CDECL nulldrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -706,10 +722,10 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetDeviceCaps */ nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ nulldrv_GetICMProfile, /* pGetICMProfile */ - NULL, /* pGetNearestColor */ + nulldrv_GetNearestColor, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ nulldrv_GetPixelFormat, /* pGetPixelFormat */ - NULL, /* pGetSystemPaletteEntries */ + nulldrv_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */ NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextMetrics */ nulldrv_IntersectClipRect, /* pIntersectClipRect */ @@ -731,8 +747,8 @@ const DC_FUNCTIONS null_driver = nulldrv_Polygon, /* pPolygon */ nulldrv_Polyline, /* pPolyline */ nulldrv_PolylineTo, /* pPolylineTo */ - NULL, /* pRealizeDefaultPalette */ - NULL, /* pRealizePalette */ + nulldrv_RealizeDefaultPalette, /* pRealizeDefaultPalette */ + nulldrv_RealizePalette, /* pRealizePalette */ nulldrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index aa9ba4b..db7fdc8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -520,6 +520,7 @@ extern INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT r extern INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; +extern COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern INT CDECL nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index e94ed7b..a60f342 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -513,8 +513,8 @@ UINT WINAPI GetSystemPaletteEntries( if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pGetSystemPaletteEntries) - ret = dc->funcs->pGetSystemPaletteEntries( dc->physDev, start, count, entries ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetSystemPaletteEntries ); + ret = physdev->funcs->pGetSystemPaletteEntries( physdev, start, count, entries ); release_dc_ptr( dc ); } return ret; @@ -563,47 +563,22 @@ UINT WINAPI GetNearestPaletteIndex( } -/*********************************************************************** - * GetNearestColor [GDI32.@] - * - * Gets a system color to match. - * - * RETURNS - * Success: Color from system palette that corresponds to given color - * Failure: CLR_INVALID - */ -COLORREF WINAPI GetNearestColor( - HDC hdc, /* [in] Handle of device context */ - COLORREF color) /* [in] Color to be matched */ +/* null driver fallback implementation for GetNearestColor */ +COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) { unsigned char spec_type; - COLORREF nearest; - DC *dc; - if (!(dc = get_dc_ptr( hdc ))) return CLR_INVALID; - - if (dc->funcs->pGetNearestColor) - { - nearest = dc->funcs->pGetNearestColor( dc->physDev, color ); - release_dc_ptr( dc ); - return nearest; - } - - if (!(GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)) - { - release_dc_ptr( dc ); - return color; - } + if (!(GetDeviceCaps( dev->hdc, RASTERCAPS ) & RC_PALETTE)) return color; spec_type = color >> 24; if (spec_type == 1 || spec_type == 2) { /* we need logical palette for PALETTERGB and PALETTEINDEX colorrefs */ - UINT index; PALETTEENTRY entry; - HPALETTE hpal = dc->hPalette ? dc->hPalette : GetStockObject( DEFAULT_PALETTE ); + HPALETTE hpal = GetCurrentObject( dev->hdc, OBJ_PAL ); + if (!hpal) hpal = GetStockObject( DEFAULT_PALETTE ); if (spec_type == 2) /* PALETTERGB */ index = GetNearestPaletteIndex( hpal, color ); else /* PALETTEINDEX */ @@ -612,18 +587,36 @@ COLORREF WINAPI GetNearestColor( if (!GetPaletteEntries( hpal, index, 1, &entry )) { WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); - if (!GetPaletteEntries( hpal, 0, 1, &entry )) - { - release_dc_ptr( dc ); - return CLR_INVALID; - } + if (!GetPaletteEntries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } - nearest = color & 0x00ffffff; - release_dc_ptr( dc ); + return color & 0x00ffffff; +} + - TRACE("(%06x): returning %06x\n", color, nearest ); +/*********************************************************************** + * GetNearestColor [GDI32.@] + * + * Gets a system color to match. + * + * RETURNS + * Success: Color from system palette that corresponds to given color + * Failure: CLR_INVALID + */ +COLORREF WINAPI GetNearestColor( + HDC hdc, /* [in] Handle of device context */ + COLORREF color) /* [in] Color to be matched */ +{ + COLORREF nearest = CLR_INVALID; + DC *dc; + + if ((dc = get_dc_ptr( hdc ))) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetNearestColor ); + nearest = physdev->funcs->pGetNearestColor( physdev, color ); + release_dc_ptr( dc ); + } return nearest; } @@ -729,21 +722,19 @@ UINT WINAPI GDIRealizePalette( HDC hdc ) if( dc->hPalette == GetStockObject( DEFAULT_PALETTE )) { - if (dc->funcs->pRealizeDefaultPalette) - realized = dc->funcs->pRealizeDefaultPalette( dc->physDev ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizeDefaultPalette ); + realized = physdev->funcs->pRealizeDefaultPalette( physdev ); } else if (InterlockedExchangePointer( (void **)&hLastRealizedPalette, dc->hPalette ) != dc->hPalette) { - if (dc->funcs->pRealizePalette) + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizePalette ); + PALETTEOBJ *palPtr = GDI_GetObjPtr( dc->hPalette, OBJ_PAL ); + if (palPtr) { - PALETTEOBJ *palPtr = GDI_GetObjPtr( dc->hPalette, OBJ_PAL ); - if (palPtr) - { - realized = dc->funcs->pRealizePalette( dc->physDev, dc->hPalette, - (dc->hPalette == hPrimaryPalette) ); - palPtr->funcs = dc->funcs; - GDI_ReleaseObj( dc->hPalette ); - } + realized = physdev->funcs->pRealizePalette( physdev, dc->hPalette, + (dc->hPalette == hPrimaryPalette) ); + palPtr->funcs = dc->funcs; + GDI_ReleaseObj( dc->hPalette ); } } else TRACE(" skipping (hLastRealizedPalette = %p)\n", hLastRealizedPalette);

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the path functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9c7b528b6f9a722a9e8fd1e37371002c8d63a1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7b528b6f9a722a9e8fd1e37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 20:43:15 2011 +0100 gdi32: Add null driver entry points for the path functions. --- dlls/gdi32/driver.c | 20 ++-- dlls/gdi32/gdi_private.h | 10 ++ dlls/gdi32/path.c | 382 +++++++++++++++++++++++++--------------------- 3 files changed, 230 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c7b528b6f9a722a9e8fd…

1 0

Alexandre Julliard : gdi32: Avoid null pointer access when we are out of gdi handles.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 46bfaeae9e7ad2217a99ac8e9feaab4e116c962d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bfaeae9e7ad2217a99ac8e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 12 20:40:30 2011 +0100 gdi32: Avoid null pointer access when we are out of gdi handles. --- dlls/gdi32/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index bdaab13..6cfe482 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -151,7 +151,7 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); - dc = NULL; + return NULL; } dc->nulldrv.hdc = dc->hSelf; return dc;

1 0

Alexandre Julliard : version: Allocate the full virtual size of the section when loading PE resources.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0136bc27d1e3c6420247e393b6ec98a5503f4af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0136bc27d1e3c6420247e393b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 12:13:39 2011 +0100 version: Allocate the full virtual size of the section when loading PE resources. --- dlls/version/resource.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 64d39dd..5772487 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -220,7 +220,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; LPBYTE resSection; - DWORD resSectionSize; + DWORD section_size, data_size; const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; @@ -282,8 +282,9 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) } /* Read in resource section */ - resSectionSize = sections[i].SizeOfRawData; - resSection = HeapAlloc( GetProcessHeap(), 0, resSectionSize ); + data_size = sections[i].SizeOfRawData; + section_size = max( data_size, sections[i].Misc.VirtualSize ); + resSection = HeapAlloc( GetProcessHeap(), 0, section_size ); if ( !resSection ) { HeapFree( GetProcessHeap(), 0, sections ); @@ -291,7 +292,8 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) } LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET ); - if ( resSectionSize != LZRead( lzfd, (char*)resSection, resSectionSize ) ) goto done; + if (data_size != LZRead( lzfd, (char*)resSection, data_size )) goto done; + if (data_size < section_size) memset( (char *)resSection + data_size, 0, section_size - data_size ); /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress);

1 0

Juan Lang : cryptnet: Fix typo.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 2a1f26b6dabcf5b194dd780481abad0ae29b026b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1f26b6dabcf5b194dd78048… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 11 08:28:51 2011 -0800 cryptnet: Fix typo. Spotted by Joris Huizer. --- dlls/cryptnet/tests/cryptnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index ba6298d..663ba45 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -367,7 +367,7 @@ static void test_retrieveObjectByUrl(void) NULL, NULL, NULL, NULL); /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - broken(GetLastError() == CRYPT_E_NO_MATCH)), + broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */

1 0

Francois Gouget : wininet: Avoid a conflict with the sun macro when compiling on Solaris.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 4bacb3f24e3919d93330e82e25a1ba88a2aabd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bacb3f24e3919d93330e82e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 11 18:22:23 2011 +0100 wininet: Avoid a conflict with the sun macro when compiling on Solaris. --- dlls/wininet/http.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a0574bf..5ae3e4d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3582,21 +3582,18 @@ static void HTTP_InsertCookies(http_request_t *request) static WORD HTTP_ParseDay(LPCWSTR day) { - static const WCHAR sun[] = { 's','u','n',0 }; - static const WCHAR mon[] = { 'm','o','n',0 }; - static const WCHAR tue[] = { 't','u','e',0 }; - static const WCHAR wed[] = { 'w','e','d',0 }; - static const WCHAR thu[] = { 't','h','u',0 }; - static const WCHAR fri[] = { 'f','r','i',0 }; - static const WCHAR sat[] = { 's','a','t',0 }; - - if (!strcmpiW(day, sun)) return 0; - if (!strcmpiW(day, mon)) return 1; - if (!strcmpiW(day, tue)) return 2; - if (!strcmpiW(day, wed)) return 3; - if (!strcmpiW(day, thu)) return 4; - if (!strcmpiW(day, fri)) return 5; - if (!strcmpiW(day, sat)) return 6; + static const WCHAR days[7][4] = {{ 's','u','n',0 }, + { 'm','o','n',0 }, + { 't','u','e',0 }, + { 'w','e','d',0 }, + { 't','h','u',0 }, + { 'f','r','i',0 }, + { 's','a','t',0 }}; + int i; + for (i = 0; i < sizeof(days)/sizeof(*days); i++) + if (!strcmpiW(day, days[i])) + return i; + /* Invalid */ return 7; }

1 0

Aric Stewart : usp10: Update ScriptCPtoX to handle RTL runs.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3f7ad460ef159f6e71b6909e1ced0ce698ce4ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7ad460ef159f6e71b6909e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 11 12:47:37 2011 -0600 usp10: Update ScriptCPtoX to handle RTL runs. --- dlls/usp10/tests/usp10.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 37 ++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1145ca9..5b7fa97 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1076,6 +1076,7 @@ static void test_ScriptXtoX(void) int cGlyphs; WORD pwLogClustXtoCP[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; WORD pwLogClustCPtoX[10] = {0, 0, 0, 1, 1, 2, 2, 3, 3, 3}; + WORD pwLogClustCPtoX_RTL[10] = {3, 3, 3, 2, 2, 1, 1, 0, 0, 0}; SCRIPT_VISATTR psva[10]; int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; int piCP, piX; @@ -1276,6 +1277,116 @@ static void test_ScriptXtoX(void) ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + + items[0].a.fRTL = TRUE; + + iCP=0; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 780, + "iCP=%d should return piX=780 not %d\n", iCP, piX); + + iCP=1; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 720, + "iCP=%d should return piX=720 not %d\n", iCP, piX); + + iCP=2; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 660, + "iCP=%d should return piX=660 not %d\n", iCP, piX); + + iCP=3; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 600, + "iCP=%d should return piX=600 not %d\n", iCP, piX); + + iCP=4; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 495, + "iCP=%d should return piX=495 not %d\n", iCP, piX); + + iCP=5; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 390, + "iCP=%d should return piX=390 not %d\n", iCP, piX); + + iCP=6; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 295, + "iCP=%d should return piX=295 not %d\n", iCP, piX); + + iCP=7; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 200, + "iCP=%d should return piX=200 not %d\n", iCP, piX); + + iCP=8; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 133, + "iCP=%d should return piX=133 not %d\n", iCP, piX); + + iCP=9; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 66, + "iCP=%d should return piX=66 not %d\n", iCP, piX); + + iCP=10; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 0, + "iCP=%d should return piX=0 not %d\n", iCP, piX); + + iCP=11; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClustCPtoX_RTL, psva, piAdvance, &items[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 0, + "iCP=%d should return piX=0 %d\n", iCP, piX); } static void test_ScriptString(HDC hdc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b58b60e..d575425 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1106,13 +1106,39 @@ HRESULT WINAPI ScriptCPtoX(int iCP, int iCluster = -1; int clust_size = 1; float special_size = 0.0; + int iMaxPos = 0; + BOOL rtl = FALSE; TRACE("(%d,%d,%d,%d,%p,%p,%p,%p,%p)\n", iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, psa, piX); + if (psa->fRTL && ! psa->fLogicalOrder) + rtl = TRUE; + if (fTrailing) - iCP++; + { + if (rtl) + iCP--; + else + iCP++; + } + + if (rtl) + { + int max_clust = pwLogClust[0]; + + for (item=0; item < cGlyphs; item++) + if (pwLogClust[item] > max_clust) + { + ERR("We do not handle non reversed clusters properly\n"); + break; + } + + iMaxPos = 0; + for (item = max_clust; item >=0; item --) + iMaxPos += piAdvance[item]; + } iPosX = 0.0; for (item=0; item < iCP && item < cGlyphs; item++) @@ -1136,7 +1162,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, else break; } - if (check >= cGlyphs) + if (check >= cGlyphs && !iMaxPos) { for (check = clust; check < cGlyphs; check++) special_size += piAdvance[check]; @@ -1153,6 +1179,13 @@ HRESULT WINAPI ScriptCPtoX(int iCP, iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; } + if (iMaxPos > 0) + { + iPosX = iMaxPos - iPosX; + if (iPosX < 0) + iPosX = 0; + } + *piX = iPosX; TRACE("*piX=%d\n", *piX); return S_OK;

1 0