April 2011 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : user32: Use symbolic names for values returned by WM_MENUCHAR handler.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: a859e73d5f192da5605134bae413886520f6eda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a859e73d5f192da5605134bae… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 11 13:44:53 2011 +0900 user32: Use symbolic names for values returned by WM_MENUCHAR handler. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 6385476..c92eeb1 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1464,7 +1464,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, return 0; case WM_MENUCHAR: - return 0x00010000; /* MDI children don't have menu bars */ + return MAKELRESULT( 0, MNC_CLOSE ); /* MDI children don't have menu bars */ case WM_CLOSE: SendMessageW( client, WM_MDIDESTROY, (WPARAM)hwnd, 0 );

1 0

Nikolay Sivov : comctl32/tab: Use dpa to store item data.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 82258f4f2580a591d7a9940204b194b7f833c09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82258f4f2580a591d7a994020… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 9 19:46:59 2011 +0400 comctl32/tab: Use dpa to store item data. --- dlls/comctl32/tab.c | 154 +++++++++++++++++++++------------------------------ 1 files changed, 64 insertions(+), 90 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f86fd0f..6744ed7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -52,6 +52,7 @@ * */ +#include <assert.h> #include <stdarg.h> #include <string.h> @@ -110,7 +111,6 @@ typedef struct INT iSelected; /* the currently selected item */ INT iHotTracked; /* the highlighted item under the mouse */ INT uFocus; /* item which has the focus */ - TAB_ITEM* items; /* pointer to an array of TAB_ITEM's */ BOOL DoRedraw; /* flag for redrawing when tab contents is changed*/ BOOL needsScrolling; /* TRUE if the size of the tabs is greater than * the size of the control */ @@ -122,6 +122,8 @@ typedef struct DWORD exStyle; /* Extended style used, currently: TCS_EX_FLATSEPARATORS, TCS_EX_REGISTERDROP */ DWORD dwStyle; /* the cached window GWL_STYLE */ + + HDPA items; /* dynamic array of TAB_ITEM* pointers */ } TAB_INFO; /****************************************************************************** @@ -141,9 +143,6 @@ typedef struct #define EXTRA_ICON_PADDING 3 #define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongPtrW(hwnd,0)) -/* Since items are variable sized, cannot directly access them */ -#define TAB_GetItem(info,i) \ - ((TAB_ITEM*)((LPBYTE)info->items + (i) * TAB_ITEM_SIZE(info))) #define GET_DEFAULT_MIN_TAB_WIDTH(infoPtr) (DEFAULT_MIN_TAB_WIDTH - (DEFAULT_PADDING_X - (infoPtr)->uHItemPadding) * 2) @@ -155,6 +154,12 @@ typedef struct static const WCHAR themeClass[] = { 'T','a','b',0 }; +static inline TAB_ITEM* TAB_GetItem(const TAB_INFO *infoPtr, INT i) +{ + assert(i >= 0 && i < infoPtr->uNumItem); + return DPA_GetPtr(infoPtr->items, i); +} + /****************************************************************************** * Prototypes */ @@ -209,9 +214,8 @@ static void TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) { if (TRACE_ON(tab)) { - TAB_ITEM *ti; + TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem); - ti = TAB_GetItem(infoPtr, iItem); TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n", iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage); TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n", @@ -2640,42 +2644,21 @@ TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode TAB_DumpItemExternalT(pti, iItem, bUnicode); - - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (TAB_ITEM_SIZE(infoPtr)); - infoPtr->uNumItem++; - infoPtr->iSelected = 0; + if (!(item = Alloc(sizeof(TAB_ITEM_SIZE(infoPtr))))) return FALSE; + if (DPA_InsertPtr(infoPtr->items, iItem, item) == -1) + { + Free(item); + return FALSE; } - else { - LPBYTE oldItems = (LPBYTE)infoPtr->items; - - infoPtr->uNumItem++; - infoPtr->items = Alloc (TAB_ITEM_SIZE(infoPtr) * infoPtr->uNumItem); - - /* pre insert copy */ - if (iItem > 0) { - memcpy (infoPtr->items, oldItems, - iItem * TAB_ITEM_SIZE(infoPtr)); - } - - /* post insert copy */ - if (iItem < infoPtr->uNumItem - 1) { - memcpy (TAB_GetItem(infoPtr, iItem + 1), - oldItems + iItem * TAB_ITEM_SIZE(infoPtr), - (infoPtr->uNumItem - iItem - 1) * TAB_ITEM_SIZE(infoPtr)); - } - - if (iItem <= infoPtr->iSelected) + if (infoPtr->uNumItem == 0) + infoPtr->iSelected = 0; + else if (iItem <= infoPtr->iSelected) infoPtr->iSelected++; - Free (oldItems); - } - - item = TAB_GetItem(infoPtr, iItem); + infoPtr->uNumItem++; item->pszText = NULL; - if (pti->mask & TCIF_TEXT) { if (bUnicode) @@ -2885,64 +2868,49 @@ TAB_GetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) { - BOOL bResult = FALSE; + TAB_ITEM *item; TRACE("(%p, %d)\n", infoPtr, iItem); - if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) - { - TAB_ITEM *item = TAB_GetItem(infoPtr, iItem); - LPBYTE oldItems = (LPBYTE)infoPtr->items; + if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; + + item = TAB_GetItem(infoPtr, iItem); + Free(item->pszText); + Free(item); + infoPtr->uNumItem--; + DPA_DeletePtr(infoPtr->items, iItem); - TAB_InvalidateTabArea(infoPtr); - Free(item->pszText); - infoPtr->uNumItem--; + TAB_InvalidateTabArea(infoPtr); - if (!infoPtr->uNumItem) + if (infoPtr->uNumItem == 0) + { + if (infoPtr->iHotTracked >= 0) { - infoPtr->items = NULL; - if (infoPtr->iHotTracked >= 0) - { - KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); - infoPtr->iHotTracked = -1; - } + KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); + infoPtr->iHotTracked = -1; } - else - { - infoPtr->items = Alloc(TAB_ITEM_SIZE(infoPtr) * infoPtr->uNumItem); - - if (iItem > 0) - memcpy(infoPtr->items, oldItems, iItem * TAB_ITEM_SIZE(infoPtr)); - - if (iItem < infoPtr->uNumItem) - memcpy(TAB_GetItem(infoPtr, iItem), - oldItems + (iItem + 1) * TAB_ITEM_SIZE(infoPtr), - (infoPtr->uNumItem - iItem) * TAB_ITEM_SIZE(infoPtr)); - if (iItem <= infoPtr->iHotTracked) - { - /* When tabs move left/up, the hot track item may change */ - FIXME("Recalc hot track\n"); - } - } - Free(oldItems); - - /* Readjust the selected index */ - if (iItem == infoPtr->iSelected) - infoPtr->iSelected = -1; - else if (iItem < infoPtr->iSelected) - infoPtr->iSelected--; - - if (infoPtr->uNumItem == 0) - infoPtr->iSelected = -1; + infoPtr->iSelected = -1; + } + else + { + if (iItem <= infoPtr->iHotTracked) + { + /* When tabs move left/up, the hot track item may change */ + FIXME("Recalc hot track\n"); + } + } - /* Reposition and repaint tabs */ - TAB_SetItemBounds(infoPtr); + /* adjust the selected index */ + if (iItem == infoPtr->iSelected) + infoPtr->iSelected = -1; + else if (iItem < infoPtr->iSelected) + infoPtr->iSelected--; - bResult = TRUE; - } + /* reposition and repaint tabs */ + TAB_SetItemBounds(infoPtr); - return bResult; + return TRUE; } static inline LRESULT TAB_DeleteAllItems (TAB_INFO *infoPtr) @@ -3063,7 +3031,7 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) infoPtr->uHItemPadding_s = 6; infoPtr->uVItemPadding_s = 3; infoPtr->hFont = 0; - infoPtr->items = 0; + infoPtr->items = DPA_Create(8); infoPtr->hcurArrow = LoadCursorW (0, (LPWSTR)IDC_ARROW); infoPtr->iSelected = -1; infoPtr->iHotTracked = -1; @@ -3147,16 +3115,22 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) static LRESULT TAB_Destroy (TAB_INFO *infoPtr) { - UINT iItem; + INT iItem; SetWindowLongPtrW(infoPtr->hwnd, 0, 0); - if (infoPtr->items) { - for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) { - Free (TAB_GetItem(infoPtr, iItem)->pszText); - } - Free (infoPtr->items); + for (iItem = infoPtr->uNumItem - 1; iItem >= 0; iItem--) + { + TAB_ITEM *tab = TAB_GetItem(infoPtr, iItem); + + DPA_DeletePtr(infoPtr->items, iItem); + infoPtr->uNumItem--; + + Free(tab->pszText); + Free(tab); } + DPA_Destroy(infoPtr->items); + infoPtr->items = NULL; if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip);

