December 2016 - Wine-Commits

Akihiro Sagawa : wineqtdecoder: Fix reference leaks.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 0eac876e3feb15eabe559249dd04d328e424dba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eac876e3feb15eabe559249d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 5 00:37:17 2016 +0900 wineqtdecoder: Fix reference leaks. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 1d5b808..7db7a28 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -864,6 +864,9 @@ static ULONG WINAPI QTInPin_Release(IPin *iface) if (This->pAlloc) IMemAllocator_Release(This->pAlloc); This->pAlloc = NULL; + if (This->pReader) + IAsyncReader_Release(This->pReader); + This->pReader = NULL; This->pin.IPin_iface.lpVtbl = NULL; return 0; } @@ -1203,6 +1206,7 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) { IMemAllocator_Decommit(This->pAlloc); IPin_Disconnect(This->pin.pConnectedTo); + IPin_Release(This->pin.pConnectedTo); This->pin.pConnectedTo = NULL; hr = QT_RemoveOutputPins(Parser); }

1 0

Akihiro Sagawa : winegstreamer: Fix reference leaks.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 38586dcf48bf38c136ea315fd9d83a1be56483b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38586dcf48bf38c136ea315fd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 5 00:37:14 2016 +0900 winegstreamer: Fix reference leaks. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 7 +++++++ dlls/winegstreamer/gstdemux.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 3077b38..9db1c72 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -366,6 +366,13 @@ static void test_render_run(const WCHAR *file) } releasefiltergraph(); + + if (h != INVALID_HANDLE_VALUE) { + /* check reference leaks */ + h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); + CloseHandle(h); + } } static void test_graph_builder(void) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 03d8d5b..c33ed9e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1951,6 +1951,9 @@ static ULONG WINAPI GSTInPin_Release(IPin *iface) if (This->pAlloc) IMemAllocator_Release(This->pAlloc); This->pAlloc = NULL; + if (This->pReader) + IAsyncReader_Release(This->pReader); + This->pReader = NULL; This->pin.IPin_iface.lpVtbl = NULL; return 0; } else @@ -2048,6 +2051,7 @@ static HRESULT WINAPI GSTInPin_Disconnect(IPin *iface) if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(This->pAlloc); IPin_Disconnect(This->pin.pConnectedTo); + IPin_Release(This->pin.pConnectedTo); This->pin.pConnectedTo = NULL; hr = GST_RemoveOutputPins(Parser); } else

1 0

Lauri Kenttä : cmd/tests: Treat compressed file as broken in %~ai test.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 29cb86a722cf6a673766e49f7491c6f4f0ffce43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cb86a722cf6a673766e49f7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Dec 3 11:06:46 2016 +0200 cmd/tests: Treat compressed file as broken in %~ai test. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2df4311..e81fbcb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -531,7 +531,7 @@ N @todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' -'--a------'@or_broken@'--a--------'@or_broken@'%~ai' +'--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' '5'@or_broken@'%~zi' ''@or_broken@'%~ti' ''@or_broken@'%~ti'

1 0

