wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Józef Kucia : wined3d: Introduce helper function for binding buffers.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 4affb95ebb87645a3127130d16aee9a8c6335c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4affb95ebb87645a3127130d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:47 2016 +0100 wined3d: Introduce helper function for binding buffers. 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/buffer.c | 53 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d4ab55..68c9af5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -100,6 +100,17 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) return FALSE; } +/* Context activation is done by the caller. */ +static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) + context_invalidate_state(context, STATE_INDEXBUFFER); + + GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); +} + /* Context activation is done by the caller */ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { @@ -148,9 +159,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine goto fail; } - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); + buffer_bind(This, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -486,25 +495,23 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ - if (This->resource.heap_memory) - return This->resource.heap_memory; + if (buffer->resource.heap_memory) + return buffer->resource.heap_memory; - if (!wined3d_resource_allocate_sysmem(&This->resource)) + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) ERR("Failed to allocate system memory.\n"); - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); - GL_EXTCALL(glGetBufferSubData(This->buffer_type_hint, 0, This->resource.size, This->resource.heap_memory)); - This->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer_bind(buffer, context); + GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); + checkGLcall("buffer download"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; - return This->resource.heap_memory; + return buffer->resource.heap_memory; } static void buffer_unload(struct wined3d_resource *resource) @@ -977,9 +984,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1076,9 +1081,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1167,19 +1170,13 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } else if (dst_buffer_mem && !src_buffer_mem) { - if (src_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(src_buffer->buffer_type_hint, src_bo_address.buffer_object)); - + buffer_bind(src_buffer, context); GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); checkGLcall("buffer download"); } else if (!dst_buffer_mem && src_buffer_mem) { - if (dst_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(dst_buffer->buffer_type_hint, dst_bo_address.buffer_object)); - + buffer_bind(dst_buffer, context); GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d7a2bb..48d21d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2892,7 +2892,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 97c70c86be26e02a398411877d6e6a26367d3ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c70c86be26e02a398411877… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. 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/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be3fdb0..f57f326 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1533,8 +1533,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0

Hans Leidekker : iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: e8ceab5344e2ffa88a35727569294e0832f76c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ceab5344e2ffa88a3572756… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 22 14:36:33 2016 +0100 iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 92653ed5..73e4302 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1379,13 +1379,14 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { char temp[128]; + IP_ADAPTER_PREFIX *prefix; ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), @@ -1452,6 +1453,18 @@ static void test_GetAdaptersAddresses(void) sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); trace("ZoneIndices: %s\n", temp); trace("FirstPrefix: %p\n", aa->FirstPrefix); + prefix = aa->FirstPrefix; + while (prefix) + { + trace("\tLength: %u\n", S(U(*prefix)).Length); + trace("\tFlags: 0x%08x\n", S(U(*prefix)).Flags); + trace("\tNext: %p\n", prefix->Next); + trace("\tAddress.lpSockaddr: %p\n", prefix->Address.lpSockaddr); + trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength); + trace("\tPrefixLength: %u\n", prefix->PrefixLength); + trace("\n"); + prefix = prefix->Next; + } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed));

1 0

Jacek Caban : mshtml/tests: Fixed xmlhttprequest test failures.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: f8d47a66371579aef09670281928c03dce977b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d47a66371579aef09670281… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 22 13:10:42 2016 +0100 mshtml/tests: Fixed xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a16dad1..3153804 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -386,6 +386,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; const char *value; + BOOL skip_all_headers; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -450,6 +451,9 @@ static void test_header(const struct HEADER_TYPE expect[], int num) SysFreeString(key); SysFreeString(text); + if(expect[i].skip_all_headers) + continue; + strcpy(buf, expect[i].key); strcat(buf, ": "); strcat(buf, expect[i].value); @@ -581,10 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Server", "Apache"}, {"Accept-Ranges", "bytes"}, {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Type", "application/xml", TRUE} }; trace("test_sync_xhr\n");

1 0

