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

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

18 May '09

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 18 May '09

18 May '09

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 18 May '09

18 May '09

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

Aric Stewart : msctf/tests: Test TextService requesting an EditSession.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 8535f8c67056764a1cd9fe5cbad1bfce2aec71cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8535f8c67056764a1cd9fe5cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 15 14:10:16 2009 -0500 msctf/tests: Test TextService requesting an EditSession. --- dlls/msctf/tests/inputprocessor.c | 147 ++++++++++++++++++++++++++++++++++++- 1 files changed, 144 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 3728711..a4d9979 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -54,6 +54,10 @@ static INT test_OnInitDocumentMgr = SINK_UNEXPECTED; static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; +static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_GetStatus = SINK_UNEXPECTED; +static INT test_ACP_RequestLock = SINK_UNEXPECTED; +static INT test_DoEditSession = SINK_UNEXPECTED; /********************************************************************** @@ -63,6 +67,8 @@ typedef struct tagTextStoreACP { const ITextStoreACPVtbl *TextStoreACPVtbl; LONG refCount; + + ITextStoreACPSink *sink; } TextStoreACP; static void TextStoreACP_Destructor(TextStoreACP *This) @@ -109,7 +115,14 @@ static ULONG WINAPI TextStoreACP_Release(ITextStoreACP *iface) static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { - trace("\n"); + TextStoreACP *This = (TextStoreACP *)iface; + HRESULT hr; + + ok(test_ACP_AdviseSink == SINK_EXPECTED, "Unexpected TextStoreACP_AdviseSink sink\n"); + test_ACP_AdviseSink = SINK_FIRED; + + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&This->sink)); + ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); return S_OK; } @@ -119,16 +132,25 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, trace("\n"); return S_OK; } + static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, DWORD dwLockFlags, HRESULT *phrSession) { - trace("\n"); + TextStoreACP *This = (TextStoreACP *)iface; + + ok(test_ACP_RequestLock == SINK_EXPECTED,"Unexpected TextStoreACP_RequestLock\n"); + test_ACP_RequestLock = SINK_FIRED; + test_DoEditSession = SINK_EXPECTED; + *phrSession = ITextStoreACPSink_OnLockGranted(This->sink, TS_LF_READWRITE); + ok(test_DoEditSession = SINK_FIRED,"expected DoEditSession not fired\n"); + ok(*phrSession == 0xdeadcafe,"Unexpected return from ITextStoreACPSink_OnLockGranted\n"); return S_OK; } static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - trace("\n"); + ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); + test_ACP_GetStatus = SINK_FIRED; return S_OK; } static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, @@ -1114,12 +1136,14 @@ static void test_startSession(void) cnt = check_context_refcount(cxt); test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); ok(test_OnPushContext == SINK_FIRED, "OnPushContext sink not fired\n"); ok(test_OnInitDocumentMgr == SINK_FIRED, "OnInitDocumentMgr sink not fired\n"); + ok(test_ACP_AdviseSink == SINK_FIRED,"TextStoreACP_AdviseSink not fired\n"); hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); @@ -1289,6 +1313,122 @@ static void test_ClientId(void) ITfClientId_Release(pcid); } +/********************************************************************** + * ITfEditSession + **********************************************************************/ +typedef struct tagEditSession +{ + const ITfEditSessionVtbl *EditSessionVtbl; + LONG refCount; +} EditSession; + +static void EditSession_Destructor(EditSession *This) +{ + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID iid, LPVOID *ppvOut) +{ + EditSession *This = (EditSession *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfEditSession)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI EditSession_AddRef(ITfEditSession *iface) +{ + EditSession *This = (EditSession *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI EditSession_Release(ITfEditSession *iface) +{ + EditSession *This = (EditSession *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + EditSession_Destructor(This); + return ret; +} + +static HRESULT WINAPI EditSession_DoEditSession(ITfEditSession *iface, +TfEditCookie ec) +{ + ok(test_DoEditSession == SINK_EXPECTED, "Unexpected DoEditSession\n"); + ok(test_ACP_RequestLock == SINK_FIRED,"Expected RequestLock not fired\n"); + test_DoEditSession = SINK_FIRED; + return 0xdeadcafe; +} + +static const ITfEditSessionVtbl EditSession_EditSessionVtbl = +{ + EditSession_QueryInterface, + EditSession_AddRef, + EditSession_Release, + + EditSession_DoEditSession +}; + +HRESULT EditSession_Constructor(ITfEditSession **ppOut) +{ + EditSession *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(EditSession)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->EditSessionVtbl = &EditSession_EditSessionVtbl; + This->refCount = 1; + + *ppOut = (ITfEditSession*)This; + return S_OK; +} + +static void test_TStoApplicationText(void) +{ + HRESULT hr, hrSession; + ITfEditSession *es; + ITfContext *cxt; + ITfDocumentMgr *dm; + + ITfThreadMgr_GetFocus(g_tm, &dm); + EditSession_Constructor(&es); + ITfDocumentMgr_GetTop(dm,&cxt); + + hrSession = 0xfeedface; + /* Test no premissions flags */ + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession); + todo_wine ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); + todo_wine ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); + + hrSession = 0xfeedface; + test_ACP_GetStatus = SINK_EXPECTED; + test_ACP_RequestLock = SINK_EXPECTED; + hrSession = 0xfeedface; + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); + todo_wine ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); + todo_wine ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); + todo_wine ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); + todo_wine ok(test_DoEditSession == SINK_FIRED," expected DoEditSession not fired\n"); + todo_wine ok(hrSession == 0xdeadcafe,"Unexpected hrSession\n"); + + ITfContext_Release(cxt); + ITfDocumentMgr_Release(dm); + ITfEditSession_Release(es); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -1303,6 +1443,7 @@ START_TEST(inputprocessor) test_TfGuidAtom(); test_ClientId(); test_KeystrokeMgr(); + test_TStoApplicationText(); test_endSession(); test_EnumLanguageProfiles(); test_FindClosestCategory();

