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

Henri Verbeet : wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: a887128ffddf4d44569cd8480387409533c95e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a887128ffddf4d44569cd8480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:58 2011 +0200 wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 087196c..9b02177 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,6 +6367,9 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: + if (dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET)))

1 0

Huw Davies : gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed .
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: bdc3b9c0a98de289d009690706ef3a90e323301c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc3b9c0a98de289d00969070… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:11 2011 +0100 gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 21ebec8..9e996a0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -444,7 +444,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; + if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); }

1 0

Huw Davies : gdi32: Allow SetBitmapBits to set incomplete scanlines.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: cb82c45b3a803e24f2f9f10c5857a9ee2a923888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb82c45b3a803e24f2f9f10c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:12 2011 +0100 gdi32: Allow SetBitmapBits to set incomplete scanlines. --- dlls/gdi32/bitmap.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8117d6d..33d3a53 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -535,6 +535,7 @@ LONG WINAPI SetBitmapBits( int i, src_stride, dst_stride; struct bitblt_coords src, dst; struct gdi_image_bits src_bits; + HRGN clip = NULL; if (!bits) return 0; @@ -548,17 +549,30 @@ LONG WINAPI SetBitmapBits( if (bmp->dib) src_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); else src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + count = min( count, src_stride * bmp->bitmap.bmHeight ); dst_stride = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = min( count / src_stride, bmp->bitmap.bmHeight ); + src.visrect.bottom = src.height = (count + src_stride - 1 ) / src_stride; dst = src; - /* Only set entire lines */ - count = src.height * src_stride; + if (count % src_stride) + { + HRGN last_row; + int extra_pixels = ((count % src_stride) << 3) / bmp->bitmap.bmBitsPixel; + + if ((count % src_stride << 3) % bmp->bitmap.bmBitsPixel) + FIXME( "Unhandled partial pixel\n" ); + clip = CreateRectRgn( src.visrect.left, src.visrect.top, + src.visrect.right, src.visrect.bottom - 1 ); + last_row = CreateRectRgn( src.visrect.left, src.visrect.bottom - 1, + src.visrect.left + extra_pixels, src.visrect.bottom ); + CombineRgn( clip, clip, last_row, RGN_OR ); + DeleteObject( last_row ); + } TRACE("(%p, %d, %p) %dx%d %d bpp fetched height: %d\n", hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, @@ -579,8 +593,10 @@ LONG WINAPI SetBitmapBits( } src_bits.is_copy = TRUE; src_bits.free = free_heap_bits; - for (i = 0; i < dst.height; i++) + for (i = 0; i < count / src_stride; i++) memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, src_stride ); + if (count % src_stride) + memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, count % src_stride ); } /* query the color info */ @@ -604,10 +620,11 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &src_bits, &src, &dst, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0; + if (clip) DeleteObject( clip ); if (src_bits.free) src_bits.free( &src_bits ); GDI_ReleaseObj( hbitmap ); return count;

1 0

Huw Davies : gdi32: Fix colour table comparison.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 40742c2f725e8a5f987471ccaafb59aa5c03820d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40742c2f725e8a5f987471cca… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:10 2011 +0100 gdi32: Fix colour table comparison. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6ffb554..21ebec8 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -445,7 +445,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; - return memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } case 16:

1 0

Henri Verbeet : wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 26484c92005c74d88b3cc2a6c1e3896e2e8941ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=26484c92005c74d88b3cc2a6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:56 2011 +0200 wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8412aa5..d7d65fb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,12 +6367,20 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + return FALSE; + } + else if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Color fill not supported\n"); return FALSE; } + /* FIXME: We should reject color fills on formats with fixups, + * but this would break P8 color fills for example. */ + return TRUE; case WINED3D_BLIT_OP_DEPTH_FILL:

1 0