1 0

Henri Verbeet : wined3d: Check FBO completeness after the read / draw buffers are specified.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 84103460bdab8a3f57f29817d7be2ceaf93ee2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84103460bdab8a3f57f29817d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 8 20:22:52 2011 +0200 wined3d: Check FBO completeness after the read / draw buffers are specified. Unless the driver implements ARB_ES2_compatibility / GL4.1, FBO completeness depends on what read / draw buffers are set. --- dlls/wined3d/context.c | 25 ++++++++++++++++++++++--- dlls/wined3d/surface.c | 4 ++++ dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c2bdd3c..be2ad3c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -299,7 +299,7 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, } /* GL locking is done by the caller */ -static void context_check_fbo_status(struct wined3d_context *context, GLenum target) +void context_check_fbo_status(struct wined3d_context *context, GLenum target) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; @@ -499,8 +499,6 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->current_fbo = NULL; context_bind_fbo(context, target, NULL); } - - context_check_fbo_status(context, target); } /* GL locking is done by the caller */ @@ -2056,6 +2054,13 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp context->draw_buffer_dirty = FALSE; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + ENTER_GL(); + context_check_fbo_status(context, GL_FRAMEBUFFER); + LEAVE_GL(); + } + SetupForBlit(device, context); } @@ -2119,6 +2124,13 @@ BOOL context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm context_apply_draw_buffers(context, rt_count, rts); context->draw_buffer_dirty = TRUE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + ENTER_GL(); + context_check_fbo_status(context, GL_FRAMEBUFFER); + LEAVE_GL(); + } + if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE); @@ -2186,6 +2198,13 @@ BOOL context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp context->draw_buffer_dirty = FALSE; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + ENTER_GL(); + context_check_fbo_status(context, GL_FRAMEBUFFER); + LEAVE_GL(); + } + if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 801eb57..c2d92ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3416,6 +3416,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT glReadBuffer(GL_COLOR_ATTACHMENT0); checkGLcall("glReadBuffer()"); } + context_check_fbo_status(context, GL_READ_FRAMEBUFFER); LEAVE_GL(); if (dst_location == SFLAG_INDRAWABLE) @@ -3438,6 +3439,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } + context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); @@ -3516,9 +3518,11 @@ static void wined3d_surface_depth_blt_fbo(IWineD3DDeviceImpl *device, IWineD3DSu context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); glReadBuffer(GL_NONE); checkGLcall("glReadBuffer()"); + context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); context_set_draw_buffer(context, GL_NONE); + context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); if (gl_mask & GL_DEPTH_BUFFER_BIT) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5be6705..6db92d6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -302,6 +302,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * ENTER_GL(); context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL, SFLAG_INTEXTURE); glReadBuffer(GL_COLOR_ATTACHMENT0); + context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d78d504..4ef1cb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1218,6 +1218,7 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; +void context_check_fbo_status(struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Francois Gouget : d3dx9_36: Make get_parameter_{handle, struct}() static.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 18e0e8c4c7dcbcc0d152ca1ba5e2fb49d0962edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e0e8c4c7dcbcc0d152ca1ba… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 10 18:45:11 2011 +0200 d3dx9_36: Make get_parameter_{handle,struct}() static. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1e3de0c..a03e8a3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -91,12 +91,12 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } -struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) +static struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) { return (struct d3dx_parameter *) handle; } -D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) +static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { return (D3DXHANDLE) parameter; }

