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

Dylan Smith : d3dx9/tests: Add basic tests for D3DXCreateText.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: eec288a4c52d9c926b1c87e52ebf04800c3dae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec288a4c52d9c926b1c87e52… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 9 08:26:28 2011 -0500 d3dx9/tests: Add basic tests for D3DXCreateText. --- dlls/d3dx9_36/tests/mesh.c | 183 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index f460c2d..476fb30 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -19,6 +19,7 @@ */ #include <stdio.h> +#include <float.h> #include "wine/test.h" #include "d3dx9.h" @@ -28,6 +29,13 @@ got=D3DXGetFVFVertexSize(type); \ ok(got==exp, "Expected: %d, Got: %d\n", exp, got); +#define compare_float(got, exp) \ + do { \ + float _got = (got); \ + float _exp = (exp); \ + ok(_got == _exp, "Expected: %g, Got: %g\n", _exp, _got); \ + } while (0) + static BOOL compare(FLOAT u, FLOAT v) { return (fabs(u-v) < admitted_error); @@ -2004,6 +2012,180 @@ static void D3DXCreateCylinderTest(void) DestroyWindow(wnd); } +static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOAT deviation, FLOAT extrusion) +{ + HRESULT hr; + ID3DXMesh *d3dxmesh; + char name[256]; + OUTLINETEXTMETRIC otm; + GLYPHMETRICS gm; + GLYPHMETRICSFLOAT *glyphmetrics_float = malloc(sizeof(GLYPHMETRICSFLOAT) * strlen(text)); + int i; + LOGFONT lf; + HFONT font = NULL, oldfont = NULL; + + sprintf(name, "text ('%s', %f, %f)", text, deviation, extrusion); + + hr = D3DXCreateText(device, hdc, text, deviation, extrusion, &d3dxmesh, NULL, glyphmetrics_float); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create text with D3DXCreateText\n"); + return; + } + + /* must select a modified font having lfHeight = otm.otmEMSquare before + * calling GetGlyphOutline to get the expected values */ + if (!GetObject(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf) || + !GetOutlineTextMetrics(hdc, sizeof(otm), &otm)) + { + d3dxmesh->lpVtbl->Release(d3dxmesh); + skip("Couldn't get text outline\n"); + return; + } + lf.lfHeight = otm.otmEMSquare; + lf.lfWidth = 0; + font = CreateFontIndirect(&lf); + if (!font) { + d3dxmesh->lpVtbl->Release(d3dxmesh); + skip("Couldn't create the modified font\n"); + return; + } + oldfont = SelectObject(hdc, font); + + for (i = 0; i < strlen(text); i++) + { + const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; + GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); + compare_float(glyphmetrics_float[i].gmfBlackBoxX, gm.gmBlackBoxX / (float)otm.otmEMSquare); + compare_float(glyphmetrics_float[i].gmfBlackBoxY, gm.gmBlackBoxY / (float)otm.otmEMSquare); + compare_float(glyphmetrics_float[i].gmfptGlyphOrigin.x, gm.gmptGlyphOrigin.x / (float)otm.otmEMSquare); + compare_float(glyphmetrics_float[i].gmfptGlyphOrigin.y, gm.gmptGlyphOrigin.y / (float)otm.otmEMSquare); + compare_float(glyphmetrics_float[i].gmfCellIncX, gm.gmCellIncX / (float)otm.otmEMSquare); + compare_float(glyphmetrics_float[i].gmfCellIncY, gm.gmCellIncY / (float)otm.otmEMSquare); + } + + d3dxmesh->lpVtbl->Release(d3dxmesh); + SelectObject(hdc, oldfont); +} + +static void D3DXCreateTextTest(void) +{ + HRESULT hr; + HWND wnd; + HDC hdc; + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* d3dxmesh = NULL; + HFONT hFont; + OUTLINETEXTMETRIC otm; + int number_of_vertices; + int number_of_faces; + + wnd = CreateWindow("static", "d3dx9_test", WS_POPUP, 0, 0, 1000, 1000, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hdc = CreateCompatibleDC(NULL); + + hFont = CreateFont(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, + "Arial"); + SelectObject(hdc, hFont); + GetOutlineTextMetrics(hdc, sizeof(otm), &otm); + + hr = D3DXCreateText(device, hdc, "wine", 0.001f, 0.4f, NULL, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + /* D3DXCreateTextA page faults from passing NULL text */ + + hr = D3DXCreateTextW(device, hdc, NULL, 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(device, hdc, "", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(device, hdc, " ", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(NULL, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(device, NULL, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(device, hdc, "wine", -FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateText(device, hdc, "wine", 0.001f, -FLT_MIN, &d3dxmesh, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + /* deviation = 0.0f treated as if deviation = 1.0f / otm.otmEMSquare */ + hr = D3DXCreateText(device, hdc, "wine", 1.0f / otm.otmEMSquare, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + number_of_vertices = d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh); + number_of_faces = d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh); + if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + + hr = D3DXCreateText(device, hdc, "wine", 0.0f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(number_of_vertices == d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), + "Got %d vertices, expected %d\n", + d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_vertices); + ok(number_of_faces == d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh), + "Got %d faces, expected %d\n", + d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); + if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + +#if 0 + /* too much detail requested, so will appear to hang */ + trace("Waiting for D3DXCreateText to finish with deviation = FLT_MIN ...\n"); + hr = D3DXCreateText(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + trace("D3DXCreateText finish with deviation = FLT_MIN\n"); +#endif + + hr = D3DXCreateText(device, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + + test_createtext(device, hdc, "wine", FLT_MAX, 0.4f); + test_createtext(device, hdc, "wine", 0.001f, FLT_MIN); + test_createtext(device, hdc, "wine", 0.001f, 0.0f); + test_createtext(device, hdc, "wine", 0.001f, FLT_MAX); + test_createtext(device, hdc, "wine", 0.0f, 1.0f); + + DeleteDC(hdc); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + static void test_get_decl_length(void) { static const D3DVERTEXELEMENT9 declaration1[] = @@ -2138,6 +2320,7 @@ START_TEST(mesh) D3DXCreateBoxTest(); D3DXCreateSphereTest(); D3DXCreateCylinderTest(); + D3DXCreateTextTest(); test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion();

