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

Stefan Dösinger : wined3d: Remove the atifs shader backend.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: e7733eacb78aeeed9a4937675e30c08ceebfaf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7733eacb78aeeed9a4937675… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 11 09:41:28 2008 -0500 wined3d: Remove the atifs shader backend. Since atifs is only doing the fragment pipeline replacement right now there is no need for the shader backend structure any longer. The ffp private data is stored in new fragment pipeline private data(which could potentially be set to equal the shader private data if needed). --- dlls/wined3d/ati_fragment_shader.c | 104 ++++++----------------------------- dlls/wined3d/device.c | 13 +++++ dlls/wined3d/directx.c | 3 - dlls/wined3d/state.c | 5 ++ dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 39 insertions(+), 89 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index e4420f1..6fc0aa4 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -50,7 +50,6 @@ struct atifs_ffp_desc struct atifs_private_data { - struct shader_arb_priv parent; struct list fragment_shaders; /* A linked list to track fragment pipeline replacement shaders */ }; @@ -782,7 +781,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi IWineD3DDeviceImpl *This = stateblock->wineD3DDevice; struct atifs_ffp_desc *desc; struct texture_stage_op op[MAX_TEXTURES]; - struct atifs_private_data *priv = (struct atifs_private_data *) This->shader_priv; + struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; DWORD mapped_stage; unsigned int i; @@ -1019,64 +1018,24 @@ static void atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, str caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; } -const struct fragment_pipeline atifs_fragment_pipeline = { - atifs_enable, - atifs_get_caps, - atifs_fragmentstate_template -}; - -/* GL_ATI_fragment_shader backend.It borrows a lot from a the - * ARB shader backend, currently the whole vertex processing - * code. This code would also forward pixel shaders, but if - * GL_ARB_fragment_program is supported, the atifs shader backend - * is not used. - */ -static void shader_atifs_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { - arb_program_shader_backend.shader_select(iface, usePS, useVS); -} - -static void shader_atifs_select_depth_blt(IWineD3DDevice *iface) { - arb_program_shader_backend.shader_select_depth_blt(iface); -} - -static void shader_atifs_deselect_depth_blt(IWineD3DDevice *iface) { - arb_program_shader_backend.shader_deselect_depth_blt(iface); -} - -static void shader_atifs_load_constants(IWineD3DDevice *iface, char usePS, char useVS) { - arb_program_shader_backend.shader_load_constants(iface, usePS, useVS); -} - -static void shader_atifs_cleanup(IWineD3DDevice *iface) { - arb_program_shader_backend.shader_cleanup(iface); -} - -static void shader_atifs_color_correction(SHADER_OPCODE_ARG* arg) { - arb_program_shader_backend.shader_color_correction(arg); -} - -static void shader_atifs_destroy(IWineD3DBaseShader *iface) { - arb_program_shader_backend.shader_destroy(iface); -} - -static HRESULT shader_atifs_alloc(IWineD3DDevice *iface) { +static HRESULT atifs_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - HRESULT hr; struct atifs_private_data *priv; - hr = arb_program_shader_backend.shader_alloc_private(iface); - if(FAILED(hr)) return hr; - This->shader_priv = HeapReAlloc(GetProcessHeap(), 0, This->shader_priv, - sizeof(struct atifs_private_data)); - priv = (struct atifs_private_data *) This->shader_priv; + This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); + if(!This->fragment_priv) { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + priv = (struct atifs_private_data *) This->fragment_priv; list_init(&priv->fragment_shaders); return WINED3D_OK; } #define GLINFO_LOCATION This->adapter->gl_info -static void shader_atifs_free(IWineD3DDevice *iface) { +static void atifs_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct atifs_private_data *priv = (struct atifs_private_data *) This->shader_priv; + struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; struct ffp_desc *entry, *entry2; struct atifs_ffp_desc *entry_ati; @@ -1089,42 +1048,15 @@ static void shader_atifs_free(IWineD3DDevice *iface) { HeapFree(GetProcessHeap(), 0, entry); } LEAVE_GL(); - - /* Not actually needed, but revert what we've done before */ - This->shader_priv = HeapReAlloc(GetProcessHeap(), 0, This->shader_priv, - sizeof(struct shader_arb_priv)); - arb_program_shader_backend.shader_free_private(iface); + HeapFree(GetProcessHeap(), 0, priv); + This->fragment_priv = NULL; } #undef GLINFO_LOCATION -static BOOL shader_atifs_dirty_const(IWineD3DDevice *iface) { - return arb_program_shader_backend.shader_dirtifyable_constants(iface); -} - -static void shader_atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps) { - arb_program_shader_backend.shader_get_caps(devtype, gl_info, caps); -} - -static void shader_atifs_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { - ERR("Should not get here\n"); -} - -static void shader_atifs_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { - arb_program_shader_backend.shader_generate_vshader(iface, buffer); -} - -const shader_backend_t atifs_shader_backend = { - shader_atifs_select, - shader_atifs_select_depth_blt, - shader_atifs_deselect_depth_blt, - shader_atifs_load_constants, - shader_atifs_cleanup, - shader_atifs_color_correction, - shader_atifs_destroy, - shader_atifs_alloc, - shader_atifs_free, - shader_atifs_dirty_const, - shader_atifs_generate_pshader, - shader_atifs_generate_vshader, - shader_atifs_get_caps, +const struct fragment_pipeline atifs_fragment_pipeline = { + atifs_enable, + atifs_get_caps, + atifs_alloc, + atifs_free, + atifs_fragmentstate_template }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 998f950..6c78ec4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2131,6 +2131,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR TRACE("Shader private data couldn't be allocated\n"); goto err_out; } + hr = This->frag_pipe->alloc_private(iface); + if(FAILED(hr)) { + TRACE("Fragment pipeline private data couldn't be allocated\n"); + goto err_out; + } /* Set up some starting GL setup */ @@ -2216,6 +2221,7 @@ err_out: This->stateBlock = NULL; } This->shader_backend->shader_free_private(iface); + This->frag_pipe->free_private(iface); return hr; } @@ -2305,6 +2311,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ This->shader_backend->shader_free_private(iface); + This->frag_pipe->free_private(iface); /* Release the buffers (with sanity checks)*/ TRACE("Releasing the depth stencil buffer at %p\n", This->stencilBufferTarget); @@ -7220,6 +7227,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->depth_blt_rb_h = 0; } This->shader_backend->shader_free_private(iface); + This->frag_pipe->free_private(iface); for (i = 0; i < GL_LIMITS(textures); i++) { /* Textures are recreated below */ @@ -7328,6 +7336,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE ERR("Failed to recreate shader private data\n"); return hr; } + hr = This->frag_pipe->alloc_private(iface); + if(FAILED(hr)) { + TRACE("Fragment pipeline private data couldn't be allocated\n"); + return hr; + } /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9992ee2..a88f443 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2879,9 +2879,6 @@ static const shader_backend_t *select_shader_backend(UINT Adapter, WINED3DDEVTYP select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) { ret = &glsl_shader_backend; - } else if (vs_selected_mode == SHADER_ARB && ps_selected_mode != SHADER_NONE && - !GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { - ret = &atifs_shader_backend; } else if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) { ret = &arb_program_shader_backend; } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0ea627c..3e45942 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4534,11 +4534,16 @@ static void ffp_fragment_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_in } +static HRESULT ffp_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static void ffp_fragment_free(IWineD3DDevice *iface) {} + #undef GLINFO_LOCATION const struct fragment_pipeline ffp_fragment_pipeline = { nvts_enable, ffp_fragment_get_caps, + ffp_fragment_alloc, + ffp_fragment_free, ffp_fragmentstate_template }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 327a14f..d5352ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -551,6 +551,8 @@ struct fragment_caps { struct fragment_pipeline { void (*enable_extension)(IWineD3DDevice *iface, BOOL enable); void (*get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct fragment_caps *caps); + HRESULT (*alloc_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDevice *iface); const struct StateEntryTemplate *states; }; @@ -788,6 +790,7 @@ struct IWineD3DDeviceImpl int ps_selected_mode; const shader_backend_t *shader_backend; void *shader_priv; + void *fragment_priv; struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1];

