July 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : winetest: Initialize sin_zero field sockaddr_in structure (Coverity).
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 2e97facdd08fb4ed1bb134a2928a44869443a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e97facdd08fb4ed1bb134a29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:29:24 2016 +0300 winetest: Initialize sin_zero field sockaddr_in structure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/send.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index d421e8b..a419b16 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -52,6 +52,7 @@ open_http (const char *server) sa.sin_family = AF_INET; sa.sin_port = htons (80); sa.sin_addr.s_addr = inet_addr (server); + memset (sa.sin_zero, 0, sizeof(sa.sin_zero)); if (sa.sin_addr.s_addr == INADDR_NONE) { struct hostent *host = gethostbyname (server); if (!host) {

1 0

Ken Thomases : ntdll: For Mac 64-bit, poke NtCurrentTeb()-> ThreadLocalStoragePointer to the corresponding offset from %gs.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 3d8efb238808a519902e047d8673237debb0f0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8efb238808a519902e047d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jul 28 16:33:25 2016 -0500 ntdll: For Mac 64-bit, poke NtCurrentTeb()->ThreadLocalStoragePointer to the corresponding offset from %gs. 64-bit Windows apps have hard-coded accesses to %gs:0x58 baked into them. They need to find the ThreadLocalStoragePointer there. Technically, the gsbase register and the memory it points to belong to the pthread implementation on macOS. It's used for the pthread TLS implementation. Slot 11 (offset 0x58) is currently used for the implementation of the ttyname() system library function. We do not anticipate that Wine or any of the system libraries or frameworks it uses will call ttyname(). Furthermore, Apple has made it so that future releases of macOS will no longer use that slot. So, we hijack it for our purposes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 ++++++ dlls/ntdll/signal_x86_64.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d9176d7..f1ef7ab 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -818,6 +818,10 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) if (!new) return -1; if (old) memcpy( new, old, tls_module_count * sizeof(*new) ); teb->ThreadLocalStoragePointer = new; +#if defined(__APPLE__) && defined(__x86_64__) + if (teb->Reserved5[0]) + ((TEB*)teb->Reserved5[0])->ThreadLocalStoragePointer = new; +#endif TRACE( "thread %04lx tls block %p -> %p\n", (ULONG_PTR)teb->ClientId.UniqueThread, old, new ); /* FIXME: can't free old block here, should be freed at thread exit */ } @@ -1017,6 +1021,11 @@ static NTSTATUS alloc_thread_tls(void) GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; +#if defined(__APPLE__) && defined(__x86_64__) + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (pointers), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); +#endif return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 10faaea..decae5c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2832,6 +2832,69 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +#ifdef __APPLE__ +/********************************************************************** + * mac_thread_gsbase + */ +static void *mac_thread_gsbase(void) +{ + static int gsbase_offset = -1; + void *ret; + + if (gsbase_offset < 0) + { + /* Search for the array of TLS slots within the pthread data structure. + That's what the macOS pthread implementation uses for gsbase. */ + const void* const sentinel1 = (const void*)0x2bffb6b4f11228ae; + const void* const sentinel2 = (const void*)0x0845a7ff6ab76707; + int rc; + pthread_key_t key; + const void** p = (const void**)pthread_self(); + int i; + + gsbase_offset = 0; + if ((rc = pthread_key_create(&key, NULL))) + { + ERR("failed to create sentinel key for gsbase search: %d\n", rc); + return NULL; + } + + pthread_setspecific(key, sentinel1); + + for (i = key + 1; i < 2000; i++) /* arbitrary limit */ + { + if (p[i] == sentinel1) + { + pthread_setspecific(key, sentinel2); + + if (p[i] == sentinel2) + { + gsbase_offset = (i - key) * sizeof(*p); + break; + } + + pthread_setspecific(key, sentinel1); + } + } + + pthread_key_delete(key); + } + + if (gsbase_offset) + { + ret = (char*)pthread_self() + gsbase_offset; + TRACE("pthread_self() %p + offset 0x%08x -> gsbase %p\n", pthread_self(), gsbase_offset, ret); + } + else + { + ret = NULL; + ERR("failed to locate gsbase; won't be able to poke ThreadLocalStoragePointer into pthread TLS; expect crashes\n"); + } + + return ret; +} +#endif + /********************************************************************** * signal_init_thread */ @@ -2850,6 +2913,14 @@ void signal_init_thread( TEB *teb ) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" : : "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); + + /* alloc_tls_slot() needs to poke a value to an address relative to each + thread's gsbase. Have each thread record its gsbase pointer into its + TEB so alloc_tls_slot() can find it. */ + teb->Reserved5[0] = mac_thread_gsbase(); #else # error Please define setting %gs for your architecture #endif

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser GetParserState.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: a9115b36c62924e31d361cee2af6007435f27d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9115b36c62924e31d361cee2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 29 09:43:15 2016 +0000 msxml3: Implement IXMLParser GetParserState. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 51f2a27..32514e3 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -144,6 +144,9 @@ static void create_test(void) hr = IXMLParser_SetFlags(parser, 0); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_GetParserState(parser); + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); + IXMLParser_Release(parser); } diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index ca40b22..6fcdb82 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -51,6 +51,7 @@ typedef struct _xmlparser LONG ref; int flags; + XML_PARSER_STATE state; } xmlparser; static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface ) @@ -345,9 +346,9 @@ static HRESULT WINAPI xmlparser_GetParserState(IXMLParser *iface) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p)\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + return This->state; } static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface) @@ -447,6 +448,7 @@ HRESULT XMLParser_create(void **ppObj) This->nodefactory = NULL; This->input = NULL; This->flags = 0; + This->state = XMLPARSER_IDLE; This->ref = 1; *ppObj = &This->IXMLParser_iface;

