July 2008 - Wine-Commits - list.winehq.org

Rob Shearman : widl: Consolidate top-level parameter conformance/ variance expression writing into a separate function.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: d60dc3f88baddbea739df56febd00e5ce352eebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60dc3f88baddbea739df56fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jul 3 09:11:00 2008 +0100 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions. --- tools/widl/typegen.c | 115 +++++++++++++++++++++++++++---------------------- 1 files changed, 63 insertions(+), 52 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 79ae0f4..5db970e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2770,7 +2770,7 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ -static inline int is_size_needed_for_phase(enum remoting_phase phase) +static inline int is_conformance_needed_for_phase(enum remoting_phase phase) { return (phase != PHASE_UNMARSHAL); } @@ -2793,6 +2793,67 @@ expr_t *get_size_is_expr(const type_t *t, const char *name) return x; } +static void write_parameter_conf_or_var_exprs(FILE *file, int indent, + enum remoting_phase phase, + const var_t *var) +{ + const type_t *type = var->type; + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + break; + else if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + break; + else if (is_array(type) || is_string_type(var->attrs, type)) + { + if (is_conformance_needed_for_phase(phase)) + { + if (type->size_is) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + if (type->length_is) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + } + break; + } + else if (type->type == RPC_FC_NON_ENCAPSULATED_UNION) + { + if (is_conformance_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, get_attrp(var->attrs, ATTR_SWITCHIS), 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + break; + } + else if (type->type == RPC_FC_IP) + { + expr_t *iid; + + if (is_conformance_needed_for_phase(phase) && (iid = get_attrp( var->attrs, ATTR_IIDIS ))) + { + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); + write_expr( file, iid, 1, 1, NULL, NULL ); + fprintf( file, ";\n\n" ); + } + break; + } + else if (is_ptr(type)) + type = type->ref; + else + break; + } +} + static void write_remoting_arg(FILE *file, int indent, const func_t *func, enum pass pass, enum remoting_phase phase, const var_t *var) @@ -2824,6 +2885,7 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, break; } + write_parameter_conf_or_var_exprs(file, indent, phase, var); rtype = type->type; if (is_context_handle(type)) @@ -2879,13 +2941,6 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, print_phase_function(file, indent, "NonConformantString", phase, var, start_offset); else { - if (type->size_is && is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) print_phase_function(file, indent, "Pointer", phase, var, start_offset - (type->size_is ? 4 : 2)); @@ -2908,43 +2963,14 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "VaryingArray"; } else if (tc == RPC_FC_CARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "ConformantArray"; } else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) { - if (is_size_needed_for_phase(phase)) - { - if (type->size_is) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (type->length_is) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - } array_type = (tc == RPC_FC_BOGUS_ARRAY ? "ComplexArray" : "ConformantVaryingArray"); @@ -3029,21 +3055,6 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } else { - expr_t *iid; - expr_t *sx = get_size_is_expr(type, var->name); - - if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL ); - fprintf( file, ";\n\n" ); - } - else if (sx) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long) "); - write_expr(file, sx, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } if (var->type->ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); else

1 0

Maarten Lankhorst : quartz: Fix return value for video renderer.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 28c7b230ed84ee73bbfefe32c64ee7d8dbf270f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c7b230ed84ee73bbfefe32c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 2 20:09:33 2008 -0700 quartz: Fix return value for video renderer. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 76b1a8a..23a5cd9 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -362,7 +362,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) HRESULT hr; if (This->state == State_Stopped) - return S_FALSE; + return VFW_E_WRONG_STATE; TRACE("%p %p\n", iface, pSample);

1 0

Maarten Lankhorst : quartz: Fix return values in directsound renderer.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: e5767b1c023574c00a828fb02795a138064bf4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5767b1c023574c00a828fb02… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 2 20:08:46 2008 -0700 quartz: Fix return values in directsound renderer. --- dlls/quartz/dsoundrender.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1bdf390..e81acfb 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -243,11 +243,8 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) * pause completion here, but for sound playing a single frame doesn't make sense */ - if (This->state == State_Paused) - return S_FALSE; - if (This->state == State_Stopped) - return S_FALSE; + return VFW_E_WRONG_STATE; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -272,6 +269,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) return S_OK; } + if (This->state == State_Paused) + return S_OK; + cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream);

1 0

