September 2008 - Wine-Commits

Detlef Riekenberg : dlls: Do not use __WINE_ALLOC_SIZE between void and *.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 9593c9e6f55409b26b77ee1f7ff02d697c6f4df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9593c9e6f55409b26b77ee1f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 19 05:35:49 2008 +0200 dlls: Do not use __WINE_ALLOC_SIZE between void and *. --- dlls/hhctrl.ocx/hhctrl.h | 8 ++++---- dlls/localspl/localspl_private.h | 7 ++++++- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/riched20/editor.h | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f529a59..795bea4 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc_zero(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 614e108..8e67ed3 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,11 +51,16 @@ extern HINSTANCE LOCALSPL_hInstance; /* ## Memory allocation functions ## */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( GetProcessHeap(), 0, len ); } +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4b4675b..5a9f533 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -654,17 +654,17 @@ extern LONG module_ref; /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cbebdba..2c68378 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,7 @@ struct _RTF_Info; extern HANDLE me_heap; -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } @@ -35,7 +35,7 @@ static inline BOOL heap_free( void *ptr ) return HeapFree( me_heap, 0, ptr ); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc( void *ptr, size_t len ) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); }

1 0

Alexandre Julliard : user32/tests: Fix a few more message test failures.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 2193a701375cd140b25f3634a0cba99bbdfb8c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2193a701375cd140b25f3634a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 12:07:18 2008 +0200 user32/tests: Fix a few more message test failures. --- dlls/user32/tests/msg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0194433..3d2fd1e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -919,6 +919,7 @@ static const struct message WmShowChildInvisibleParentSeq_1[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHILDACTIVATE, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, @@ -1674,7 +1675,7 @@ static void flush_events(void) if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); - min_timeout = 10; + min_timeout = 20; } } @@ -2690,7 +2691,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|defwinproc|optional, 1 }, - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional }, /* in MDI client */ @@ -8435,6 +8436,7 @@ struct sendmsg_info static DWORD CALLBACK send_msg_thread( LPVOID arg ) { struct sendmsg_info *info = arg; + SetLastError( 0xdeadbeef ); info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL ); if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT, "unexpected error %d\n", GetLastError()); return 0; @@ -9341,8 +9343,8 @@ static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) DWORD start_ticks, end_ticks; start_ticks = GetTickCount(); - /* add some deviation (5%) to cover not expected delays */ - start_ticks += timeout / 20; + /* add some deviation (50%) to cover not expected delays */ + start_ticks += timeout / 2; do {

1 0

Detlef Riekenberg : winspool: Use the backend for AddMonitor.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 6d0ffa50a0fe76c74ba3c88863dc7bab786bd350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0ffa50a0fe76c74ba3c8886… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 18 22:40:09 2008 +0200 winspool: Use the backend for AddMonitor. --- dlls/winspool.drv/info.c | 78 ++-------------------------------------------- 1 files changed, 3 insertions(+), 75 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 81d6b61..4737e98 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2271,12 +2271,7 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { - monitor_t * pm = NULL; LPMONITOR_INFO_2W mi2w; - HKEY hroot = NULL; - HKEY hentry = NULL; - DWORD disposition; - BOOL res = FALSE; mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors, @@ -2284,6 +2279,8 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) debugstr_w(mi2w ? mi2w->pEnvironment : NULL), debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + if ((backend == NULL) && !load_backend()) return FALSE; + if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); return FALSE; @@ -2294,76 +2291,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - if (pName && (pName[0])) { - FIXME("for server %s not implemented\n", debugstr_w(pName)); - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - - if (!mi2w->pName || (! mi2w->pName[0])) { - WARN("pName not valid : %s\n", debugstr_w(mi2w->pName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (!mi2w->pEnvironment || lstrcmpW(mi2w->pEnvironment, envname_x86W)) { - WARN("Environment %s requested (we support only %s)\n", - debugstr_w(mi2w->pEnvironment), debugstr_w(envname_x86W)); - SetLastError(ERROR_INVALID_ENVIRONMENT); - return FALSE; - } - - if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) { - WARN("pDLLName not valid : %s\n", debugstr_w(mi2w->pDLLName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) != ERROR_SUCCESS) { - ERR("unable to create key %s\n", debugstr_w(MonitorsW)); - return FALSE; - } - - if(RegCreateKeyExW( hroot, mi2w->pName, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_QUERY_VALUE, NULL, &hentry, - &disposition) == ERROR_SUCCESS) { - - /* Some installers set options for the port before calling AddMonitor. - We query the "Driver" entry to verify that the monitor is installed, - before we return an error. - When a user installs two print monitors at the same time with the - same name but with a different driver DLL and a task switch comes - between RegQueryValueExW and RegSetValueExW, a race condition - is possible but silently ignored. */ - - DWORD namesize = 0; - - if ((disposition == REG_OPENED_EXISTING_KEY) && - (RegQueryValueExW(hentry, DriverW, NULL, NULL, NULL, - &namesize) == ERROR_SUCCESS)) { - TRACE("monitor %s already exists\n", debugstr_w(mi2w->pName)); - /* NT: ERROR_PRINT_MONITOR_ALREADY_INSTALLED (3006) - 9x: ERROR_ALREADY_EXISTS (183) */ - SetLastError(ERROR_PRINT_MONITOR_ALREADY_INSTALLED); - } - else - { - INT len; - len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); - res = (RegSetValueExW(hentry, DriverW, 0, - REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); - } - RegCloseKey(hentry); - } - - RegCloseKey(hroot); - return (res); + return backend->fpAddMonitor(pName, Level, pMonitors); } /******************************************************************

1 0

Detlef Riekenberg : localspl: Implement AddMonitor.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: ab32b35ba78f18fb22454c7449871d83d1964bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab32b35ba78f18fb22454c744… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 18 22:35:29 2008 +0200 localspl: Implement AddMonitor. --- dlls/localspl/localspl_main.c | 321 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 320 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab32b35ba78f18fb22454…

1 0

Dylan Smith : richedit: Removed a redundant condition.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 72d754108ac2648d24e0a317720044ce50786bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d754108ac2648d24e0a3177… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 18 09:38:55 2008 -0400 richedit: Removed a redundant condition. --- dlls/riched20/paint.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fb50a89..eba37ef 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1119,9 +1119,8 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) - si.fMask |= SIF_DISABLENOSCROLL; - if ((si.fMask & SIF_DISABLENOSCROLL)) { + si.fMask |= SIF_DISABLENOSCROLL; bScrollBarWillBeVisible = TRUE; }

1 0

Detlef Riekenberg : advapi32: Remove outdated comment.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: b67533f204326ecb4b150a1943dc3d3f408bb5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67533f204326ecb4b150a194… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 18 18:52:43 2008 +0200 advapi32: Remove outdated comment. --- dlls/advapi32/registry.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4c97ed1..ff574b2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -8,9 +8,6 @@ * Copyright (C) 1998 Matthew Becker * Copyright (C) 1999 Sylvain St-Germain * - * This file is concerned about handle management and interaction with the Wine server. - * Registry file I/O is in misc/registry.c. - * * 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

1 0

Henri Verbeet : wined3d: Create a FBO for each combination of render targets and depth stencil.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 45820046e84413e38a17ea71bfb96b5900bddff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45820046e84413e38a17ea71b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:53 2008 +0200 wined3d: Create a FBO for each combination of render targets and depth stencil. The main reason for this change is crappy performance for reconfiguring FBOs. --- dlls/wined3d/context.c | 123 +++++++++++++++++++++++++--------------- dlls/wined3d/device.c | 26 +++++--- dlls/wined3d/surface.c | 8 +- dlls/wined3d/wined3d_private.h | 15 ++++- 4 files changed, 110 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45820046e84413e38a17e…

1 0

Henri Verbeet : wined3d: Get rid of context_set_depth_stencil_fbo().
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 3a8ab00fe15e092bc724cb12028aaf0d1c02b335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8ab00fe15e092bc724cb120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:53 2008 +0200 wined3d: Get rid of context_set_depth_stencil_fbo(). Integrate clearing the depth stencil attachment in context_attach_depth_stencil_fbo(). --- dlls/wined3d/context.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4d70d1d..6e93970 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -137,15 +137,23 @@ void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_targe { IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; - if (use_render_buffer && depth_stencil_impl->current_renderbuffer) + TRACE("Attach depth stencil %p\n", depth_stencil); + + if (depth_stencil) { - GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); - checkGLcall("glFramebufferRenderbufferEXT()"); - } else { - context_apply_attachment_filter_states((IWineD3DDevice *)This, depth_stencil, TRUE); + if (use_render_buffer && depth_stencil_impl->current_renderbuffer) + { + GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); + checkGLcall("glFramebufferRenderbufferEXT()"); + } else { + context_apply_attachment_filter_states((IWineD3DDevice *)This, depth_stencil, TRUE); - GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, depth_stencil_impl->glDescription.target, - depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, depth_stencil_impl->glDescription.target, + depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } + } else { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()"); } } @@ -169,22 +177,6 @@ void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWO } } -/* TODO: Handle stencil attachments */ -static void context_set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) -{ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - TRACE("Set depth stencil to %p\n", depth_stencil); - - if (depth_stencil) - { - context_attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, depth_stencil, TRUE); - } else { - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); - checkGLcall("glFramebufferTexture2DEXT()"); - } -} - static void context_check_fbo_status(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -267,7 +259,7 @@ void context_apply_fbo_state(IWineD3DDevice *iface) { surface_set_compatible_renderbuffer(This->stencilBufferTarget, w, h); } - context_set_depth_stencil_fbo(iface, This->stencilBufferTarget); + context_attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, This->stencilBufferTarget, TRUE); context->fbo_depth_attachment = This->stencilBufferTarget; }

