wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: Make the shader parameter to init_output_registers () const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3a9001fbb63491c3386504315706a9341530855e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9001fbb63491c3386504315… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:28 2011 +0100 wined3d: Make the shader parameter to init_output_registers() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a53f04a..ea404cb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3927,7 +3927,7 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(struct wined3d_shader *shader, DWORD sig_num, +static void init_output_registers(const struct wined3d_shader *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx, struct arb_vs_compiled_shader *compiled) { unsigned int i, j;

1 0

Henri Verbeet : wined3d: Make some parameters to shader_generate_arb_declarations() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: e71830625533fef913a8a50cb06f447abc25b4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71830625533fef913a8a50cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:27 2011 +0100 wined3d: Make some parameters to shader_generate_arb_declarations() const. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1573c17..a53f04a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -725,10 +725,10 @@ static DWORD *local_const_mapping(const struct wined3d_shader *shader) } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(struct wined3d_shader *shader, +static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, - const struct wined3d_gl_info *gl_info, DWORD *lconst_map, - DWORD *num_clipplanes, struct shader_arb_ctx_priv *ctx) + const struct wined3d_gl_info *gl_info, const DWORD *lconst_map, + DWORD *num_clipplanes, const struct shader_arb_ctx_priv *ctx) { DWORD i, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type);

1 0

