wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Henri Verbeet : wined3d: Get rid of context_bind_fbo() calls outside context.c.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 33fafc6166c72624f159824145d1a8d5274ddf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fafc6166c72624f15982414… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:44 2011 +0200 wined3d: Get rid of context_bind_fbo() calls outside context.c. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 37 ++++++++++++++----------------------- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b0bc5f6..620a89b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -33,7 +33,7 @@ static DWORD wined3d_context_tls_idx; /* FBO helper functions */ /* GL locking is done by the caller */ -void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) +static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; GLuint f; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9422a0b..7c5b6d9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5010,6 +5010,7 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF struct wined3d_context *context; RECT src_rect, dst_rect; GLenum gl_filter; + GLenum buffer; TRACE("device %p, filter %s,\n", device, debug_d3dtexturefiltertype(filter)); TRACE("src_surface %p, src_location %s, src_rect %s,\n", @@ -5062,48 +5063,38 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF if (src_location == SFLAG_INDRAWABLE) { - GLenum buffer = surface_get_gl_buffer(src_surface); - TRACE("Source surface %p is onscreen.\n", src_surface); - + buffer = surface_get_gl_buffer(src_surface); surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); - - ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, NULL); - glReadBuffer(buffer); - checkGLcall("glReadBuffer()"); } else { TRACE("Source surface %p is offscreen.\n", src_surface); - ENTER_GL(); - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL, src_location); - glReadBuffer(GL_COLOR_ATTACHMENT0); - checkGLcall("glReadBuffer()"); + buffer = GL_COLOR_ATTACHMENT0; } + + ENTER_GL(); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL, src_location); + glReadBuffer(buffer); + checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); LEAVE_GL(); if (dst_location == SFLAG_INDRAWABLE) { - GLenum buffer = surface_get_gl_buffer(dst_surface); - TRACE("Destination surface %p is onscreen.\n", dst_surface); - + buffer = surface_get_gl_buffer(dst_surface); surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - - ENTER_GL(); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, buffer); } else { TRACE("Destination surface %p is offscreen.\n", dst_surface); - - ENTER_GL(); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); - context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); + buffer = GL_COLOR_ATTACHMENT0; } + + ENTER_GL(); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a7e61fb..5ad6966 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -306,7 +306,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, glReadBuffer(GL_COLOR_ATTACHMENT0); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); context_set_draw_buffer(context, GL_BACK); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -350,7 +350,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, gl_filter = GL_NEAREST; ENTER_GL(); - context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbf8641..17e8b41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1233,7 +1233,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; -void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of dst_fbo.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: dcc969c32ce479ddeed7277f04c18994a017dfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc969c32ce479ddeed7277f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:43 2011 +0200 wined3d: Get rid of dst_fbo. As a result we can get rid of a couple of other things as well. --- dlls/wined3d/context.c | 13 ++++--------- dlls/wined3d/device.c | 16 ---------------- dlls/wined3d/surface.c | 30 +++++++----------------------- dlls/wined3d/wined3d_private.h | 6 ------ 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fbfb843..b0bc5f6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -112,8 +112,8 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) } /* GL locking is done by the caller */ -void context_attach_depth_stencil_fbo(const struct wined3d_context *context, - GLenum fbo_target, struct wined3d_surface *depth_stencil, BOOL use_render_buffer) +static void context_attach_depth_stencil_fbo(const struct wined3d_context *context, + GLenum fbo_target, struct wined3d_surface *depth_stencil) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -123,7 +123,7 @@ void context_attach_depth_stencil_fbo(const struct wined3d_context *context, { DWORD format_flags = depth_stencil->resource.format->flags; - if (use_render_buffer && depth_stencil->current_renderbuffer) + if (depth_stencil->current_renderbuffer) { if (format_flags & WINED3DFMT_FLAG_DEPTH) { @@ -381,7 +381,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply depth targets */ if (entry->depth_stencil) surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); - context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, TRUE); + context_attach_depth_stencil_fbo(context, target, entry->depth_stencil); entry->attached = TRUE; } @@ -863,11 +863,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (context->valid) { - if (context->dst_fbo) - { - TRACE("Destroy dst FBO %d\n", context->dst_fbo); - context_destroy_fbo(context, &context->dst_fbo); - } if (context->dummy_arbfp_prog) { GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d88b57..b694e2b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1437,15 +1437,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) LEAVE_GL(); device->depth_blt_texture = 0; } - if (device->depth_blt_rb) - { - ENTER_GL(); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &device->depth_blt_rb); - LEAVE_GL(); - device->depth_blt_rb = 0; - device->depth_blt_rb_w = 0; - device->depth_blt_rb_h = 0; - } /* Release the update stateblock */ if (wined3d_stateblock_decref(device->updateStateBlock)) @@ -5526,13 +5517,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d glDeleteTextures(1, &device->depth_blt_texture); device->depth_blt_texture = 0; } - if (device->depth_blt_rb) - { - gl_info->fbo_ops.glDeleteRenderbuffers(1, &device->depth_blt_rb); - device->depth_blt_rb = 0; - device->depth_blt_rb_w = 0; - device->depth_blt_rb_h = 0; - } if (device->cursorTexture) { glDeleteTextures(1, &device->cursorTexture); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0b73433..9422a0b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5705,7 +5705,8 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, + context->swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); @@ -5733,27 +5734,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co glTexParameteri(bind_target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); glBindTexture(bind_target, old_binding); - /* Setup the destination */ - if (!device->depth_blt_rb) - { - gl_info->fbo_ops.glGenRenderbuffers(1, &device->depth_blt_rb); - checkGLcall("glGenRenderbuffersEXT"); - } - if (device->depth_blt_rb_w != w || device->depth_blt_rb_h != h) - { - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, device->depth_blt_rb); - checkGLcall("glBindRenderbufferEXT"); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, w, h); - checkGLcall("glRenderbufferStorageEXT"); - device->depth_blt_rb_w = w; - device->depth_blt_rb_h = h; - } - - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, device->depth_blt_rb); - checkGLcall("glFramebufferRenderbufferEXT"); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, + NULL, surface, SFLAG_INTEXTURE); + context_set_draw_buffer(context, GL_NONE); /* Do the actual blit */ surface_depth_blt(surface, gl_info, device->depth_blt_texture, 0, 0, w, h, bind_target); @@ -5771,7 +5754,8 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, + context->swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); surface_depth_blt(surface, gl_info, surface->texture_name, 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4e3f3e..fbf8641 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1105,7 +1105,6 @@ struct wined3d_context struct list fbo_list; struct list fbo_destroy_list; struct fbo_entry *current_fbo; - GLuint dst_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; BOOL rebind_fbo; @@ -1234,8 +1233,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; -void context_attach_depth_stencil_fbo(const struct wined3d_context *context, - GLenum fbo_target, struct wined3d_surface *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(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, @@ -1705,9 +1702,6 @@ struct wined3d_device /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture; - GLuint depth_blt_rb; - UINT depth_blt_rb_w; - UINT depth_blt_rb_h; /* Cursor management */ UINT xHotSpot;

1 0

Henri Verbeet : wined3d: Just invalidate STATE_FRAMEBUFFER in surface_load_ds_location().
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: ccb3a51a44beb0a57bbd588c70c1add2ce9c2ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb3a51a44beb0a57bbd588c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:42 2011 +0200 wined3d: Just invalidate STATE_FRAMEBUFFER in surface_load_ds_location(). --- dlls/wined3d/surface.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3d9bfb7..0b73433 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5759,8 +5759,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co surface_depth_blt(surface, gl_info, device->depth_blt_texture, 0, 0, w, h, bind_target); checkGLcall("depth_blt"); - if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); - else context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_invalidate_state(context, STATE_FRAMEBUFFER); LEAVE_GL(); @@ -5777,7 +5776,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt"); - if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); + context_invalidate_state(context, STATE_FRAMEBUFFER); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Apply clear state after depth / stencil setup in device_clear_render_targets().
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 4428bda4a11658de88b573473746cdc31112d26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4428bda4a11658de88b573473… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:41 2011 +0200 wined3d: Apply clear state after depth / stencil setup in device_clear_render_targets(). --- dlls/wined3d/device.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84c7789..7d88b57 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -680,13 +680,6 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count return WINED3D_OK; } - if (!context_apply_clear_state(context, device, rt_count, fb)) - { - context_release(context); - WARN("Failed to apply clear state, skipping clear.\n"); - return WINED3D_OK; - } - if (target) { render_offscreen = context->render_offscreen; @@ -699,6 +692,22 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count drawable_height = fb->depth_stencil->pow2Height; } + if (flags & WINED3DCLEAR_ZBUFFER) + { + DWORD location = render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + + if (location == SFLAG_DS_ONSCREEN && fb->depth_stencil != device->onscreen_depth_stencil) + device_switch_onscreen_ds(device, context, fb->depth_stencil); + prepare_ds_clear(fb->depth_stencil, context, location, draw_rect, rect_count, clear_rect); + } + + if (!context_apply_clear_state(context, device, rt_count, fb)) + { + context_release(context); + WARN("Failed to apply clear state, skipping clear.\n"); + return WINED3D_OK; + } + ENTER_GL(); /* Only set the values up once, as they are not changing. */ @@ -718,15 +727,6 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - - if (location == SFLAG_DS_ONSCREEN && fb->depth_stencil != device->onscreen_depth_stencil) - { - LEAVE_GL(); - device_switch_onscreen_ds(device, context, fb->depth_stencil); - ENTER_GL(); - } - prepare_ds_clear(fb->depth_stencil, context, location, draw_rect, rect_count, clear_rect); surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); glDepthMask(GL_TRUE);