1 0

Henri Verbeet : wined3d: Get rid of context_set_render_target_fbo().
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 8f2ed870f1c27dc3d241b172563d67af8ccec649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2ed870f1c27dc3d241b1725… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:53 2008 +0200 wined3d: Get rid of context_set_render_target_fbo(). Integrate clearing the attachment in context_attach_surface_fbo(). --- dlls/wined3d/context.c | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 067db87..4d70d1d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -154,12 +154,19 @@ void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWO { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; - context_apply_attachment_filter_states((IWineD3DDevice *)This, surface, TRUE); + TRACE("Attach surface %p to %u\n", surface, idx); - GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, surface_impl->glDescription.target, - surface_impl->glDescription.textureName, surface_impl->glDescription.level)); + if (surface) + { + context_apply_attachment_filter_states((IWineD3DDevice *)This, surface, TRUE); - checkGLcall("attach_surface_fbo"); + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, surface_impl->glDescription.target, + surface_impl->glDescription.textureName, surface_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } else { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + } } /* TODO: Handle stencil attachments */ @@ -178,21 +185,6 @@ static void context_set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface } } -static void context_set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) -{ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - TRACE("Set render target %u to %p\n", idx, render_target); - - if (render_target) - { - context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, idx, render_target); - } else { - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, GL_TEXTURE_2D, 0, 0)); - checkGLcall("glFramebufferTexture2DEXT()"); - } -} - static void context_check_fbo_status(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -260,7 +252,7 @@ void context_apply_fbo_state(IWineD3DDevice *iface) IWineD3DSurface *render_target = This->render_targets[i]; if (context->fbo_color_attachments[i] != render_target) { - context_set_render_target_fbo(iface, i, render_target); + context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, i, render_target); context->fbo_color_attachments[i] = render_target; } }

1 0

Henri Verbeet : wined3d: Handle drawbuffers in context_apply_fbo_state() instead of context_set_render_target_fbo().
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 734b31e00b3f3aff6df6a967d61e93e3abb41a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734b31e00b3f3aff6df6a967d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 14:57:53 2008 +0200 wined3d: Handle drawbuffers in context_apply_fbo_state() instead of context_set_render_target_fbo(). --- dlls/wined3d/context.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c3297ac..067db87 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -187,12 +187,9 @@ static void context_set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWin if (render_target) { context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, idx, render_target); - This->draw_buffers[idx] = GL_COLOR_ATTACHMENT0_EXT + idx; } else { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()"); - - This->draw_buffers[idx] = GL_NONE; } } @@ -281,6 +278,14 @@ void context_apply_fbo_state(IWineD3DDevice *iface) context_set_depth_stencil_fbo(iface, This->stencilBufferTarget); context->fbo_depth_attachment = This->stencilBufferTarget; } + + for (i = 0; i < GL_LIMITS(buffers); ++i) + { + if (This->render_targets[i]) + This->draw_buffers[i] = GL_COLOR_ATTACHMENT0_EXT + i; + else + This->draw_buffers[i] = GL_NONE; + } } else { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); }

1 0