May 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Support clipplanes with GLSL.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 2cb8f42168aa9b00b8dd511a6e5828b45088cbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb8f42168aa9b00b8dd511a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 17:24:01 2009 +0200 wined3d: Support clipplanes with GLSL. This is the Nth attemt to make clipping work with GLSL shaders. The patch now uses the GLSL quirk table to handle cards that need a custom varying for gl_ClipPos, and the code is adapted to the changed state table and shader backend system. --- dlls/wined3d/arb_program_shader.c | 2 + dlls/wined3d/directx.c | 22 ++++++++++++++++++ dlls/wined3d/glsl_shader.c | 34 ++++++++++++++++++++------- dlls/wined3d/state.c | 45 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 ++ 6 files changed, 83 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cb8f42168aa9b00b8dd5…

1 0

Stefan Dösinger : WineD3D: Support more constants in ARB shaders.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: d7f282f241e154c43f1fef2bc61945d0bb634771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f282f241e154c43f1fef2bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:02:45 2009 +0200 WineD3D: Support more constants in ARB shaders. GL_LIMIT - 1 for vertex programs and the GL limit in fragment programs. The indirect addressing limitation in GLSL applies here as well. --- dlls/wined3d/arb_program_shader.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bfd2d7d..93f84d5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -59,15 +59,10 @@ static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { else return 1; } -/* The arb shader only loads the bump mapping environment matrix into the shader if it finds - * a free constant to do that, so only reduce the number of available constants by 2 for the fog states. - */ -#define ARB_SHADER_RESERVED_PS_CONSTS 2 - /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - reserved_vs_const(&GLINFO_LOCATION)) +#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - 1) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ @@ -316,11 +311,28 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; DWORD i, cur, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); - unsigned max_constantsF = min(This->baseShader.limits.constant_float, - (pshader ? GL_LIMITS(pshader_constantsF) - ARB_SHADER_RESERVED_PS_CONSTS : - GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info))); + unsigned max_constantsF; const local_constant *lconst; + /* In pixel shaders, all private constants are program local, we don't need anything + * from program.env. Thus we can advertise the full set of constants in pixel shaders. + * If we need a private constant the GL implementation will squeeze it in somewhere + * + * With vertex shaders we need the posFixup and on some GL implementations 4 helper + * immediate values. The posFixup is loaded using program.env for now, so always + * subtract one from the number of constants. If the shader uses indirect addressing, + * account for the helper const too because we have to declare all availabke d3d constants + * and don't know which are actually used. + */ + if(pshader) { + max_constantsF = GL_LIMITS(pshader_constantsF); + } else { + if(This->baseShader.reg_maps.usesrelconstF) { + max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); + } else { + max_constantsF = GL_LIMITS(vshader_constantsF) - 1; + } + } /* Temporary Output register */ shader_addline(buffer, "TEMP TMP_OUT;\n"); @@ -2092,14 +2104,14 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - 1; } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); pCaps->PixelShader1xMaxValue = 8.0; TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); - pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF) - ARB_SHADER_RESERVED_PS_CONSTS; + pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); } pCaps->VSClipping = FALSE; /* TODO: GL_NV_vertex_program2_option provides this */

1 0

