February 2011 - Wine-Commits

Austin English : gdiplus/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 0d8f2b364c247b32dd203a56a8ae9ed3e6c5e24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8f2b364c247b32dd203a56a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 23:16:28 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 834ba60..323461a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -254,6 +254,7 @@ static void test_fontfamily_properties (void) ok(result == 1854, "Expected 1854, got %d\n", result); result = 0; stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); ok(result == 434, "Expected 434, got %d\n", result); GdipDeleteFontFamily(FontFamily); } @@ -277,6 +278,7 @@ static void test_fontfamily_properties (void) ok(result == 1825, "Expected 1825, got %d\n", result); result = 0; stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); ok(result == 443, "Expected 443 got %d\n", result); GdipDeleteFontFamily(FontFamily); }

1 0

Austin English : avifil32/tests: Remove useless variable assignments (LLVM/ Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 0d258b47371d9ca0b8dfd9c7d7222c4236e642f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d258b47371d9ca0b8dfd9c7d… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 5 20:56:17 2011 -0800 avifil32/tests: Remove useless variable assignments (LLVM/Clang). --- dlls/avifil32/tests/api.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 14ad4b4..4b87806 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -232,11 +232,7 @@ static void test_EditStreamSetInfo(void) hres = CreateEditableStream(&stream, NULL); ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); - - if(0) /* Crashing - first parameter not checked */ - hres = EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); - - /* Size parameter is somehow checked (notice the crash with size=-1 below) */ + /* Size parameter is somehow checked (notice the crash with size=-1 below) */ hres = EditStreamSetInfo(stream, NULL, 0); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); @@ -244,11 +240,14 @@ static void test_EditStreamSetInfo(void) ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); if(0) - { /* Crashing - second parameter not checked */ - hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); + { + /* Crashing - first parameter not checked */ + EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + + /* Crashing - second parameter not checked */ + EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); - hres = EditStreamSetInfo(stream, NULL, -1); - ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + EditStreamSetInfo(stream, NULL, -1); } hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) );

1 0

Vincent Povirk : windowscodecs: Release the icon frame substream on success too.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 29ec595e4a2411ab72ccab7bd493f22e753988b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ec595e4a2411ab72ccab7bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 5 13:01:20 2011 -0600 windowscodecs: Release the icon frame substream on success too. --- dlls/windowscodecs/icoformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index de6ebe6..b4abac5 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -671,6 +671,8 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, LeaveCriticalSection(&This->lock); + IStream_Release(substream); + return S_OK; fail:

1 0

Vincent Povirk : gdiplus: Fix error path in GdipAddPathRectangle.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 4fd76b09958397477cea1c5c279f53bcd129752f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd76b09958397477cea1c5c2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 5 14:22:11 2011 -0600 gdiplus: Fix error path in GdipAddPathRectangle. --- dlls/gdiplus/graphicspath.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c9d67b1..5a68147 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1536,9 +1536,10 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, fail: /* reverting */ - GdipDeletePath(path); - GdipClonePath(backup, &path); - GdipDeletePath(backup); + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); + memcpy(path, backup, sizeof(*path)); + GdipFree(backup); return retstat; } @@ -1581,9 +1582,10 @@ GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath *path, GDIPCONST GpRectF *rects fail: /* reverting */ - GdipDeletePath(path); - GdipClonePath(backup, &path); - GdipDeletePath(backup); + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); + memcpy(path, backup, sizeof(*path)); + GdipFree(backup); return retstat; }

1 0

EG Galano : gdiplus/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: fbf9494b89d88ae50d215442b2de10fe206d3350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf9494b89d88ae50d215442b… Author: EG Galano <eg.galano(a)gmail.com> Date: Sat Feb 5 00:21:00 2011 -0800 gdiplus/tests: Make sure return value is used (LLVM/Clang). --- dlls/gdiplus/tests/pathiterator.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3e1c287..17cd463 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -124,6 +124,7 @@ static void test_nextmarker(void) expect(4, result); start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); /* start/end remain unchanged */ expect((INT)0xdeadbeef, start); expect((INT)0xdeadbeef, end);

1 0

