wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

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

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

Stefan Dösinger : wined3d: Avoid declaring helper_const in vertex programs if possible.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: c7839112c9cb60f85b55f511e38405829cd930c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7839112c9cb60f85b55f511e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:01:49 2009 +0200 wined3d: Avoid declaring helper_const in vertex programs if possible. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e7dd296..bfd2d7d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -42,11 +42,22 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ +static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { + if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ + gl_info->arb_vs_offset_limit || /* Have to init texcoords */ + gl_info->set_texcoord_w) { /* Load the immval offset */ + return TRUE; + } + return FALSE; +} -/* We have to subtract any other PARAMs that we might use in our shader programs. - * ATI seems to count 2 implicit PARAMs when we use fog and NVIDIA counts 1, - * and we reference one row of the PROJECTION matrix which counts as 1 PARAM. */ -#define ARB_SHADER_RESERVED_VS_CONSTS 3 +static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { + /* We use one PARAM for the pos fixup, and in some cases one to load + * some immediate values into the shader + */ + if(need_helper_const(gl_info)) return 2; + 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. @@ -56,7 +67,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); /* 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) - ARB_SHADER_RESERVED_VS_CONSTS) +#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - reserved_vs_const(&GLINFO_LOCATION)) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ @@ -307,7 +318,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh 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) - ARB_SHADER_RESERVED_VS_CONSTS)); + GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info))); const local_constant *lconst; /* Temporary Output register */ @@ -1958,7 +1969,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); - shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); + if(need_helper_const(gl_info)) { + shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); + } /* Mesa supports only 95 constants */ if (GL_VEND(MESA) || GL_VEND(WINE)) @@ -2009,7 +2022,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); } else if (!reg_maps->fog) { - shader_addline(buffer, "MOV result.fogcoord, helper_const.w;\n"); + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); } /* Write the final position. @@ -2026,7 +2040,12 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); @@ -2073,7 +2092,7 @@ 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) - ARB_SHADER_RESERVED_VS_CONSTS; + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {

1 0

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