1 0

Henri Verbeet : wined3d: Apply draw state after depth / stencil setup in drawPrimitive().
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 03eb6a4aa6e18f102a1f59789833c50f50ac3222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03eb6a4aa6e18f102a1f59789… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:40 2011 +0200 wined3d: Apply draw state after depth / stencil setup in drawPrimitive(). --- dlls/wined3d/drawprim.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6133182..5f2198e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -608,13 +608,6 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId return; } - if (!context_apply_draw_state(context, device)) - { - context_release(context); - WARN("Unable to apply draw state, skipping draw.\n"); - return; - } - if (device->fb.depth_stencil) { /* Note that this depends on the context_acquire() call above to set @@ -650,6 +643,13 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId } } + if (!context_apply_draw_state(context, device)) + { + context_release(context); + WARN("Unable to apply draw state, skipping draw.\n"); + return; + } + if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0] || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) && context->render_offscreen

1 0

Jacek Caban : winnt.h: Added LOCALE_CUSTOM_* declarations.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: d60b53761b3dcaa1f31ddd3e0e87d229e60b9949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60b53761b3dcaa1f31ddd3e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 14:51:21 2011 +0200 winnt.h: Added LOCALE_CUSTOM_* declarations. --- include/winnt.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 73a2ae8..0be6040 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1970,6 +1970,10 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) #define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)) #define LOCALE_INVARIANT (MAKELCID(MAKELANGID(LANG_INVARIANT,SUBLANG_NEUTRAL),SORT_DEFAULT)) +#define LOCALE_CUSTOM_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_DEFAULT),SORT_DEFAULT)) +#define LOCALE_CUSTOM_UNSPECIFIED (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_UNSPECIFIED),SORT_DEFAULT)) +#define LOCALE_CUSTOM_UI_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_UI_CUSTOM_DEFAULT),SORT_DEFAULT)) + #define UNREFERENCED_PARAMETER(u) (void)(u) #define DBG_UNREFERENCED_PARAMETER(u) (void)(u)

1 0

Jacek Caban : iexplore: Use ieframe instead of shdocvw.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 89817dec10086a0cf1afac4f34f63c1d6af2c011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89817dec10086a0cf1afac4f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:25:05 2011 +0200 iexplore: Use ieframe instead of shdocvw. --- programs/iexplore/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 1c1e191..9bdd85d 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows -IMPORTS = shdocvw +IMPORTS = ieframe DELAYIMPORTS = advpack version C_SRCS = \

1 0

Jacek Caban : shdocvw: Moved remaining code out of factory.c.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 598e4405223142e0a274d09b460fe66ffc9636d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598e4405223142e0a274d09b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:24:41 2011 +0200 shdocvw: Moved remaining code out of factory.c. --- dlls/shdocvw/Makefile.in | 1 - dlls/shdocvw/factory.c | 109 ------------------------------------------- dlls/shdocvw/shdocvw_main.c | 74 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 110 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 0a44a60..74fad95 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -5,7 +5,6 @@ IMPORTS = uuid shlwapi DELAYIMPORTS = version ole32 oleaut32 ieframe C_SRCS = \ - factory.c \ shdocvw_main.c \ shlinstobj.c diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c deleted file mode 100644 index 246b852..0000000 --- a/dlls/shdocvw/factory.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Implementation of class factory for IE Web Browser - * - * Copyright 2001 John R. Sheets (for CodeWeavers) - * - * 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 - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <string.h> -#include <stdio.h> - -#include "shdocvw.h" -#include "winreg.h" -#include "isguids.h" - -#include "winver.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); - -/********************************************************************** - * Implement the WebBrowser class factory - */ - -static HRESULT get_ieframe_object(REFCLSID rclsid, REFIID riid, void **ppv) -{ - HINSTANCE ieframe_instance; - - static HRESULT (WINAPI *ieframe_DllGetClassObject)(REFCLSID,REFIID,void**); - - if(!ieframe_DllGetClassObject) { - ieframe_instance = get_ieframe_instance(); - if(!ieframe_instance) - return CLASS_E_CLASSNOTAVAILABLE; - - ieframe_DllGetClassObject = (void*)GetProcAddress(ieframe_instance, "DllGetClassObject"); - if(!ieframe_DllGetClassObject) - return CLASS_E_CLASSNOTAVAILABLE; - } - - return ieframe_DllGetClassObject(rclsid, riid, ppv); -} - -/************************************************************************* - * DllGetClassObject (SHDOCVW.@) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - TRACE("\n"); - - if(IsEqualGUID(&CLSID_WebBrowser, rclsid) - || IsEqualGUID(&CLSID_WebBrowser_V1, rclsid) - || IsEqualGUID(&CLSID_InternetShortcut, rclsid) - || IsEqualGUID(&CLSID_CUrlHistory, rclsid) - || IsEqualGUID(&CLSID_TaskbarList, rclsid)) - return get_ieframe_object(rclsid, riid, ppv); - - /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ - return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); -} - -/*********************************************************************** - * DllRegisterServer (shdocvw.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - TRACE("\n"); - return S_OK; -} - -/*********************************************************************** - * DllUnregisterServer (shdocvw.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - TRACE("\n"); - return S_OK; -} - -/****************************************************************** - * IEWinMain (SHDOCVW.101) - * - * Only returns on error. - */ -DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) -{ - DWORD (WINAPI *pIEWinMain)(LPSTR,int); - - TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - - pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); - if(!pIEWinMain) - ExitProcess(1); - - return pIEWinMain(szCommandLine, nShowWindow); -} diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 36233b5..2bfe3c9 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -33,6 +33,7 @@ #include "winreg.h" #include "shlwapi.h" #include "wininet.h" +#include "isguids.h" #include "initguid.h" @@ -54,6 +55,79 @@ HINSTANCE get_ieframe_instance(void) return ieframe_instance; } +static HRESULT get_ieframe_object(REFCLSID rclsid, REFIID riid, void **ppv) +{ + HINSTANCE ieframe_instance; + + static HRESULT (WINAPI *ieframe_DllGetClassObject)(REFCLSID,REFIID,void**); + + if(!ieframe_DllGetClassObject) { + ieframe_instance = get_ieframe_instance(); + if(!ieframe_instance) + return CLASS_E_CLASSNOTAVAILABLE; + + ieframe_DllGetClassObject = (void*)GetProcAddress(ieframe_instance, "DllGetClassObject"); + if(!ieframe_DllGetClassObject) + return CLASS_E_CLASSNOTAVAILABLE; + } + + return ieframe_DllGetClassObject(rclsid, riid, ppv); +} + +/************************************************************************* + * DllGetClassObject (SHDOCVW.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + TRACE("\n"); + + if(IsEqualGUID(&CLSID_WebBrowser, rclsid) + || IsEqualGUID(&CLSID_WebBrowser_V1, rclsid) + || IsEqualGUID(&CLSID_InternetShortcut, rclsid) + || IsEqualGUID(&CLSID_CUrlHistory, rclsid) + || IsEqualGUID(&CLSID_TaskbarList, rclsid)) + return get_ieframe_object(rclsid, riid, ppv); + + /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ + return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); +} + +/*********************************************************************** + * DllRegisterServer (shdocvw.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (shdocvw.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("\n"); + return S_OK; +} + +/****************************************************************** + * IEWinMain (SHDOCVW.101) + * + * Only returns on error. + */ +DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) +{ + DWORD (WINAPI *pIEWinMain)(LPSTR,int); + + TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); + + pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); + if(!pIEWinMain) + ExitProcess(1); + + return pIEWinMain(szCommandLine, nShowWindow); +} + /************************************************************************* * SHDOCVW DllMain */