Henri Verbeet : d2d1/tests: Introduce a helper function to add lines to a geometry sink.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: a8dc7cc1d6adc00e08e6ad0aaed18ef51a785bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8dc7cc1d6adc00e08e6ad0aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:04 2016 +0100 d2d1/tests: Introduce a helper function to add lines to a geometry sink. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 134 ++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 84 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1653e68..3635131 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -130,6 +130,14 @@ static void translate_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) matrix->_32 += x * matrix->_12 + y * matrix->_22; } +static void line_to(ID2D1GeometrySink *sink, float x, float y) +{ + D2D1_POINT_2F point; + + set_point(&point, x, y); + ID2D1GeometrySink_AddLine(sink, point); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1187,99 +1195,61 @@ static void fill_geometry_sink(ID2D1GeometrySink *sink) set_point(&point, 15.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 55.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 55.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 75.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 75.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 45.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 45.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 35.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 35.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 65.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 65.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 15.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 55.0f, 20.0f); + line_to(sink, 55.0f, 220.0f); + line_to(sink, 25.0f, 220.0f); + line_to(sink, 25.0f, 100.0f); + line_to(sink, 75.0f, 100.0f); + line_to(sink, 75.0f, 300.0f); + line_to(sink, 5.0f, 300.0f); + line_to(sink, 5.0f, 60.0f); + line_to(sink, 45.0f, 60.0f); + line_to(sink, 45.0f, 180.0f); + line_to(sink, 35.0f, 180.0f); + line_to(sink, 35.0f, 140.0f); + line_to(sink, 65.0f, 140.0f); + line_to(sink, 65.0f, 260.0f); + line_to(sink, 15.0f, 260.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 155.0f, 300.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 155.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 155.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 155.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 155.0f, 160.0f); + line_to(sink, 85.0f, 160.0f); + line_to(sink, 85.0f, 300.0f); + line_to(sink, 120.0f, 300.0f); + line_to(sink, 120.0f, 20.0f); + line_to(sink, 155.0f, 20.0f); + line_to(sink, 155.0f, 160.0f); + line_to(sink, 85.0f, 160.0f); + line_to(sink, 85.0f, 20.0f); + line_to(sink, 120.0f, 20.0f); + line_to(sink, 120.0f, 300.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 165.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 165.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 235.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 235.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 165.0f, 300.0f); + line_to(sink, 235.0f, 300.0f); + line_to(sink, 235.0f, 20.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 225.0f, 60.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 225.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 175.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 175.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 225.0f, 260.0f); + line_to(sink, 175.0f, 260.0f); + line_to(sink, 175.0f, 60.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 215.0f, 220.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 185.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 185.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 215.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 185.0f, 220.0f); + line_to(sink, 185.0f, 100.0f); + line_to(sink, 215.0f, 100.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 195.0f, 180.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 205.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 205.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 195.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 205.0f, 180.0f); + line_to(sink, 205.0f, 140.0f); + line_to(sink, 195.0f, 140.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); } @@ -1719,18 +1689,14 @@ static void test_path_geometry(void) set_point(&point, 40.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 75.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 75.0f, 300.0f); + line_to(sink, 5.0f, 300.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 40.0f, 290.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 55.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 55.0f, 160.0f); + line_to(sink, 25.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); hr = ID2D1GeometrySink_Close(sink);

1 0

André Hentschel : WWN 403: Add Aric's Video
by Jeremy Newman Dec. 5, 2016

Dec. 5, 2016

Module: website Branch: master Commit: c41ba1ed8a733c1d8b48ed6977515075af2e86f1 URL: http://source.winehq.org/git/website.git/?a=commit;h=c41ba1ed8a733c1d8b48ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 5 17:45:49 2016 +0100 WWN 403: Add Aric's Video Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- wwn/en/wn20161202_403.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20161202_403.xml b/wwn/en/wn20161202_403.xml index 16c264b..342b28e 100644 --- a/wwn/en/wn20161202_403.xml +++ b/wwn/en/wn20161202_403.xml @@ -55,7 +55,7 @@ The expected main areas of development after 2.0 will be Aric’s HID support, t Aric Stewart presented his work on supporting the Windows human interface device layer in Wine. This is a low level interface that allows applications to talk to devices like joysticks, keyboards, gamepads, etc. Few applications use it to use joysticks, instead they use higher level libraries like DirectInput or XInput, which then talk to this lower level layer. Wine currently supports DirectInput, so joysticks and gamepads work in many games. Unfortunately XInput is missing. Aric’s plan is to provide the low level hid.dll and (re-)implement dinput and xinput on top of it. This puts all operating system abstraction code (Linux, OSX, Android specific joystick handling) into hid.dll and allows applications that talk directly to hid.dll to work. Those applications are rare, but they exist. -Aric’s presentation video will be uploaded soon... +You can see Aric’s <a href="https://youtu.be/VcW_et0GC5Q">full presentation here</a>! Aric also sent a mail explaining the current status to <a href="https://www.winehq.org/pipermail/wine-devel/2016-November/115142.html">wine-devel</a>: <quote>

1 0

Jeremy Newman : remove scroll class
by Jeremy Newman Dec. 5, 2016

Dec. 5, 2016

Module: appdb Branch: master Commit: d0c61b7b970e191a6e88cb6aaf3041cd403f5e88 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d0c61b7b970e191a6e88cb6a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 5 08:34:45 2016 -0600 remove scroll class --- include/note.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/note.php b/include/note.php index ca914ac..0e43cce 100644 --- a/include/note.php +++ b/include/note.php @@ -296,7 +296,7 @@ class Note { $shOutput .= '</form>'; } - echo html_note("{$sTitle}", $this->shDescription, $shOutput, 'default panel-scroll'); + echo html_note("{$sTitle}", $this->shDescription, $shOutput, 'default'); } public static function displayNotesForEntry($iVersionId, $iAppId = null)

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.24
by Jeremy Newman Dec. 5, 2016