1 0

Juan Lang : inetmib1: Rename a poorly named variable.
by Alexandre Julliard 18 May '09

18 May '09

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

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

18 May '09

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: Retrieve control data only once at WinProc call.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 7a8f52b37cb3f9885ddcaeec6e87e0959a701f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f52b37cb3f9885ddcaeec6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 22:53:25 2009 +0400 comctl32/header: Retrieve control data only once at WinProc call. --- dlls/comctl32/header.c | 523 ++++++++++++++++++++++-------------------------- 1 files changed, 240 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a8f52b37cb3f9885ddca…

1 0

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

18 May '09

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/header: Use cached colors instead of querying them again.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: f875314ffe7d7e68bb029373f31f33a52c9bd34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f875314ffe7d7e68bb029373f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:00:04 2009 +0400 comctl32/header: Use cached colors instead of querying them again. --- dlls/comctl32/header.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 88dcec8..5c0b355 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -300,7 +300,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); - SetBkColor(hdc, GetSysColor(COLOR_3DFACE)); + SetBkColor(hdc, comctl32_color.clr3dFace); if (lCDFlags & CDRF_NOTIFYITEMDRAW && !(phdi->fmt & HDF_OWNERDRAW)) { @@ -497,7 +497,7 @@ HEADER_DrawHotDivider(const HEADER_INFO *infoPtr, HDC hdc) RECT r; HEADER_GetHotDividerRect(infoPtr, &r); - brush = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT)); + brush = CreateSolidBrush(comctl32_color.clrHighlight); FillRect(hdc, &r, brush); DeleteObject(brush); } @@ -2067,6 +2067,10 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SETREDRAW: return HEADER_SetRedraw(infoPtr, wParam, lParam); + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + default: if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg)) ERR("unknown msg %04x wp=%04lx lp=%08lx\n",

1 0

Nikolay Sivov : comtl32/listview: Cache Header control window GWL_STYLE.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 27f3a6d60523f7aba143a77bae7fdb4f66f8febd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f3a6d60523f7aba143a77ba… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:03:08 2009 +0400 comtl32/listview: Cache Header control window GWL_STYLE. --- dlls/comctl32/header.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 5c0b355..40718c7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -78,6 +78,7 @@ typedef struct BOOL bDragging; /* Are we dragging an item? */ BOOL bTracking; /* Is in tracking mode? */ POINT ptLButtonDown; /* The point where the left button was pressed */ + DWORD dwStyle; /* the cached window GWL_STYLE */ INT iMoveItem; /* index of tracked item. (Tracking mode) */ INT xTrackOffset; /* distance between the right side of the tracked item and the cursor */ INT xOldTrack; /* track offset (see above) after the last WM_MOUSEMOVE */ @@ -329,7 +330,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU else { HBRUSH hbr; - if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & HDS_BUTTONS) { + if (infoPtr->dwStyle & HDS_BUTTONS) { if (phdi->bDown) { DrawEdge (hdc, &r, BDR_RAISEDOUTER, BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); @@ -547,7 +548,7 @@ HEADER_Refresh (HEADER_INFO *infoPtr, HDC hdc) DrawThemeBackground(theme, hdc, HP_HEADERITEM, HIS_NORMAL, &rcRest, NULL); } else { - if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & HDS_BUTTONS) + if (infoPtr->dwStyle & HDS_BUTTONS) DrawEdge (hdc, &rcRest, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT|BF_MIDDLE); else DrawEdge (hdc, &rcRest, EDGE_ETCHED, BF_BOTTOM|BF_MIDDLE); @@ -1300,7 +1301,7 @@ HEADER_Layout (HEADER_INFO *infoPtr, LPHDLAYOUT lpLayout) lpLayout->pwpos->x = lpLayout->prc->left; lpLayout->pwpos->y = lpLayout->prc->top; lpLayout->pwpos->cx = lpLayout->prc->right - lpLayout->prc->left; - if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & HDS_HIDDEN) + if (infoPtr->dwStyle & HDS_HIDDEN) lpLayout->pwpos->cy = 0; else { lpLayout->pwpos->cy = infoPtr->nHeight; @@ -1421,6 +1422,7 @@ HEADER_Create (HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->hcurDivopen = LoadCursorW (COMCTL32_hModule, MAKEINTRESOURCEW(IDC_DIVIDEROPEN)); infoPtr->bPressed = FALSE; infoPtr->bTracking = FALSE; + infoPtr->dwStyle = lpcs->style; infoPtr->iMoveItem = 0; infoPtr->himl = 0; infoPtr->iHotItem = -1; @@ -1504,7 +1506,7 @@ HEADER_LButtonDblClk (HEADER_INFO *infoPtr, INT x, INT y) pt.y = y; HEADER_InternalHitTest (infoPtr, &pt, &flags, &nItem); - if ((GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & HDS_BUTTONS) && (flags == HHT_ONHEADER)) + if ((infoPtr->dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER)) HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMDBLCLICKW, nItem, NULL); else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) HEADER_SendNotifyWithHDItemT(infoPtr, HDN_DIVIDERDBLCLICKW, nItem, NULL); @@ -1516,7 +1518,6 @@ HEADER_LButtonDblClk (HEADER_INFO *infoPtr, INT x, INT y) static LRESULT HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) { - DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); POINT pt; UINT flags; INT nItem; @@ -1526,7 +1527,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) pt.y = y; HEADER_InternalHitTest (infoPtr, &pt, &flags, &nItem); - if ((dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER)) { + if ((infoPtr->dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER)) { SetCapture (infoPtr->hwndSelf); infoPtr->bCaptured = TRUE; infoPtr->bPressed = TRUE; @@ -1553,7 +1554,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) infoPtr->iMoveItem = nItem; infoPtr->xTrackOffset = infoPtr->items[nItem].rect.right - pt.x; - if (!(dwStyle & HDS_FULLDRAG)) { + if (!(infoPtr->dwStyle & HDS_FULLDRAG)) { infoPtr->xOldTrack = infoPtr->items[nItem].rect.right; hdc = GetDC (infoPtr->hwndSelf); HEADER_DrawTrackLine (infoPtr, hdc, infoPtr->xOldTrack); @@ -1571,7 +1572,6 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) static LRESULT HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) { - DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); POINT pt; UINT flags; INT nItem; @@ -1615,7 +1615,7 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) infoPtr->bDragging = FALSE; HEADER_SetHotDivider(infoPtr, FALSE, -1); } - else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + else if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) { infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (infoPtr->hwndSelf); @@ -1637,7 +1637,7 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_ENDTRACKW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth); - if (!(dwStyle & HDS_FULLDRAG)) { + if (!(infoPtr->dwStyle & HDS_FULLDRAG)) { hdc = GetDC (infoPtr->hwndSelf); HEADER_DrawTrackLine (infoPtr, hdc, infoPtr->xOldTrack); ReleaseDC (infoPtr->hwndSelf, hdc); @@ -1699,14 +1699,13 @@ HEADER_MouseLeave (HEADER_INFO *infoPtr) static LRESULT HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) { - DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); POINT pt; UINT flags; INT nItem, nWidth; HDC hdc; /* With theming, hottracking is always enabled */ BOOL hotTrackEnabled = - ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) + ((infoPtr->dwStyle & HDS_BUTTONS) && (infoPtr->dwStyle & HDS_HOTTRACK)) || (GetWindowTheme (infoPtr->hwndSelf) != NULL); INT oldHotItem = infoPtr->iHotItem; @@ -1723,7 +1722,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) if (infoPtr->bCaptured) { /* check if we should drag the header */ - if (infoPtr->bPressed && !infoPtr->bDragging && dwStyle&HDS_DRAGDROP + if (infoPtr->bPressed && !infoPtr->bDragging && (infoPtr->dwStyle & HDS_DRAGDROP) && HEADER_IsDragDistance(infoPtr, &pt)) { if (!HEADER_SendNotifyWithHDItemT(infoPtr, HDN_BEGINDRAG, infoPtr->iMoveItem, NULL)) @@ -1766,7 +1765,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem); } else if (infoPtr->bTracking) { - if (dwStyle & HDS_FULLDRAG) { + if (infoPtr->dwStyle & HDS_FULLDRAG) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; nWidth = pt.x - lpItem->rect.left + infoPtr->xTrackOffset; if (!HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH, nWidth)) @@ -1923,6 +1922,19 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar return ret; } +static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType, + const LPSTYLESTRUCT lpss) +{ + TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + wStyleType, lpss->styleOld, lpss->styleNew); + + if (wStyleType != GWL_STYLE) return 0; + + infoPtr->dwStyle = lpss->styleNew; + + return 0; +} + /* Update the theme handle after a theme change */ static LRESULT HEADER_ThemeChanged(const HEADER_INFO *infoPtr) { @@ -2067,6 +2079,9 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SETREDRAW: return HEADER_SetRedraw(infoPtr, wParam, lParam); + case WM_STYLECHANGED: + return HEADER_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return 0;

1 0