Francois Gouget : mshtml: Make some functions static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 49ceec53c42f320900d1eda08bad7a40029001e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ceec53c42f320900d1eda08… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:12 2016 +0100 mshtml: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index abb71a8..0d3d450 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -169,7 +169,7 @@ static void HTMLCommentElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); HTMLElement *new_elem; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aea6a92..65083ab 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -396,7 +396,7 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) +static HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; @@ -461,7 +461,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const } } -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) +static HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) { const WCHAR *val; WCHAR buf[14]; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index e9de151..fbf2ac0 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -124,9 +124,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wined3d: Make wined3d_texture_force_reload() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 272b8bc190b967acbdba6becb5b54a46bebb2004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272b8bc190b967acbdba6becb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:59 2016 +0100 wined3d: Make wined3d_texture_force_reload() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 30 +++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7e28681..2687bf1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -822,6 +822,21 @@ void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, *buffer_object, texture, sub_resource_idx); } +static void wined3d_texture_force_reload(struct wined3d_texture *texture) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + unsigned int i; + + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED + | WINED3D_TEXTURE_CONVERTED); + texture->async.flags &= ~WINED3D_TEXTURE_ASYNC_COLOR_KEY; + for (i = 0; i < sub_count; ++i) + { + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i].resource, + WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); + } +} + void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; @@ -844,21 +859,6 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win texture->flags |= alloc_flag; } -void wined3d_texture_force_reload(struct wined3d_texture *texture) -{ - unsigned int sub_count = texture->level_count * texture->layer_count; - unsigned int i; - - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED - | WINED3D_TEXTURE_CONVERTED); - texture->async.flags &= ~WINED3D_TEXTURE_ASYNC_COLOR_KEY; - for (i = 0; i < sub_count; ++i) - { - texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i].resource, - WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); - } -} - void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbaa4b3..7d7a2bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2452,7 +2452,6 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; -void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture,

1 0

Michael Stefaniuc : ddraw: Use SetRect() instead of open coding it.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 060387936d5b7253ad1e49700d3efa95bc4f8160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060387936d5b7253ad1e49700… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 22 10:31:25 2016 +0100 ddraw: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 +----- dlls/ddraw/surface.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 23c3e32..21f87d9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6077,11 +6077,7 @@ static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *ds wined3d_mutex_lock(); if (!src_rect) - { - srcrect.left = srcrect.top = 0; - srcrect.right = src->surface_desc.dwWidth; - srcrect.bottom = src->surface_desc.dwHeight; - } + SetRect(&srcrect, 0, 0, src->surface_desc.dwWidth, src->surface_desc.dwHeight); else srcrect = *src_rect; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3709b94..83457fc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1407,16 +1407,10 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons UINT i; if (!dst_rect_in) - { - dst_rect.left = 0; - dst_rect.top = 0; - dst_rect.right = dst_surface->surface_desc.dwWidth; - dst_rect.bottom = dst_surface->surface_desc.dwHeight; - } + SetRect(&dst_rect, 0, 0, dst_surface->surface_desc.dwWidth, + dst_surface->surface_desc.dwHeight); else - { dst_rect = *dst_rect_in; - } if (IsRectEmpty(&dst_rect)) return DDERR_INVALIDRECT; @@ -1424,16 +1418,10 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface) { if (!src_rect_in) - { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = src_surface->surface_desc.dwWidth; - src_rect.bottom = src_surface->surface_desc.dwHeight; - } + SetRect(&src_rect, 0, 0, src_surface->surface_desc.dwWidth, + src_surface->surface_desc.dwHeight); else - { src_rect = *src_rect_in; - } if (IsRectEmpty(&src_rect)) return DDERR_INVALIDRECT;

1 0

Aaryaman Vasishta : d3drm: Move struct d3drm_texture to header for global access.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: b05b96a0e2cf3ea1911b2e866445d774cf876f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05b96a0e2cf3ea1911b2e866… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Mar 21 21:54:45 2016 +0530 d3drm: Move struct d3drm_texture to header for global access. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 91 +++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/d3drm_private.h | 11 +++++- dlls/d3drm/meshbuilder.c | 6 +-- dlls/d3drm/texture.c | 19 ++-------- 4 files changed, 99 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b05b96a0e2cf3ea1911b2…

1 0

Francois Gouget : shell32/tests: Make shlexec' s reset_association_description() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: d02e559b914d5d738f52bf1ec6d739302adfed91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02e559b914d5d738f52bf1ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:24 2016 +0100 shell32/tests: Make shlexec's reset_association_description() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 07c3b48..ebf9d80 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -365,7 +365,7 @@ static void WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, . #define okShell okShell_(__FILE__, __LINE__) static char assoc_desc[2048]; -void reset_association_description(void) +static void reset_association_description(void) { *assoc_desc = '\0'; }

1 0

Francois Gouget : dinput: Make ff_effect_direction_to_rad() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: adb39b8fde7ce607bc4b0399f1bfa68308c19e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb39b8fde7ce607bc4b0399f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:24:53 2016 +0100 dinput: Make ff_effect_direction_to_rad() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0e7be2c..ad7d3ad 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -67,7 +67,7 @@ static inline LinuxInputEffectImpl *impl_from_IDirectInputEffect(IDirectInputEff return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); } -double ff_effect_direction_to_rad(unsigned int dir) +static double ff_effect_direction_to_rad(unsigned int dir) { return (dir & 0xffff) * M_PI / 0x8000; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
73
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 March 2016