Dec. 5, 2016

Module: website Branch: master Commit: 779f3804a4ac9507177bd02363c0b3cf3fe42fa0 URL: http://source.winehq.org/git/website.git/?a=commit;h=779f3804a4ac9507177bd0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Dec 4 08:22:56 2016 +0100 Polish translation for release 1.9.24 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016112501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016112501.xml b/news/pl/2016112501.xml new file mode 100644 index 0000000..7c710e3 --- /dev/null +++ b/news/pl/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>Listopad 25, 2016</date> +<title>Wydano Wine 1.9.24</title> +<body> + Wydanie rozwojowe Wine 1.9.24 jest już dostępne. + <a href="{$root}/announce/1.9.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa dla nieuszeregowanych widoków dostępu w Direct3D.</li> + <li>Wiele poprawek w testach regresji.</li> + <li>Kilka ulepszeń w obsłudze HID.</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.24.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

Detlef Riekenberg : localspl: Accept valid environments in AddMonitor.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 5d6f96fd9d890d617c6c0c6af7b6ab46c48ceb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6f96fd9d890d617c6c0c6af… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 2 19:09:54 2016 +0100 localspl: Accept valid environments in AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index b5fcdb1..f359b73 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1465,6 +1465,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo */ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { + const printenv_t * env; monitor_t * pm = NULL; LPMONITOR_INFO_2W mi2w; HKEY hroot = NULL; @@ -1489,12 +1490,10 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!mi2w->pEnvironment || lstrcmpW(mi2w->pEnvironment, x86_envnameW)) { - WARN("Environment %s requested (we support only %s)\n", - debugstr_w(mi2w->pEnvironment), debugstr_w(x86_envnameW)); - SetLastError(ERROR_INVALID_ENVIRONMENT); - return FALSE; - } + + env = validate_envW(mi2w->pEnvironment); + if (!env) + return FALSE; /* ERROR_INVALID_ENVIRONMENT */ if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) { WARN("pDLLName not valid : %s\n", debugstr_w(mi2w->pDLLName));

1 0

Józef Kucia : wined3d: Fix depth/ stencil shader resource views.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: af1be967a0b0262a980e9bfbdff107c1d6db7e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1be967a0b0262a980e9bfbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:36 2016 +0100 wined3d: Fix depth/stencil shader resource views. The WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT formats were not initialized. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 609f415..00899a1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -276,6 +276,19 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, }; +struct wined3d_format_typeless_depth_stencil_info +{ + enum wined3d_format_id depth_stencil_id; + enum wined3d_format_id depth_view_id; + enum wined3d_format_id stencil_view_id; +}; + +static const struct wined3d_format_typeless_depth_stencil_info typeless_depth_stencil_formats[] = +{ + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT}, + {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT}, +}; + struct wined3d_format_ddi_info { enum wined3d_format_id id; @@ -1665,6 +1678,13 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } +static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) +{ + enum wined3d_format_id id = dst_format->id; + *dst_format = *src_format; + dst_format->id = id; +} + static void format_set_flag(struct wined3d_format *format, unsigned int flag) { unsigned int i; @@ -2912,8 +2932,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format = &gl_info->formats[srgb_fmt_idx]; - *srgb_format = *format; - srgb_format->id = format_srgb_info[j].srgb_format_id; + copy_format(srgb_format, format); if (gl_info->supported[EXT_TEXTURE_SRGB] && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) @@ -3460,12 +3479,51 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_format = &gl_info->formats[typeless_fmt_idx]; memcpy(flags, typeless_format->flags, sizeof(flags)); - *typeless_format = *format; - typeless_format->id = typed_formats[i].typeless_id; + copy_format(typeless_format, format); for (j = 0; j < ARRAY_SIZE(typeless_format->flags); ++j) typeless_format->flags[j] |= flags[j]; } + for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) + { + struct wined3d_format *ds_format, *depth_view_format, *stencil_view_format; + int ds_fmt_idx, depth_view_fmt_idx, stencil_view_fmt_idx; + + ds_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_stencil_id); + if (ds_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_stencil_id), + typeless_depth_stencil_formats[i].depth_stencil_id); + return FALSE; + } + + depth_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_view_id); + if (depth_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_view_id), + typeless_depth_stencil_formats[i].depth_view_id); + return FALSE; + } + + stencil_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].stencil_view_id); + if (stencil_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].stencil_view_id), + typeless_depth_stencil_formats[i].stencil_view_id); + return FALSE; + } + + ds_format = &gl_info->formats[ds_fmt_idx]; + depth_view_format = &gl_info->formats[depth_view_fmt_idx]; + stencil_view_format = &gl_info->formats[stencil_view_fmt_idx]; + + copy_format(depth_view_format, ds_format); + copy_format(stencil_view_format, ds_format); + } + return TRUE; }