1 0

Juan Lang : crypt32: Add MS root certs to root store.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: e459ac84ee8caecd25f5c6027e17c917d412f5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e459ac84ee8caecd25f5c6027… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 11 08:20:35 2008 -0700 crypt32: Add MS root certs to root store. --- dlls/crypt32/rootstore.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 244 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e459ac84ee8caecd25f5c…

1 0

Alexandre Julliard : Wine release 1.1.1
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: website Branch: master Commit: 2aae0cc3b7e15bcda8ada67c5def4aa637c9fed5 URL: http://source.winehq.org/git/website.git/?a=commit;h=2aae0cc3b7e15bcda8ada6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 18:07:44 2008 +0200 Wine release 1.1.1 --- news/en/2008071101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2008071101.xml b/news/en/2008071101.xml new file mode 100644 index 0000000..6c36eea --- /dev/null +++ b/news/en/2008071101.xml @@ -0,0 +1,17 @@ +<news> +<date>July 11, 2008</date> +<title>Wine 1.1.1 Released</title> +<body> + The Wine development release 1.1.1 is now available. + <a href="?announce=1.1.1">What's new</a> in this release: +<ul> + <li>Fixes for Photoshop CS3 and Office 2007 installers.</li> + <li>More progress on gdiplus.</li> + <li>Support for Unicode files in regedit.</li> + <li>Improved video playback.</li> + <li>Many Richedit fixes and improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.1 : Alexandre Julliard : Release 1.1.1
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: refs/tags/wine-1.1.1 Tag: 17f7d6889979b569f1b20026c7536989fd12bb75 URL: http://source.winehq.org/git/wine.git/?a=tag;h=17f7d6889979b569f1b20026c753… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 17:55:55 2008 +0200 Release 1.1.1

