July 2006 - Wine-commits - list.winehq.org

Ivan Gyurdiev : wined3d: Respect EnableAutoDepthStencil parameter.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 99f67c676b73bc5138fd27f072cd788a29292c42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99f67c676b73bc5138fd27f… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:06:32 2006 -0400 wined3d: Respect EnableAutoDepthStencil parameter. --- dlls/wined3d/device.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index babbb9b..53c4986 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1752,7 +1752,7 @@ #endif } /* Under directX swapchains share the depth stencil, so only create one depth-stencil */ - if (pPresentationParameters->EnableAutoDepthStencil && hr == WINED3D_OK) { + if (*(pPresentationParameters->EnableAutoDepthStencil) && hr == WINED3D_OK) { TRACE("Creating depth stencil buffer\n"); if (This->depthStencilBuffer == NULL ) { hr = D3DCB_CreateDepthStencil((IUnknown *) This->parent, @@ -2127,12 +2127,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("Setting rendertarget to NULL\n"); This->renderTarget = NULL; - IWineD3DSurface_GetParent(This->depthStencilBuffer, &stencilBufferParent); - IUnknown_Release(stencilBufferParent); /* once for the get parent */ - if(IUnknown_Release(stencilBufferParent) >0){ /* the second time for when it was created */ - FIXME("(%p) Something's still holding the depthStencilBuffer\n",This); + if (This->depthStencilBuffer) { + IWineD3DSurface_GetParent(This->depthStencilBuffer, &stencilBufferParent); + IUnknown_Release(stencilBufferParent); /* once for the get parent */ + if(IUnknown_Release(stencilBufferParent) >0){ /* the second time for when it was created */ + FIXME("(%p) Something's still holding the depthStencilBuffer\n",This); + } + This->depthStencilBuffer = NULL; } - This->depthStencilBuffer = NULL; for(i=0; i < This->NumberOfSwapChains; i++) { TRACE("Releasing the implicit swapchain %d\n", i);

1 0

Ivan Gyurdiev : d3d9: State management test framework for d3d9.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 84d6bd04699309b34b1906e05bb466487265fe0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84d6bd04699309b34b1906e… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:08:42 2006 -0400 d3d9: State management test framework for d3d9. --- dlls/d3d9/tests/shader.c | 38 - dlls/d3d9/tests/stateblock.c | 1354 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 1262 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=84d6bd04699309b34b1…

1 0

