wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Alexandre Julliard : make_unicode: Fix typo in Indic syllable table generation.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: cb65a3fbf995870bb97c442fd7bcce02d5b6607a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb65a3fbf995870bb97c442fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:58:53 2016 +0900 make_unicode: Fix typo in Indic syllable table generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indicsyllable.c | 212 +++++++++++++++++++++++++-------------------- tools/make_unicode | 2 +- 2 files changed, 118 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb65a3fbf995870bb97c4…

1 0

Alexandre Julliard : libwine: Map partial DBCS characters to the default char.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 62033734961f29ea95c489700648026949da4b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62033734961f29ea95c489700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:44:26 2016 +0900 libwine: Map partial DBCS characters to the default char. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 8 ++++---- libs/wine/c_10001.c | 16 ++++++++-------- libs/wine/c_10002.c | 24 ++++++++++++------------ libs/wine/c_10003.c | 24 ++++++++++++------------ libs/wine/c_10008.c | 22 +++++++++++----------- libs/wine/c_1361.c | 32 ++++++++++++++++---------------- libs/wine/c_20932.c | 30 +++++++++++++++--------------- libs/wine/c_932.c | 16 ++++++++-------- libs/wine/c_936.c | 32 ++++++++++++++++---------------- libs/wine/c_949.c | 32 ++++++++++++++++---------------- libs/wine/c_950.c | 32 ++++++++++++++++---------------- libs/wine/mbtowc.c | 16 ++++++++-------- tools/make_unicode | 4 ++-- 13 files changed, 144 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62033734961f29ea95c48…

1 0