Aric Stewart : msctf: Define ITfEditSession implemented by TextServices.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: f61855ae2208ca0f63db82196fc04504edf93d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61855ae2208ca0f63db82196… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 15 14:09:44 2009 -0500 msctf: Define ITfEditSession implemented by TextServices. --- include/msctf.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 40853ee..91b11c3 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -713,3 +713,14 @@ interface ITfLanguageProfileNotifySink : IUnknown HRESULT OnLanguageChanged(); } + +[ + object, + uuid(aa80e803-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfEditSession : IUnknown +{ + HRESULT DoEditSession( + [in] TfEditCookie ec); +}

1 0

Aric Stewart : msctf: TfContext intitalization and uninitialization on Push and Pop.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 7d4e1336247bb701e9e23ef4f36909793e70c25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4e1336247bb701e9e23ef4f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 15 14:09:58 2009 -0500 msctf: TfContext intitalization and uninitialization on Push and Pop. --- dlls/msctf/context.c | 39 ++++++++++++++++++++++++++++++++------- dlls/msctf/documentmgr.c | 4 ++++ dlls/msctf/msctf_internal.h | 3 +++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index dff4fd8..42ae71e 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -66,6 +66,7 @@ typedef struct tagContext { /* const ITfQueryEmbeddedVtbl *QueryEmbeddedVtbl; */ /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ LONG refCount; + BOOL connected; TfClientId tidOwner; @@ -446,16 +447,12 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->SourceVtbl = &Context_SourceVtbl; This->refCount = 1; This->tidOwner = tidOwner; + This->connected = FALSE; if (punk) { - if (SUCCEEDED(IUnknown_QueryInterface(punk, &IID_ITextStoreACP, - (LPVOID*)&This->pITextStoreACP))) - { - if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) - ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, - (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); - } + IUnknown_QueryInterface(punk, &IID_ITextStoreACP, + (LPVOID*)&This->pITextStoreACP); IUnknown_QueryInterface(punk, &IID_ITfContextOwnerCompositionSink, (LPVOID*)&This->pITfContextOwnerCompositionSink); @@ -478,6 +475,34 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp return S_OK; } +HRESULT Context_Initialize(ITfContext *iface) +{ + Context *This = (Context *)iface; + + if (This->pITextStoreACP) + { + if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) + ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, + (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); + } + This->connected = TRUE; + return S_OK; +} + +HRESULT Context_Uninitialize(ITfContext *iface) +{ + Context *This = (Context *)iface; + + if (This->pITextStoreACPSink) + { + ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)This->pITextStoreACPSink); + if (ITextStoreACPSink_Release(This->pITextStoreACPSink) == 0) + This->pITextStoreACPSink = NULL; + } + This->connected = FALSE; + return S_OK; +} + /************************************************************************** * ITextStoreACPSink **************************************************************************/ diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index e1e5b19..7fd354a 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -138,6 +138,7 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) This->contextStack[0] = check; ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); + Context_Initialize(check); return S_OK; } @@ -153,11 +154,13 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); + Context_Uninitialize(This->contextStack[0]); } if (This->contextStack[1]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); ITfContext_Release(This->contextStack[1]); + Context_Uninitialize(This->contextStack[1]); } This->contextStack[0] = This->contextStack[1] = NULL; ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); @@ -172,6 +175,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); + Context_Uninitialize(This->contextStack[0]); This->contextStack[0] = This->contextStack[1]; This->contextStack[1] = NULL; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 15950ed..3dce778 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -35,6 +35,9 @@ extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfConte extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT Context_Initialize(ITfContext *cxt); +extern HRESULT Context_Uninitialize(ITfContext *cxt); + /* cookie function */ extern DWORD generate_Cookie(DWORD magic, LPVOID data); extern DWORD get_Cookie_magic(DWORD id);

1 0

