October 2006 - Wine-Commits

Detlef Riekenberg : user: Remove wrong comment.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 530abd2e25d9f073a10453543f0fd7f2e87acbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=530abd2e25d9f073a10453543… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 24 18:06:32 2006 +0200 user: Remove wrong comment. --- dlls/user/win.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 91a9f09..1c3d9e4 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -643,7 +643,6 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) * WIN_DestroyThreadWindows * * Destroy all children of 'wnd' owned by the current thread. - * Return TRUE if something was done. */ void WIN_DestroyThreadWindows( HWND hwnd ) {

1 0

Dmitry Timoshkov : kernel32: Exit from initial thread with ExitThread not by ExitProcess.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 5a1fd50db345c1de97d9d02133728a6080d2848b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1fd50db345c1de97d9d0213… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 24 23:49:44 2006 +0900 kernel32: Exit from initial thread with ExitThread not by ExitProcess. --- dlls/winex11.drv/xinerama.c | 45 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 0d01b58..12f6c65 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -106,9 +106,10 @@ static int query_screens(void) nb_monitors = count; for (i = 0; i < nb_monitors; i++) { +#if 1 /* FIXME: for now, force primary to be the screen that starts at (0,0) origin */ if (!screens[i].x_org && !screens[i].y_org) primary_monitor = i; - +#endif monitors[i].cbSize = sizeof( monitors[i] ); monitors[i].rcMonitor.left = screens[i].x_org; monitors[i].rcMonitor.top = screens[i].y_org; @@ -121,11 +122,6 @@ static int query_screens(void) } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; - - for (i = 0; i < nb_monitors; i++) - TRACE( "monitor %p: %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), - (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } else count = 0; @@ -145,11 +141,36 @@ #endif /* HAVE_LIBXINERAMA */ void xinerama_init(void) { MONITORINFOEXW *primary; + int i; wine_tsx11_lock(); SetRect( &virtual_screen_rect, 0, 0, screen_width, screen_height ); +#if 0 + if (root_window != DefaultRootWindow( gdi_display )) + { + static const WCHAR monitorW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','u',0}; + nb_monitors = 4; + if ((monitors = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(*monitors) ))) + { + for (i = 0; i < nb_monitors; i++) + { + monitors[i].cbSize = sizeof( monitors[i] ); + monitors[i].rcMonitor.left = (i & 1) ? screen_width / 2 : 0; + monitors[i].rcMonitor.top = (i & 2) ? screen_height / 2 : 0; + monitors[i].rcMonitor.right = monitors[i].rcMonitor.left + screen_width / 2; + monitors[i].rcMonitor.bottom = monitors[i].rcMonitor.top + screen_height / 2; + monitors[i].rcWork = monitors[i].rcMonitor; + monitors[i].dwFlags = 0; + wsprintfW( monitors[i].szDevice, monitorW, i ); + } + primary_monitor = 3; + get_primary()->dwFlags |= MONITORINFOF_PRIMARY; + } + } + else +#endif if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect; @@ -158,11 +179,21 @@ void xinerama_init(void) } primary = get_primary(); + /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); + for (i = 0; i < nb_monitors; i++) + { + OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top ); + OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top ); + ERR( "monitor %p: %s%s\n", + index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); + } + screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; - TRACE( "virtual size: %s primary size: %dx%d\n", + ERR( "virtual size: %s primary size: %dx%d\n", wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); wine_tsx11_unlock();

1 0

Ivan Gyurdiev : wined3d: Add D3DBLEND to the WINED3D namespace.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 10cbffb3359d87e728d17899a7499ea06f222840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cbffb3359d87e728d17899a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:05:39 2006 -0400 wined3d: Add D3DBLEND to the WINED3D namespace. --- dlls/wined3d/device.c | 32 ++++++++++++++++---------------- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d_types.h | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e93b1de..e4a4253 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3585,29 +3585,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl { int newVal = GL_ZERO; switch (Value) { - case D3DBLEND_ZERO : newVal = GL_ZERO; break; - case D3DBLEND_ONE : newVal = GL_ONE; break; - case D3DBLEND_SRCCOLOR : newVal = GL_SRC_COLOR; break; - case D3DBLEND_INVSRCCOLOR : newVal = GL_ONE_MINUS_SRC_COLOR; break; - case D3DBLEND_SRCALPHA : newVal = GL_SRC_ALPHA; break; - case D3DBLEND_INVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; break; - case D3DBLEND_DESTALPHA : newVal = GL_DST_ALPHA; break; - case D3DBLEND_INVDESTALPHA : newVal = GL_ONE_MINUS_DST_ALPHA; break; - case D3DBLEND_DESTCOLOR : newVal = GL_DST_COLOR; break; - case D3DBLEND_INVDESTCOLOR : newVal = GL_ONE_MINUS_DST_COLOR; break; - case D3DBLEND_SRCALPHASAT : newVal = GL_SRC_ALPHA_SATURATE; break; - - case D3DBLEND_BOTHSRCALPHA : newVal = GL_SRC_ALPHA; + case WINED3DBLEND_ZERO : newVal = GL_ZERO; break; + case WINED3DBLEND_ONE : newVal = GL_ONE; break; + case WINED3DBLEND_SRCCOLOR : newVal = GL_SRC_COLOR; break; + case WINED3DBLEND_INVSRCCOLOR : newVal = GL_ONE_MINUS_SRC_COLOR; break; + case WINED3DBLEND_SRCALPHA : newVal = GL_SRC_ALPHA; break; + case WINED3DBLEND_INVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; break; + case WINED3DBLEND_DESTALPHA : newVal = GL_DST_ALPHA; break; + case WINED3DBLEND_INVDESTALPHA : newVal = GL_ONE_MINUS_DST_ALPHA; break; + case WINED3DBLEND_DESTCOLOR : newVal = GL_DST_COLOR; break; + case WINED3DBLEND_INVDESTCOLOR : newVal = GL_ONE_MINUS_DST_COLOR; break; + case WINED3DBLEND_SRCALPHASAT : newVal = GL_SRC_ALPHA_SATURATE; break; + + case WINED3DBLEND_BOTHSRCALPHA : newVal = GL_SRC_ALPHA; This->srcBlend = newVal; This->dstBlend = newVal; break; - case D3DBLEND_BOTHINVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; + case WINED3DBLEND_BOTHINVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; This->srcBlend = newVal; This->dstBlend = newVal; break; - case D3DBLEND_BLENDFACTOR : newVal = GL_CONSTANT_COLOR; break; - case D3DBLEND_INVBLENDFACTOR : newVal = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : newVal = GL_CONSTANT_COLOR; break; + case WINED3DBLEND_INVBLENDFACTOR : newVal = GL_ONE_MINUS_CONSTANT_COLOR; break; default: FIXME("Unrecognized src/dest blend value %d (%d)\n", Value, State); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 38bd927..2503c83 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -851,8 +851,8 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_ZWRITEENABLE, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHATESTENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LASTPIXEL, TRUE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, D3DBLEND_ONE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, D3DBLEND_ZERO); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, D3DCULL_CCW); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); @@ -973,8 +973,8 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_WRAP14, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_WRAP15, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SEPARATEALPHABLENDENABLE, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA, D3DBLEND_ONE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA, D3DBLEND_ZERO); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA, WINED3DBLEND_ONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA, D3DBLENDOP_ADD); /* clipping status */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 2341e94..24d5756 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -442,6 +442,25 @@ typedef enum _WINED3DRENDERSTATETYPE { #define WINEHIGHEST_RENDER_STATE WINED3DRS_BLENDOPALPHA /* Highest WINED3DRS_ value */ +typedef enum _WINED3DBLEND { + WINED3DBLEND_ZERO = 1, + WINED3DBLEND_ONE = 2, + WINED3DBLEND_SRCCOLOR = 3, + WINED3DBLEND_INVSRCCOLOR = 4, + WINED3DBLEND_SRCALPHA = 5, + WINED3DBLEND_INVSRCALPHA = 6, + WINED3DBLEND_DESTALPHA = 7, + WINED3DBLEND_INVDESTALPHA = 8, + WINED3DBLEND_DESTCOLOR = 9, + WINED3DBLEND_INVDESTCOLOR = 10, + WINED3DBLEND_SRCALPHASAT = 11, + WINED3DBLEND_BOTHSRCALPHA = 12, + WINED3DBLEND_BOTHINVSRCALPHA = 13, + WINED3DBLEND_BLENDFACTOR = 14, + WINED3DBLEND_INVBLENDFACTOR = 15, + WINED3DBLEND_FORCE_DWORD = 0x7fffffff +} WINED3DBLEND; + typedef enum _WINED3DVERTEXBLENDFLAGS { WINED3DVBF_DISABLE = 0, WINED3DVBF_1WEIGHTS = 1,

1 0

Ivan Gyurdiev : wined3d: Add D3DZBUFFERTYPE to the WINED3D namespace.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 5f79e80827d9fe7d11d1036416f7c4f53d82459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f79e80827d9fe7d11d103641… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:06:19 2006 -0400 wined3d: Add D3DZBUFFERTYPE to the WINED3D namespace. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- include/wine/wined3d_types.h | 8 ++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4a4253..d82bf4e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3452,22 +3452,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; case WINED3DRS_ZENABLE : - switch ((D3DZBUFFERTYPE) Value) { - case D3DZB_FALSE: + switch ((WINED3DZBUFFERTYPE) Value) { + case WINED3DZB_FALSE: glDisable(GL_DEPTH_TEST); checkGLcall("glDisable GL_DEPTH_TEST"); break; - case D3DZB_TRUE: + case WINED3DZB_TRUE: glEnable(GL_DEPTH_TEST); checkGLcall("glEnable GL_DEPTH_TEST"); break; - case D3DZB_USEW: + case WINED3DZB_USEW: glEnable(GL_DEPTH_TEST); checkGLcall("glEnable GL_DEPTH_TEST"); FIXME("W buffer is not well handled\n"); break; default: - FIXME("Unrecognized D3DZBUFFERTYPE value %d\n", Value); + FIXME("Unrecognized WINED3DZBUFFERTYPE value %d\n", Value); } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2503c83..084b43d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -839,9 +839,9 @@ static HRESULT WINAPI IWineD3DStateBloc TRACE("Render states\n"); /* Render states: */ if (ThisDevice->depthStencilBuffer != NULL) { - IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, D3DZB_TRUE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_TRUE); } else { - IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, D3DZB_FALSE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_FALSE); } IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE, D3DFILL_SOLID); IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE, D3DSHADE_GOURAUD); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a3fcb2..365d047 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1224,8 +1224,8 @@ static HRESULT WINAPI IWineD3DSurfaceImp glDrawBuffer(GL_BACK); vcheckGLcall("glDrawBuffer"); } - if(myDevice->stateBlock->renderState[WINED3DRS_ZENABLE] == D3DZB_TRUE || - myDevice->stateBlock->renderState[WINED3DRS_ZENABLE] == D3DZB_USEW) glEnable(GL_DEPTH_TEST); + if(myDevice->stateBlock->renderState[WINED3DRS_ZENABLE] == WINED3DZB_TRUE || + myDevice->stateBlock->renderState[WINED3DRS_ZENABLE] == WINED3DZB_USEW) glEnable(GL_DEPTH_TEST); if (myDevice->stateBlock->renderState[WINED3DRS_ALPHABLENDENABLE]) glEnable(GL_BLEND); if (myDevice->stateBlock->renderState[WINED3DRS_FOGENABLE]) glEnable(GL_FOG); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 24d5756..067188a 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -470,6 +470,14 @@ typedef enum _WINED3DVERTEXBLENDFLAGS { WINED3DVBF_0WEIGHTS = 256 } WINED3DVERTEXBLENDFLAGS; +typedef enum _WINED3DZBUFFERTYPE { + WINED3DZB_FALSE = 0, + WINED3DZB_TRUE = 1, + WINED3DZB_USEW = 2, + + WINED3DZB_FORCE_DWORD = 0x7fffffff +} WINED3DZBUFFERTYPE; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace .
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 93b3106be2cd7e62e59e59fe28308efbdf9d6379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b3106be2cd7e62e59e59fe2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:04:12 2006 -0400 wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace. --- dlls/wined3d/vertexshader.c | 6 +++--- dlls/wined3d/wined3d_private_types.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d48be44..1b84c00 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -942,13 +942,13 @@ #endif break; case WINED3DSPR_RASTOUT: switch (reg) { - case D3DSRO_POSITION: + case WINED3DSRO_POSITION: p[i] = &output->oPos; break; - case D3DSRO_FOG: + case WINED3DSRO_FOG: p[i] = &output->oFog; break; - case D3DSRO_POINT_SIZE: + case WINED3DSRO_POINT_SIZE: p[i] = &output->oPts; break; } diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 2466fa5..f02e980 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -80,6 +80,15 @@ typedef enum _WINED3DSHADER_PARAM_REGIST WINED3DSPR_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_REGISTER_TYPE; +/* RASTOUT register offsets */ +typedef enum _WINED3DVS_RASTOUT_OFFSETS { + WINED3DSRO_POSITION = 0, + WINED3DSRO_FOG = 1, + WINED3DSRO_POINT_SIZE = 2, + + WINED3DSRO_FORCE_DWORD = 0x7FFFFFFF +} WINED3DVS_RASTOUT_OFFSETS; + /** Source register modifiers **/ #define WINED3DVS_SWIZZLE_SHIFT 16 #define WINED3DVS_SWIZZLE_MASK (0xFF << WINED3DVS_SWIZZLE_SHIFT)