Mike McCormack : msi: Use TRACE not FIXME for already implemented functions .
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: dfb1f4f55b5cdf5ef31641860ca449b5c3df3058 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfb1f4f55b5cdf5ef316418… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:04:09 2006 +0900 msi: Use TRACE not FIXME for already implemented functions. --- dlls/msi/msi.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 61c4d1a..8f11de9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -224,7 +224,7 @@ UINT WINAPI MsiInstallProductW(LPCWSTR s MSIPACKAGE *package = NULL; UINT r; - FIXME("%s %s\n",debugstr_w(szPackagePath), debugstr_w(szCommandLine)); + TRACE("%s %s\n",debugstr_w(szPackagePath), debugstr_w(szCommandLine)); r = MSI_OpenPackageW( szPackagePath, &package ); if (r == ERROR_SUCCESS) @@ -276,7 +276,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWS ' ','I','n','s','t','a','l','l','e','d','=','1',0}; LPWSTR commandline; - FIXME("%s %d %d %s\n",debugstr_w(szProduct), iInstallLevel, eInstallState, + TRACE("%s %d %d %s\n",debugstr_w(szProduct), iInstallLevel, eInstallState, debugstr_w(szCommandLine)); if (eInstallState != INSTALLSTATE_LOCAL && @@ -391,8 +391,6 @@ UINT WINAPI MsiConfigureProductA(LPCSTR UINT WINAPI MsiConfigureProductW(LPCWSTR szProduct, int iInstallLevel, INSTALLSTATE eInstallState) { - FIXME("%s %d %d\n", debugstr_w(szProduct), iInstallLevel, eInstallState); - return MsiConfigureProductExW(szProduct, iInstallLevel, eInstallState, NULL); }

1 0

Mike McCormack : msi: A component with an empty path is not used.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: a36d06c0039fc95fdc77bc8fe99ea582ed0f5e4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a36d06c0039fc95fdc77bc8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:04:26 2006 +0900 msi: A component with an empty path is not used. --- dlls/msi/msi.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8f11de9..f197f47 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -986,6 +986,7 @@ INSTALLSTATE WINAPI MSI_GetComponentPath UINT rc; HKEY hkey = 0; LPWSTR path = NULL; + INSTALLSTATE r; TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf); @@ -1018,13 +1019,15 @@ INSTALLSTATE WINAPI MSI_GetComponentPath if (!path) return INSTALLSTATE_UNKNOWN; - if (path[0]=='0') - FIXME("Registry entry.. check entry\n"); + if (path[0]) + r = INSTALLSTATE_LOCAL; + else + r = INSTALLSTATE_NOTUSED; msi_strcpy_to_awstring( path, lpPathBuf, pcchBuf ); msi_free( path ); - return INSTALLSTATE_LOCAL; + return r; } /******************************************************************

1 0

Ivan Gyurdiev : wined3d: Restore recording mode later in ActiveRender().
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 0c6c9f04a76c7666d07689cedd21970eca81953e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c6c9f04a76c7666d07689c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:03:31 2006 -0400 wined3d: Restore recording mode later in ActiveRender(). --- dlls/wined3d/device.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2956a15..fb7e084 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7225,6 +7225,8 @@ #endif static HRESULT WINAPI IWineD3DDeviceImpl_ActiveRender(IWineD3DDevice* iface, IWineD3DSurface *RenderSurface) { HRESULT ret = WINED3DERR_INVALIDCALL; + BOOL oldRecording; + IWineD3DStateBlockImpl *oldUpdateStateBlock; /** * Currently only active for GLX >= 1.3 @@ -7444,23 +7446,14 @@ #endif } } -#if 1 /* Apply the stateblock to the new context -FIXME: This is a bit of a hack, each context should know it's own state, -the directX current directX state should then be applied to the context */ - { - BOOL oldRecording; - IWineD3DStateBlockImpl *oldUpdateStateBlock; - oldUpdateStateBlock = This->updateStateBlock; - oldRecording= This->isRecordingState; - This->isRecordingState = FALSE; - This->updateStateBlock = This->stateBlock; - IWineD3DStateBlock_Apply((IWineD3DStateBlock *)This->stateBlock); - - This->isRecordingState = oldRecording; - This->updateStateBlock = oldUpdateStateBlock; - } -#endif - + /* Disable recording, and apply the stateblock to the new context + * FIXME: This is a bit of a hack, each context should know it's own state, + * the directX current directX state should then be applied to the context */ + oldUpdateStateBlock = This->updateStateBlock; + oldRecording= This->isRecordingState; + This->isRecordingState = FALSE; + This->updateStateBlock = This->stateBlock; + IWineD3DStateBlock_Apply((IWineD3DStateBlock *)This->stateBlock); /* clean up the current rendertargets swapchain (if it belonged to one) */ if (currentSwapchain != NULL) { @@ -7474,10 +7467,9 @@ #endif IWineD3DSurface_AddRef(This->renderTarget); IWineD3DSurface_Release(tmp); - - { DWORD value; + /* The surface must be rendered upside down to cancel the flip produce by glCopyTexImage */ /* Check that the container is not a swapchain member */ @@ -7498,6 +7490,10 @@ #endif This->proj_valid = FALSE; } + /* Restore recording state */ + This->isRecordingState = oldRecording; + This->updateStateBlock = oldUpdateStateBlock; + ret = WINED3D_OK; if (cfgs != NULL) {

1 0

Ivan Gyurdiev : wined3d: Do not return WINED3DERR_INVALIDCALL for Phong shading.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 65109002aec324bb21a3c3ca9e975afba6710bfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65109002aec324bb21a3c3c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:04:18 2006 -0400 wined3d: Do not return WINED3DERR_INVALIDCALL for Phong shading. --- dlls/wined3d/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb7e084..babbb9b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3491,10 +3491,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl checkGLcall("glShadeModel"); break; case D3DSHADE_PHONG: - FIXME("D3DSHADE_PHONG isn't supported?\n"); - - LEAVE_GL(); - return WINED3DERR_INVALIDCALL; + FIXME("D3DSHADE_PHONG isn't supported\n"); + break; default: FIXME("Unrecognized/Unhandled D3DSHADEMODE value %ld\n", Value); }

