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

Iván Matellanes : msvcirt: Implement ostream manipulators.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 38fb1062daaf68afe4dc20e1aceddfa89fe1ea4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fb1062daaf68afe4dc20e1a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:53 2016 +0100 msvcirt: Implement ostream manipulators. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 32c1bf4..666c44c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2843,24 +2843,25 @@ ostream* __thiscall ostream_print_ios_manip(ostream *this, ios* (__cdecl *func)( /* ?endl@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_endl(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + ostream_put_char(this, '\n'); + return ostream_flush(this); } /* ?ends@@YAAAVostream@@AAV1@@Z */ /* ?ends@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_ends(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_put_char(this, 0); } /* ?flush@@YAAAVostream@@AAV1@@Z */ /* ?flush@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_flush_manip(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_flush(this); } /******************************************************************

1 0

Hugh McMaster : msvcrt: Implement _wperror.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 56eb4d3105733693f8de43eacf8e20ed922cb65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56eb4d3105733693f8de43eac… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 01:53:00 2016 +0000 msvcrt: Implement _wperror. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efbd688..5fae918 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1568,7 +1568,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7476995..38fdfe9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1925,7 +1925,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7aa2d19..4ef7358 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1949,7 +1949,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f236db5..6bd5083 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -641,7 +641,7 @@ @ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 5414dc6..7e3f265 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -637,7 +637,7 @@ @ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a6f0a90..1c1dc1a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1250,7 +1250,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 48aed2c..13d1bab 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1223,7 +1223,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 641ca35..46b1859 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -344,6 +344,31 @@ void CDECL MSVCRT_perror(const char* str) } /********************************************************************* + * _wperror (MSVCRT.@) + */ +void CDECL MSVCRT__wperror(const MSVCRT_wchar_t* str) +{ + MSVCRT_size_t size; + char *buffer = NULL; + + if (str && *str) + { + size = MSVCRT_wcstombs(NULL, str, 0); + if (size == -1) return; + size++; + buffer = MSVCRT_malloc(size); + if (!buffer) return; + if (MSVCRT_wcstombs(buffer, str, size) == -1) + { + MSVCRT_free(buffer); + return; + } + } + MSVCRT_perror(buffer); + if (buffer) MSVCRT_free(buffer); +} + +/********************************************************************* * _wcserror_s (MSVCRT.@) */ int CDECL MSVCRT__wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37107d5..274d2e7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1184,7 +1184,7 @@ @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen # stub _woutput_s -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen (wstr wstr) MSVCRT__wpopen # stub _wprintf_l(wstr ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index da03fd1..ecfb612 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2097,7 +2097,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) @ cdecl _wputenv_s(wstr wstr)

1 0

Nikolay Sivov : Update data tables to Unicode 9.0.0.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 58e0972c5ca8c82f65860733aaf3aeb41a7725bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e0972c5ca8c82f65860733a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 22 15:00:22 2016 +0300 Update data tables to Unicode 9.0.0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 11 +- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 298 ++++++----- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 1262 ++++++++++++++++++++++---------------------- dlls/dwrite/scripts.h | 268 +++++----- dlls/usp10/bracket.c | 2 +- dlls/usp10/breaking.c | 6 +- dlls/usp10/indicsyllable.c | 108 ++-- dlls/usp10/linebreak.c | 298 ++++++----- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 108 ++-- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/wine/casemap.c | 45 +- libs/wine/wctype.c | 38 +- loader/l_intl.nls | Bin 6406 -> 6470 bytes tools/make_unicode | 24 +- 19 files changed, 1280 insertions(+), 1200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58e0972c5ca8c82f65860…

1 0

Andrew Eikum : urlmon: Allow NULL IBindStatusCallback in URLOpenBlockingStream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 4ac74d108310ce9b721504025d35567e3f83afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac74d108310ce9b721504025… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 21 14:13:05 2016 -0500 urlmon: Allow NULL IBindStatusCallback in URLOpenBlockingStream. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 15 +++++++++++++++ dlls/urlmon/umstream.c | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 9882a4d..354d809 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -328,6 +328,21 @@ static void test_URLOpenBlockingStreamW(void) ok(pStream != NULL, "pStream is NULL\n"); if(pStream) { + buffer[0] = 0; + hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); + ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); + ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); + + IStream_Release(pStream); + } + + hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, &pStream, 0, NULL); + ok(hr == S_OK, "URLOpenBlockingStreamW failed with error 0x%08x\n", hr); + + ok(pStream != NULL, "pStream is NULL\n"); + if(pStream) + { + buffer[0] = 0; hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 3a3e09a..9c94658 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -122,12 +122,18 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { + DWORD size = pbindinfo->cbSize; ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); - return E_INVALIDARG; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF,

1 0

Andrew Eikum : urlmon: Allow NULL IBindStatusCallback in UrlOpenStream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: a4a8693e8922af2d8f4bdadc3e3cf4812263d645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a8693e8922af2d8f4bdadc3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 21 14:13:09 2016 -0500 urlmon: Allow NULL IBindStatusCallback in UrlOpenStream. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 3 +++ dlls/urlmon/umstream.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 354d809..6717198 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -380,6 +380,9 @@ static void test_URLOpenStreamW(void) CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); + + hr = URLOpenStreamW(NULL, INDEX_HTML, 0, NULL); + ok(hr == S_OK, "URLOpenStreamW failed with error 0x%08x\n", hr); } START_TEST(stream) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 9c94658..01cc755 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -182,8 +182,20 @@ static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); - HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + HRESULT hr = S_OK; + + if(This->pBSC) + hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + else{ + DWORD size = pbindinfo->cbSize; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + } + *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; + return hr; }