1 0

Ivan Gyurdiev : wined3d: Add D3DTA masks to the WINED3D namespace.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 4f611bc0e041b93bd5d093803f5cf9ee6b08e2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f611bc0e041b93bd5d093803… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:05:00 2006 -0400 wined3d: Add D3DTA masks to the WINED3D namespace. Also fix usage of D3DTSS/D3DTA in ddraw. --- dlls/ddraw/device.c | 40 +++++++++++----------- dlls/wined3d/stateblock.c | 14 ++++---- dlls/wined3d/utils.c | 78 +++++++++++++++++++++--------------------- include/wine/wined3d_types.h | 11 ++++++ 4 files changed, 77 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f611bc0e041b93bd5d09…

1 0

Ivan Gyurdiev : wined3d: Add D3DTADDRESS to the WINED3D namespace.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 997e670e1295edfca57a77205c68e39d4339a665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e670e1295edfca57a77205… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:03:18 2006 -0400 wined3d: Add D3DTADDRESS to the WINED3D namespace. --- dlls/wined3d/basetexture.c | 10 +++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 16 ++++++++-------- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d_types.h | 10 ++++++++++ 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index f5cc355..3fdbf4a 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -256,9 +256,9 @@ #endif } /* Initialise the state of the texture object to the openGL defaults, not the directx defaults */ - This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = D3DTADDRESS_WRAP; - This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = D3DTADDRESS_WRAP; - This->baseTexture.states[WINED3DTEXSTA_ADDRESSW] = D3DTADDRESS_WRAP; + This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_WRAP; + This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_WRAP; + This->baseTexture.states[WINED3DTEXSTA_ADDRESSW] = WINED3DTADDRESS_WRAP; This->baseTexture.states[WINED3DTEXSTA_BORDERCOLOR] = 0; This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_LINEAR; This->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; /* GL_NEAREST_MIPMAP_LINEAR */ @@ -268,7 +268,7 @@ #endif This->baseTexture.states[WINED3DTEXSTA_SRGBTEXTURE] = 0; This->baseTexture.states[WINED3DTEXSTA_ELEMENTINDEX] = 0; This->baseTexture.states[WINED3DTEXSTA_DMAPOFFSET] = 0; - This->baseTexture.states[WINED3DTEXSTA_TSSADDRESSW] = D3DTADDRESS_WRAP; + This->baseTexture.states[WINED3DTEXSTA_TSSADDRESSW] = WINED3DTADDRESS_WRAP; IWineD3DBaseTexture_SetDirty(iface, TRUE); isNewTexture = TRUE; } @@ -358,7 +358,7 @@ void WINAPI IWineD3DBaseTextureImpl_Appl case WINED3DSAMP_ADDRESSW: /* fall through */ *state = samplerStates[textureObjectSamplerStates[i].state]; if (*state < minLookup[WINELOOKUP_WARPPARAM] || *state > maxLookup[WINELOOKUP_WARPPARAM]) { - FIXME("Unrecognized or unsupported D3DTADDRESS_* value %d, state %d\n", *state, textureObjectSamplerStates[i].function); + FIXME("Unrecognized or unsupported WINED3DTADDRESS_* value %d, state %d\n", *state, textureObjectSamplerStates[i].function); } else { GLint wrapParm = stateLookup[WINELOOKUP_WARPPARAM][*state - minLookup[WINELOOKUP_WARPPARAM]]; TRACE("Setting WRAP_R to %d for %x\n", wrapParm, textureDimensions); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed0a2e9..e93b1de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5510,7 +5510,7 @@ static void WINAPI IWineD3DDeviceImpl_Ap case WINED3DTSS_ADDRESSW : #if 0 /* I'm not sure what D3D does about ADDRESSW appearing twice */ if (Value < minLookup[WINELOOKUP_WARPPARAM] || Value > maxLookup[WINELOOKUP_WARPPARAM]) { - FIXME("Unrecognized or unsupported D3DTADDRESS_* value %d, state %d\n", Value, Type); + FIXME("Unrecognized or unsupported WINED3DTADDRESS_* value %d, state %d\n", Value, Type); } else { GLint wrapParm = stateLookup[WINELOOKUP_WARPPARAM][Value - minLookup[WINELOOKUP_WARPPARAM]]; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 25839b5..e34f4cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -933,8 +933,8 @@ #undef USE_GL_FUNC /* Load all the lookup tables TODO: It may be a good idea to make minLookup and maxLookup const and populate them in wined3d_private.h where they are declared */ - minLookup[WINELOOKUP_WARPPARAM] = D3DTADDRESS_WRAP; - maxLookup[WINELOOKUP_WARPPARAM] = D3DTADDRESS_MIRRORONCE; + minLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_WRAP; + maxLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_MIRRORONCE; minLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_NONE; maxLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_ANISOTROPIC; @@ -944,15 +944,15 @@ #undef USE_GL_FUNC stateLookup[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(*stateLookup[i]) * (1 + maxLookup[i] - minLookup[i]) ); } - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_WRAP - minLookup[WINELOOKUP_WARPPARAM]] = GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_CLAMP - minLookup[WINELOOKUP_WARPPARAM]] = GL_CLAMP_TO_EDGE; - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_WRAP - minLookup[WINELOOKUP_WARPPARAM]] = GL_REPEAT; + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_CLAMP - minLookup[WINELOOKUP_WARPPARAM]] = GL_CLAMP_TO_EDGE; + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_MIRROR - minLookup[WINELOOKUP_WARPPARAM]] = + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRROR - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][D3DTADDRESS_MIRRORONCE - minLookup[WINELOOKUP_WARPPARAM]] = + stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRRORONCE - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; stateLookup[WINELOOKUP_MAGFILTER][WINED3DTEXF_NONE - minLookup[WINELOOKUP_MAGFILTER]] = GL_NEAREST; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5a22b50..2e31a9f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -999,7 +999,7 @@ static HRESULT WINAPI IWineD3DStateBloc This->textureState[i][WINED3DTSS_BUMPENVLSCALE ] = (DWORD) 0.0; This->textureState[i][WINED3DTSS_BUMPENVLOFFSET ] = (DWORD) 0.0; This->textureState[i][WINED3DTSS_TEXTURETRANSFORMFLAGS ] = WINED3DTTFF_DISABLE; - This->textureState[i][WINED3DTSS_ADDRESSW ] = D3DTADDRESS_WRAP; + This->textureState[i][WINED3DTSS_ADDRESSW ] = WINED3DTADDRESS_WRAP; This->textureState[i][WINED3DTSS_COLORARG0 ] = D3DTA_CURRENT; This->textureState[i][WINED3DTSS_ALPHAARG0 ] = D3DTA_CURRENT; This->textureState[i][WINED3DTSS_RESULTARG ] = D3DTA_CURRENT; @@ -1008,9 +1008,9 @@ static HRESULT WINAPI IWineD3DStateBloc /* Sampler states*/ for (i = 0 ; i < GL_LIMITS(sampler_stages); i++) { TRACE("Setting up default samplers states for sampler %d\n", i); - This->samplerState[i][WINED3DSAMP_ADDRESSU ] = D3DTADDRESS_WRAP; - This->samplerState[i][WINED3DSAMP_ADDRESSV ] = D3DTADDRESS_WRAP; - This->samplerState[i][WINED3DSAMP_ADDRESSW ] = D3DTADDRESS_WRAP; + This->samplerState[i][WINED3DSAMP_ADDRESSU ] = WINED3DTADDRESS_WRAP; + This->samplerState[i][WINED3DSAMP_ADDRESSV ] = WINED3DTADDRESS_WRAP; + This->samplerState[i][WINED3DSAMP_ADDRESSW ] = WINED3DTADDRESS_WRAP; This->samplerState[i][WINED3DSAMP_BORDERCOLOR ] = 0x00; This->samplerState[i][WINED3DSAMP_MAGFILTER ] = WINED3DTEXF_POINT; This->samplerState[i][WINED3DSAMP_MINFILTER ] = WINED3DTEXF_POINT; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 9492cbf..36f2b41 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -593,6 +593,16 @@ typedef enum _WINED3DTEXTUREOP { WINED3DTOP_FORCE_DWORD = 0x7fffffff, } WINED3DTEXTUREOP; +typedef enum _WINED3DTEXTUREADDRESS { + WINED3DTADDRESS_WRAP = 1, + WINED3DTADDRESS_MIRROR = 2, + WINED3DTADDRESS_CLAMP = 3, + WINED3DTADDRESS_BORDER = 4, + WINED3DTADDRESS_MIRRORONCE = 5, + + WINED3DTADDRESS_FORCE_DWORD = 0x7fffffff +} WINED3DTEXTUREADDRESS; + typedef enum _WINED3DTRANSFORMSTATETYPE { WINED3DTS_VIEW = 2, WINED3DTS_PROJECTION = 3,