Henri Verbeet : wined3d: Merge surface_getdc() and gdi_surface_getdc().
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3f11631e75442320da1b64b26b6dd15fd8147579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f11631e75442320da1b64b26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:26 2011 +0100 wined3d: Merge surface_getdc() and gdi_surface_getdc(). --- dlls/wined3d/surface.c | 90 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 28 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6713f98..5568695 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1029,43 +1029,6 @@ done: surface->surface_ops->surface_draw_overlay(surface); } -static HRESULT surface_getdc(struct wined3d_surface *surface) -{ - WINED3DLOCKED_RECT lock; - HRESULT hr; - - TRACE("surface %p.\n", surface); - - /* Create a DIB section if there isn't a dc yet. */ - if (!surface->hDC) - { - if (surface->flags & SFLAG_CLIENT) - { - surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_release_client_storage(surface); - } - hr = surface_create_dib_section(surface); - if (FAILED(hr)) - return WINED3DERR_INVALIDCALL; - - /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & SFLAG_PBO)) - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - - /* Map the surface. */ - hr = wined3d_surface_map(surface, &lock, NULL, 0); - if (FAILED(hr)) - ERR("Map failed, hr %#x.\n", hr); - - /* Sync the DIB with the PBO. This can't be done earlier because Map() - * activates the allocatedMemory. */ - if (surface->flags & SFLAG_PBO) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); - - return hr; -} - static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) @@ -1956,7 +1919,6 @@ static const struct wined3d_surface_ops surface_ops = surface_preload, surface_map, surface_unmap, - surface_getdc, }; /***************************************************************************** @@ -2085,28 +2047,6 @@ static void gdi_surface_unmap(struct wined3d_surface *surface) memset(&surface->lockedRect, 0, sizeof(RECT)); } -static HRESULT gdi_surface_getdc(struct wined3d_surface *surface) -{ - WINED3DLOCKED_RECT lock; - HRESULT hr; - - TRACE("surface %p.\n", surface); - - /* Should have a DIB section already. */ - if (!(surface->flags & SFLAG_DIBSECTION)) - { - WARN("DC not supported on this surface\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Map the surface. */ - hr = wined3d_surface_map(surface, &lock, NULL, 0); - if (FAILED(hr)) - ERR("Map failed, hr %#x.\n", hr); - - return hr; -} - static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, @@ -2115,7 +2055,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_preload, gdi_surface_map, gdi_surface_unmap, - gdi_surface_getdc, }; void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) @@ -3862,6 +3801,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { + WINED3DLOCKED_RECT lock; HRESULT hr; TRACE("surface %p, dc %p.\n", surface, dc); @@ -3880,9 +3820,35 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (surface->flags & SFLAG_LOCKED) return WINED3DERR_INVALIDCALL; - hr = surface->surface_ops->surface_getdc(surface); + /* Create a DIB section if there isn't a dc yet. */ + if (!surface->hDC) + { + if (surface->flags & SFLAG_CLIENT) + { + surface_load_location(surface, SFLAG_INSYSMEM, NULL); + surface_release_client_storage(surface); + } + hr = surface_create_dib_section(surface); + if (FAILED(hr)) + return WINED3DERR_INVALIDCALL; + + /* Use the DIB section from now on if we are not using a PBO. */ + if (!(surface->flags & SFLAG_PBO)) + surface->resource.allocatedMemory = surface->dib.bitmap_data; + } + + /* Map the surface. */ + hr = wined3d_surface_map(surface, &lock, NULL, 0); if (FAILED(hr)) + { + ERR("Map failed, hr %#x.\n", hr); return hr; + } + + /* Sync the DIB with the PBO. This can't be done earlier because Map() + * activates the allocatedMemory. */ + if (surface->flags & SFLAG_PBO) + memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4adfa83..098d03a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2004,7 +2004,6 @@ struct wined3d_surface_ops void (*surface_preload)(struct wined3d_surface *surface); void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); - HRESULT (*surface_getdc)(struct wined3d_surface *surface); }; struct wined3d_surface

1 0

Henri Verbeet : wined3d: Add fallbacks for d3d9 and d3d10 cards in select_card_amd_mesa().
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 739dbab46e1ce2b00b395a8430fc046b31b6c743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739dbab46e1ce2b00b395a843… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:25 2011 +0100 wined3d: Add fallbacks for d3d9 and d3d10 cards in select_card_amd_mesa(). --- dlls/wined3d/directx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0fce621..2e63a1a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1932,6 +1932,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_AMD_RADEON_HD2600; + if (d3d_level >= 9) { static const struct @@ -1966,6 +1969,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info if (strstr(gl_renderer, cards[i].renderer)) return cards[i].id; } + + return CARD_AMD_RADEON_9500; } if (d3d_level >= 8)

1 0

Henri Verbeet : wined3d: Avoid a drawable -> texture transfer through sysmem in arbfp_blit_surface() with backbuffer ORM.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3bfecd58d282ac50463f659e427a2d3d86d12334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfecd58d282ac50463f659e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:24 2011 +0100 wined3d: Avoid a drawable -> texture transfer through sysmem in arbfp_blit_surface() with backbuffer ORM. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++--- dlls/wined3d/surface.c | 26 +++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8fd0714..1573c17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7270,14 +7270,29 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win } HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { struct wined3d_context *context; + RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; /* Now load the surface */ - surface_internal_preload(src_surface, SRGB_RGB); + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + { + /* Without FBO blits transfering from the drawable to the texture is + * expensive, because we have to flip the data in sysmem. Since we can + * flip in the blitter, we don't actually need that flip anyway. So we + * use the surface's texture as scratch texture, and flip the source + * rectangle instead. */ + surface_load_fb_texture(src_surface, FALSE); + + src_rect.top = src_surface->resource.height - src_rect.top; + src_rect.bottom = src_surface->resource.height - src_rect.bottom; + } + else + surface_internal_preload(src_surface, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface); @@ -7291,7 +7306,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, ENTER_GL(); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, src_rect, &dst_rect, filter); + draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); LEAVE_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f75593d..6713f98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4310,25 +4310,14 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } } -/* Read the framebuffer contents into a texture */ -static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL srgb) +/* Read the framebuffer contents into a texture. Note that this function + * doesn't do any kind of flipping. Using this on an onscreen surface will + * result in a flipped D3D texture. */ +void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) { struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; - if (!surface_is_offscreen(surface)) - { - /* We would need to flip onscreen surfaces, but there's no efficient - * way to do that here. It makes more sense for the caller to - * explicitly go through sysmem. */ - ERR("Not supported for onscreen targets.\n"); - return; - } - - /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer - * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any - * states in the stateblock, and no driver was found yet that had bugs in that regard. - */ context = context_acquire(device, surface); device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -4339,7 +4328,10 @@ static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL ENTER_GL(); - glReadBuffer(device->offscreenBuffer); + if (surface_is_offscreen(surface)) + glReadBuffer(device->offscreenBuffer); + else + glReadBuffer(surface_get_gl_buffer(surface)); checkGLcall("glReadBuffer"); glCopyTexSubImage2D(surface->texture_target, surface->texture_level, @@ -6037,7 +6029,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, && surface_is_offscreen(surface) && (surface->flags & SFLAG_INDRAWABLE)) { - read_from_framebuffer_texture(surface, srgb); + surface_load_fb_texture(surface, srgb); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90a70b4..4adfa83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2088,6 +2088,7 @@ BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN;

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: c872590a42b7e8f747ecbabbafe705ae193d941e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c872590a42b7e8f747ecbabba… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Nov 3 18:13:48 2011 +0100 po: Update Polish translation. --- po/pl.po | 236 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 130 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c872590a42b7e8f747ecb…

1 0

Claudio Fontana : wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 485571539f5c27a5bd391ae69e436d774f8b9276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485571539f5c27a5bd391ae69… Author: Claudio Fontana <claudio.fontana(a)gmail.com> Date: Thu Nov 3 01:03:37 2011 +0100 wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id. --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5422a74..0fce621 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,7 +1154,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, @@ -1522,7 +1523,8 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ - {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ + {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a987d5..90a70b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1404,7 +1404,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, - CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080,

1 0

Austin English : urlmon: Add some more tests for FindMimeFromData().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: aa80ce8cf7058e43f93a5a7f5cce6fe143a3982e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa80ce8cf7058e43f93a5a7f5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 1 22:17:45 2011 -0700 urlmon: Add some more tests for FindMimeFromData(). --- dlls/urlmon/tests/misc.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d9aebc7..cc69c72 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -733,6 +733,31 @@ static void test_FindMimeFromData(void) ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, excepted E_INVALIDARG\n", hres);

1 0

Austin English : wininet: Add a stub for ShowClientAuthCerts.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 25bc31ac2e8a07ed59bcbc734c79fb7af18a8803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc31ac2e8a07ed59bcbc734… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 31 11:37:47 2011 -0700 wininet: Add a stub for ShowClientAuthCerts. --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 020fe2c..43be36d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4385,3 +4385,9 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) FIXME("(%p, %08lx) stub\n", a, b); return 0; } + +DWORD WINAPI ShowClientAuthCerts(HWND parent) +{ + FIXME("%p: stub\n", parent); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 2773d4b..1e651b5 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -234,7 +234,7 @@ @ stdcall SetUrlCacheGroupAttributeW(int64 long long ptr ptr) @ stub SetUrlCacheHeaderData @ stub ShowCertificate -@ stub ShowClientAuthCerts +@ stdcall ShowClientAuthCerts(ptr) @ stub ShowSecurityInfo @ stdcall ShowX509EncodedCertificate(ptr ptr long) @ stdcall UnlockUrlCacheEntryFile(str long) UnlockUrlCacheEntryFileA

1 0

Jacek Caban : mshtml: Fixed ref count leaks.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 92d55a84d674be49bd570d51663967d5e524e15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d55a84d674be49bd570d516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 19:26:07 2011 +0100 mshtml: Fixed ref count leaks. --- dlls/mshtml/htmlelem.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9d9fc8d..36103be 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) nsAString_InitDepend(&html_str, v); nsres = nsIDOMNSHTMLElement_SetInnerHTML(nselem, &html_str); nsAString_Finish(&html_str); - + nsIDOMNSHTMLElement_Release(nselem); if(NS_FAILED(nsres)) { FIXME("SetInnerHtml failed %08x\n", nsres); return E_FAIL; @@ -1069,6 +1069,7 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) nsAString_Init(&html_str, NULL); nsres = nsIDOMNSHTMLElement_GetInnerHTML(nselem, &html_str); + nsIDOMNSHTMLElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { const PRUnichar *html;

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
86
Older →

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 November 2011