March 2006 - Wine-commits - list.winehq.org

Mike McCormack : user32: Implement SPI_[GS]ETTOOLTIPANIMATION and SPI_[GS] ETTOOLTIPFADE.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: fc9d36e4b77cdf2950d1a11957386767f5e78581 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc9d36e4b77cdf2950d1a11… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:58:06 2006 +0900 user32: Implement SPI_[GS]ETTOOLTIPANIMATION and SPI_[GS]ETTOOLTIPFADE. --- dlls/user/sysparams.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index f97bbfb..bd1e99d 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2185,10 +2185,22 @@ BOOL WINAPI SystemParametersInfoW( UINT ret = set_user_pref_param( 1, 0x04, (BOOL)pvParam, fWinIni ); break; - WINE_SPI_FIXME(SPI_GETTOOLTIPANIMATION); /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETTOOLTIPFADE); /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETTOOLTIPANIMATION: /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x08, pvParam ); + break; + + case SPI_SETTOOLTIPANIMATION: /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x08, (BOOL)pvParam, fWinIni ); + break; + + case SPI_GETTOOLTIPFADE: /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x10, pvParam ); + break; + + case SPI_SETTOOLTIPFADE: /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x10, (BOOL)pvParam, fWinIni ); + break; + case SPI_GETCURSORSHADOW: /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_user_pref_param( 1, 0x20, pvParam ); break;

1 0