Austin English : ole32/tests: Remove unused assignment (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 5ca437e758b734c191a91833d65029b4f2bded9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca437e758b734c191a91833d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:19:07 2011 -0800 ole32/tests: Remove unused assignment (LLVM/Clang). --- dlls/ole32/tests/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2d67b1e..3c35fab 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -870,7 +870,7 @@ static void test_CoRegisterClassObject(void) /* crashes with at least win9x DCOM! */ if (0) - hr = CoRevokeClassObject(cookie); + CoRevokeClassObject(cookie); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Test more return values (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: cf36677cbcd709c2c9a61aed8533705cee0fac3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36677cbcd709c2c9a61aed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 04:12:50 2011 +0300 comctl32/tests: Test more return values (LLVM/Clang). --- dlls/comctl32/tests/listview.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5e71a6b..a4ffa2e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -766,6 +766,7 @@ static void test_images(void) memset(&r1, 0, sizeof r1); r1.left = LVIR_ICON; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1); + expect(1, r); r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0); ok(r == TRUE, "should not fail\n"); @@ -778,6 +779,7 @@ static void test_images(void) memset(&r2, 0, sizeof r2); r2.left = LVIR_ICON; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); + expect(1, r); ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); @@ -811,6 +813,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0xfccc, "state %x\n", item.state); /* Don't set LVIF_STATE */ @@ -827,6 +830,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0, "state %x\n", item.state); r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); @@ -837,6 +841,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); if (item.state != 0x1ccc) { win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); @@ -856,6 +861,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1000, "state %x\n", item.state); /* Add a further item this time specifying a state and still its state goes to 0x1000 */ @@ -871,6 +877,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aaa, "state %x\n", item.state); /* Set an item's state to checked */ @@ -879,11 +886,13 @@ static void test_checkboxes(void) item.stateMask = 0xf000; item.state = 0x2000; r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + expect(1, r); item.iItem = 3; item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Check that only the bits we asked for are returned, @@ -894,6 +903,7 @@ static void test_checkboxes(void) item.stateMask = 0xf000; item.state = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2000, "state %x\n", item.state); /* Set the style again and check that doesn't change an item's state */ @@ -904,6 +914,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Unsetting the checkbox extended style doesn't change an item's state */ @@ -914,6 +925,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Now setting the style again will change an item's state */ @@ -924,6 +936,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aaa, "state %x\n", item.state); /* Toggle checkbox tests (bug 9934) */ @@ -940,6 +953,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aab, "state %x\n", item.state); r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); @@ -951,6 +965,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aab, "state %x\n", item.state); r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); @@ -3028,6 +3043,7 @@ static void test_hittest(void) memset(&bounds, 0, sizeof(bounds)); bounds.left = LVIR_BOUNDS; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); + expect(1, r); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0);

1 0

Austin English : rsaenh/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 13b0e284b3b966e6f7804ee9a8afd1b3ad0073cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b0e284b3b966e6f7804ee9a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:26:10 2011 -0800 rsaenh/tests: Make sure to use return values (LLVM/Clang). --- dlls/rsaenh/tests/rsaenh.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index fab959c..cef7d65 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1248,6 +1248,7 @@ static void test_rc2(void) dwKeyLen = 1025; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); + ok(!result, "CryptSetKeyParam failed: %08x\n", GetLastError()); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); @@ -2483,6 +2484,7 @@ static void test_rsa_round_trip(void) exportedKey = HeapAlloc(GetProcessHeap(), 0, keyLen); result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, exportedKey, &keyLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); /* destroy the key... */ CryptDestroyKey(keyExchangeKey); CryptDestroyKey(signKey); @@ -2922,22 +2924,23 @@ static void test_key_initialization(void) { result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); } dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); dwLen = (DWORD)sizeof(abSessionKey); result = CryptImportKey(prov1, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); /* Once the key has been imported, subsequently acquiring a context with * the same name will allow retrieving the key. */ result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); CryptReleaseContext(prov2, 0);

1 0

Austin English : kernel32/tests: Remove unused assignment (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: a96b23cc1b89653da33050346d3bf3dc0b95a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96b23cc1b89653da33050346… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 21:19:38 2011 -0800 kernel32/tests: Remove unused assignment (LLVM/Clang). --- dlls/kernel32/tests/change.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 8e22dd7..4d0bc1c 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -47,7 +47,7 @@ static DWORD CALLBACK NotificationThread(LPVOID arg) if (status == WAIT_OBJECT_0 ) { notified = TRUE; - ret = FindNextChangeNotification(change); + FindNextChangeNotification(change); } ret = FindCloseChangeNotification(change);

1 0

Austin English : usp10/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: fe628d493259f509de64f562ca52892b6025e0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe628d493259f509de64f562c… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:48:59 2011 -0800 usp10/tests: Make sure to use return value (LLVM/Clang). --- dlls/usp10/tests/usp10.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 06e9289..8a06bd9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -467,6 +467,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 /* This test determines that the pointer returned by ScriptGetProperties is valid * by checking a known value in the table */ hr = ScriptGetProperties(&ppSp, &iMaxProps); + ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); trace("number of script properties %d\n", iMaxProps); ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); if (iMaxProps > 0) @@ -489,7 +490,6 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; @@ -556,7 +556,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); } } - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } @@ -696,7 +696,7 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); cInChars = cChars = 4; @@ -727,7 +727,7 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok(pwOutGlyphs3[7] == pwOutGlyphs2[7], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[8] == pwOutGlyphs2[8], "glyph not mirrored correctly\n"); - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } @@ -842,7 +842,6 @@ static void test_ScriptTextOut(HDC hdc) if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -958,11 +957,9 @@ static void test_ScriptTextOut2(HDC hdc) /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc2, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -1036,11 +1033,9 @@ static void test_ScriptTextOut3(HDC hdc) /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 2; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -1427,6 +1422,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* having a leading rtl character seems to confuse usp */ /* this looks to be a windows bug we should emulate */ hr = ScriptStringCPtoX(ssa, 0, TRUE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); @@ -1437,6 +1433,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) else { hr = ScriptStringCPtoX(ssa, 0, FALSE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); @@ -1447,9 +1444,15 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* Check beyond the end boundary of the whole string */ if (rtl[String_len-1]) + { hr = ScriptStringCPtoX(ssa, String_len-1, FALSE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + } else + { hr = ScriptStringCPtoX(ssa, String_len-1, TRUE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + } X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr);

1 0