1 0

Henri Verbeet : wined3d: Send sampler object desctruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 29788075e0bc736c09f92c9200ecf56509f601c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29788075e0bc736c09f92c920… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:00 2016 +0200 wined3d: Send sampler object desctruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 865198b..1a2e2a1 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,23 +33,28 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +static void wined3d_sample_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + struct wined3d_sampler *sampler = object; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + context = context_acquire(sampler->device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); + context_release(context); + + HeapFree(GetProcessHeap(), 0, sampler); +} + +ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +{ + ULONG refcount = InterlockedDecrement(&sampler->refcount); + TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) - { - context = context_acquire(sampler->device, NULL); - gl_info = context->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); - - HeapFree(GetProcessHeap(), 0, sampler); - } + wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sample_destroy_object, sampler); return refcount; }

1 0

Henri Verbeet : wined3d: Send shader destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 87f667b46843589c4656b7373f28536343e06f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f667b46843589c4656b7373… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:01 2016 +0200 wined3d: Send shader destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f3e145..7682850 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2650,6 +2650,12 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_destroy_object(void *object) +{ + shader_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) { ULONG refcount = InterlockedDecrement(&shader->ref); @@ -2658,9 +2664,8 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { - shader_cleanup(shader); shader->parent_ops->wined3d_object_destroyed(shader->parent); - HeapFree(GetProcessHeap(), 0, shader); + wined3d_cs_emit_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); } return refcount;

1 0

Henri Verbeet : wined3d: Send vertex declaration destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 9ba058e94c2662f5296c95adeafd29c59b137249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba058e94c2662f5296c95ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:02 2016 +0200 wined3d: Send vertex declaration destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/vertexdeclaration.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index febd695..c8704e9 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -50,6 +50,14 @@ ULONG CDECL wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration return refcount; } +static void wined3d_vertex_declaration_destroy_object(void *object) +{ + struct wined3d_vertex_declaration *declaration = object; + + HeapFree(GetProcessHeap(), 0, declaration->elements); + HeapFree(GetProcessHeap(), 0, declaration); +} + ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration) { ULONG refcount = InterlockedDecrement(&declaration->ref); @@ -58,9 +66,9 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { - HeapFree(GetProcessHeap(), 0, declaration->elements); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); - HeapFree(GetProcessHeap(), 0, declaration); + wined3d_cs_emit_destroy_object(declaration->device->cs, + wined3d_vertex_declaration_destroy_object, declaration); } return refcount;

1 0

Henri Verbeet : wined3d: Send query destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 97eb359588725f6d1c38146a606856b50588dbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97eb359588725f6d1c38146a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:03 2016 +0200 wined3d: Send query destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 410ce6c..c8d6b47 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -233,41 +233,46 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query) return refcount; } -ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +static void wined3d_query_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&query->ref); + struct wined3d_query *query = object; - TRACE("%p decreasing refcount to %u.\n", query, refcount); + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ + if (query->type == WINED3D_QUERY_TYPE_EVENT) + { + struct wined3d_event_query *event_query = query->extendedData; + if (event_query) wined3d_event_query_destroy(event_query); + } + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) + { + struct wined3d_occlusion_query *oq = query->extendedData; - if (!refcount) + if (oq->context) context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } + else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { - /* Queries are specific to the GL context that created them. Not - * deleting the query will obviously leak it, but that's still better - * than potentially deleting a different query with the same id in this - * context, and (still) leaking the actual query. */ - if (query->type == WINED3D_QUERY_TYPE_EVENT) - { - struct wined3d_event_query *event_query = query->extendedData; - if (event_query) wined3d_event_query_destroy(event_query); - } - else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) - { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_timestamp_query *tq = query->extendedData; - if (oq->context) context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) - { - struct wined3d_timestamp_query *tq = query->extendedData; + if (tq->context) + context_free_timestamp_query(tq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } - if (tq->context) - context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } + HeapFree(GetProcessHeap(), 0, query); +} - HeapFree(GetProcessHeap(), 0, query); - } +ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +{ + ULONG refcount = InterlockedDecrement(&query->ref); + + TRACE("%p decreasing refcount to %u.\n", query, refcount); + + if (!refcount) + wined3d_cs_emit_destroy_object(query->device->cs, wined3d_query_destroy_object, query); return refcount; }

1 0

Henri Verbeet : wined3d: Send palette destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: bb6417d5afc52d84d6acf16b5d7445de40716578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6417d5afc52d84d6acf16b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:04 2016 +0200 wined3d: Send palette destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/palette.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index fadcc43..ba9c42e 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) return refcount; } +static void wined3d_palette_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) { ULONG refcount = InterlockedDecrement(&palette->ref); @@ -40,7 +45,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, palette); + wined3d_cs_emit_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); return refcount; }

1 0