18 May '09

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: Update the bump constants after a shader change.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 45563979bd5f6bb1a91205ba3b10564291cca9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45563979bd5f6bb1a91205ba3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:34:12 2009 +0200 wined3d: Update the bump constants after a shader change. Since we're using local constants now, we have to update the constants after a shader change. --- dlls/wined3d/arb_program_shader.c | 50 +++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1ff7fd4..4e35983 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -186,6 +186,32 @@ static void shader_arb_load_np2fixup_constants( /* not implemented */ } +static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) +{ + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; + IWineD3DPixelShaderImpl *psi = (IWineD3DPixelShaderImpl *) pshader; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; + unsigned char i; + + for(i = 0; i < psi->numbumpenvmatconsts; i++) + { + /* The state manager takes care that this function is always called if the bump env matrix changes */ + const float *data = (const float *)&stateBlock->textureState[(int) psi->bumpenvmatconst[i].texunit][WINED3DTSS_BUMPENVMAT00]; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst[i].const_num, data)); + + if (psi->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED) + { + /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. + * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we + * don't care about them. The pointers are valid for sure because the stateblock is bigger. + * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN + */ + const float *scale = (const float *)&stateBlock->textureState[(int) psi->luminanceconst[i].texunit][WINED3DTSS_BUMPENVLSCALE]; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->luminanceconst[i].const_num, scale)); + } + } +} /** * Loads the app-supplied constants into the currently set ARB_[vertex/fragment]_programs. * @@ -201,7 +227,6 @@ static void shader_arb_load_constants( IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; - unsigned char i; if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; @@ -218,9 +243,7 @@ static void shader_arb_load_constants( } if (usePixelShader) { - IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; - IWineD3DPixelShaderImpl *psi = (IWineD3DPixelShaderImpl *) pshader; /* Load DirectX 9 float constants for pixel shader */ deviceImpl->highest_dirty_ps_const = shader_arb_load_constantsF( @@ -228,24 +251,7 @@ static void shader_arb_load_constants( deviceImpl->highest_dirty_ps_const, stateBlock->pixelShaderConstantF, deviceImpl->activeContext->pshader_const_dirty); - - for(i = 0; i < psi->numbumpenvmatconsts; i++) { - /* The state manager takes care that this function is always called if the bump env matrix changes - */ - const float *data = (const float *)&stateBlock->textureState[(int) psi->bumpenvmatconst[i].texunit][WINED3DTSS_BUMPENVMAT00]; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst[i].const_num, data)); - - if (psi->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED) - { - /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. - * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we - * don't care about them. The pointers are valid for sure because the stateblock is bigger. - * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN - */ - const float *scale = (const float *)&stateBlock->textureState[(int) psi->luminanceconst[i].texunit][WINED3DTSS_BUMPENVLSCALE]; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->luminanceconst[i].const_num, scale)); - } - } + shader_arb_ps_local_constants(deviceImpl); } } @@ -1687,6 +1693,8 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); } TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); + + shader_arb_ps_local_constants(This); } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function

1 0

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

18 May '09

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

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

18 May '09

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

Nikolay Sivov : comctl32/treeview: Use cached colors instead of GetSysColor in TreeView.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: d93aab9c2aac21048653b090fcae8f1ca310edd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93aab9c2aac21048653b090f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:08:44 2009 +0400 comctl32/treeview: Use cached colors instead of GetSysColor in TreeView. --- dlls/comctl32/treeview.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 4aa5725..d01a127 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2306,7 +2306,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) > TVS_LINESATROOT); HBRUSH hbr, hbrOld; - COLORREF clrBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; if (!lar && item->iLevel == 0) @@ -2460,26 +2460,26 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem { if ((wineItem->state & TVIS_DROPHILITED) || inFocus) { - nmcdhdr.clrTextBk = GetSysColor(COLOR_HIGHLIGHT); - nmcdhdr.clrText = GetSysColor(COLOR_HIGHLIGHTTEXT); + nmcdhdr.clrTextBk = comctl32_color.clrHighlight; + nmcdhdr.clrText = comctl32_color.clrHighlightText; } else { - nmcdhdr.clrTextBk = GetSysColor(COLOR_BTNFACE); + nmcdhdr.clrTextBk = comctl32_color.clrBtnFace; if (infoPtr->clrText == -1) - nmcdhdr.clrText = GetSysColor(COLOR_WINDOWTEXT); + nmcdhdr.clrText = comctl32_color.clrWindowText; else nmcdhdr.clrText = infoPtr->clrText; } } else { - nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (wineItem == infoPtr->hotItem)) nmcdhdr.clrText = comctl32_color.clrHighlight; else if (infoPtr->clrText == -1) - nmcdhdr.clrText = GetSysColor(COLOR_WINDOWTEXT); + nmcdhdr.clrText = comctl32_color.clrWindowText; else nmcdhdr.clrText = infoPtr->clrText; } @@ -2786,7 +2786,7 @@ static LRESULT TREEVIEW_EraseBackground(const TREEVIEW_INFO *infoPtr, HDC hDC) { HBRUSH hBrush; - COLORREF clrBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; RECT rect; @@ -4885,7 +4885,7 @@ initialize_checkboxes(TREEVIEW_INFO *infoPtr) SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, - GetSysColor(COLOR_WINDOW)); + comctl32_color.clrWindow); TRACE("checkbox index %d\n", nIndex); DeleteObject(hbm); @@ -4949,7 +4949,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->clrBk = -1; /* use system color */ infoPtr->clrText = -1; /* use system color */ infoPtr->clrLine = RGB(128, 128, 128); - infoPtr->clrInsertMark = GetSysColor(COLOR_BTNTEXT); + infoPtr->clrInsertMark = comctl32_color.clrBtnText; /* hwndToolTip */ @@ -5705,7 +5705,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_STYLECHANGED: return TREEVIEW_StyleChanged(infoPtr, wParam, lParam); - /* WM_SYSCOLORCHANGE */ + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; /* WM_SYSKEYDOWN */

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

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

← Newer
1
...
36
37
38
39
40
41
42
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009