Maarten Lankhorst : wined3d: Fix a deadlock that may occur during initialization.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 422d71f630c8f90ca280494eaef8fda7674d1c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d71f630c8f90ca280494ea… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 2 20:08:10 2008 -0700 wined3d: Fix a deadlock that may occur during initialization. --- dlls/wined3d/directx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index acb147e..8811d0a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -770,6 +770,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } } } + + LEAVE_GL(); + /* Now work out what GL support this card really has */ #define USE_GL_FUNC(type, pfn, ext, replace) { \ DWORD ver = ver_for_ext(ext); \ @@ -784,6 +787,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { WGL_EXT_FUNCS_GEN; #undef USE_GL_FUNC + ENTER_GL(); /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* * loading the functions, otherwise the code above will load the extension entry points instead of the * core functions, which may not work

1 0

Michael Stefaniuc : gdiplus: Remove redundant NULL check before GdipFree ( Smatch).
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 808c5dbece015fd9183327a78e120d7b70811b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c5dbece015fd9183327a78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 2 23:39:01 2008 +0200 gdiplus: Remove redundant NULL check before GdipFree (Smatch). --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 98a4c43..78de0a6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -445,7 +445,7 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return InvalidParameter; TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName)); - if (FontFamily->FamilyName) GdipFree (FontFamily->FamilyName); + GdipFree (FontFamily->FamilyName); GdipFree (FontFamily); return Ok; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 93efbc4..59a8d53 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -190,7 +190,7 @@ static void test_fontfamily (void) stat = GdipDeleteFontFamily(*family); expect (Ok, stat); - if (family) GdipFree (family); + GdipFree (family); }

1 0

H. Verbeet : wined3d: Track depth stencil location per-surface.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 4f77c29bcf58a88cea8fb833f770aa107960b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f77c29bcf58a88cea8fb833f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 2 23:00:41 2008 +0200 wined3d: Track depth stencil location per-surface. This gets rid of depth_copy_state in the device, and instead tracks the most up to date location per-surface. This makes things a lot easier to follow, and allows us to make a copy when switching depth stencils in SetDepthStencilSurface(). --- dlls/wined3d/context.c | 3 - dlls/wined3d/device.c | 47 ++++++++----- dlls/wined3d/drawprim.c | 86 ++---------------------- dlls/wined3d/surface.c | 124 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 76 ++++++++++++--------- dlls/wined3d/wined3d_private_types.h | 7 -- 6 files changed, 199 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f77c29bcf58a88cea8fb…

1 0

H. Verbeet : wined3d: Use dst_fbo to do the depth blit.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: e7d0ef72ba5616d9e9c7d5f0af27db1328ccbf9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d0ef72ba5616d9e9c7d5f0a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 2 23:00:11 2008 +0200 wined3d: Use dst_fbo to do the depth blit. This makes the depth copy independent of the currently attached render targets. This is important for the next patch because it might do a depth copy when the render targets aren't in a valid configuration (SetDepthStencilSurface()). --- dlls/wined3d/device.c | 16 ++++++++++++++-- dlls/wined3d/drawprim.c | 25 +++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 6 ++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 03c6145..1f5a206 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2279,6 +2279,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D glDeleteTextures(1, &This->depth_blt_texture); This->depth_blt_texture = 0; } + if (This->depth_blt_rb) { + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); + This->depth_blt_rb = 0; + This->depth_blt_rb_w = 0; + This->depth_blt_rb_h = 0; + } This->shader_backend->shader_destroy_depth_blt(iface); This->shader_backend->shader_free_private(iface); @@ -6038,7 +6044,7 @@ static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { return NULL; } -static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { +void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; if (!*fbo) { @@ -6050,7 +6056,7 @@ static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { } /* TODO: Handle stencil attachments */ -static void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { +void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; if (use_render_buffer && depth_stencil_impl->current_renderbuffer) { @@ -7199,6 +7205,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE glDeleteTextures(1, &This->depth_blt_texture); This->depth_blt_texture = 0; } + if (This->depth_blt_rb) { + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); + This->depth_blt_rb = 0; + This->depth_blt_rb_w = 0; + This->depth_blt_rb_h = 0; + } This->shader_backend->shader_destroy_depth_blt(iface); This->shader_backend->shader_free_private(iface); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7214bf8..d3767a1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -802,10 +802,31 @@ void depth_copy(IWineD3DDevice *iface) { glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); glBindTexture(GL_TEXTURE_2D, old_binding); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); - checkGLcall("glBindFramebuffer()"); + /* Setup the destination */ + if (!This->depth_blt_rb) { + GL_EXTCALL(glGenRenderbuffersEXT(1, &This->depth_blt_rb)); + checkGLcall("glGenRenderbuffersEXT"); + } + if (This->depth_blt_rb_w != depth_stencil->currentDesc.Width + || This->depth_blt_rb_h != depth_stencil->currentDesc.Height) { + GL_EXTCALL(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, This->depth_blt_rb)); + checkGLcall("glBindRenderbufferEXT"); + GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, depth_stencil->currentDesc.Width, depth_stencil->currentDesc.Height)); + checkGLcall("glRenderbufferStorageEXT"); + This->depth_blt_rb_w = depth_stencil->currentDesc.Width; + This->depth_blt_rb_h = depth_stencil->currentDesc.Height; + } + + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->dst_fbo); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, This->depth_blt_rb)); + checkGLcall("glFramebufferRenderbufferEXT"); + attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, (IWineD3DSurface *)depth_stencil, FALSE); + + /* Do the actual blit */ depth_blt(iface, This->depth_blt_texture); checkGLcall("depth_blt"); + + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); } else { TRACE("Copying offscreen surface to onscreen depth buffer\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83955b9..24cf73b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -863,6 +863,9 @@ struct IWineD3DDeviceImpl GLuint dst_fbo; GLenum *draw_buffers; GLuint depth_blt_texture; + GLuint depth_blt_rb; + UINT depth_blt_rb_w; + UINT depth_blt_rb_h; /* Cursor management */ BOOL bCursorVisible; @@ -2437,4 +2440,7 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); +void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); +void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); + #endif