1 0

Alexandre Julliard : Release 1.1.1.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: a0289148e14728e45587b8cb17f90862d8400939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0289148e14728e45587b8cb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 17:55:55 2008 +0200 Release 1.1.1. --- ANNOUNCE | 1468 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 764 insertions(+), 724 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0289148e14728e45587b…

1 0

Alexandre Julliard : winealsa: Fix some unsigned comparison < 0 warnings.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: fdb682811d38a7c150f79fc0801e2fa87257ce16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb682811d38a7c150f79fc08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 15:29:41 2008 +0200 winealsa: Fix some unsigned comparison < 0 warnings. --- dlls/winealsa.drv/mixer.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index ee67eef..426656d 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -607,7 +607,7 @@ static mixer* MIX_GetMix(UINT wDevID) { mixer *mmixer; - if (wDevID < 0 || wDevID >= cards) + if (wDevID >= cards) { WARN("Invalid mixer id: %d\n", wDevID); return NULL; @@ -888,7 +888,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW if (!mmixer) return MMSYSERR_BADDEVICEID; - if (line < 0 || line >= mmixer->chans || !mmixer->controls[ctrl].enabled) + if (line >= mmixer->chans || !mmixer->controls[ctrl].enabled) return MIXERR_INVALCONTROL; ct = &mmixer->controls[ctrl]; @@ -1095,7 +1095,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW if (!mmixer) return MMSYSERR_BADDEVICEID; - if (line < 0 || line >= mmixer->chans) + if (line >= mmixer->chans) { WARN("Invalid line id: %d not in range of 0-%d\n", line, mmixer->chans-1); return MMSYSERR_INVALPARAM; @@ -1343,7 +1343,7 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) } case MIXER_GETLINEINFOF_LINEID: - if (Ml->dwLineID < 0 || Ml->dwLineID >= mmixer->chans) + if (Ml->dwLineID >= mmixer->chans) return MIXERR_INVALLINE; TRACE("MIXER_GETLINEINFOF_LINEID %d\n", Ml->dwLineID); @@ -1363,7 +1363,7 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) break; case MIXER_GETLINEINFOF_DESTINATION: - if (Ml->dwDestination < 0 || Ml->dwDestination >= mmixer->dests) + if (Ml->dwDestination >= mmixer->dests) { WARN("dest %d out of bounds\n", Ml->dwDestination); return MIXERR_INVALLINE; @@ -1375,13 +1375,13 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) break; case MIXER_GETLINEINFOF_SOURCE: - if (Ml->dwDestination < 0 || Ml->dwDestination >= mmixer->dests) + if (Ml->dwDestination >= mmixer->dests) { WARN("dest %d for source out of bounds\n", Ml->dwDestination); return MIXERR_INVALLINE; } - if (Ml->dwSource < 0 || Ml->dwSource >= getsrccntfromchan(mmixer, Ml->dwDestination)) + if (Ml->dwSource >= getsrccntfromchan(mmixer, Ml->dwDestination)) { WARN("src %d out of bounds\n", Ml->dwSource); return MIXERR_INVALLINE; @@ -1455,7 +1455,7 @@ static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PT if (flags == MIXER_GETLINECONTROLSF_ONEBYID) mlc->dwLineID = mlc->u.dwControlID / CONTROLSPERLINE; - if (mlc->dwLineID < 0 || mlc->dwLineID >= mmixer->chans) + if (mlc->dwLineID >= mmixer->chans) { TRACE("Invalid dwLineID %d\n", mlc->dwLineID); return MIXERR_INVALLINE;

1 0

Reece Dunn : comctl32: Add support for drawing themed group boxes.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: a5d28014763e5317d635aa3125c179b0aa9b2981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d28014763e5317d635aa312… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Jul 10 19:29:32 2008 +0100 comctl32: Add support for drawing themed group boxes. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/theme_button.c | 145 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/theming.c | 7 ++- 3 files changed, 152 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index bf62a22..ad96a50 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -34,6 +34,7 @@ C_SRCS = \ string.c \ syslink.c \ tab.c \ + theme_button.c \ theme_combo.c \ theme_dialog.c \ theme_edit.c \ diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c new file mode 100644 index 0000000..588f1a4 --- /dev/null +++ b/dlls/comctl32/theme_button.c @@ -0,0 +1,145 @@ +/* + * Theming - Button control + * + * Copyright (c) 2008 by Reece H. Dunn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(themingbutton); + +#define BUTTON_TYPE 0x0f /* bit mask for the available button types */ + +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC) +{ + RECT bgRect, textRect; + SIZE textExtent; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + int state = IsWindowEnabled(hwnd) ? GBS_NORMAL : GBS_DISABLED; + WCHAR text[MAX_PATH]; + int len = MAX_PATH; + + GetClientRect(hwnd, &bgRect); + textRect = bgRect; + + len = GetWindowTextW(hwnd, text, len); + + GetTextExtentPoint32W(hDC, text, len, &textExtent); + + bgRect.top += (textExtent.cy / 2); + textRect.left += 10; + textRect.bottom = textRect.top + textExtent.cy; + textRect.right = textRect.left + textExtent.cx + 4; + + ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + + DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); + + SelectClipRgn(hDC, NULL); + + textRect.left += 2; + textRect.right -= 2; + DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, len, 0, 0, &textRect); + + if (hPrevFont) SelectObject(hDC, hPrevFont); +} + +static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) +{ + PAINTSTRUCT ps; + HDC hDC; + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + + if ((dwStyle & BUTTON_TYPE) == BS_GROUPBOX) + { + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + GB_draw(theme, hwnd, hDC); + if (!hParamDC) EndPaint(hwnd, &ps); + } + else return FALSE; /* Delegate drawing to the non-themed code. */ + + return TRUE; +} + +/********************************************************************** + * The button control subclass window proc. + */ +LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + const WCHAR* themeClass = WC_BUTTONW; + HTHEME theme; + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + OpenThemeData(hwnd, themeClass); + return result; + + case WM_DESTROY: + theme = GetWindowTheme(hwnd); + CloseThemeData (theme); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme(hwnd); + CloseThemeData (theme); + OpenThemeData(hwnd, themeClass); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_PAINT: + theme = GetWindowTheme(hwnd); + if (theme && BUTTON_Paint(theme, hwnd, (HDC)wParam)) + return 0; + else + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_ENABLE: + theme = GetWindowTheme(hwnd); + if (theme) RedrawWindow(hwnd, NULL, NULL, + RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + default: + /* Call old proc */ + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + } + return 0; +} diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 5b5f6b3..090fe27 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(theming); typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, ULONG_PTR); +extern LRESULT CALLBACK THEMING_ButtonSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR); extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, @@ -53,6 +55,7 @@ static const struct ThemingSubclass } subclasses[] = { /* Note: list must be sorted by class name */ {dialogClass, THEMING_DialogSubclassProc}, + {WC_BUTTONW, THEMING_ButtonSubclassProc}, {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, {WC_EDITW, THEMING_EditSubclassProc}, @@ -91,13 +94,15 @@ MAKE_SUBCLASS_PROC(1) MAKE_SUBCLASS_PROC(2) MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) +MAKE_SUBCLASS_PROC(5) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, subclass_proc2, subclass_proc3, - subclass_proc4 + subclass_proc4, + subclass_proc5 }; /***********************************************************************

1 0

Gerald Pfeifer : comctl32: Some simplifications.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: baa818120c037de2682cbcef4247548cf87b27db URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa818120c037de2682cbcef4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jul 10 16:21:00 2008 +0200 comctl32: Some simplifications. --- dlls/comctl32/treeview.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 28b822e..f2f0eb9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1585,7 +1585,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) /* Get/Set Messages *********************************************************/ static LRESULT -TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam, LPARAM lParam) +TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) { if(wParam) infoPtr->bRedraw = TRUE; @@ -2910,7 +2910,7 @@ TREEVIEW_SortOnName(TREEVIEW_ITEM *first, TREEVIEW_ITEM *second, /* Returns the number of physical children belonging to item. */ static INT -TREEVIEW_CountChildren(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) +TREEVIEW_CountChildren(const TREEVIEW_ITEM *item) { INT cChildren = 0; HTREEITEM hti; @@ -2924,7 +2924,7 @@ TREEVIEW_CountChildren(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) /* Returns a DPA containing a pointer to each physical child of item in * sibling order. If item has no children, an empty DPA is returned. */ static HDPA -TREEVIEW_BuildChildDPA(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) +TREEVIEW_BuildChildDPA(const TREEVIEW_ITEM *item) { HTREEITEM child = item->firstChild; @@ -2955,7 +2955,7 @@ TREEVIEW_BuildChildDPA(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) */ static LRESULT -TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, BOOL fRecurse, HTREEITEM parent, +TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent, LPTVSORTCB pSort) { INT cChildren; @@ -2984,7 +2984,7 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, BOOL fRecurse, HTREEITEM parent, lpCompare = (LPARAM)infoPtr; } - cChildren = TREEVIEW_CountChildren(infoPtr, parent); + cChildren = TREEVIEW_CountChildren(parent); /* Make sure there is something to sort */ if (cChildren > 1) @@ -2995,7 +2995,7 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, BOOL fRecurse, HTREEITEM parent, HTREEITEM nextItem = 0; HTREEITEM prevItem = 0; - HDPA sortList = TREEVIEW_BuildChildDPA(infoPtr, parent); + HDPA sortList = TREEVIEW_BuildChildDPA(parent); if (sortList == NULL) return FALSE; @@ -3076,9 +3076,9 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, BOOL fRecurse, HTREEITEM parent, * and sort the children of the TV item specified in lParam */ static LRESULT -TREEVIEW_SortChildrenCB(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPTVSORTCB pSort) +TREEVIEW_SortChildrenCB(TREEVIEW_INFO *infoPtr, LPTVSORTCB pSort) { - return TREEVIEW_Sort(infoPtr, wParam, pSort->hParent, pSort); + return TREEVIEW_Sort(infoPtr, pSort->hParent, pSort); } @@ -3086,9 +3086,9 @@ TREEVIEW_SortChildrenCB(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPTVSORTCB pSort) * Sort the children of the TV item specified in lParam. */ static LRESULT -TREEVIEW_SortChildren(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TREEVIEW_SortChildren(TREEVIEW_INFO *infoPtr, LPARAM lParam) { - return TREEVIEW_Sort(infoPtr, (BOOL)wParam, (HTREEITEM)lParam, NULL); + return TREEVIEW_Sort(infoPtr, (HTREEITEM)lParam, NULL); } @@ -4160,7 +4160,7 @@ TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) static LRESULT -TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam) { TREEVIEW_ITEM *dragItem = (HTREEITEM)lParam; INT cx, cy; @@ -5188,7 +5188,7 @@ TREEVIEW_MouseLeave (TREEVIEW_INFO * infoPtr) } static LRESULT -TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, WPARAM wParam, LPARAM lParam) +TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) { POINT pt; TRACKMOUSEEVENT trackinfo; @@ -5453,7 +5453,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case TVM_CREATEDRAGIMAGE: - return TREEVIEW_CreateDragImage(infoPtr, wParam, lParam); + return TREEVIEW_CreateDragImage(infoPtr, lParam); case TVM_DELETEITEM: return TREEVIEW_DeleteItem(infoPtr, (HTREEITEM)lParam); @@ -5587,10 +5587,10 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_SetUnicodeFormat(infoPtr, (BOOL)wParam); case TVM_SORTCHILDREN: - return TREEVIEW_SortChildren(infoPtr, wParam, lParam); + return TREEVIEW_SortChildren(infoPtr, lParam); case TVM_SORTCHILDRENCB: - return TREEVIEW_SortChildrenCB(infoPtr, wParam, (LPTVSORTCB)lParam); + return TREEVIEW_SortChildrenCB(infoPtr, (LPTVSORTCB)lParam); case WM_CHAR: return TREEVIEW_ProcessLetterKeys( hwnd, wParam, lParam ); @@ -5634,7 +5634,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_MOUSEMOVE: if (infoPtr->dwStyle & TVS_TRACKSELECT) - return TREEVIEW_MouseMove(infoPtr, wParam, lParam); + return TREEVIEW_MouseMove(infoPtr, lParam); else return 0; @@ -5671,7 +5671,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam); case WM_SETREDRAW: - return TREEVIEW_SetRedraw(infoPtr, wParam, lParam); + return TREEVIEW_SetRedraw(infoPtr, wParam); case WM_SIZE: return TREEVIEW_Size(infoPtr, wParam, lParam);