Riccardo Bortolato : wined3d: Get rid of wined3d_device_get_surface_from_dc().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: b278bb8f5670a123b25d51fd8c927cb4f896a574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278bb8f5670a123b25d51fd8… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Feb 8 18:32:06 2016 +0100 wined3d: Get rid of wined3d_device_get_surface_from_dc(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 37 +++++++++++++++++++------------ dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 55 +++++++++++++++++++++++++++------------------- dlls/wined3d/device.c | 26 ---------------------- dlls/wined3d/surface.c | 7 ------ dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 7 files changed, 56 insertions(+), 74 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 89ce07a..5ffc951 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2621,29 +2621,38 @@ static HRESULT WINAPI ddraw4_GetDeviceIdentifier(IDirectDraw4 *iface, * Always returns DD_OK because it's a stub * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, - IDirectDrawSurface7 **Surface) +static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, + HDC dc, IDirectDrawSurface7 **surface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); - struct wined3d_surface *wined3d_surface; struct ddraw_surface *surface_impl; - TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); + TRACE("iface %p, dc %p, surface %p.\n", iface, dc, surface); + + if (!surface) + return E_INVALIDARG; - if (!Surface) return E_INVALIDARG; + if (!dc) + goto done; - if (!(wined3d_surface = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc))) + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface_impl, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) { - TRACE("No surface found for dc %p.\n", hdc); - *Surface = NULL; - return DDERR_NOTFOUND; + if (surface_impl->dc != dc) + continue; + + TRACE("Found surface %p for dc %p.\n", surface_impl, dc); + *surface = &surface_impl->IDirectDrawSurface7_iface; + IDirectDrawSurface7_AddRef(*surface); + wined3d_mutex_unlock(); + return DD_OK; } + wined3d_mutex_unlock(); - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *Surface = &surface_impl->IDirectDrawSurface7_iface; - IDirectDrawSurface7_AddRef(*Surface); - TRACE("Returning surface %p.\n", Surface); - return DD_OK; +done: + TRACE("No surface found for dc %p.\n", dc); + *surface = NULL; + return DDERR_NOTFOUND; } static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d73d87b..e6d8f3a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -197,6 +197,7 @@ struct ddraw_surface struct list surface_list_entry; DWORD Handle; + HDC dc; }; struct ddraw_texture diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d5ebe31..3286b97 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2103,48 +2103,53 @@ static HRESULT WINAPI ddraw_surface1_AddOverlayDirtyRect(IDirectDrawSurface *ifa * For details, see IWineD3DSurface::GetDC * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) +static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); HRESULT hr = DD_OK; - TRACE("iface %p, dc %p.\n", iface, hdc); + TRACE("iface %p, dc %p.\n", iface, dc); - if(!hdc) + if (!dc) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); + hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); - if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + if (SUCCEEDED(hr)) { - const struct ddraw_palette *palette; + surface->dc = *dc; - if (surface->palette) - palette = surface->palette; - else if (surface->ddraw->primary) - palette = surface->ddraw->primary->palette; - else - palette = NULL; + if (format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; - if (palette) - wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *dc); + } } wined3d_mutex_unlock(); - switch(hr) + switch (hr) { - /* Some, but not all errors set *hdc to NULL. E.g. DCALREADYCREATED does not - * touch *hdc - */ + /* Some, but not all errors set *dc to NULL. E.g. DCALREADYCREATED + * does not touch *dc. */ case WINED3DERR_INVALIDCALL: - if(hdc) *hdc = NULL; + *dc = NULL; return DDERR_INVALIDPARAMS; - default: return hr; + default: + return hr; } } @@ -2205,11 +2210,15 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h TRACE("iface %p, dc %p.\n", iface, hdc); wined3d_mutex_lock(); - hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); - if (SUCCEEDED(hr) && (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + if (SUCCEEDED(hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc))) + { + surface->dc = NULL; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + } wined3d_mutex_unlock(); + return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14e1f51..2d45135 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5040,32 +5040,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -struct wined3d_surface * CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc) -{ - struct wined3d_resource *resource; - - TRACE("device %p, dc %p.\n", device, dc); - - if (!dc) - return NULL; - - LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) - { - if (resource->type == WINED3D_RTYPE_SURFACE) - { - struct wined3d_surface *s = surface_from_resource(resource); - - if (s->hDC == dc) - { - TRACE("Found surface %p for dc %p.\n", s, dc); - return s; - } - } - } - - return NULL; -} - static int wined3d_sampler_compare(const void *key, const struct wine_rb_entry *entry) { const struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5ba3ac..8597404 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,13 +1883,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - return surface->resource.parent; -} - DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { unsigned int alignment; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 532702e..5933b48 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,7 +84,6 @@ @ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) -@ cdecl wined3d_device_get_surface_from_dc(ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long) @@ -221,7 +220,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 420a55b..df95da9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2202,7 +2202,6 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, UINT stream_idx, UINT *divider); -struct wined3d_surface * __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc); struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); @@ -2473,7 +2472,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); -void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc,

1 0

Henri Verbeet : wined3d: Store custom pitches in the texture instead of the surface.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 195d16c8267fcd5085048b3513571e2fee0eb548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195d16c8267fcd5085048b351… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:05 2016 +0100 wined3d: Store custom pitches in the texture instead of the surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++-------- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 267d2f0..d5ba3ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1897,8 +1897,8 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->pitch) - return surface->pitch; + if (surface->container->row_pitch) + return surface->container->row_pitch; alignment = surface->resource.device->surface_alignment; pitch = wined3d_format_calculate_pitch(surface->resource.format, surface->resource.width); @@ -1909,8 +1909,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, unsigned int pitch) +HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_resource *texture_resource = &surface->container->resource; unsigned int width, height; @@ -1959,20 +1958,19 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; valid_location = WINED3D_LOCATION_USER_MEMORY; } - surface->pitch = pitch; surface->resource.format = texture_resource->format; surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; - if (surface->pitch) + if (surface->container->row_pitch) { - surface->resource.size = height * surface->pitch; + surface->resource.size = height * surface->container->row_pitch; } else { /* User memory surfaces don't have the regular surface alignment. */ surface->resource.size = wined3d_format_calculate_size(texture_resource->format, 1, width, height, 1); - surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width); + surface->container->row_pitch = wined3d_format_calculate_pitch(texture_resource->format, width); } /* The format might be changed to a format that needs conversion. diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ded4ca..0a084de 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -645,8 +645,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.height = height; texture->user_memory = mem; + texture->row_pitch = pitch; - return wined3d_surface_update_desc(surface, gl_info, pitch); + return wined3d_surface_update_desc(surface, gl_info); } void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ced1555..142cb93 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2365,6 +2365,7 @@ struct wined3d_texture GLenum target; void *user_memory; + unsigned int row_pitch; /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async @@ -2492,7 +2493,6 @@ struct wined3d_surface DWORD flags; - UINT pitch; UINT pow2Width; UINT pow2Height; @@ -2570,7 +2570,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, unsigned int pitch) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Store the "user_memory" pointer in the texture instead of the surface.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 77088e3faaded7f583903102240b9a2879a42fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77088e3faaded7f5839031022… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:04 2016 +0100 wined3d: Store the "user_memory" pointer in the texture instead of the surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 4 +++- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11db96e..267d2f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -488,7 +488,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win } if (location & WINED3D_LOCATION_USER_MEMORY) { - data->addr = surface->user_memory; + data->addr = surface->container->user_memory; data->buffer_object = 0; return; } @@ -567,7 +567,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_USER_MEMORY: - if (!surface->user_memory) + if (!surface->container->user_memory) ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); break; @@ -1910,7 +1910,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) } HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) + const struct wined3d_gl_info *gl_info, unsigned int pitch) { struct wined3d_resource *texture_resource = &surface->container->resource; unsigned int width, height; @@ -1954,7 +1954,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; - if ((surface->user_memory = mem)) + if (surface->container->user_memory) { surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; valid_location = WINED3D_LOCATION_USER_MEMORY; @@ -2414,7 +2414,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break; case WINED3D_LOCATION_USER_MEMORY: - base_memory = surface->user_memory; + base_memory = surface->container->user_memory; break; case WINED3D_LOCATION_DIB: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c48c91..4ded4ca 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -644,7 +644,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.width = width; texture->resource.height = height; - return wined3d_surface_update_desc(surface, gl_info, mem, pitch); + texture->user_memory = mem; + + return wined3d_surface_update_desc(surface, gl_info, pitch); } void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea47bbf..ced1555 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2364,6 +2364,8 @@ struct wined3d_texture DWORD flags; GLenum target; + void *user_memory; + /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async { @@ -2486,7 +2488,6 @@ struct wined3d_surface struct wined3d_resource resource; const struct wined3d_surface_ops *surface_ops; struct wined3d_texture *container; - void *user_memory; DWORD locations; DWORD flags; @@ -2569,7 +2570,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info, unsigned int pitch) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_update_surface().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 85ba92c33a8c689e375fae2f3313657aaa9877fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ba92c33a8c689e375fae2f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:03 2016 +0100 wined3d: Get rid of wined3d_device_update_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 +--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18fdc1d..14e1f51 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3676,7 +3676,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, i * src_levels + j + src_skip_levels)); dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i * dst_levels + j)); - if (FAILED(hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL))) + if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) { WARN("Failed to update surface, hr %#x.\n", hr); return hr; @@ -3850,26 +3850,6 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } -/* FIXME: Callers should probably use wined3d_device_update_sub_resource() - * instead. */ -HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, - struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const POINT *dst_point) -{ - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_point(dst_point)); - - if (src_surface->resource.pool != WINED3D_POOL_SYSTEM_MEM || dst_surface->resource.pool != WINED3D_POOL_DEFAULT) - { - WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", - src_surface, dst_surface); - return WINED3DERR_INVALIDCALL; - } - - return surface_upload_from_surface(dst_surface, dst_point, src_surface, src_rect); -} - void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d31cf9a..532702e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,7 +160,6 @@ @ cdecl wined3d_device_uninit_3d(ptr) @ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long) -@ cdecl wined3d_device_update_surface(ptr ptr ptr ptr ptr) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b8bf7b..420a55b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2319,8 +2319,6 @@ HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch); -HRESULT __cdecl wined3d_device_update_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const POINT *dst_point); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_surface_update_overlay_z_order ().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: f0053d06c4fc168360da638fa26f1927fe975262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0053d06c4fc168360da638fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:02 2016 +0100 wined3d: Get rid of wined3d_surface_update_overlay_z_order(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 22 +++++++++------------- dlls/wined3d/surface.c | 14 -------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 5 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f2399e4..d73d87b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -162,7 +162,6 @@ struct ddraw_surface /* Connections to other Objects */ struct ddraw *ddraw; - struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; struct wined3d_rendertarget_view *wined3d_rtv; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9b7d76e..d5ebe31 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1216,7 +1216,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; struct wined3d_texture *texture; IDirectDrawSurface7 *current; - struct wined3d_surface *tmp; HRESULT hr; TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); @@ -1237,7 +1236,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); - tmp = dst_impl->wined3d_surface; if (dst_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; @@ -1269,7 +1267,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1301,7 +1298,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1319,7 +1315,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); - src_impl->wined3d_surface = tmp; wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; @@ -3843,20 +3838,22 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlayDisplay(IDirectDrawSurface *if * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_UpdateOverlayZOrder(IDirectDrawSurface7 *iface, - DWORD Flags, IDirectDrawSurface7 *DDSRef) + DWORD flags, IDirectDrawSurface7 *reference) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface7(DDSRef); - HRESULT hr; - TRACE("iface %p, flags %#x, reference %p.\n", iface, Flags, DDSRef); + FIXME("iface %p, flags %#x, reference %p stub!\n", iface, flags, reference); wined3d_mutex_lock(); - hr = wined3d_surface_update_overlay_z_order(surface->wined3d_surface, - Flags, reference_impl ? reference_impl->wined3d_surface : NULL); + if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OVERLAY)) + { + WARN("Not an overlay surface.\n"); + wined3d_mutex_unlock(); + return DDERR_NOTAOVERLAYSURFACE; + } wined3d_mutex_unlock(); - return hr; + return DD_OK; } static HRESULT WINAPI ddraw_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 *iface, @@ -6302,7 +6299,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } desc->lpSurface = NULL; - surface->wined3d_surface = wined3d_surface; wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); surface->sub_resource_idx = sub_resource_idx; *parent_ops = &ddraw_surface_wined3d_parent_ops; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 53f4d09..11db96e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1909,20 +1909,6 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref) -{ - FIXME("surface %p, flags %#x, ref %p stub!\n", surface, flags, ref); - - if (!(surface->resource.usage & WINED3DUSAGE_OVERLAY)) - { - TRACE("Not an overlay surface.\n"); - return WINEDDERR_NOTAOVERLAYSURFACE; - } - - return WINED3D_OK; -} - HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 53eb97a..d31cf9a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40f3d49..0b8bf7b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2477,8 +2477,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_update_overlay().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 02008a6f2e373ba4ff06deb8ca124ecd65b57227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02008a6f2e373ba4ff06deb8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:01 2016 +0100 wined3d: Introduce wined3d_texture_update_overlay(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 22 +++++++++++----- dlls/wined3d/surface.c | 47 ---------------------------------- dlls/wined3d/texture.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 ++-- 5 files changed, 84 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02008a6f2e373ba4ff06d…

1 0

Jacek Caban : mshtml/tests: Fixed xmlhttprequest tests on IE7.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: f614d7fa5283b30a058f2537dde77bd27ddb3b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f614d7fa5283b30a058f2537d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 18:12:54 2016 +0100 mshtml/tests: Fixed xmlhttprequest tests on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index b402aeb..dd8e797 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -83,7 +83,7 @@ DEFINE_EXPECT(xmlhttprequest_onreadystatechange_loading); DEFINE_EXPECT(xmlhttprequest_onreadystatechange_done); #define test_disp(u,id) _test_disp(__LINE__,u,id) -static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) +static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const IID *broken_diid) { IDispatchEx *dispex; ITypeInfo *typeinfo; @@ -108,8 +108,9 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); - ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid), "unexpected guid %s\n", - wine_dbgstr_guid(&type_attr->guid)); + ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid) + || broken(broken_diid && IsEqualGUID(&type_attr->guid, broken_diid)), + "unexpected guid %s\n", wine_dbgstr_guid(&type_attr->guid)); ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); ITypeInfo_Release(typeinfo); @@ -118,9 +119,9 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) IDispatchEx_Release(dispex); } -#define test_event_args(a,b,c,d,e,f,g) _test_event_args(__LINE__,a,b,c,d,e,f,g) -static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD wFlags, DISPPARAMS *pdp, - VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +#define test_event_args(a,b,c,d,e,f,g,h) _test_event_args(__LINE__,a,b,c,d,e,f,g,h) +static void _test_event_args(unsigned line, const IID *dispiid, const IID *broken_dispiid, DISPID id, WORD wFlags, + DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ok_(__FILE__,line) (id == DISPID_VALUE, "id = %d\n", id); ok_(__FILE__,line) (wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); @@ -135,7 +136,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) - _test_disp(line, (IUnknown*)V_DISPATCH(pdp->rgvarg), dispiid); + _test_disp(line, (IUnknown*)V_DISPATCH(pdp->rgvarg), dispiid, broken_dispiid); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -241,7 +242,7 @@ static HRESULT WINAPI xmlhttprequest_onreadystatechange(IDispatchEx *iface, DISP LONG val; HRESULT hres; - test_event_args(&DIID_DispHTMLXMLHttpRequest, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_args(&DIID_DispHTMLXMLHttpRequest, &IID_IHTMLXMLHttpRequest, id, wFlags, pdp, pvarRes, pei, pspCaller); hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); ok(hres == S_OK, "get_readyState failed: %08x\n", hres);

1 0

Jacek Caban : mshtml/tests: Fixed style tests on IE6.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 433f82c74e5b203d35b00f015841ec2b448542eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=433f82c74e5b203d35b00f015… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 17:52:17 2016 +0100 mshtml/tests: Fixed style tests on IE6. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94ccc76..3da1a70 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2935,14 +2935,17 @@ static void test_current_style(IHTMLCurrentStyle *current_style) IHTMLCurrentStyle3_Release(current_style3); hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)&current_style4); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); - - hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); - VariantClear(&v); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v); - IHTMLCurrentStyle4_Release(current_style4); + IHTMLCurrentStyle4_Release(current_style4); + }else { + win_skip("IHTMLCurrentStyle4 not supported.\n"); + } } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
76
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 February 2016