October 2016 - Wine-Commits

Frédéric Delanoy : French translation for release 1.8.5
by Jeremy Newman Oct. 10, 2016

Oct. 10, 2016

Module: website Branch: master Commit: ece83d84cbaf06cd833da48e6a7cfac39478e0fe URL: http://source.winehq.org/git/website.git/?a=commit;h=ece83d84cbaf06cd833da4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 8 17:25:41 2016 +0200 French translation for release 1.8.5 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016100701.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2016100701.xml b/news/fr/2016100701.xml new file mode 100644 index 0000000..9072d16 --- /dev/null +++ b/news/fr/2016100701.xml @@ -0,0 +1,11 @@ +<news> +<date>7 octobre 2016</date> +<title>Sortie de Wine 1.8.5</title> +<body> + La version de maintenance 1.8.5 de Wine est disponible. + <a href="{$root}/announce/1.8.5">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.5.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8.5
by Jeremy Newman Oct. 10, 2016

Oct. 10, 2016

Module: website Branch: master Commit: 57b3b0e90faa8f7a612df52868bed3809f4230ed URL: http://source.winehq.org/git/website.git/?a=commit;h=57b3b0e90faa8f7a612df5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 8 07:40:14 2016 +0200 Polish translation for release 1.8.5 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016100701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/pl/2016100701.xml b/news/pl/2016100701.xml new file mode 100644 index 0000000..624ca9e --- /dev/null +++ b/news/pl/2016100701.xml @@ -0,0 +1,12 @@ +<news> +<date>Październik 7, 2016</date> +<title>Wydano Wine 1.8.5</title> +<body> + Poprawione wydanie Wine 1.8.5 jest już dostępne. + <a href="{$root}/announce/1.8.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.20
by Jeremy Newman Oct. 10, 2016

Oct. 10, 2016

Module: website Branch: master Commit: 9640baa725b94b63666d6045b686d1cd4acb591d URL: http://source.winehq.org/git/website.git/?a=commit;h=9640baa725b94b63666d60… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 8 07:40:13 2016 +0200 Polish translation for release 1.9.20 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016100101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016100101.xml b/news/pl/2016100101.xml new file mode 100644 index 0000000..2a3f3a6 --- /dev/null +++ b/news/pl/2016100101.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 1, 2016</date> +<title>Wydano Wine 1.9.20</title> +<body> + Wydanie rozwojowe Wine 1.9.20 jest już dostępne. + <a href="{$root}/announce/1.9.20">Co nowego</a> w tym wydaniu: +<ul> + <li>Reimplementacja API schowka.</li> + <li>Obsługa wiadomości w UsługachSiecowych.</li> + <li>Dużo więcej API dla bibliotek Set.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.20.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.8.5
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: website Branch: master Commit: 00461efcbcd7bb5eb8534224fa92267849d6ac15 URL: http://source.winehq.org/git/website.git/?a=commit;h=00461efcbcd7bb5eb85342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 7 22:09:26 2016 +0200 Wine release 1.8.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016100701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2016100701.xml b/news/en/2016100701.xml new file mode 100644 index 0000000..a496bbf --- /dev/null +++ b/news/en/2016100701.xml @@ -0,0 +1,12 @@ +<news> +<date>October 7, 2016</date> +<title>Wine 1.8.5 Released</title> +<body> + The Wine maintenance release 1.8.5 is now available. + <a href="{$root}/announce/1.8.5">What's new</a> in this release: +<ul> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : Release 1.8.5.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: b1387f9b18cd7e1ca1ddf54ff8ff6fe32c286f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1387f9b18cd7e1ca1ddf54ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 15 23:14:11 2016 +0200 Release 1.8.5. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 346 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 7 ++ VERSION | 2 +- configure | 18 ++-- 4 files changed, 184 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1387f9b18cd7e1ca1ddf…

1 0

Tag wine-1.8.5 : Alexandre Julliard : Release 1.8.5
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: refs/tags/wine-1.8.5 Tag: 4eadaa637afd8c2d8b7ffe7e582a13f82b7da68a URL: http://source.winehq.org/git/wine.git/?a=tag;h=4eadaa637afd8c2d8b7ffe7e582a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 7 22:00:34 2016 +0200 Release 1.8.5

1 0