1 0

Dylan Smith : d3dx9/tests: Added outline comparison tests for D3DXCreateText.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: b06a6c84ac4fda7032606731c4293a69a0e30402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06a6c84ac4fda7032606731c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 9 08:26:42 2011 -0500 d3dx9/tests: Added outline comparison tests for D3DXCreateText. --- dlls/d3dx9_36/tests/mesh.c | 759 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 759 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b06a6c84ac4fda7032606…

1 0

Aric Stewart : usp10: Corrections to ScriptCPtoX.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 73f743f6d2cc10cc999c0f21c65b584e43b94a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f743f6d2cc10cc999c0f21c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 8 14:33:29 2011 -0600 usp10: Corrections to ScriptCPtoX. --- dlls/usp10/tests/usp10.c | 130 +++++++++++++++++++++++++++++++++++----------- dlls/usp10/usp10.c | 59 ++++++++++++++++++--- 2 files changed, 149 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73f743f6d2cc10cc999c0…

1 0

Dylan Smith : d3dx9/tests: Partially test front and back faces for D3DXCreateText.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: ed3ce3c91b1bfe6defbf86bb45f7a4ed34a10550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ce3c91b1bfe6defbf86bb4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 9 08:26:58 2011 -0500 d3dx9/tests: Partially test front and back faces for D3DXCreateText. --- dlls/d3dx9_36/tests/mesh.c | 103 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 95 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 74f61fa..4f4adcf 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2542,7 +2542,7 @@ error: return hr == D3D_OK; } -static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, int textlen) +static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, int textlen, float extrusion) { HRESULT hr; DWORD number_of_vertices, number_of_faces; @@ -2652,6 +2652,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str { int nb_outline_vertices1, nb_outline_faces1; int nb_outline_vertices2, nb_outline_faces2; + int nb_back_vertices, nb_back_faces; int first_vtx1, first_vtx2; int first_face1, first_face2; int j; @@ -2726,21 +2727,107 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str face_idx1 = first_face1 + nb_outline_faces1; face_idx2 = first_face2 + nb_outline_faces2; - /* skip to the outline for the next glyph */ + /* partial test on back vertices and faces */ + first_vtx1 = vtx_idx1; for (; vtx_idx1 < number_of_vertices; vtx_idx1++) { - if (vertices[vtx_idx1].normal.z == 0) - break; - } - for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) { - if (mesh->vertices[vtx_idx2].normal.z == 0) + struct vertex vtx; + + if (vertices[vtx_idx1].normal.z != 1.0f) break; + + vtx.position.z = 0.0f; + vtx.normal.x = 0.0f; + vtx.normal.y = 0.0f; + vtx.normal.z = 1.0f; + ok(compare(vertices[vtx_idx1].position.z, vtx.position.z), + "Test %s, glyph %d, vertex position.z %d, result %g, expected %g\n", name, i, vtx_idx1, + vertices[vtx_idx1].position.z, vtx.position.z); + ok(compare_vec3(vertices[vtx_idx1].normal, vtx.normal), + "Test %s, glyph %d, vertex normal %d, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, vtx_idx1, + vertices[vtx_idx1].normal.x, vertices[vtx_idx1].normal.y, vertices[vtx_idx1].normal.z, + vtx.normal.x, vtx.normal.y, vtx.normal.z); } + nb_back_vertices = vtx_idx1 - first_vtx1; + first_face1 = face_idx1; for (; face_idx1 < number_of_faces; face_idx1++) { + const D3DXVECTOR3 *vtx1, *vtx2, *vtx3; + D3DXVECTOR3 normal; + D3DXVECTOR3 v1 = {0, 0, 0}; + D3DXVECTOR3 v2 = {0, 0, 0}; + D3DXVECTOR3 forward = {0.0f, 0.0f, 1.0f}; + if (faces[face_idx1][0] >= vtx_idx1 || faces[face_idx1][1] >= vtx_idx1 || faces[face_idx1][2] >= vtx_idx1) break; + + vtx1 = &vertices[faces[face_idx1][0]].position; + vtx2 = &vertices[faces[face_idx1][1]].position; + vtx3 = &vertices[faces[face_idx1][2]].position; + + D3DXVec3Subtract(&v1, vtx2, vtx1); + D3DXVec3Subtract(&v2, vtx3, vtx2); + D3DXVec3Cross(&normal, &v1, &v2); + D3DXVec3Normalize(&normal, &normal); + ok(compare_vec3(normal, forward), + "Test %s, glyph %d, face %d normal, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, face_idx1, + normal.x, normal.y, normal.z, forward.x, forward.y, forward.z); + } + nb_back_faces = face_idx1 - first_face1; + + /* compare front and back faces & vertices */ + if (extrusion == 0.0f) { + /* Oddly there are only back faces in this case */ + nb_back_vertices /= 2; + nb_back_faces /= 2; + face_idx1 -= nb_back_faces; + vtx_idx1 -= nb_back_vertices; + } + for (j = 0; j < nb_back_vertices; j++) + { + struct vertex vtx = vertices[first_vtx1]; + vtx.position.z = -extrusion; + vtx.normal.x = 0.0f; + vtx.normal.y = 0.0f; + vtx.normal.z = extrusion == 0.0f ? 1.0f : -1.0f; + ok(compare_vec3(vertices[vtx_idx1].position, vtx.position), + "Test %s, glyph %d, vertex position %d, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, vtx_idx1, + vertices[vtx_idx1].position.x, vertices[vtx_idx1].position.y, vertices[vtx_idx1].position.z, + vtx.position.x, vtx.position.y, vtx.position.z); + ok(compare_vec3(vertices[vtx_idx1].normal, vtx.normal), + "Test %s, glyph %d, vertex normal %d, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, vtx_idx1, + vertices[vtx_idx1].normal.x, vertices[vtx_idx1].normal.y, vertices[vtx_idx1].normal.z, + vtx.normal.x, vtx.normal.y, vtx.normal.z); + vtx_idx1++; + first_vtx1++; + } + for (j = 0; j < nb_back_faces; j++) + { + int f1, f2; + if (extrusion == 0.0f) { + f1 = 1; + f2 = 2; + } else { + f1 = 2; + f2 = 1; + } + ok(faces[face_idx1][0] == faces[first_face1][0] + nb_back_vertices && + faces[face_idx1][1] == faces[first_face1][f1] + nb_back_vertices && + faces[face_idx1][2] == faces[first_face1][f2] + nb_back_vertices, + "Test %s, glyph %d, face %d, result (%d, %d, %d), expected (%d, %d, %d)\n", name, i, face_idx1, + faces[face_idx1][0], faces[face_idx1][1], faces[face_idx1][2], + faces[first_face1][0] - nb_back_faces, + faces[first_face1][f1] - nb_back_faces, + faces[first_face1][f2] - nb_back_faces); + first_face1++; + face_idx1++; + } + + /* skip to the outline for the next glyph */ + for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) { + if (mesh->vertices[vtx_idx2].normal.z == 0) + break; } for (; face_idx2 < mesh->number_of_faces; face_idx2++) { @@ -2820,7 +2907,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOA } mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; - compare_text_outline_mesh(name, d3dxmesh, &mesh, strlen(text)); + compare_text_outline_mesh(name, d3dxmesh, &mesh, strlen(text), extrusion); free_mesh(&mesh);