Juan Lang : inetmib1: Rename a poorly named variable.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 6a025c5a32b64d6379e3243b1120742dff6d9201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a025c5a32b64d6379e3243b1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 15 08:00:31 2009 -0700 inetmib1: Rename a poorly named variable. --- dlls/inetmib1/main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 7ce0111..b0ff812 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -456,11 +456,11 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, } else { - AsnObjectIdentifier ipOid = { instanceLen, + AsnObjectIdentifier instanceOid = { instanceLen, oid->ids + base->idLength + 1 }; - *instance = findNextOidInTable(&ipOid, table, tableEntrySize, - makeKey, compare); + *instance = findNextOidInTable(&instanceOid, table, + tableEntrySize, makeKey, compare); if (!*instance || *instance > table->numEntries) ret = SNMP_ERRORSTATUS_NOSUCHNAME; } @@ -477,10 +477,10 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, ret = SNMP_ERRORSTATUS_NOSUCHNAME; else { - AsnObjectIdentifier ipOid = { instanceLen, + AsnObjectIdentifier instanceOid = { instanceLen, oid->ids + base->idLength + 1 }; - *instance = findOidInTable(&ipOid, table, tableEntrySize, + *instance = findOidInTable(&instanceOid, table, tableEntrySize, makeKey, compare); if (!*instance) ret = SNMP_ERRORSTATUS_NOSUCHNAME;

1 0

Stefan Dösinger : wined3d: Use local constants for bump parameters.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 3372846aa64bdda484d5b5496db40aa1773eb65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3372846aa64bdda484d5b5496… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:22:23 2009 +0200 wined3d: Use local constants for bump parameters. This simplifies the loading code a bit. The constants were never designed to be at the same location in all shaders, so there's no point in using program.env. This way we don't collide with the d3d shader constants and its easier to work together with NP2 fixups and other shaders. --- dlls/wined3d/arb_program_shader.c | 192 +++++++++++++------------------------ 1 files changed, 68 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3372846aa64bdda484d5b…

1 0

Robert Key : wined3d: Remove HD 4800 "2048MB for X2 versions" comment.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 0cea80708ffc74476da44864dbc698d9d731f353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cea80708ffc74476da44864d… Author: Robert Key <hpestilence(a)gmail.com> Date: Fri May 15 16:49:52 2009 -0400 wined3d: Remove HD 4800 "2048MB for X2 versions" comment. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 825d8f5..9e9a5cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1280,7 +1280,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { strstr(gl_info->gl_renderer, "HD 4890")) { gl_info->gl_card = CARD_ATI_RADEON_HD4800; - vidmem = 512; /* HD4800 cards use 512-1024MB, up to 2048MB for X2 version */ + vidmem = 512; /* HD4800 cards use 512-1024MB */ } /* Radeon R6xx HD2900/HD3800 - highend */ else if (strstr(gl_info->gl_renderer, "HD 2900") ||

1 0

Nikolay Sivov : comctl32/header: Move parameter cast to WinProc where possible.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: e6a3807e59d445386eadd3079b061492543c6a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a3807e59d445386eadd3079… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 22:57:26 2009 +0400 comctl32/header: Move parameter cast to WinProc where possible. --- dlls/comctl32/header.c | 125 +++++++++++++++++++++--------------------------- 1 files changed, 55 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a3807e59d445386eadd…

1 0

Nikolay Sivov : comctl32/tests: Don' t use magic numbers for ListView exstyles.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 45b8e6a4f92e9072780ad7202031c0ac9f2ab5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b8e6a4f92e9072780ad7202… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:47:38 2009 +0400 comctl32/tests: Don't use magic numbers for ListView exstyles. --- dlls/comctl32/tests/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6386655..0c6b139 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -410,7 +410,9 @@ static void test_images(void) 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); - r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, 0x940); + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, + LVS_EX_UNDERLINEHOT | LVS_EX_FLATSB | LVS_EX_ONECLICKACTIVATE); + ok(r == 0, "should return zero\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl);

1 0

Huw Davies : ole32: Implement TYMED_ISTORAGE marshalling.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: c36826705c99f9700b9d6b5e6453656c0f17390f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36826705c99f9700b9d6b5e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 14:50:12 2009 +0100 ole32: Implement TYMED_ISTORAGE marshalling. --- dlls/ole32/usrmarshal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index f3e87c4..1337a39 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1786,7 +1786,10 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM TRACE("TYMED_ISTORAGE\n"); if (pStgMedium->u.pstg) { - FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + IUnknown *unk; + IStorage_QueryInterface(pStgMedium->u.pstg, &IID_IUnknown, (void**)&unk); + size = WdtpInterfacePointer_UserSize(pFlags, LOWORD(*pFlags), size, unk, &IID_IStorage); + IUnknown_Release(unk); } break; case TYMED_GDI: @@ -1895,7 +1898,10 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p TRACE("TYMED_ISTORAGE\n"); if (pStgMedium->u.pstg) { - FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + IUnknown *unk; + IStorage_QueryInterface(pStgMedium->u.pstg, &IID_IUnknown, (void**)&unk); + pBuffer = WdtpInterfacePointer_UserMarshal(pFlags, LOWORD(*pFlags), pBuffer, unk, &IID_IStorage); + IUnknown_Release(unk); } break; case TYMED_GDI: @@ -2025,7 +2031,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char TRACE("TYMED_ISTORAGE\n"); if (content) { - FIXME("not implemented for IStorage\n"); + pBuffer = WdtpInterfacePointer_UserUnmarshal(pFlags, pBuffer, (IUnknown**)&pStgMedium->u.pstg, &IID_IStorage); } else pStgMedium->u.pstg = NULL;

1 0