wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Piotr Caban : comctl32: Prevent double theme closing when WM_DESTROY is called many times.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7e3103199cc8e115e0828bcad9441a5b940e4b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3103199cc8e115e0828bcad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:22:40 2011 +0200 comctl32: Prevent double theme closing when WM_DESTROY is called many times. --- dlls/comctl32/theme_dialog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 915db07..cdca2dd 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -54,7 +54,9 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, case WM_DESTROY: CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + SetWindowTheme( hWnd, NULL, NULL ); + OpenThemeData( hWnd, NULL ); + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); case WM_THEMECHANGED: CloseThemeData ( theme );

1 0

Piotr Caban : comctl32: Make themed button hot when mouse is over it.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7d17bc55ebd93d50195753994d998ef51564c404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d17bc55ebd93d50195753994… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:22:26 2011 +0200 comctl32: Make themed button hot when mouse is over it. --- dlls/comctl32/theme_button.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 90e1172..01f16fb 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -317,6 +317,37 @@ LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + case WM_MOUSEMOVE: + { + TRACKMOUSEEVENT mouse_event; + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hwnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + break; + } + + case WM_MOUSEHOVER: + { + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hwnd, 0, state|BST_HOT); + InvalidateRect(hwnd, NULL, FALSE); + break; + } + + case WM_MOUSELEAVE: + { + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hwnd, 0, state&(~BST_HOT)); + InvalidateRect(hwnd, NULL, FALSE); + break; + } + default: /* Call old proc */ return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam);

1 0

Piotr Caban : comctl32: Improved setting button state.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: d2c9a5cfae5251ba03cf6ff639012a2a9216a39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c9a5cfae5251ba03cf6ff63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:59 2011 +0200 comctl32: Improved setting button state. --- dlls/comctl32/theme_button.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 488c751..90e1172 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -246,18 +246,26 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - ButtonState drawState = IsWindowEnabled(hwnd) ? STATE_NORMAL : STATE_DISABLED; + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if (paint) + if(!paint) + return FALSE; + + if(IsWindowEnabled(hwnd)) { - hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); - if (!hParamDC) EndPaint(hwnd, &ps); - return TRUE; + if(state & BST_PUSHED) drawState = STATE_PRESSED; + else if(state & BST_HOT) drawState = STATE_HOT; + else if(state & BST_FOCUS) drawState = STATE_DEFAULTED; + else drawState = STATE_NORMAL; } + else drawState = STATE_DISABLED; - return FALSE; /* Delegate drawing to the non-themed code. */ + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + paint(theme, hwnd, hDC, drawState, dtFlags); + if (!hParamDC) EndPaint(hwnd, &ps); + return TRUE; } /**********************************************************************

1 0

Piotr Caban : comctl32: Use vssym32.h instead of tmschema.h.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: f831f77515fdaa9332473a8304e05d8633df0d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f831f77515fdaa9332473a830… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:48 2011 +0200 comctl32: Use vssym32.h instead of tmschema.h. --- dlls/comctl32/header.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/progress.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/theme_button.c | 2 +- dlls/comctl32/theme_combo.c | 2 +- dlls/comctl32/theme_dialog.c | 2 +- dlls/comctl32/theme_edit.c | 2 +- dlls/comctl32/theme_listbox.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- dlls/comctl32/updown.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 603d0a3..1cf28aa 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -40,7 +40,7 @@ #include "commctrl.h" #include "comctl32.h" #include "imagelist.h" -#include "tmschema.h" +#include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 79133ba..ebe53f4 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -53,7 +53,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 71fba9d..d331d19 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -44,7 +44,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cc3c8a7..99bde77 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -92,7 +92,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rebar); diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 427fb76..1cb69eb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -52,7 +52,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(statusbar); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1ad8c53..e4a7adc 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -64,7 +64,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" #include <math.h> diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 113e851..488c751 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index a6c6f87..9482a3b 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 9285941..915db07 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c index b3b142a..c6fd34c 100644 --- a/dlls/comctl32/theme_edit.c +++ b/dlls/comctl32/theme_edit.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_listbox.c b/dlls/comctl32/theme_listbox.c index 8147ba4..9177214 100644 --- a/dlls/comctl32/theme_listbox.c +++ b/dlls/comctl32/theme_listbox.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2af5cec..46584b5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -81,7 +81,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolbar); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c924b53..91f8176 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -42,7 +42,7 @@ #include "winnls.h" #include "commctrl.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" #include "comctl32.h" diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bd65fca..909c1eb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -60,7 +60,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 75653e1..2c5fc60 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -41,7 +41,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

Piotr Caban : include: Added vssym32.h.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7d7b1d5599290f02b49cbf02dfeedd946dad756e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7b1d5599290f02b49cbf02d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:35 2011 +0200 include: Added vssym32.h. --- include/Makefile.in | 1 + include/vssym32.h | 685 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 686 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d7b1d5599290f02b49cb…

1 0

Piotr Caban : include: Added vsstyle.h.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: b3831c474a6a1403d6027ff834d1d27901b65f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3831c474a6a1403d6027ff83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:25 2011 +0200 include: Added vsstyle.h. --- include/Makefile.in | 1 + include/vsstyle.h | 1746 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1747 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3831c474a6a1403d6027…

1 0

Piotr Caban : user32: Don't redeclare button state macros.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 371cff4883f465587c5b00eb5a66b2c517fd4c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371cff4883f465587c5b00eb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:06 2011 +0200 user32: Don't redeclare button state macros. --- dlls/user32/button.c | 80 +++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=371cff4883f465587c5b0…

1 0

John Edmonds : ddraw: Warning message about an invalid structure size will now print the structure 's size.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: ed1788bad0eb7bb2a41eb832f1197fadda4d8db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1788bad0eb7bb2a41eb832f… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Sun Jun 26 13:52:27 2011 -0400 ddraw: Warning message about an invalid structure size will now print the structure's size. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1b70d7e..102aa55 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -863,7 +863,7 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, if(DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2)) { - WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDERR_INVALIDPARAMS); + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDSD->dwSize); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; }

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::EndPass( ).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: bc59705acac5f67a834c6e4ed4338c1db8b1f532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59705acac5f67a834c6e4ed… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:38 2011 +0200 d3dx9: Implement ID3DXEffect::EndPass(). --- dlls/d3dx9_36/effect.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b11d3d1..756163a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2873,13 +2873,21 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p\n", This); - return E_NOTIMPL; + if (This->active_pass) + { + This->active_pass = NULL; + return D3D_OK; + } + + WARN("Invalid call.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: SetTechnique().
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: b7919e65fdcf3c266a95898376660fa934635dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7919e65fdcf3c266a9589837… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:35 2011 +0200 d3dx9: Implement ID3DXEffect::SetTechnique(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0f9d413..b11d3d1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2747,13 +2747,36 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPO return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(This->base_effect); + struct d3dx_technique *tech = is_valid_technique(base, technique); - FIXME("(%p)->(%p): stub\n", This, technique); + TRACE("iface %p, technique %p\n", This, technique); - return E_NOTIMPL; + if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); + + if (tech) + { + UINT i; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *t = get_technique_struct(base->technique_handles[i]); + + if (tech == t) + { + This->active_technique = get_technique_handle(t); + TRACE("Technique %u (%p)\n", i, tech); + return D3D_OK; + } + } + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
81
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 June 2011