1 0

H. Verbeet : wined3d: Make sure the FBO doesn' t have any depth attachments in color_fill_fbo() and stretch_rect_fbo().
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 22421b84765037dbea10ed73c3faaf8016830b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22421b84765037dbea10ed73c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 2 22:59:49 2008 +0200 wined3d: Make sure the FBO doesn't have any depth attachments in color_fill_fbo() and stretch_rect_fbo(). Currently this is already true, but the next patch will break that assumption. --- dlls/wined3d/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7e157d..03c6145 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6156,6 +6156,8 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS TRACE("Surface %p is offscreen\n", surface); bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->dst_fbo); attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, surface); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); + checkGLcall("glFramebufferRenderbufferEXT"); } if (rect) { @@ -6611,6 +6613,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED attach_surface_fbo(This, GL_READ_FRAMEBUFFER_EXT, 0, src_surface); glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glReadBuffer()"); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_READ_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); + checkGLcall("glFramebufferRenderbufferEXT"); } LEAVE_GL(); @@ -6646,6 +6650,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface); glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glDrawBuffer()"); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_DRAW_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); + checkGLcall("glFramebufferRenderbufferEXT"); } glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));

1 0

Michael Karcher : winex11: Made local constant static.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 3d95f5e1c60556efc082fd4802f66a32ec3ca0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d95f5e1c60556efc082fd480… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Wed Jul 2 20:17:23 2008 +0200 winex11: Made local constant static. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 8988428..b816601 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4031,8 +4031,8 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, int bitmap_type; BOOL core_header; void* colorPtr; - const PALETTEENTRY peBlack = {0,0,0,0}; - const PALETTEENTRY peWhite = {255,255,255,0}; + static const PALETTEENTRY peBlack = {0,0,0,0}; + static const PALETTEENTRY peWhite = {255,255,255,0}; if (!physBitmap) return 0; if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0;

1 0

Owen Rudge : shell32: Check registry entry for cpl files ( in standard control panel).
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 9e6a7661d80ebebf005b55dd5177da5f24ef5c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6a7661d80ebebf005b55dd5… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 2 18:08:42 2008 +0100 shell32: Check registry entry for cpl files (in standard control panel). --- dlls/shell32/control.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 7afe8e9..2a58f67 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "wine/winbase16.h" #include "wownt32.h" #include "wine/debug.h" @@ -319,14 +320,42 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) } } +static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_root, LPCWSTR szRepPath) +{ + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; + HKEY hkey; + + if (RegOpenKeyW(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + { + int idx = 0; + + for(;; ++idx) + { + DWORD nameLen = MAX_PATH; + DWORD valueLen = MAX_PATH; + + if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + break; + + Control_LoadApplet(hWnd, value, panel); + } + RegCloseKey(hkey); + } +} + static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) { HANDLE h; WIN32_FIND_DATAW fd; WCHAR buffer[MAX_PATH]; static const WCHAR wszAllCpl[] = {'*','.','c','p','l',0}; + static const WCHAR wszRegPath[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','C','p','l','s',0}; WCHAR *p; + /* first add .cpl files in the system directory */ GetSystemDirectoryW( buffer, MAX_PATH ); p = buffer + strlenW(buffer); *p++ = '\\'; @@ -340,6 +369,10 @@ static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) FindClose(h); } + /* now check for cpls in the registry */ + Control_RegisterRegistryApplets(hWnd, panel, HKEY_LOCAL_MACHINE, wszRegPath); + Control_RegisterRegistryApplets(hWnd, panel, HKEY_CURRENT_USER, wszRegPath); + Control_DoInterface(panel, hWnd, hInst); }

1 0