1 0

Roy Shea : include: Add header for mstask.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 7c74ff3bbbcfab3bbf809095140514c2fbf3e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c74ff3bbbcfab3bbf8090951… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Jul 10 12:48:08 2008 -0700 include: Add header for mstask. --- .gitignore | 1 + include/Makefile.in | 1 + include/mstask.idl | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/prsht.h | 3 + include/winbase.h | 3 + include/wtypes.idl | 14 ++ 6 files changed, 376 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c74ff3bbbcfab3bbf809…

1 0

Stefan Dösinger : wined3d: Samplers -> misc states.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: f330815da50c0b29de60caf6b81f8a66b26cd5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f330815da50c0b29de60caf6b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 3 07:04:59 2008 -0500 wined3d: Samplers -> misc states. --- dlls/wined3d/state.c | 61 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0a74e79..c7f8d85 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4299,26 +4299,26 @@ const struct StateEntry FFPStateTable[] = { /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, NULL }, /* Sampler states */ - { /* 0, Sampler 0 */ STATE_SAMPLER(0), sampler }, - { /* 1, Sampler 1 */ STATE_SAMPLER(1), sampler }, - { /* 2, Sampler 2 */ STATE_SAMPLER(2), sampler }, - { /* 3, Sampler 3 */ STATE_SAMPLER(3), sampler }, - { /* 4, Sampler 3 */ STATE_SAMPLER(4), sampler }, - { /* 5, Sampler 5 */ STATE_SAMPLER(5), sampler }, - { /* 6, Sampler 6 */ STATE_SAMPLER(6), sampler }, - { /* 7, Sampler 7 */ STATE_SAMPLER(7), sampler }, - { /* 8, Sampler 8 */ STATE_SAMPLER(8), sampler }, - { /* 9, Sampler 9 */ STATE_SAMPLER(9), sampler }, - { /*10, Sampler 10 */ STATE_SAMPLER(10), sampler }, - { /*11, Sampler 11 */ STATE_SAMPLER(11), sampler }, - { /*12, Sampler 12 */ STATE_SAMPLER(12), sampler }, - { /*13, Sampler 13 */ STATE_SAMPLER(13), sampler }, - { /*14, Sampler 14 */ STATE_SAMPLER(14), sampler }, - { /*15, Sampler 15 */ STATE_SAMPLER(15), sampler }, - { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), sampler }, - { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), sampler }, - { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), sampler }, - { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), sampler }, + { /* 0, Sampler 0 */ STATE_SAMPLER(0), NULL }, + { /* 1, Sampler 1 */ STATE_SAMPLER(1), NULL }, + { /* 2, Sampler 2 */ STATE_SAMPLER(2), NULL }, + { /* 3, Sampler 3 */ STATE_SAMPLER(3), NULL }, + { /* 4, Sampler 3 */ STATE_SAMPLER(4), NULL }, + { /* 5, Sampler 5 */ STATE_SAMPLER(5), NULL }, + { /* 6, Sampler 6 */ STATE_SAMPLER(6), NULL }, + { /* 7, Sampler 7 */ STATE_SAMPLER(7), NULL }, + { /* 8, Sampler 8 */ STATE_SAMPLER(8), NULL }, + { /* 9, Sampler 9 */ STATE_SAMPLER(9), NULL }, + { /*10, Sampler 10 */ STATE_SAMPLER(10), NULL }, + { /*11, Sampler 11 */ STATE_SAMPLER(11), NULL }, + { /*12, Sampler 12 */ STATE_SAMPLER(12), NULL }, + { /*13, Sampler 13 */ STATE_SAMPLER(13), NULL }, + { /*14, Sampler 14 */ STATE_SAMPLER(14), NULL }, + { /*15, Sampler 15 */ STATE_SAMPLER(15), NULL }, + { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), NULL }, + { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), NULL }, + { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), NULL }, + { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), NULL }, /* Pixel shader */ { /* , Pixel Shader */ STATE_PIXELSHADER, NULL }, /* Transform states follow */ @@ -4997,6 +4997,27 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }}, { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }}, + /* Samplers */ + { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }}, + { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }}, + { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler }}, + { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler }}, + { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler }}, + { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler }}, + { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler }}, + { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler }}, + { STATE_SAMPLER(8), { STATE_SAMPLER(8), sampler }}, + { STATE_SAMPLER(9), { STATE_SAMPLER(9), sampler }}, + { STATE_SAMPLER(10), { STATE_SAMPLER(10), sampler }}, + { STATE_SAMPLER(11), { STATE_SAMPLER(11), sampler }}, + { STATE_SAMPLER(12), { STATE_SAMPLER(12), sampler }}, + { STATE_SAMPLER(13), { STATE_SAMPLER(13), sampler }}, + { STATE_SAMPLER(14), { STATE_SAMPLER(14), sampler }}, + { STATE_SAMPLER(15), { STATE_SAMPLER(15), sampler }}, + { STATE_SAMPLER(16), /* Vertex sampler 0 */ { STATE_SAMPLER(16), sampler }}, + { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }}, + { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }}, + { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }}, {0 /* Terminate */, { 0, 0 }}, };

1 0