1 0

Ivan Gyurdiev : wined3d: Correct initial render states.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 99272f0deec2a224613edf2687ee90dc8f9bba43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99272f0deec2a224613edf2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:05:22 2006 -0400 wined3d: Correct initial render states. --- dlls/wined3d/stateblock.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d23d782..e3d0e7c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -708,7 +708,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, D3DCULL_CCW); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); - IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0xff); /*??*/ + IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_DITHERENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHABLENDENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGENABLE, FALSE); @@ -758,26 +758,29 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALIZENORMALS, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); - IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, D3DMCS_COLOR2); + IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, D3DVBF_DISABLE); IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPLANEENABLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE, tmpfloat.d); - tmpfloat.f = 0.0f; + tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE_MIN, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSPRITEENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALEENABLE, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_A, TRUE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_B, TRUE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_C, TRUE); + tmpfloat.f = 1.0f; + IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_A, tmpfloat.d); + tmpfloat.f = 0.0f; + IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_B, tmpfloat.d); + tmpfloat.f = 0.0f; + IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALE_C, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_MULTISAMPLEANTIALIAS, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_MULTISAMPLEMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_PATCHEDGESTYLE, D3DPATCHEDGE_DISCRETE); tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_PATCHSEGMENTS, tmpfloat.d); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DEBUGMONITORTOKEN, D3DDMT_DISABLE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DEBUGMONITORTOKEN, 0xbaadcafe); tmpfloat.f = 64.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE_MAX, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);

1 0

Andrew Talbot : mscms/tests: Write-strings warnings fix.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: dc3dd4784d80ba5f9501187c82da67150f74b645 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc3dd4784d80ba5f9501187… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 20 22:16:25 2006 +0100 mscms/tests: Write-strings warnings fix. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 27ef1c9..74ef07e 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -446,7 +446,7 @@ static void test_GetCountColorProfileEle typedef struct colorspace_description_struct { DWORD dwID; - char *szName; + const char *szName; BOOL registered; char filename[MAX_PATH]; } colorspace_descr;

1 0

Ivan Gyurdiev : wined3d: Read shader constants from correct stateblock.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: b77b72c91ba8ae78e0a0b2eb558ec19175778a41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b77b72c91ba8ae78e0a0b2e… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 20 23:02:29 2006 -0400 wined3d: Read shader constants from correct stateblock. --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0a0e4e6..2956a15 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4650,7 +4650,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantB[start], cnt * sizeof(BOOL)); + memcpy(dstData, &This->stateBlock->vertexShaderConstantB[start], cnt * sizeof(BOOL)); return WINED3D_OK; } @@ -4697,7 +4697,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4); + memcpy(dstData, &This->stateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4); return WINED3D_OK; } @@ -4744,7 +4744,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantF[start * 4], cnt * sizeof(float) * 4); + memcpy(dstData, &This->stateBlock->vertexShaderConstantF[start * 4], cnt * sizeof(float) * 4); return WINED3D_OK; } @@ -4832,7 +4832,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantB[start], cnt * sizeof(BOOL)); + memcpy(dstData, &This->stateBlock->pixelShaderConstantB[start], cnt * sizeof(BOOL)); return WINED3D_OK; } @@ -4879,7 +4879,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantI[start * 4], cnt * sizeof(int) * 4); + memcpy(dstData, &This->stateBlock->pixelShaderConstantI[start * 4], cnt * sizeof(int) * 4); return WINED3D_OK; } @@ -4926,7 +4926,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantF[start * 4], cnt * sizeof(float) * 4); + memcpy(dstData, &This->stateBlock->pixelShaderConstantF[start * 4], cnt * sizeof(float) * 4); return WINED3D_OK; }

1 0