1 0

Ivan Gyurdiev : wined3d: D3DLOCK: Use consistently in the WINED3D namespace .
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 74cd90a18abbd049937b507574a753f18f9cd1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cd90a18abbd049937b50757… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 24 06:02:30 2006 -0400 wined3d: D3DLOCK: Use consistently in the WINED3D namespace. --- dlls/wined3d/surface_gdi.c | 4 ++-- dlls/wined3d/vertexbuffer.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 1e797d3..c316fd8 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -541,7 +541,7 @@ #endif { if (Src) { - IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, WINED3DLOCK_READONLY); sfmt = Src->resource.format; } sEntry = getFormatDescEntry(sfmt); @@ -1220,7 +1220,7 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurf } else { - ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, D3DLOCK_READONLY); + ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY); if(ret != D3D_OK) goto error; ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0); if(ret != D3D_OK) goto error; diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 84d184c..aeccdab 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -451,9 +451,9 @@ static HRESULT WINAPI IWineD3DVertexBuf TRACE("Locking directly into the buffer\n"); - if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & D3DLOCK_DISCARD) ) { + if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & WINED3DLOCK_DISCARD) ) { mode = GL_WRITE_ONLY_ARB; - } else if( Flags & (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE) ) { + } else if( Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) ) { mode = GL_READ_ONLY_ARB; }