Mike McCormack : user32: Implement SPI_[GS]ETMENUANIMATION and SPI_[GS] ETSELECTIONFADE.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 9d044542685a7d93fc6671b1489af889fd7ba194 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d044542685a7d93fc6671b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:57:34 2006 +0900 user32: Implement SPI_[GS]ETMENUANIMATION and SPI_[GS]ETSELECTIONFADE. --- dlls/user/sysparams.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 48359d5..f97bbfb 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2108,8 +2108,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_GETACTIVEWINDOWTRACKING);/* 0x1000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETACTIVEWINDOWTRACKING);/* 0x1001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETMENUANIMATION); /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETMENUANIMATION); /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETMENUANIMATION: /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 0, 0x02, pvParam ); + break; + + case SPI_SETMENUANIMATION: /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x02, (BOOL)pvParam, fWinIni ); + break; + case SPI_GETCOMBOBOXANIMATION: /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_user_pref_param( 0, 0x04, pvParam ); break; @@ -2171,8 +2177,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_GETMENUFADE); /* 0x1012 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMENUFADE); /* 0x1013 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETSELECTIONFADE); /* 0x1014 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETSELECTIONFADE); /* 0x1015 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETSELECTIONFADE: /* 0x1014 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x04, pvParam ); + break; + + case SPI_SETSELECTIONFADE: /* 0x1015 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x04, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETTOOLTIPANIMATION); /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Mike McCormack : user32: Implement SystemParametersInfo(SPI_[SG] ETCURSORSHADOW).
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 9786252186158260c524c56fe614705f12dda163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9786252186158260c524c56… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:30 2006 +0900 user32: Implement SystemParametersInfo(SPI_[SG]ETCURSORSHADOW). --- dlls/user/sysparams.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 6401c88..48359d5 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2177,8 +2177,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETTOOLTIPFADE); /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCURSORSHADOW); /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCURSORSHADOW); /* 0x101B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCURSORSHADOW: /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x20, pvParam ); + break; + + case SPI_SETCURSORSHADOW: /* 0x101B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x20, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETMOUSESONAR); /* 0x101C _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/

1 0

Mike McCormack : user32: Implement SystemParametersInfo(SPI_[GS] ETCOMBOBOXANIMATION).
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 3244096d2e14b655925d6c48f16c4700c4c48b64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3244096d2e14b655925d6c4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:09 2006 +0900 user32: Implement SystemParametersInfo(SPI_[GS]ETCOMBOBOXANIMATION). --- dlls/user/sysparams.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index b17ee66..6401c88 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2110,8 +2110,13 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETACTIVEWINDOWTRACKING);/* 0x1001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETMENUANIMATION); /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMENUANIMATION); /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCOMBOBOXANIMATION); /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCOMBOBOXANIMATION); /* 0x1005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCOMBOBOXANIMATION: /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 0, 0x04, pvParam ); + break; + + case SPI_SETCOMBOBOXANIMATION: /* 0x1005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x04, (BOOL)pvParam, fWinIni ); + break; case SPI_GETLISTBOXSMOOTHSCROLLING: /* 0x1006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ if (!pvParam) return FALSE;

1 0

Mike McCormack : user32: Implement SPI_[SG]ETCARETWIDTH.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: cd37125f7aaa4ae45f2f334a5b60901ae652b7e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd37125f7aaa4ae45f2f334… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:55:39 2006 +0900 user32: Implement SPI_[SG]ETCARETWIDTH. --- dlls/user/sysparams.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 769edd7..b17ee66 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -77,6 +77,7 @@ enum spi_index SPI_USERPREFERENCEMASK_IDX, SPI_NONCLIENTMETRICS_IDX, SPI_MINIMIZEDMETRICS_IDX, + SPI_CARETWIDTH_IDX, SPI_INDEX_COUNT }; @@ -207,6 +208,8 @@ static const WCHAR SPI_SETMOUSESCROLLLIN static const WCHAR SPI_SETMOUSESCROLLLINES_VALNAME[]= {'W','h','e','e','l','S','c','r','o','l','l','L','i','n','e','s',0}; static const WCHAR SPI_SETMENUSHOWDELAY_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETMENUSHOWDELAY_VALNAME[]= {'M','e','n','u','S','h','o','w','D','e','l','a','y',0}; +static const WCHAR SPI_CARETWIDTH_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_CARETWIDTH_VALNAME[]= {'C','a','r','e','t','W','i','d','t','h',0}; /* FIXME - real values */ static const WCHAR SPI_SETSCREENSAVERRUNNING_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -296,6 +299,7 @@ static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; static BOOL swap_buttons = FALSE; static BOOL listbox_smoothscrolling = FALSE; +static UINT caret_width = 1; static BYTE user_prefs[4]; static MINIMIZEDMETRICS minimized_metrics = @@ -2196,8 +2200,20 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETACTIVEWNDTRKTIMEOUT); /* 0x2003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETFOREGROUNDFLASHCOUNT);/* 0x2004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETFOREGROUNDFLASHCOUNT);/* 0x2005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCARETWIDTH); /* 0x2006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCARETWIDTH); /* 0x2007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCARETWIDTH: /* 0x2006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_uint_param( SPI_CARETWIDTH_IDX, + SPI_CARETWIDTH_REGKEY, + SPI_CARETWIDTH_VALNAME, + &caret_width, pvParam ); + break; + + case SPI_SETCARETWIDTH: /* 0x2007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_uint_param( SPI_CARETWIDTH_IDX, + SPI_CARETWIDTH_REGKEY, + SPI_CARETWIDTH_VALNAME, + &caret_width, uiParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCKTIME); /* 0x2008 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCKTIME); /* 0x2009 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGTYPE); /* 0x200A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Alexandre Julliard : x11drv: Only warp the mouse pointer if it has actually moved.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: bc15e1bc8195737e0f9ddc741cf4d9e79f500c55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc15e1bc8195737e0f9ddc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 18:18:01 2006 +0200 x11drv: Only warp the mouse pointer if it has actually moved. --- dlls/x11drv/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/mouse.c b/dlls/x11drv/mouse.c index f2123c0..43b0fb4 100644 --- a/dlls/x11drv/mouse.c +++ b/dlls/x11drv/mouse.c @@ -289,7 +289,8 @@ void X11DRV_send_mouse_input( HWND hwnd, { queue_raw_mouse_message( WM_MOUSEMOVE, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - if (injected_flags & LLMHF_INJECTED) /* we have to actually move the cursor */ + if ((injected_flags & LLMHF_INJECTED) && + ((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */ { TRACE( "warping to (%ld,%ld)\n", pt.x, pt.y ); wine_tsx11_lock();

1 0

Alexandre Julliard : mshtml: Don' t free the URL we have just stored in the callback object.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 31332b3cd6d1c8fb0e11cbb2ff7d00a223468a8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31332b3cd6d1c8fb0e11cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 20:00:18 2006 +0200 mshtml: Don't free the URL we have just stored in the callback object. --- dlls/mshtml/persist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 9496ceb..270f249 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -465,7 +465,6 @@ static HRESULT WINAPI PersistMoniker_Loa IBinding_Abort(This->status_callback->binding); callback = This->status_callback = BindStatusCallback_Create(This, url); - CoTaskMemFree(url); if(pibc) { pbind = pibc;

1 0

H. Verbeet : d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1e421c7da9f85e44c37afce6560c0d63429463f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e421c7da9f85e44c37afce… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 26 04:19:00 2006 +0200 d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer. --- dlls/d3d8/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2173d04..e784634 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -398,6 +398,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; + TRACE("(%p) Relay\n", This); /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer8Impl)); if (NULL == object) {

1 0

Stefan Dösinger : wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1d47556195ecea5dc1456597be5fb88bb2fbc9b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d47556195ecea5dc145659… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 28 12:47:36 2006 +0200 wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/swapchain.c | 4 ++-- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d_types.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f3ceb4..2173d04 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -197,7 +197,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* d3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -230,7 +230,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Rese localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* D3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index addfb8b..8241538 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -314,7 +314,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDe localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; /* d3d9 only */ localParameters.MultiSampleQuality = NULL; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32880fa..c5eb0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -172,7 +172,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Re localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 62246fc..86389a9 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -298,7 +298,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDe localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 83ea7c2..c058720 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -128,7 +128,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G winePresentParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; winePresentParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; winePresentParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - winePresentParameters.SwapEffect = &pPresentationParameters->SwapEffect; + winePresentParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; winePresentParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; winePresentParameters.Windowed = &pPresentationParameters->Windowed; winePresentParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -178,7 +178,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 05dee94..e417eba 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -314,7 +314,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Pre LEAVE_GL(); /* Although this is not strictly required, a simple demo showed this does occur on (at least non-debug) d3d */ - if (This->presentParms.SwapEffect & D3DSWAPEFFECT_DISCARD) { + if (This->presentParms.SwapEffect & WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing\n"); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 08e68ba..5ecc645 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -479,7 +479,7 @@ typedef struct _WINED3DPRESENT_PARAMETER UINT *BackBufferCount; WINED3DMULTISAMPLE_TYPE *MultiSampleType; DWORD *MultiSampleQuality; - D3DSWAPEFFECT *SwapEffect; + WINED3DSWAPEFFECT *SwapEffect; HWND *hDeviceWindow; BOOL *Windowed; BOOL *EnableAutoDepthStencil;

1 0

Aric Stewart : twain: Add a property sheet UI for scanning.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 8358c63e15b64f7e11a238e2b375121108148479 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8358c63e15b64f7e11a238e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 22 13:34:22 2006 -0600 twain: Add a property sheet UI for scanning. --- dlls/twain/.gitignore | 1 dlls/twain/Makefile.in | 8 dlls/twain/ds_ctrl.c | 17 + dlls/twain/ds_image.c | 10 dlls/twain/dsm_ctrl.c | 1 dlls/twain/resource.h | 23 + dlls/twain/rsrc.rc | 28 + dlls/twain/twain32_main.c | 1 dlls/twain/twain_En.rc | 40 ++ dlls/twain/twain_i.h | 8 dlls/twain/ui.c | 1074 +++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 1205 insertions(+), 6 deletions(-) create mode 100644 dlls/twain/resource.h create mode 100644 dlls/twain/rsrc.rc create mode 100644 dlls/twain/twain_En.rc create mode 100644 dlls/twain/ui.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8358c63e15b64f7e11a…

1 0