February 2016 - Wine-commits

Hugh McMaster : reg: Output program name instead of the generic 'Error'.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Ask the user whether they want to overwrite an existing registry value.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16_UINT format.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: ec45c894bc60008e8f6b9955e88adb33c92e1027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec45c894bc60008e8f6b9955e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 9 11:24:41 2016 +0100 wined3d: Add support for WINED3DFMT_R16_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d00281..0cc0b4c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -199,6 +199,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_FLAG_INTEGER}, + {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INTEGER}, }; struct wined3d_format_block_info @@ -1138,6 +1139,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16_UINT, GL_R16UI, GL_R16UI, 0, + GL_RED_INTEGER, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, @@ -2319,6 +2324,11 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) continue; + /* ARB_texture_rg defines integer formats if ARB_texture_integer is also supported. */ + if (!gl_info->supported[EXT_TEXTURE_INTEGER] + && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) + continue; + format->glInternal = format_texture_info[i].gl_internal; format->glGammaInternal = format_texture_info[i].gl_srgb_internal; format->rtInternal = format_texture_info[i].gl_rt_internal;

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT format.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: ea6070b93f7fab5589199c0661a8ba6fa0f7e318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6070b93f7fab5589199c066… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 9 11:24:42 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0cc0b4c..d835bbe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -200,6 +200,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INTEGER}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3DFMT_FLAG_INTEGER}, }; struct wined3d_format_block_info @@ -1315,6 +1316,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 8, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_BUFFER_FLOAT, convert_s8_uint_d24_float}, + {WINED3DFMT_R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_TEXTURE, + EXT_TEXTURE_INTEGER, NULL}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, GL_RED, GL_UNSIGNED_BYTE, 0,

1 0

Hugh McMaster : reg: Output messages with a variable number of arguments and convert message arrays to strings.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Specify the data type that is unsupported.
by Alexandre Julliard 09 Feb '16

09 Feb '16

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: 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

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

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