Nikolay Sivov : ntdll: Stub TokenSessionId for query call.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 8e904f95c3472a84c7fcce7097b6b6cb5d5200ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e904f95c3472a84c7fcce709… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 01:27:22 2011 +0400 ntdll: Stub TokenSessionId for query call. --- dlls/ntdll/nt.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index bc7ef86..3e5d420 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -263,7 +263,7 @@ NTSTATUS WINAPI NtQueryInformationToken( sizeof(SECURITY_IMPERSONATION_LEVEL), /* TokenImpersonationLevel */ sizeof(TOKEN_STATISTICS), /* TokenStatistics */ 0, /* TokenRestrictedSids */ - 0, /* TokenSessionId */ + sizeof(DWORD), /* TokenSessionId */ 0, /* TokenGroupsAndPrivileges */ 0, /* TokenSessionReference */ 0, /* TokenSandBoxInert */ @@ -521,6 +521,12 @@ NTSTATUS WINAPI NtQueryInformationToken( elevation->TokenIsElevated = TRUE; } break; + case TokenSessionId: + { + *((DWORD*)tokeninfo) = 0; + FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0

Huw Davies : winex11: Sync a dib section's bits before copying the brush.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: f15dcec52ffeaa48c9d467ce17faa0be28aba5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15dcec52ffeaa48c9d467ce1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:23:56 2011 +0100 winex11: Sync a dib section's bits before copying the brush. --- dlls/winex11.drv/brush.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 8f3e576..6909d52 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -216,6 +216,8 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; + X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); + if ((physDev->depth == 1) && (physBitmap->pixmap_depth != 1)) { wine_tsx11_lock(); @@ -233,6 +235,8 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) X11DRV_XRender_CopyBrush(physDev, physBitmap, bitmap.bmWidth, bitmap.bmHeight); } + X11DRV_DIB_Unlock( physBitmap, TRUE ); + if (physBitmap->pixmap_depth > 1) { physDev->brush.fillStyle = FillTiled;

1 0

Henri Verbeet : wined3d: Draw buffers are per-framebuffer state.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: f8ce77a5986ce0648dc6cbaef77ddf6828ea1e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ce77a5986ce0648dc6cbaef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:54 2011 +0200 wined3d: Draw buffers are per-framebuffer state. --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac5a05a..53aeca3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -268,6 +268,17 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ } } +static inline DWORD context_generate_rt_mask(GLenum buffer) +{ + /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ + return buffer ? (1 << 31) | buffer : 0; +} + +static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) +{ + return (1 << 31) | surface_get_gl_buffer(target); +} + static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, struct wined3d_surface **render_targets, struct wined3d_surface *depth_stencil, DWORD location) { @@ -279,6 +290,7 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); entry->depth_stencil = depth_stencil; entry->location = location; + entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; entry->id = 0; @@ -1204,17 +1216,6 @@ static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, return iPixelFormat; } -static inline DWORD context_generate_rt_mask(GLenum buffer) -{ - /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ - return buffer ? (1 << 31) | buffer : 0; -} - -static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) -{ - return (1 << 31) | surface_get_gl_buffer(target); -} - /* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) @@ -1875,7 +1876,10 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - context->draw_buffers_mask = context_generate_rt_mask(buffer); + if (context->current_fbo) + context->current_fbo->rt_mask = context_generate_rt_mask(buffer); + else + context->draw_buffers_mask = context_generate_rt_mask(buffer); } static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) @@ -1942,7 +1946,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { - DWORD rt_mask; + DWORD rt_mask, old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -1973,8 +1977,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de rt_mask = context_generate_rt_mask_no_fbo(device, context->current_rt); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2011,7 +2017,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { - DWORD rt_mask = 0; + DWORD rt_mask = 0, old_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2075,8 +2081,10 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2142,6 +2150,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat const struct wined3d_device *device = context->swapchain->device; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); + DWORD old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2157,7 +2166,8 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } - if (context->draw_buffers_mask != rt_mask) + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2168,12 +2178,13 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - DWORD rt_mask; + DWORD rt_mask, old_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; rt_mask = find_draw_buffers_mask(context, device); - if (context->draw_buffers_mask != rt_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 044e0df..5e20740 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,6 +1944,7 @@ struct fbo_entry struct wined3d_surface **render_targets; struct wined3d_surface *depth_stencil; DWORD location; + DWORD rt_mask; BOOL attached; GLuint id; };

1 0

Henri Verbeet : wined3d: Merge FindContext() into context_acquire().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 34b2956e23a03458ed4c13d7556eb5438cb3fa1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b2956e23a03458ed4c13d75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:53 2011 +0200 wined3d: Merge FindContext() into context_acquire(). This actually fixes a bug. A context's current_rt field may get set to NULL if that surface gets destroyed or unloaded. In general, the next time that context is acquired, context_setup_target() will then set everything up again. However, if a context_acquire() call with a NULL target ends up returning such a context, context_setup_target() never sets the current_rt field because the target FindContext() chooses never gets propagated to context_acquire(). This patch ensures context_setup_target() is never called with a NULL target. --- dlls/wined3d/context.c | 99 +++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac252d8..ac5a05a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1811,59 +1811,6 @@ static void SetupForBlit(struct wined3d_device *device, struct wined3d_context * context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_PROJECTION)); } -/* Do not call while under the GL lock. */ -static struct wined3d_context *FindContext(const struct wined3d_device *device, const struct wined3d_surface *target) -{ - struct wined3d_context *current_context = context_get_current(); - struct wined3d_context *context; - - if (current_context && current_context->destroyed) current_context = NULL; - - if (!target) - { - if (current_context - && current_context->current_rt - && current_context->swapchain->device == device) - { - target = current_context->current_rt; - } - else - { - struct wined3d_swapchain *swapchain = device->swapchains[0]; - if (swapchain->back_buffers) target = swapchain->back_buffers[0]; - else target = swapchain->front_buffer; - } - } - - if (current_context && current_context->current_rt == target) - { - context_update_window(current_context); - return current_context; - } - - if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) - { - TRACE("Rendering onscreen\n"); - - context = swapchain_get_context(target->container.u.swapchain); - } - else - { - TRACE("Rendering offscreen\n"); - - /* Stay with the current context if possible. Otherwise use the - * context for the primary swapchain. */ - if (current_context && current_context->swapchain->device == device) - context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); - } - - context_update_window(context); - - return context; -} - static inline BOOL is_rt_mask_onscreen(DWORD rt_mask) { return rt_mask & (1 << 31); @@ -2290,7 +2237,6 @@ static void context_setup_target(struct wined3d_device *device, { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - if (!target) return; render_offscreen = surface_is_offscreen(target); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; @@ -2347,7 +2293,50 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi TRACE("device %p, target %p.\n", device, target); - context = FindContext(device, target); + if (current_context && current_context->destroyed) + current_context = NULL; + + if (!target) + { + if (current_context + && current_context->current_rt + && current_context->swapchain->device == device) + { + target = current_context->current_rt; + } + else + { + struct wined3d_swapchain *swapchain = device->swapchains[0]; + if (swapchain->back_buffers) + target = swapchain->back_buffers[0]; + else + target = swapchain->front_buffer; + } + } + + if (current_context && current_context->current_rt == target) + { + context = current_context; + } + else if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) + { + TRACE("Rendering onscreen.\n"); + + context = swapchain_get_context(target->container.u.swapchain); + } + else + { + TRACE("Rendering offscreen.\n"); + + /* Stay with the current context if possible. Otherwise use the + * context for the primary swapchain. */ + if (current_context && current_context->swapchain->device == device) + context = current_context; + else + context = swapchain_get_context(device->swapchains[0]); + } + + context_update_window(context); context_setup_target(device, context, target); context_enter(context); if (!context->valid) return context;

1 0

Nikolay Sivov : advapi32/tests: Fix invalid read in test.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: e717a78afe042db4612bee76468bcbb262191c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e717a78afe042db4612bee764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 13:33:38 2011 +0400 advapi32/tests: Fix invalid read in test. --- dlls/advapi32/tests/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index db7df81..17c52dc 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3924,6 +3924,7 @@ static void test_CreateRestrictedToken(void) /* disable a SID in new token */ sattr.Sid = token_groups->Groups[i].Sid; sattr.Attributes = 0; + r_token = NULL; ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); todo_wine ok(ret, "got error %d\n", GetLastError());

1 0