Jeff Latimer : usp10: Add functionality for ScriptXtoCP and ScriptCPtoX calls.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: 8d139c8b960249e9513492b7ca16d9311b4ef1de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d139c8b960249e9513492b… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Jul 20 22:16:50 2006 +1000 usp10: Add functionality for ScriptXtoCP and ScriptCPtoX calls. --- dlls/usp10/tests/usp10.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 49 ++++++++++++++++++++++--- 2 files changed, 134 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cbaf44a..2a3d9c4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -487,6 +487,96 @@ void test_ScriptTextOut(void) DestroyWindow(hwnd); } +static void test_ScriptXtoX(void) +/**************************************************************************************** + * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * + ****************************************************************************************/ +{ + int iX, iCP; + int cChars; + int cGlyphs; + WORD pwLogClust[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + SCRIPT_VISATTR psva[10]; + int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; + SCRIPT_ANALYSIS psa; + int piCP, piX; + int piTrailing; + BOOL fTrailing; + HRESULT hr; + + iX = -1; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); + ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); + ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d", piTrailing); + iX = 1954; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); + ok(piCP == 10, "Excessive iX should return piCP=10 not %d\n", piCP); + ok(piTrailing == FALSE, "Excessive iX should return piTrailing=FALSE not %d\n", piTrailing); + iX = 779; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); + ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 780; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); + ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 868; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); + ok(piCP == 4, "iX=%d should return piCP=4 not %d\n", iX, piCP); + + iCP=5; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %d\n", (unsigned int) hr); + ok(piX == 976, "iCP=%d should return piX=976 not %d\n", iCP, piX); + iCP=5; + fTrailing = TRUE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %d\n", (unsigned int) hr); + ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + iCP=6; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %d\n", (unsigned int) hr); + ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + iCP=11; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %d\n", (unsigned int) hr); + ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + iCP=11; + fTrailing = TRUE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %d\n", (unsigned int) hr); + ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + +} + static void test_ScriptString(void) { HRESULT hr; @@ -569,5 +659,6 @@ START_TEST(usp10) test_ScriptGetCMap(pwOutGlyphs); test_ScriptGetFontProperties(); test_ScriptTextOut(); + test_ScriptXtoX(); test_ScriptString(); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index aa39449..9e02007 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -362,11 +362,20 @@ HRESULT WINAPI ScriptCPtoX(int iCP, const SCRIPT_ANALYSIS *psa, int *piX) { - FIXME("(%d,%d,%d,%d,%p,%p,%p,%p,%p): stub\n", + int item; + int iPosX; + float fMaxPosX = 0; + TRACE("(%d,%d,%d,%d,%p,%p,%p,%p,%p)\n", iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, psa, piX); - - *piX = 1; /* Return something in range */ + for (item=0; item < cGlyphs; item++) /* total piAdvance */ + fMaxPosX += piAdvance[item]; + iPosX = (fMaxPosX/cGlyphs)*(iCP+fTrailing); + if (iPosX > fMaxPosX) + iPosX = fMaxPosX; + *piX = iPosX; /* Return something in range */ + + TRACE("*piX=%d\n", *piX); return S_OK; } @@ -384,12 +393,40 @@ HRESULT WINAPI ScriptXtoCP(int iX, int *piCP, int *piTrailing) { - FIXME("(%d,%d,%d,%p,%p,%p,%p,%p,%p): stub\n", + int item; + int iPosX = 1; + float fMaxPosX = 1; + float fAvePosX; + TRACE("(%d,%d,%d,%p,%p,%p,%p,%p,%p)\n", iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, psa, piCP, piTrailing); + if (iX < 0) /* iX is before start of run */ + { + *piCP = -1; + *piTrailing = TRUE; + return S_OK; + } - *piCP = 1; /* Return something in range */ - *piTrailing = 0; + for (item=0; item < cGlyphs; item++) /* total piAdvance */ + fMaxPosX += piAdvance[item]; + + if (iX >= fMaxPosX) /* iX too large */ + { + *piCP = cChars; + *piTrailing = FALSE; + return S_OK; + } + + fAvePosX = fMaxPosX / cGlyphs; + for (item = 0; item < cGlyphs && iPosX < iX; item++) + iPosX = fAvePosX * (item +1); + if (iPosX - iX > fAvePosX/2) + *piTrailing = 0; + else + *piTrailing = 1; /* yep we are over half way */ + + *piCP = item -1; /* Return character position */ + TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX); return S_OK; }

1 0