1 0

Michael Stefaniuc : comctl32: Remove an always true conditional expression.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 302ae44d8b752ca470c3f5923a9012d04a52b6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302ae44d8b752ca470c3f5923… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 12:23:19 2016 +0200 comctl32: Remove an always true conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 58a7b67..9811da3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3469,7 +3469,9 @@ static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList2 *iface, int i, if (!ImageList_GetImageInfo(imgl, i, &info)) return E_FAIL; - return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; + *prc = info.rcImage; + + return S_OK; } static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList2 *iface, int *cx,

1 0

Michael Stefaniuc : comctl32: Use straight assignments instead of CopyRect ().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 77fc4697dd7c2b81181c4549c22210bc16913736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fc4697dd7c2b81181c4549c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 12:23:39 2016 +0200 comctl32: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tab.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index a6243a9..752f870 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2389,7 +2389,7 @@ REBAR_GetRect (const REBAR_INFO *infoPtr, INT iBand, RECT *lprc) lpBand = REBAR_GetBand(infoPtr, iBand); /* For CCS_VERT the coordinates will be swapped - like on Windows */ - CopyRect (lprc, &lpBand->rcBand); + *lprc = lpBand->rcBand; TRACE("band %d, (%s)\n", iBand, wine_dbgstr_rect(lprc)); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 9806783..0ed9152 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -458,7 +458,7 @@ static BOOL TAB_InternalGetItemRect( /* Now, calculate the position of the item as if it were selected. */ if (selectedRect!=NULL) { - CopyRect(selectedRect, itemRect); + *selectedRect = *itemRect; /* The rectangle of a selected item is a bit wider. */ if(infoPtr->dwStyle & TCS_VERTICAL) @@ -1729,7 +1729,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect dis.itemState |= ODS_FOCUS; dis.hwndItem = infoPtr->hwnd; dis.hDC = hdc; - CopyRect(&dis.rcItem,drawRect); + dis.rcItem = *drawRect; /* when extra data fits ULONG_PTR, store it directly */ if (infoPtr->cbInfo > sizeof(LPARAM))

1 0

Henri Verbeet : wined3d: Get rid of struct wined3d_volume.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 50af9acb48190cdd4bf9efaf0c6c417ce4586dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50af9acb48190cdd4bf9efaf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:30 2016 +0200 wined3d: Get rid of struct wined3d_volume. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 26 +++++--------------------- dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5b9f69..9feb108 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2320,12 +2320,10 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi { for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = texture->sub_resources[i].u.volume; - - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, internal, - wined3d_texture_get_level_width(texture, volume->texture_level), - wined3d_texture_get_level_height(texture, volume->texture_level), - wined3d_texture_get_level_depth(texture, volume->texture_level), + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, + wined3d_texture_get_level_width(texture, i), + wined3d_texture_get_level_height(texture, i), + wined3d_texture_get_level_depth(texture, i), 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } @@ -2334,7 +2332,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { - HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); } static const struct wined3d_texture_ops texture3d_ops = @@ -2380,7 +2377,6 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_volume *volumes; unsigned int i; HRESULT hr; @@ -2474,25 +2470,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->resource.map_binding = WINED3D_LOCATION_BUFFER; } - if (!(volumes = wined3d_calloc(level_count, sizeof(*volumes)))) - { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; - } - /* Generate all the surfaces. */ for (i = 0; i < texture->level_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_volume *volume; - - volume = &volumes[i]; - volume->container = texture; - volume->texture_level = i; sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - sub_resource->u.volume = volume; if (FAILED(hr = device_parent->ops->volume_created(device_parent, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) @@ -2505,7 +2489,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); - TRACE("Created volume level %u @ %p.\n", i, volume); + TRACE("Created volume level %u.\n", i); } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3acbbd..e5793d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2688,7 +2688,6 @@ struct wined3d_texture union { struct wined3d_surface *surface; - struct wined3d_volume *volume; } u; unsigned int offset; unsigned int size; @@ -2783,13 +2782,6 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; -struct wined3d_volume -{ - struct wined3d_texture *container; - - GLint texture_level; -}; - void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data ().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 90cff7284a04b0f5d6505dc3d906a152532ba26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cff7284a04b0f5d6505dc3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:31 2016 +0200 wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 ++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9feb108..0c1fa05 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1449,7 +1449,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + texture->texture_ops->texture_upload_data(texture, i, context, + &addr, data[i].row_pitch, data[i].slice_pitch); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1460,10 +1463,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { static const POINT dst_point = {0, 0}; - struct wined3d_const_bo_address addr; unsigned int texture_level; RECT src_rect; @@ -1471,11 +1474,8 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), wined3d_texture_get_level_height(texture, texture_level)); - addr.buffer_object = 0; - addr.addr = data->data; - wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, - texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2101,19 +2101,16 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - struct wined3d_const_bo_address addr; - unsigned int row_pitch, slice_pitch; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); + unsigned int dst_row_pitch, dst_slice_pitch; - addr.buffer_object = 0; - addr.addr = data->data; + wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); + if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) + FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); - wined3d_volume_upload_data(texture, sub_resource_idx, context, &addr); + wined3d_volume_upload_data(texture, sub_resource_idx, context, data); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5793d3..e3b0a56 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2614,7 +2614,8 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void (*texture_prepare_texture)(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Upload only a single sub-resource in wined3d_texture_upload_data().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: d72ff80a4661f07a0be244abc94864e6f1f2a2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72ff80a4661f07a0be244abc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:32 2016 +0200 wined3d: Upload only a single sub-resource in wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 73 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c1fa05..4a9ed42 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1426,40 +1426,12 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, - const struct wined3d_sub_resource_data *data) +static void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_context *context; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - if (!data[i].data) - { - WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); - return E_INVALIDARG; - } - } - - context = context_acquire(texture->resource.device, NULL); - - wined3d_texture_prepare_texture(texture, context, FALSE); - wined3d_texture_bind_and_dirtify(texture, context, FALSE); - - for (i = 0; i < sub_count; ++i) - { - const struct wined3d_const_bo_address addr = {0, data[i].data}; - - texture->texture_ops->texture_upload_data(texture, i, context, - &addr, data[i].row_pitch, data[i].slice_pitch); - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context_release(context); - - return WINED3D_OK; + texture->texture_ops->texture_upload_data(texture, sub_resource_idx, + context, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2783,11 +2755,38 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ - if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) + if (data) { - wined3d_texture_cleanup_sync(object); - HeapFree(GetProcessHeap(), 0, object); - return hr; + unsigned int sub_count = level_count * layer_count; + struct wined3d_context *context; + unsigned int i; + + for (i = 0; i < sub_count; ++i) + { + if (!data[i].data) + { + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + wined3d_texture_cleanup_sync(object); + HeapFree(GetProcessHeap(), 0, object); + return E_INVALIDARG; + } + } + + context = context_acquire(device, NULL); + + wined3d_texture_prepare_texture(object, context, FALSE); + wined3d_texture_bind_and_dirtify(object, context, FALSE); + + for (i = 0; i < sub_count; ++i) + { + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + wined3d_texture_upload_data(object, i, context, &addr, data[i].row_pitch, data[i].slice_pitch); + wined3d_texture_validate_location(object, i, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(object, i, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_release(context); } TRACE("Created texture %p.\n", object);

1 0

Henri Verbeet : wined3d: Use the context' s gl_info in wined3d_timestamp_query_ops_issue().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 18d60012e8c32e4ef918952eab5a9e96590e6963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d60012e8c32e4ef918952ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:33 2016 +0200 wined3d: Use the context's gl_info in wined3d_timestamp_query_ops_issue(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 55e63e9..9843558 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -567,8 +567,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; TRACE("query %p, flags %#x.\n", query, flags); @@ -582,6 +581,7 @@ static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD if (tq->context) context_free_timestamp_query(tq); context = context_acquire(query->device, NULL); + gl_info = context->gl_info; context_alloc_timestamp_query(context, tq); GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); checkGLcall("glQueryCounter()");

1 0

Henri Verbeet : wined3d: Issue queries through the command stream.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 7cda73e81864c52457d4d65f71f0140af30597d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cda73e81864c52457d4d65f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:34 2016 +0200 wined3d: Issue queries through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a898c2c..b52e887 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -54,6 +54,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, + WINED3D_CS_OP_QUERY_ISSUE, }; struct wined3d_cs_present @@ -267,6 +268,13 @@ struct wined3d_cs_destroy_object void *object; }; +struct wined3d_cs_query_issue +{ + enum wined3d_cs_op opcode; + struct wined3d_query *query; + DWORD flags; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1215,6 +1223,26 @@ void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void cs->ops->submit(cs); } +static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_query_issue *op = data; + struct wined3d_query *query = op->query; + + query->query_ops->query_issue(query, op->flags); +} + +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs_query_issue *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_QUERY_ISSUE; + op->query = query; + op->flags = flags; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1245,6 +1273,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, + /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9843558..97675ad 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -350,7 +350,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - query->query_ops->query_issue(query, flags); + wined3d_cs_emit_query_issue(query->device->cs, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3b0a56..e933909 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3041,6 +3041,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;

1 0