1 0

Francois Gouget : progman: Fix the Alt+Enter accelerator so it shows the selected element attributes.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 25a31a49c1382235278116a157020532c78e86e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a31a49c1382235278116a15… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 10 18:45:06 2011 +0200 progman: Fix the Alt+Enter accelerator so it shows the selected element attributes. --- programs/progman/progman.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/progman/progman.rc b/programs/progman/progman.rc index 4562093..2281b33 100644 --- a/programs/progman/progman.rc +++ b/programs/progman/progman.rc @@ -86,5 +86,5 @@ IDS_SYMBOLS_ICO, "Icons (*.ico)" ACCEL ACCELERATORS { -VK_RETURN, PM_EXECUTE, VIRTKEY, ALT +VK_RETURN, PM_ATTRIBUTES, VIRTKEY, ALT }

1 0

Nikolay Sivov : comctl32/tab: Fix invalid read of item data.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 6867735e20e7d6615d77eabb10f79c296a778bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6867735e20e7d6615d77eabb1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 9 19:39:45 2011 +0400 comctl32/tab: Fix invalid read of item data. --- dlls/comctl32/tab.c | 2 +- dlls/comctl32/tests/tab.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index fe82d59..f86fd0f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2500,7 +2500,7 @@ static void TAB_EnsureSelectionVisible( if (infoPtr->leftmostVisible >= iSelected) { - infoPtr->leftmostVisible = iSelected; + if (iSelected >= 0) infoPtr->leftmostVisible = iSelected; } else { diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 4c464e6..5bd2ea0 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1052,6 +1052,9 @@ static void test_insert_focus(HWND parent_wnd) hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, mask, 0); ok(hTab != NULL, "Failed to create tab control\n"); + r = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(-1, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0);

1 0

Francois Gouget : mshtml: Make HTMLFiltersCollection_Create() static.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: aa3f823d193ef76d23502bf1d1094896d497bccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3f823d193ef76d23502bf1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 10 18:46:08 2011 +0200 mshtml: Make HTMLFiltersCollection_Create() static. --- dlls/mshtml/htmlelem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index bf54739..74a4394 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -109,7 +109,7 @@ static inline HTMLFiltersCollection *impl_from_IHTMLFiltersCollection(IHTMLFilte return CONTAINING_RECORD(iface, HTMLFiltersCollection, IHTMLFiltersCollection_iface); } -IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); +static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1971,7 +1971,7 @@ static dispex_static_data_t HTMLFiltersCollection_dispex = { HTMLFiltersCollection_iface_tids }; -IHTMLFiltersCollection *HTMLFiltersCollection_Create() +static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void) { HTMLFiltersCollection *ret = heap_alloc(sizeof(HTMLFiltersCollection));

1 0

Henri Verbeet : wined3d: Explicitly handle 0 rt_count right at the start of context_apply_draw_buffers ().
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: bf99c0248f04655dfb402d03bc29a52a20dc5466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf99c0248f04655dfb402d03b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 8 20:22:49 2011 +0200 wined3d: Explicitly handle 0 rt_count right at the start of context_apply_draw_buffers(). It's trivial, and allows the rest of the code to assume at least 1 render target is present. --- dlls/wined3d/context.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b5ae5a..64380c8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1915,7 +1915,14 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur /* Context activation is done by the caller. */ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, IWineD3DSurfaceImpl **rts) { - if (rt_count && !surface_is_offscreen(rts[0])) + if (!rt_count) + { + ENTER_GL(); + glDrawBuffer(GL_NONE); + checkGLcall("glDrawBuffer()"); + LEAVE_GL(); + } + else if (!surface_is_offscreen(rts[0])) { ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rts[0])); @@ -1951,7 +1958,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ } else { - glDrawBuffer(rt_count ? rts[0]->resource.device->offscreenBuffer : GL_NONE); + glDrawBuffer(rts[0]->resource.device->offscreenBuffer); checkGLcall("glDrawBuffer()"); } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Only set draw buffers that are explicitly specified in context_apply_draw_buffers ().
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 2f3c147ab282b6e1a782df17b8a223496bfc5508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3c147ab282b6e1a782df17b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 8 20:22:50 2011 +0200 wined3d: Only set draw buffers that are explicitly specified in context_apply_draw_buffers(). Anything that isn't explicitly specified is set to GL_NONE by glDrawBuffersARB(). --- dlls/wined3d/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 64380c8..d1a3189 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1937,9 +1937,9 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < rt_count; ++i) { - if (i < rt_count && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; @@ -1947,7 +1947,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(rt_count, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else

1 0

Henri Verbeet : wined3d: Set the read buffer to GL_NONE for draws and clears on an FBO.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 8e12b2e61e8c6441ed25c116142c262efdf88b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e12b2e61e8c6441ed25c1161… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 8 20:22:51 2011 +0200 wined3d: Set the read buffer to GL_NONE for draws and clears on an FBO. For the benefit of depth-only draws and clears, that would otherwise fail FBO completeness, unless the driver supports ARB_ES2_compatibility. --- dlls/wined3d/context.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d1a3189..c2bdd3c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2105,6 +2105,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm ++i; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, depth_stencil, SFLAG_INTEXTURE); + glReadBuffer(GL_NONE); + checkGLcall("glReadBuffer"); } else { @@ -2172,6 +2174,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil, SFLAG_INTEXTURE); + glReadBuffer(GL_NONE); + checkGLcall("glReadBuffer"); LEAVE_GL(); } }

1 0