1 0

Jacek Caban : ieframe: Moved classes registration to ieframe.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 908d8333a8f03ae3c143dc613696791815571aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=908d8333a8f03ae3c143dc613… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:24:23 2011 +0200 ieframe: Moved classes registration to ieframe. --- dlls/ieframe/Makefile.in | 1 + dlls/ieframe/ieframe.rc | 3 ++ dlls/{shdocvw/shdocvw.rgs => ieframe/ieframe.rgs} | 2 +- dlls/ieframe/ieframe_main.c | 9 +++--- dlls/ieframe/ieframe_v1.idl | 30 +++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 - dlls/shdocvw/factory.c | 5 +-- dlls/shdocvw/shdocvw.rc | 3 -- dlls/shdocvw/shdocvw_v1.idl | 30 --------------------- tools/wine.inf.in | 1 + 10 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 7d730e6..7aec229 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -48,5 +48,6 @@ SVG_SRCS = \ ietoolbar.svg IDL_TLB_SRCS = ieframe_v1.idl +IDL_R_SRCS = ieframe_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index 58f6fb7..13b6a5f 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -90,3 +90,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp + +/* @makedep: ieframe.rgs */ +2 WINE_REGISTRY ieframe.rgs diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/ieframe/ieframe.rgs similarity index 96% rename from dlls/shdocvw/shdocvw.rgs rename to dlls/ieframe/ieframe.rgs index 8f8bc53..f40dbd1 100644 --- a/dlls/shdocvw/shdocvw.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -48,7 +48,7 @@ HKCR { open { - command = s 'rundll32.exe shdocvw.dll,OpenURL %%l' + command = s 'rundll32.exe ieframe.dll,OpenURL %%l' } print { diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 4f4aaf8..bf6ac02 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -18,6 +18,7 @@ #include "ieframe.h" +#include "rpcproxy.h" #include "shlguid.h" #include "isguids.h" @@ -277,8 +278,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_register_resources(ieframe_instance, NULL); } /*********************************************************************** @@ -286,6 +287,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_unregister_resources(ieframe_instance, NULL); } diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl index 45b9111..f4f7954 100644 --- a/dlls/ieframe/ieframe_v1.idl +++ b/dlls/ieframe/ieframe_v1.idl @@ -17,3 +17,33 @@ */ #include "exdisp.idl" + +[ + threading(apartment), + uuid(871c5380-42a0-1069-a2ea-08002b30309d) +] coclass Internet { } + +[ + helpstring("Microsoft Url History Service"), + threading(apartment), + uuid(3c374a40-bae4-11cf-bf7d-00aa006946ee) +] coclass CUrlHistory { interface IUrlHistoryStg2; } + +[ + helpstring("Task Bar Communication"), + threading(apartment), + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) +] coclass TaskbarList { interface ITaskbarList; } + +[ + helpstring("Internet Shortcut"), + threading(apartment), + progid("InternetShortcut"), + uuid(fbf23b40-e3f0-101b-8488-00aa003e56f8) +] coclass InternetShortcut +{ + interface IUniformResourceLocatorA; + interface IUniformResourceLocatorW; + interface IPersistFile; + interface IPropertySetStorage; +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index d7f160e..0a44a60 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -13,6 +13,5 @@ RC_SRCS = \ shdocvw.rc IDL_TLB_SRCS = shdocvw_v1.idl -IDL_R_SRCS = shdocvw_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index ce6ddb9..246b852 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -23,7 +23,6 @@ #include "shdocvw.h" #include "winreg.h" -#include "rpcproxy.h" #include "isguids.h" #include "winver.h" @@ -79,7 +78,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); - return __wine_register_resources( shdocvw_hinstance, NULL ); + return S_OK; } /*********************************************************************** @@ -88,7 +87,7 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); - return __wine_unregister_resources( shdocvw_hinstance, NULL ); + return S_OK; } /****************************************************************** diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 555eabd..0c7dd7a 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -32,6 +32,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw_v1.tlb */ 1 TYPELIB shdocvw_v1.tlb - -/* @makedep: shdocvw.rgs */ -2 WINE_REGISTRY shdocvw.rgs diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index ad6b72b..45b9111 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -17,33 +17,3 @@ */ #include "exdisp.idl" - -[ - threading(apartment), - uuid(871c5380-42a0-1069-a2ea-08002b30309d) -] coclass Internet { } - -[ - helpstring("Microsoft Url History Service"), - threading(apartment), - uuid(3c374a40-bae4-11cf-bf7d-00aa006946ee) -] coclass CUrlHistory { interface IUrlHistoryStg2; } - -[ - helpstring("Task Bar Communication"), - threading(apartment), - uuid(56fdf344-fd6d-11d0-958a-006097c9a090) -] coclass TaskbarList { interface ITaskbarList; } - -[ - helpstring("Internet Shortcut"), - threading(apartment), - progid("InternetShortcut"), - uuid(fbf23b40-e3f0-101b-8488-00aa003e56f8) -] coclass InternetShortcut -{ - interface IUniformResourceLocatorA; - interface IUniformResourceLocatorW; - interface IPersistFile; - interface IPropertySetStorage; -} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 69124be..47c5824 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2527,6 +2527,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,hhctrl.ocx,1 11,,hlink.dll,1 11,,hnetcfg.dll,1 +11,,ieframe.dll,1 11,,inetcomm.dll,1 11,,infosoft.dll,1 11,,inseng.dll,1

1 0

Jacek Caban : shdocvw: Get rid of MicrosoftBrowserArchitecture registration .
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 60f65e331fff487c24a55b6b4a5ec6b95ee3a90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f65e331fff487c24a55b6b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:23:50 2011 +0200 shdocvw: Get rid of MicrosoftBrowserArchitecture registration. --- dlls/shdocvw/shdocvw_v1.idl | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index 94ef4cd..ad6b72b 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -19,12 +19,6 @@ #include "exdisp.idl" [ - helpstring("Microsoft Browser Architecture"), - threading(apartment), - uuid(a5e46e3a-8849-11d1-9d8c-00c04fc99d61) -] coclass MicrosoftBrowserArchitecture { } - -[ threading(apartment), uuid(871c5380-42a0-1069-a2ea-08002b30309d) ] coclass Internet { }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011