Nikolay Sivov : msctf: Added stub ITextStoreACPServices support for context ITextStoreACPSink.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: b1acae60614c7333757701612f80a1a3df4c2530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1acae60614c7333757701612… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 22 10:09:37 2016 +0300 msctf: Added stub ITextStoreACPServices support for context ITextStoreACPSink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85210d46c437284a01163dfbaf4624a1d4274943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 77 +++++++++++++++++++++++++++++++++++++++ dlls/msctf/tests/inputprocessor.c | 8 +++- include/msctf.idl | 30 +++++++++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index a649c38..5a45466 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -66,6 +66,7 @@ typedef struct tagContext { /* const ITfQueryEmbeddedVtbl *QueryEmbeddedVtbl; */ ITfSourceSingle ITfSourceSingle_iface; ITextStoreACPSink ITextStoreACPSink_iface; + ITextStoreACPServices ITextStoreACPServices_iface; LONG refCount; BOOL connected; @@ -121,6 +122,11 @@ static inline Context *impl_from_ITextStoreACPSink(ITextStoreACPSink *iface) return CONTAINING_RECORD(iface, Context, ITextStoreACPSink_iface); } +static inline Context *impl_from_ITextStoreACPServices(ITextStoreACPServices *iface) +{ + return CONTAINING_RECORD(iface, Context, ITextStoreACPServices_iface); +} + static void free_sink(ContextSink *sink) { IUnknown_Release(sink->interfaces.pIUnknown); @@ -791,6 +797,8 @@ static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface, { *ppvOut = &This->ITextStoreACPSink_iface; } + else if (IsEqualIID(iid, &IID_ITextStoreACPServices)) + *ppvOut = &This->ITextStoreACPServices_iface; if (*ppvOut) { @@ -963,6 +971,74 @@ static const ITextStoreACPSinkVtbl TextStoreACPSinkVtbl = TextStoreACPSink_OnEndEditTransaction }; +static HRESULT WINAPI TextStoreACPServices_QueryInterface(ITextStoreACPServices *iface, REFIID riid, void **obj) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_QueryInterface(&This->ITextStoreACPSink_iface, riid, obj); +} + +static ULONG WINAPI TextStoreACPServices_AddRef(ITextStoreACPServices *iface) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_AddRef(&This->ITextStoreACPSink_iface); +} + +static ULONG WINAPI TextStoreACPServices_Release(ITextStoreACPServices *iface) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_Release(&This->ITextStoreACPSink_iface); +} + +static HRESULT WINAPI TextStoreACPServices_Serialize(ITextStoreACPServices *iface, ITfProperty *prop, ITfRange *range, + TF_PERSISTENT_PROPERTY_HEADER_ACP *header, IStream *stream) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p %p %p %p\n", This, prop, range, header, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_Unserialize(ITextStoreACPServices *iface, ITfProperty *prop, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *header, IStream *stream, ITfPersistentPropertyLoaderACP *loader) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p %p %p %p\n", This, prop, header, stream, loader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_ForceLoadProperty(ITextStoreACPServices *iface, ITfProperty *prop) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p\n", This, prop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_CreateRange(ITextStoreACPServices *iface, + LONG start, LONG end, ITfRangeACP **range) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %d %d %p\n", This, start, end, range); + + return S_OK; +} + +static const ITextStoreACPServicesVtbl TextStoreACPServicesVtbl = +{ + TextStoreACPServices_QueryInterface, + TextStoreACPServices_AddRef, + TextStoreACPServices_Release, + TextStoreACPServices_Serialize, + TextStoreACPServices_Unserialize, + TextStoreACPServices_ForceLoadProperty, + TextStoreACPServices_CreateRange +}; + HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; @@ -986,6 +1062,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; This->ITextStoreACPSink_iface.lpVtbl = &TextStoreACPSinkVtbl; + This->ITextStoreACPServices_iface.lpVtbl = &TextStoreACPServicesVtbl; This->refCount = 1; This->tidOwner = tidOwner; This->connected = FALSE; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 58d4d26..6cb08fe 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -230,12 +230,18 @@ static ULONG WINAPI TextStoreACP_Release(ITextStoreACP *iface) static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { + ITextStoreACPServices *services; HRESULT hr; sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); - hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&ACPSink)); + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); + + hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStoreACPServices_Release(services); + return S_OK; } diff --git a/include/msctf.idl b/include/msctf.idl index 0cfaacf..62dc0d6 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -97,6 +97,8 @@ interface ITfReadOnlyProperty; interface IEnumTfLanguageProfiles; interface ITfCompositionView; interface ITfKeyEventSink; +interface ITfPersistentPropertyLoaderACP; +interface ITfRangeACP; cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; @@ -352,6 +354,34 @@ interface ITfRangeBackup : IUnknown [ object, + uuid(aa80e901-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITextStoreACPServices : IUnknown +{ + HRESULT Serialize( + [in] ITfProperty *prop, + [in] ITfRange *range, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream); + + HRESULT Unserialize( + [in] ITfProperty *prop, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream, + [in] ITfPersistentPropertyLoaderACP *loader); + + HRESULT ForceLoadProperty( + [in] ITfProperty *prop); + + HRESULT CreateRange( + [in] LONG start, + [in] LONG end, + [out] ITfRangeACP **range); +} + +[ + object, uuid(aa80e7fd-2021-11d2-93e0-0060b067b86e), pointer_default(unique) ]

1 0

Nikolay Sivov : msctf: Make ITextStoreACPSink a part of context object.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 18eda5e82a5b92a5f22ccfcfd446ed288341fc1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18eda5e82a5b92a5f22ccfcfd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 22 10:09:36 2016 +0300 msctf: Make ITextStoreACPSink a part of context object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80c91976a2693d16a113e2701f8e731786951e52) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 264 ++++++++++++++++++++------------------------------- 1 file changed, 102 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18eda5e82a5b92a5f22cc…

1 0

Piotr Caban : msvcrt: Add _crt_debugger_hook implementation.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 1ff24243860e17cdd4265e23cf488c188add4f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff24243860e17cdd4265e23c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 13:53:19 2016 +0100 msvcrt: Add _crt_debugger_hook implementation. Based on a patch by Andrey Zhezherun. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecfc10bbfb2124e01ea99ac6ccb979071913f716) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 3 ++- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 3 ++- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 4c9a653..7cd33b5 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -30,7 +30,7 @@ @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) ucrtbase._crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex @ cdecl _errno() ucrtbase._errno diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index dfda3dd..7008c12 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -745,7 +745,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a0e9a31..96844fc 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1093,8 +1093,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e30ed25..0ec74ee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1084,8 +1084,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0e53344..1edd313 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1038,8 +1038,8 @@ @ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) msvcr120._crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) msvcr120.__crt_debugger_hook @ cdecl _ctime32(ptr) msvcr120._ctime32 @ cdecl _ctime32_s(str long ptr) msvcr120._ctime32_s @ cdecl _ctime64(ptr) msvcr120._ctime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2611bcc..a54665c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -409,8 +409,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 45e1d6b..d6e337a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -392,7 +392,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 4e9f288..c1510ef 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -498,3 +498,11 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } + +/********************************************************************* + * _crt_debugger_hook (MSVCR80.@) + */ +void CDECL MSVCRT__crt_debugger_hook(int reserved) +{ + WARN("(%x)\n", reserved); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7ce36ff..776967e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -242,7 +242,7 @@ @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64

1 0

Stefan Dösinger : wined3d: Rotate through swapchain buffers.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 2c5d3fad89bb19e6f7a0368e285db845f009fc06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5d3fad89bb19e6f7a0368e2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:08 2016 +0000 wined3d: Rotate through swapchain buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d71f452c4d70a9fa6513322a5751f1eb0f46b4e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/wined3d/swapchain.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 0663e18..16984ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8044,9 +8044,9 @@ static void test_flip(void) /* Contents were changed. */ color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -8055,15 +8055,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 120d688..c91d02c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20199,9 +20199,9 @@ static void test_flip(void) /* Contents were changed. */ color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -20210,15 +20210,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface9_Release(back_buffers[i]); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7d48de..fe2208c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -422,6 +422,51 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } +/* Context activation is done by the caller. */ +static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) +{ + struct gl_texture tex0; + GLuint rb0; + DWORD locations0; + struct wined3d_surface *surface, *surface_prev; + unsigned int i; + static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; + + if (swapchain->desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + return; + + surface_prev = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + + /* Back buffer 0 is already in the draw binding. */ + tex0 = swapchain->back_buffers[0]->texture_rgb; + rb0 = surface_prev->rb_multisample; + locations0 = surface_prev->locations; + + for (i = 1; i < swapchain->desc.backbuffer_count; ++i) + { + surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[i], 0)); + + if (!(surface->locations & supported_locations)) + surface_load_location(surface, context, swapchain->back_buffers[i]->resource.draw_binding); + + swapchain->back_buffers[i - 1]->texture_rgb = swapchain->back_buffers[i]->texture_rgb; + surface_prev->rb_multisample = surface->rb_multisample; + + surface_validate_location(surface_prev, surface->locations & supported_locations); + surface_invalidate_location(surface_prev, ~(surface->locations & supported_locations)); + + surface_prev = surface; + } + + swapchain->back_buffers[i - 1]->texture_rgb = tex0; + surface_prev->rb_multisample = rb0; + + surface_validate_location(surface_prev, locations0 & supported_locations); + surface_invalidate_location(surface_prev, ~(locations0 & supported_locations)); + + device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { @@ -549,7 +594,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + + wined3d_swapchain_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0