Re: usp10: Implement and test ScriptCacheGetHeight. (rediffed)

[Jeff Latimer]

Hans, I don't think that your test was applied, only the function was.

Jeff

Hans Leidekker wrote:
> Lotus Notes calls this one. See bug 4944.
>
> -Hans
>
> Changelog
>  Implement and test ScriptCacheGetHeight.
>
> bd39fa31f57846d1fd50aebd9425a739e6c74d9e
> diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
> index cbaf44a..51f967a 100644
> --- a/dlls/usp10/tests/usp10.c
> +++ b/dlls/usp10/tests/usp10.c
> @@ -561,6 +561,40 @@ static void test_ScriptString(void)
>     }
> }
>
> +void test_ScriptCacheGetHeight(void)
> +{
> - HRESULT hr;
> - HDC hdc;
> - HWND hwnd;
> - SCRIPT_CACHE sc = NULL;
> - LONG height;
> -
> - hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL);
> - assert(hwnd != 0);
> -
> - hdc = GetDC(hwnd);
> - ok(hdc != NULL, "HDC failed to be created\n");
> -
> - hr = ScriptCacheGetHeight(NULL, NULL, NULL);
> - ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr);
> -
> - hr = ScriptCacheGetHeight(NULL, &sc, NULL);
> - ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr);
> -
> - hr = ScriptCacheGetHeight(NULL, &sc, &height);
> - ok(hr == E_PENDING, "expected E_PENDING, got 0x%08lx\n", hr);
> -
> - height = 0;
> -
> - hr = ScriptCacheGetHeight(hdc, &sc, &height);
> - ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr);
> -
> - ok(height > 0, "expected height > 0\n");
> -
> - ReleaseDC(hwnd, hdc);
> - DestroyWindow(hwnd);
>
> +}
> -
>
> START_TEST(usp10)
> {
>     unsigned short  pwOutGlyphs[256];
> @@ -570,4 +604,5 @@ START_TEST(usp10)
>     test_ScriptGetFontProperties();
>     test_ScriptTextOut();
>     test_ScriptString();
> - test_ScriptCacheGetHeight();
>
> }