1 0

Peter Schellenbach : oleaut32: Fixed initial cyLogical value in IFont constructor. Fixed get_Size to return same value as Windows.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 2ecbfbe5df0d7b5eb333f7723113c22ad171eacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecbfbe5df0d7b5eb333f7723… Author: Peter Schellenbach <pjs(a)asent.com> Date: Mon Mar 7 16:44:38 2011 -0800 oleaut32: Fixed initial cyLogical value in IFont constructor. Fixed get_Size to return same value as Windows. --- dlls/oleaut32/olefont.c | 21 +++++++++- dlls/oleaut32/tests/olefont.c | 90 ++++++++++++++++++++++++---------------- 2 files changed, 73 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index e65504c..f128270 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -278,6 +278,11 @@ struct OLEFontImpl LONG cyLogical; LONG cyHimetric; + /* + * Stash realized height (pixels) from TEXTMETRIC - used in get_Size() + */ + LONG nRealHeight; + IConnectionPoint *pPropertyNotifyCP; IConnectionPoint *pFontEventsCP; }; @@ -671,6 +676,8 @@ static void realize_font(OLEFontImpl *This) } GetTextMetricsW(hdc, &tm); This->description.sCharset = tm.tmCharSet; + /* While we have it handy, stash the realized font height for use by get_Size() */ + This->nRealHeight = tm.tmHeight - tm.tmInternalLeading; /* corresponds to LOGFONT lfHeight */ SelectObject(hdc, old_font); } } @@ -760,8 +767,14 @@ static HRESULT WINAPI OLEFontImpl_get_Size( if(this->dirty) realize_font(this); + /* + * Convert realized font height in pixels to points descaled by current + * scaling ratio then scaled up by 10000. + */ + psize->s.Lo = MulDiv(this->nRealHeight, + this->cyHimetric * 72 * 10000, + this->cyLogical * 2540); psize->s.Hi = 0; - psize->s.Lo = this->description.cySize.s.Lo; return S_OK; } @@ -1179,8 +1192,12 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( OLEFontImpl *this = impl_from_IFont(iface); TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric); + if(cyLogical == 0 || cyHimetric == 0) + return E_INVALIDARG; + this->cyLogical = cyLogical; this->cyHimetric = cyHimetric; + this->dirty = TRUE; return S_OK; } @@ -2401,7 +2418,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) */ newObject->gdiFont = 0; newObject->dirty = TRUE; - newObject->cyLogical = 72L; + newObject->cyLogical = GetDeviceCaps(get_dc(), LOGPIXELSY); newObject->cyHimetric = 2540L; newObject->pPropertyNotifyCP = NULL; newObject->pFontEventsCP = NULL; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 57f1367..e9720bb 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -57,8 +57,7 @@ static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); /* SetRatio to ratio_logical, ratio_himetric, */ /* check that resulting hfont has height hfont_height. */ /* Various checks along the way. */ - -static void test_ifont_sizes(LONG lo_size, LONG hi_size, +static void test_ifont_size(LONG lo_size, LONG hi_size, LONG ratio_logical, LONG ratio_himetric, LONG hfont_height, const char * test_name) { @@ -69,9 +68,10 @@ static void test_ifont_sizes(LONG lo_size, LONG hi_size, LOGFONT lf; CY psize; HRESULT hres; + DWORD rtnval; fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = system_font; + fd.lpstrName = arial_font; /* using scaleable instead of bitmap font reduces errors due to font realization */ S(fd.cySize).Lo = lo_size; S(fd.cySize).Hi = hi_size; fd.sWeight = 0; @@ -87,33 +87,33 @@ static void test_ifont_sizes(LONG lo_size, LONG hi_size, test_name, hres); ok(pvObj != NULL,"%s: OCFI returns NULL.\n", test_name); - /* Read back size. Hi part was ignored. */ + /* If scaling ration specified, change ratio. */ + if(ratio_logical && ratio_himetric) + { + hres = IFont_SetRatio(ifnt, ratio_logical, ratio_himetric); + ok(hres == S_OK,"%s: IFont_SetRatio returns 0x%08x instead of S_OK.\n", + test_name, hres); + } + + /* Read back size. */ hres = IFont_get_Size(ifnt, &psize); ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n", test_name, hres); - ok(S(psize).Lo == lo_size && S(psize).Hi == 0, - "%s: get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=0.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size); - /* Change ratio, check size unchanged. Standard is 72, 2540. */ - hres = IFont_SetRatio(ifnt, ratio_logical, ratio_himetric); - ok(hres == S_OK,"%s: IFont_SR returns 0x%08x instead of S_OK.\n", - test_name, hres); - hres = IFont_get_Size(ifnt, &psize); - ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n", - test_name, hres); - ok(S(psize).Lo == lo_size && S(psize).Hi == 0, - "%s: gS after SR: Lo=%d, Hi=%d; expected Lo=%d, Hi=0.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size); + /* Check returned size - allow for errors due to rouding & font realization. */ + ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size, + "%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n", + test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size); - /* Check hFont size with this ratio. This tests an important */ - /* conversion for which MSDN is very wrong. */ + /* Check hFont size. */ hres = IFont_get_hFont (ifnt, &hfont); ok(hres == S_OK, "%s: IFont_get_hFont returns 0x%08x instead of S_OK.\n", test_name, hres); - hres = GetObject (hfont, sizeof(LOGFONT), &lf); - ok(hres == OBJ_FONT, "got obj type %d\n", hres); - ok(lf.lfHeight == hfont_height, + rtnval = GetObject (hfont, sizeof(LOGFONT), &lf); + ok(rtnval > 0, "GetObject(hfont) failed\n"); + + /* Since font scaling may encounter rouding errors, allow 1 pixel deviation. */ + ok(abs(lf.lfHeight - hfont_height) <= 1, "%s: hFont has lf.lfHeight=%d, expected %d.\n", test_name, lf.lfHeight, hfont_height); @@ -121,6 +121,37 @@ static void test_ifont_sizes(LONG lo_size, LONG hi_size, IFont_Release(ifnt); } +static void test_ifont_sizes(void) +{ + /* Test various size operations and conversions. */ + /* Add more as needed. */ + + /* Results of first 2 tests depend on display resolution. */ + HDC hdc = GetDC(0); + LONG dpi = GetDeviceCaps(hdc, LOGPIXELSY); /* expected results depend on display DPI */ + ReleaseDC(0, hdc); + if(dpi == 96) /* normal resolution display */ + { + test_ifont_size(180000, 0, 0, 0, -24, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, 0, -25, "rounding"); /* test rounding */ + } else if(dpi == 72) /* low resolution display */ + { + test_ifont_size(180000, 0, 0, 0, -18, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, 0, -19, "rounding"); /* test rounding */ + } else if(dpi == 120) /* high resolution display */ + { + test_ifont_size(180000, 0, 0, 0, -30, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, 0, -31, "rounding"); /* test rounding */ + } else + skip("Skipping resolution dependent font size tests - display resolution is %d\n", dpi); + + /* Next 4 tests specify a scaling ratio, so display resolution is not a factor. */ + test_ifont_size(180000, 0, 72, 2540, -18, "ratio1"); /* change ratio */ + test_ifont_size(180000, 0, 144, 2540, -36, "ratio2"); /* another ratio */ + test_ifont_size(180000, 0, 72, 1270, -36, "ratio3"); /* yet another ratio */ + test_ifont_size(186000, 0, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ +} + static void test_QueryInterface(void) { LPVOID pvObj = NULL; @@ -1094,20 +1125,7 @@ START_TEST(olefont) test_QueryInterface(); test_type_info(); - - /* Test various size operations and conversions. */ - /* Add more as needed. */ - if (0) /* FIXME: failing tests */ - { - test_ifont_sizes(180000, 0, 72, 2540, -18, "default"); - test_ifont_sizes(180000, 0, 144, 2540, -36, "ratio1"); /* change ratio */ - test_ifont_sizes(180000, 0, 72, 1270, -36, "ratio2"); /* 2nd part of ratio */ - - /* These depend on details of how IFont rounds sizes internally. */ - test_ifont_sizes(0, 0, 72, 2540, 0, "zero size"); /* zero size */ - test_ifont_sizes(186000, 0, 72, 2540, -19, "rounding"); /* test rounding */ - } - + test_ifont_sizes(); test_font_events_disp(); test_GetIDsOfNames(); test_Invoke();

1 0

Dylan Smith : d3dx9: Support triangulation of complex glyphs in D3DXCreateText.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 8245b46e60889669737de1b31e10ba9f63da55ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8245b46e60889669737de1b31… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 9 08:26:11 2011 -0500 d3dx9: Support triangulation of complex glyphs in D3DXCreateText. --- dlls/d3dx9_36/mesh.c | 354 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 350 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8245b46e60889669737de…

1 0

Erich Hoover : winex11: Add support for retrieving multi-rate animated cursor data.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: eddffff7809dfc4cff2280ac774e8fda939b7a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddffff7809dfc4cff2280ac7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:50 2011 -0700 winex11: Add support for retrieving multi-rate animated cursor data. --- dlls/winex11.drv/mouse.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6378641..ab500ef 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -294,7 +294,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA int width, int height, int istep ) { XcursorImage *image, *ret = NULL; - DWORD delay_jiffies, is_static; + DWORD delay_jiffies, num_steps; int x, y, i, has_alpha; XcursorPixel *ptr; @@ -310,12 +310,11 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA image->xhot = iinfo->xHotspot; image->yhot = iinfo->yHotspot; - /* TODO: Handle animated cursors that use multiple rates */ image->delay = 100; /* fallback delay, 100 ms */ - if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0 /* obtain first rate */, &delay_jiffies, &is_static) != 0) + if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, istep, &delay_jiffies, &num_steps) != 0) image->delay = (100 * delay_jiffies) / 6; /* convert jiffies (1/60s) to milliseconds */ else - WARN("Failed to retrieve animated cursor framerate.\n"); + WARN("Failed to retrieve animated cursor frame-rate for frame %d.\n", istep); /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ memset( color_bits, 0x00, color_size ); @@ -366,14 +365,16 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i { unsigned char *color_bits, *mask_bits; HBITMAP hbmColor = 0, hbmMask = 0; - XcursorImage **imgs, *image; + DWORD nFrames, delay_jiffies, i; int color_size, mask_size; BITMAPINFO *info = NULL; XcursorImages *images; + XcursorImage **imgs; Cursor cursor = 0; - int nFrames = 0; - if (!(imgs = HeapAlloc( GetProcessHeap(), 0, sizeof(XcursorImage*) ))) return 0; + /* Retrieve the number of frames to render */ + if (!GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0, &delay_jiffies, &nFrames)) return 0; + if (!(imgs = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XcursorImage*)*nFrames ))) return 0; /* Allocate all of the resources necessary to obtain a cursor frame */ if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto cleanup; @@ -406,19 +407,13 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i } /* Create an XcursorImage for each frame of the cursor */ - while (1) + for (i=0; i<nFrames; i++) { - XcursorImage **imgstmp; - - image = create_xcursor_frame( hdc, iinfo, icon, - hbmColor, color_bits, color_size, - hbmMask, mask_bits, mask_size, - width, height, nFrames ); - if (!image) break; /* no more drawable frames */ - - imgs[nFrames++] = image; - if (!(imgstmp = HeapReAlloc( GetProcessHeap(), 0, imgs, (nFrames+1)*sizeof(XcursorImage*) ))) goto cleanup; - imgs = imgstmp; + imgs[i] = create_xcursor_frame( hdc, iinfo, icon, + hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, + width, height, i ); + if (!imgs[i]) goto cleanup; } /* Build an X cursor out of all of the frames */ @@ -436,8 +431,8 @@ cleanup: if (imgs) { /* Failed to produce a cursor, free previously allocated frames */ - for (nFrames--; nFrames >= 0; nFrames--) - pXcursorImageDestroy( imgs[nFrames] ); + for (i=0; i<nFrames && imgs[i]; i++) + pXcursorImageDestroy( imgs[i] ); HeapFree( GetProcessHeap(), 0, imgs ); } /* Cleanup all of the resources used to obtain the frame data */