1 0

Lauri Kenttä : user32: Fix caret disappearing after scrolling.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 1d3b9448f6dccf642b015359af53e03f295a76cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3b9448f6dccf642b015359a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Nov 26 18:03:43 2016 +0200 user32: Fix caret disappearing after scrolling. The caret needs to be moved along with scrolling even if it's outside the visible area. Otherwise, when the caret is scrolled out from the view, the position won't get updated anymore and the caret will never scroll back again. The idea is based on the patch by André Hentschel. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 76 ++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 30dabfe..622dcad 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -837,65 +837,41 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, { GUITHREADINFO info; RECT rect, mapped_rcCaret; - BOOL hide_caret = FALSE; info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; + mapped_rcCaret = info.rcCaret; if (info.hwndCaret == hWnd) { - /* Move the caret if it's (partially) in the source rectangle */ - if (IntersectRect(&rect, scroll_rect, &info.rcCaret)) - { - *move_caret = TRUE; - hide_caret = TRUE; - new_caret_pos->x = info.rcCaret.left + dx; - new_caret_pos->y = info.rcCaret.top + dy; - } - else - { - *move_caret = FALSE; - - /* Hide the caret if it's in the destination rectangle */ - rect = *scroll_rect; - OffsetRect(&rect, dx, dy); - hide_caret = IntersectRect(&rect, &rect, &info.rcCaret); - } + /* The caret needs to be moved along with scrolling even if it's + * outside the visible area. Otherwise, when the caret is scrolled + * out from the view, the position won't get updated anymore and + * the caret will never scroll back again. */ + *move_caret = TRUE; + new_caret_pos->x = info.rcCaret.left + dx; + new_caret_pos->y = info.rcCaret.top + dy; } else { - if ((flags & SW_SCROLLCHILDREN) && IsChild(hWnd, info.hwndCaret)) - { - *move_caret = FALSE; - - /* Hide the caret if it's in the source or in the destination - rectangle */ - mapped_rcCaret = info.rcCaret; - MapWindowPoints(info.hwndCaret, hWnd, (LPPOINT)&mapped_rcCaret, 2); - - if (IntersectRect(&rect, scroll_rect, &mapped_rcCaret)) - { - hide_caret = TRUE; - } - else - { - rect = *scroll_rect; - OffsetRect(&rect, dx, dy); - hide_caret = IntersectRect(&rect, &rect, &mapped_rcCaret); - } - } - else + *move_caret = FALSE; + if (!(flags & SW_SCROLLCHILDREN) || !IsChild(hWnd, info.hwndCaret)) return 0; + MapWindowPoints(info.hwndCaret, hWnd, (LPPOINT)&mapped_rcCaret, 2); } - if (hide_caret) - { - HideCaret(info.hwndCaret); - return info.hwndCaret; + /* If the caret is not in the src/dest rects, all is fine done. */ + if (!IntersectRect(&rect, scroll_rect, &mapped_rcCaret)) + { + rect = *scroll_rect; + OffsetRect(&rect, dx, dy); + if (!IntersectRect(&rect, &rect, &mapped_rcCaret)) + return 0; } - else - return 0; + + /* Indicate that the caret needs to be updated during the scrolling. */ + return info.hwndCaret; } @@ -1456,6 +1432,8 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); hwndCaret = fix_caret(hwnd, &rc, dx, dy, flags, &moveCaret, &newCaretPos); + if (hwndCaret) + HideCaret(hwndCaret); if (is_ex) dcxflags |= DCX_CACHE; if( style & WS_CLIPSIBLINGS) dcxflags |= DCX_CLIPSIBLINGS; @@ -1555,10 +1533,10 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC DeleteObject( hrgnWinupd); } - if( hwndCaret ) { - if ( moveCaret ) SetCaretPos( newCaretPos.x, newCaretPos.y ); - ShowCaret(hwndCaret); - } + if( moveCaret ) + SetCaretPos( newCaretPos.x, newCaretPos.y ); + if( hwndCaret ) + ShowCaret( hwndCaret ); if( bOwnRgn && hrgnUpdate ) DeleteObject( hrgnUpdate );

1 0