1 0

Jeff Latimer : usp10: Add tests for ScriptStringCptoX and ScriptStringXtoCp for activation in later patches .
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: a8e5b9ae70ccc8d2425feedd46523e9451f7dd43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e5b9ae70ccc8d2425feedd4… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Oct 24 19:04:10 2006 +1000 usp10: Add tests for ScriptStringCptoX and ScriptStringXtoCp for activation in later patches. --- dlls/usp10/tests/usp10.c | 178 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 177 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 4fde627..f9b1dec 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -700,6 +700,181 @@ static void test_ScriptString(void) } } +void test_ScriptStringXtoCP_CPtoX(HDC hdc) +{ +/***************************************************************************************** + * + * This test is for the ScriptStringXtoCP and ScriptStringXtoCP functions. Due to the + * nature of the fonts between Windows and Wine, the test is implemented by generating + * values using one one function then checking the output of the second. In this way + * the validity of the functions is established using Windows as a base and confirming + * similar behaviour in wine. + */ + + HRESULT hr; + WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', '1', '2', ' ', 'a', '\0'}; + void *String = (WCHAR *) &teststr1; /* ScriptStringAnalysis needs void */ + int String_len = (sizeof(teststr1)/sizeof(WCHAR))-1; + int Glyphs = String_len * 2 + 16; /* size of buffer as recommended */ + int Charset = -1; /* unicode */ + DWORD Flags = SSA_GLYPHS; + int ReqWidth = 100; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + SCRIPT_TABDEF Tabdef; + const BYTE InClass = 0; + SCRIPT_STRING_ANALYSIS ssa = NULL; + + int Ch; /* Character position in string */ + int iTrailing; + int Cp; /* Character position in string */ + int X; + BOOL fTrailing; + + LOGFONTA lf; + HFONT zfont; + + lstrcpyA(lf.lfFaceName, "Symbol"); + lf.lfHeight = 10; + lf.lfCharSet = 0; + lf.lfItalic = 0; + lf.lfEscapement = 0; + lf.lfOrientation = 0; + lf.lfUnderline = 0; + lf.lfStrikeOut = 0; + lf.lfWeight = 400; + lf.lfWidth = 0; + lf.lfPitchAndFamily = 0; + + zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); + + /* Test with hdc, this should be a valid test + * Here we generrate an SCRIPT_STRING_ANALYSIS that will be used as input to the + * following character positions to X and X to character position functions. + */ + hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, NULL, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + todo_wine ok(ssa != NULL, "ScriptStringAnalyse ssa should not be NULL\n"); + if (hr == 0) + { + /* + * Loop to generate character positions to provide starting positions for the + * ScriptStringCPtoX and ScriptStringXtoCP functions + */ + for (Cp = 0; Cp < String_len; Cp++) + { + /* The fTrailing flag is used to indicate whether the X being returned is at + * the beginning or the end of the character. What happens here is that if + * fTrailing indicates the end of the character, ie. FALSE, then ScriptStringXtoCP + * returns the beginning of the next character and iTrailing is FALSE. So for this + * loop iTrailing will be FALSE in both cases. + */ + fTrailing = FALSE; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + todo_wine ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + fTrailing = TRUE; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + todo_wine ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + + /* + * Check that character position returned by ScriptStringXtoCP in Ch matches the + * one input to ScriptStringCPtoX. This means that the Cp to X position and back + * again works + */ + todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + } + + /* + * This test is to check that if the X position is just inside the trailing edge of the + * character then iTrailing will indicate the trailing edge, ie. TRUE + */ + fTrailing = TRUE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X--; /* put X just inside the trailing edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + todo_wine ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + iTrailing, X); + + /* + * This test is to check that if the X position is just outside the trailing edge of the + * character then iTrailing will indicate the leading edge, ie. FALSE, and Ch will indicate + * the next character, ie. Cp + 1 + */ + fTrailing = TRUE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X++; /* put X just outside the trailing edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + todo_wine ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + + /* + * This test is to check that if the X position is just outside the leading edge of the + * character then iTrailing will indicate the trailing edge, ie. TRUE, and Ch will indicate + * the next character down , ie. Cp - 1 + */ + fTrailing = FALSE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X--; /* put X just outside the leading edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + todo_wine ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + todo_wine ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, X); + todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + iTrailing, X); + + /* + * Cleanup the the SSA for the next round of tests + */ + hr = ScriptStringFree(&ssa); + todo_wine ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); + + /* + * Test to see that exceeding the number of chars returns E_INVALIDARG. First + * generate an SSA for the subsequent tests. + */ + hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, NULL, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + + /* + * When ScriptStringCPtoX is called with a character position Cp that exceeds the + * string length, return E_INVALIDARG. This also invalidates the ssa so a + * ScriptStringFree should also fail. + */ + fTrailing = FALSE; + Cp = String_len + 1; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + todo_wine ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptStringFree(&ssa); + /* + * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail + */ + todo_wine ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); + } +} + void test_ScriptCacheGetHeight(HDC hdc) { HRESULT hr; @@ -1078,8 +1253,9 @@ START_TEST(usp10) test_ScriptTextOut(); test_ScriptXtoX(); test_ScriptString(); - test_ScriptLayout(); + test_ScriptStringXtoCP_CPtoX(hdc); + test_ScriptLayout(); test_digit_substitution(); ReleaseDC(hwnd, hdc);

1 0

Jeff Latimer : usp10: Add tests for ScriptStringAnalyse and ScriptStringFree.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 37e7de1208eb6003d56c32f8e55259f03f28d91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e7de1208eb6003d56c32f8e… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Oct 24 19:02:17 2006 +1000 usp10: Add tests for ScriptStringAnalyse and ScriptStringFree. --- dlls/usp10/tests/usp10.c | 92 ++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 31df9c7..4fde627 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -614,30 +614,38 @@ static void test_ScriptXtoX(void) static void test_ScriptString(void) { +/******************************************************************************************* + * + * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse + * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This + * memory if freed by ScriptStringFree. There needs to be a valid hdc for this this as + * ScriptStrinAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * + */ + HRESULT hr; HWND hwnd; HDC hdc = 0; - WCHAR teststr[] = {'T', 'e', 's', 't', 'a', '\0'}; - void *pString = (WCHAR *) &teststr; - int cString = 5; - int cGlyphs = cString * 2 + 16; - int iCharset = -1; - DWORD dwFlags = SSA_GLYPHS; - int iReqWidth = 100; - SCRIPT_CONTROL psControl; - SCRIPT_STATE psState; - const int piDx[5] = {10, 10, 10, 10, 10}; - SCRIPT_TABDEF pTabdef; - const BYTE pbInClass = 0; - SCRIPT_STRING_ANALYSIS pssa = NULL; - - int iX = 10; - int iY = 100; - UINT uOptions = 0; - const RECT prc = {0, 50, 100, 100}; - int iMinSel = 0; - int iMaxSel = 0; - BOOL fDisabled = FALSE; + WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; + int String = (sizeof(teststr)/sizeof(WCHAR))-1; + int Glyphs = String * 2 + 16; + int Charset; + DWORD Flags = SSA_GLYPHS; + int ReqWidth = 100; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + const int Dx[5] = {10, 10, 10, 10, 10}; + SCRIPT_TABDEF Tabdef; + const BYTE InClass = 0; + SCRIPT_STRING_ANALYSIS ssa = NULL; + + int X = 10; + int Y = 100; + UINT Options = 0; + const RECT rc = {0, 50, 100, 100}; + int MinSel = 0; + int MaxSel = 0; + BOOL Disabled = FALSE; LOGFONTA lf; HFONT zfont; @@ -658,31 +666,37 @@ static void test_ScriptString(void) lf.lfOrientation = 0; lf.lfUnderline = 0; lf.lfStrikeOut = 0; - lf.lfWeight = 3; + lf.lfWeight = 300; lf.lfWidth = 10; zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); + Charset = -1; /* this flag indicates unicode input */ /* Test without hdc to get E_INVALIDARG */ - hr = ScriptStringAnalyse( NULL, pString, cString, cGlyphs, iCharset, dwFlags, - iReqWidth, &psControl, &psState, piDx, &pTabdef, - &pbInClass, &pssa); + hr = ScriptStringAnalyse( NULL, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* test with hdc, this should be a valid test */ - hr = ScriptStringAnalyse( hdc, pString, cString, cGlyphs, iCharset, dwFlags, - iReqWidth, &psControl, &psState, piDx, &pTabdef, - &pbInClass, &pssa); - ok(hr == E_NOTIMPL, "ScriptStringAnalyse Stub should return E_NOTIMPL not %08x\n", hr); -/* Commented code it pending new code in ScriptStringAnalysis */ -/* ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08x\n", (unsigned int) hr);*/ -/* ok(pssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n");*/ + hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + + /* test makes sure that a call with a valid pssa still works */ + hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + todo_wine ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); + if (hr == 0) { - hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); - ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", hr); - hr = ScriptStringFree(&pssa); - ok(hr == S_OK, "ScriptStringFree Stub should return S_OK not %08x\n", hr); + hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); + todo_wine ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); + hr = ScriptStringFree(&ssa); + todo_wine ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); } } @@ -1060,9 +1074,6 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); - ReleaseDC(hwnd, hdc); - DestroyWindow(hwnd); - test_ScriptGetFontProperties(); test_ScriptTextOut(); test_ScriptXtoX(); @@ -1070,4 +1081,7 @@ START_TEST(usp10) test_ScriptLayout(); test_digit_substitution(); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); }

1 0