1 0

André Hentschel : mountmgr.sys: Handle IOCTL_DISK_GET_DRIVE_GEOMETRY_EX.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 7a90e7a4442a011db17b7f297e7c93af87269bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a90e7a4442a011db17b7f297… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 9 20:45:18 2011 +0100 mountmgr.sys: Handle IOCTL_DISK_GET_DRIVE_GEOMETRY_EX. --- dlls/mountmgr.sys/device.c | 20 ++++++++++++++++++++ include/winioctl.h | 7 +++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c4b4b72..8b91be6 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -895,6 +895,26 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_SUCCESS; break; } + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + { + DISK_GEOMETRY_EX info; + DWORD len = min( sizeof(info), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + FIXME("The DISK_PARTITION_INFO and DISK_DETECTION_INFO structures will not be filled\n"); + + info.Geometry.Cylinders.QuadPart = 10000; + info.Geometry.MediaType = (dev->devnum.DeviceType == FILE_DEVICE_DISK) ? FixedMedia : RemovableMedia; + info.Geometry.TracksPerCylinder = 255; + info.Geometry.SectorsPerTrack = 63; + info.Geometry.BytesPerSector = 512; + info.DiskSize.QuadPart = info.Geometry.Cylinders.QuadPart * info.Geometry.TracksPerCylinder * + info.Geometry.SectorsPerTrack * info.Geometry.BytesPerSector; + info.Data[0] = 0; + memcpy( irp->MdlAddress->StartVa, &info, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } case IOCTL_STORAGE_GET_DEVICE_NUMBER: { DWORD len = min( sizeof(dev->devnum), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); diff --git a/include/winioctl.h b/include/winioctl.h index d1c3376..7f04d59 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -264,6 +264,7 @@ #define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) #define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_VOLUME_BASE ((DWORD)'V') #define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -325,6 +326,12 @@ typedef struct _DISK_GEOMETRY { DWORD BytesPerSector; } DISK_GEOMETRY, *PDISK_GEOMETRY; +typedef struct _DISK_GEOMETRY_EX { + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + BYTE Data[1]; +} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX; + typedef struct _PARTITION_INFORMATION { LARGE_INTEGER StartingOffset; LARGE_INTEGER PartitionLength;

1 0

Erich Hoover : user32: Add preliminary support for reading and storing multi-rate animated cursor data .
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 3e35caa7b2815d2d1bfdca1a893d4a1430d1edbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e35caa7b2815d2d1bfdca1a8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:40 2011 -0700 user32: Add preliminary support for reading and storing multi-rate animated cursor data. --- dlls/user32/cursoricon.c | 23 +++- dlls/user32/tests/cursoricon.c | 280 +++++++++++++++++++--------------------- 2 files changed, 152 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e35caa7b2815d2d1bfdc…

1 0

Erich Hoover : user32: Fix GetCursorFrameInfo when passed the proper number of steps.
by Alexandre Julliard March 10, 2011

March 10, 2011

Module: wine Branch: master Commit: 86a9f20aa2bf1426732d5e5ece8e2c8c9755e95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9f20aa2bf1426732d5e5ec… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:16 2011 -0700 user32: Fix GetCursorFrameInfo when passed the proper number of steps. --- dlls/user32/cursoricon.c | 29 ++++++-- dlls/user32/tests/cursoricon.c | 146 ++++++++++++++++++++++++++++++++-------- 2 files changed, 139 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86a9f20aa2bf1426732d5…

1 0