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

Józef Kucia : wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 7c9dbd789aed14100fb4d6eb4db1859ce5921dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9dbd789aed14100fb4d6eb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:35 2016 +0100 wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format. 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/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/utils.c | 144 ++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9dbd789aed14100fb4d…

1 0

Józef Kucia : wined3d: Introduce get_format_internal( ) helper function.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: e59ad5d1362d9aba2e07ed357cd70b7a7f4e2717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ad5d1362d9aba2e07ed357… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:37 2016 +0100 wined3d: Introduce get_format_internal() helper function. 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 | 173 +++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59ad5d1362d9aba2e07e…

1 0

Andrew Eikum : imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 1a6d3c15830cb69a756fdaeda64d1fd8f6cc89c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6d3c15830cb69a756fdaeda… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 2 08:09:01 2016 -0600 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 4684f30..78a0ac4 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -431,29 +431,27 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, /* generate header */ sampleL = R16(src); src += 2; W16(dst, sampleL); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexL; - dst += 2; + W16(dst, stepIndexL); dst += 2; sampleR = R16(src); src += 2; W16(dst, sampleR); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexR; - dst += 2; + W16(dst, stepIndexR); dst += 2; for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 8) { for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 0), + code1 = generate_nibble(R16(src + (4 * i + 0) * 2), &stepIndexL, &sampleL); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 0), + code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); *dst++ = (code1 << 4) | code2; } for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 1), + code1 = generate_nibble(R16(src + (4 * i + 1) * 2), &stepIndexR, &sampleR); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 1), + code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); *dst++ = (code1 << 4) | code2; }

1 0

Hugh McMaster : regedit/tests: Fix line concatenation test.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: b897c9b13de9503afafb4d2f8d9776f314d1e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b897c9b13de9503afafb4d2f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:10 2016 +0000 regedit/tests: Fix line concatenation test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 482940c..e9bf082 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -251,8 +251,8 @@ static void test_basic_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,69,6e,65,20,\ - 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n"

1 0

Józef Kucia : wined3d: Record sampler usage for sample_c instruction.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: dc7db9852a2f66aaddc8a7ed022356ee0b2debcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7db9852a2f66aaddc8a7ed0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:32 2016 +0100 wined3d: Record sampler usage for sample_c instruction. 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/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 765c682..bf4b421 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,6 +1282,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B + || ins.handler_idx == WINED3DSIH_SAMPLE_C || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ || ins.handler_idx == WINED3DSIH_SAMPLE_GRAD || ins.handler_idx == WINED3DSIH_SAMPLE_LOD)

1 0

Hugh McMaster : regedit/tests: Test whether comments ending in a backslash affect the next line.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 750358fc44087926c606623f6a27f93a5328ada3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750358fc44087926c606623f6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:33 2016 +0000 regedit/tests: Test whether comments ending in a backslash affect the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e9bf082..23ea4f9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -278,6 +278,14 @@ static void test_basic_import(void) verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment \\\n" + "\"Wine9\"=\"Line 2\"\n\n"); + verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Ken Thomases : winemac: Set the parent of Cocoa views for child windows when they are created.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: b5194d6f8300ee3114e848d1bc28207c7d4e4a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5194d6f8300ee3114e848d1b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 1 19:38:41 2016 -0600 winemac: Set the parent of Cocoa views for child windows when they are created. This fixes an oversight in commit d91e56863. Some of the views created for Win32 child windows were being left out of any view hierarchy. OpenGL contexts attached to such child windows and views were not able to render to screen, leaving blank areas. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 07d0f23..40aa439 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -786,6 +786,25 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) /*********************************************************************** + * set_cocoa_view_parent + */ +static void set_cocoa_view_parent(struct macdrv_win_data *data, HWND parent) +{ + struct macdrv_win_data *parent_data = get_win_data(parent); + macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; + macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; + + TRACE("win %p/%p parent %p/%p\n", data->hwnd, data->cocoa_view, parent, cocoa_window ? (void*)cocoa_window : (void*)superview); + + if (!cocoa_window && !superview) + WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", data->hwnd, parent); + + macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); + release_win_data(parent_data); +} + + +/*********************************************************************** * macdrv_create_win_data * * Create a Mac data window structure for an existing window. @@ -825,6 +844,8 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win TRACE("win %p/%p window %s whole %s client %s\n", hwnd, data->cocoa_view, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); + + set_cocoa_view_parent(data, parent); } return data; @@ -1574,18 +1595,8 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) destroy_cocoa_window(data); create_cocoa_view(data); } - else - { - struct macdrv_win_data *parent_data = get_win_data(parent); - macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; - macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; - - if (!cocoa_window && !superview) - WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", hwnd, parent); - macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); - release_win_data(parent_data); - } + set_cocoa_view_parent(data, parent); } else /* new top level window */ {

1 0

Vincent Povirk : gdiplus: Don' t include rotated fonts in the installed font collection.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 0d6a4b06f96da1027e564e99e37f773b0975803b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6a4b06f96da1027e564e99e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:11 2016 -0600 gdiplus: Don't include rotated fonts in the installed font collection. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 63eaed2..ed0499d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1604,6 +1604,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (type == RASTER_FONTTYPE) return 1; + /* skip rotated fonts */ + if (lfw->lfFaceName[0] == '@') + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)

1 0

Vincent Povirk : gdiplus: Create the FontFamily before checking for duplicates.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 50185949d8d41c78fe52ba7c6fc1e5de39491f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50185949d8d41c78fe52ba7c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:12 2016 -0600 gdiplus: Create the FontFamily before checking for duplicates. Sometimes GdipCreateFontFamilyFromName stores a different name in the GpFontFamily object, which breaks the duplicate check. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ed0499d..1068a47 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1599,6 +1599,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { GpFontCollection* fonts = (GpFontCollection*)lParam; + GpFontFamily* family; int i; if (type == RASTER_FONTTYPE) @@ -1608,10 +1609,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (lfw->lfFaceName[0] == '@') return 1; - /* skip duplicates */ - for (i=0; i<fonts->count; i++) - if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) - return 1; + if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + return 1; if (fonts->allocated == fonts->count) { @@ -1627,11 +1626,21 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) - fonts->count++; - else + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) return 0; + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + { + if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + { + GdipDeleteFontFamily(family); + return 1; + } + } + + fonts->FontFamilies[fonts->count++] = family; + return 1; }

1 0

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

Dec. 2, 2016

Module: wine Branch: master Commit: 85c8c3eea8a5ac31deb52dda7d3e28d2c8f11a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c8c3eea8a5ac31deb52dda7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:34 2016 +0100 wined3d: Implement stencil shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/view.c | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fabd69c..5787c22 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3904,6 +3904,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE("Disabling ARB_clip_control because ARB_viewport_array is not supported.\n"); gl_info->supported[ARB_CLIP_CONTROL] = FALSE; } + if (gl_info->supported[ARB_STENCIL_TEXTURING] && !gl_info->supported[ARB_TEXTURE_SWIZZLE]) + { + /* The stencil value needs to be placed in the green channel. */ + TRACE("Disabling ARB_stencil_texturing because ARB_texture_swizzle is not supported.\n"); + gl_info->supported[ARB_STENCIL_TEXTURING] = FALSE; + } if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) { TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 86d3ebb..2e728ac 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static BOOL is_stencil_view_format(const struct wined3d_format *format) +{ + return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT + || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -320,6 +326,25 @@ static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shad desc->u.texture.layer_idx, desc->u.texture.layer_count)); checkGLcall("Create texture view"); + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->object); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + context_release(context); } @@ -391,7 +416,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->format->id == view_format->id && texture->target == view->target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count) + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) { TRACE("Creating identity shader resource view.\n"); }

1 0

Józef Kucia : wined3d: Add ARB_stencil_texturing extension.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: fc12d331c50ac82ef8dd29a9c51ea72482baf061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc12d331c50ac82ef8dd29a9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:33 2016 +0100 wined3d: Add ARB_stencil_texturing extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 773d185..fabd69c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, + {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, @@ -3636,6 +3637,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, + {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2bafa89..26089ad 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW, + ARB_STENCIL_TEXTURING, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION,

1 0

Michael Müller : ntdll: Move EventSetInformation from advapi32 to ntdll.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 7ce4ae6895314eef8d984b285b1380477c391ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce4ae6895314eef8d984b285… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Dec 2 15:34:37 2016 +0300 ntdll: Move EventSetInformation from advapi32 to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ---------- dlls/ntdll/misc.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4868841..0ecd4e9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,7 +273,7 @@ @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister -@ stdcall EventSetInformation(int64 long ptr long) +@ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 9bd75e8..c1dbb99 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -880,16 +880,6 @@ ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor } /****************************************************************************** - * EventSetInformation [ADVAPI32.@] - */ -ULONG WINAPI EventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, - ULONG length ) -{ - FIXME("%u, %p, %u\n", class, info, length); - return ERROR_SUCCESS; -} - -/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 687fff5..ceb82f6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -380,6 +380,16 @@ ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) return ERROR_SUCCESS; } +/********************************************************************* + * EtwEventSetInformation (NTDLL.@) + */ +ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, void *info, + ULONG length ) +{ + FIXME("(%s, %u, %p, %u) stub\n", wine_dbgstr_longlong(handle), class, info, length); + return ERROR_SUCCESS; +} + /****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 57f00c0..28aa2df 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -42,6 +42,7 @@ @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() @ stdcall EtwEventRegister(ptr ptr ptr ptr) +@ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)

1 0

Hugh McMaster : reg/tests: Fix line concatenation tests.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 80b884fbef4286ed5555ae46b53f596a90cc5506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b884fbef4286ed5555ae46b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:22 2016 +0000 reg/tests: Fix line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bdbf776..d338620 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -927,8 +927,8 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,69,6e,65,20,\ - 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n" @@ -1099,8 +1099,8 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\ - 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n"

1 0

Ken Thomases : winemac: Keep floating windows in a higher window level than non-floating full-screen windows.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 7161df136fd1f98fc005528e6e2f391e5a952f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7161df136fd1f98fc005528e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 1 19:38:40 2016 -0600 winemac: Keep floating windows in a higher window level than non-floating full-screen windows. When windows aren't full-screen, non-floating windows go in NSNormalWindowLevel and floating ones go in NSFloatingWindowLevel, which is higher. However, a non-floating full-screen window will go into a level higher than either of those. The prior logic of the -adjustWindowLevels: method would keep the floating windows at a window level at least that high. They should actually be in a strictly higher level. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 0eaea57..09c95d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -520,6 +520,7 @@ static NSString* WineLocalizedString(unsigned int stringID) NSUInteger nextFloatingIndex = 0; __block NSInteger maxLevel = NSIntegerMin; __block NSInteger maxNonfloatingLevel = NSNormalWindowLevel; + __block NSInteger minFloatingLevel = NSFloatingWindowLevel; __block WineWindow* prev = nil; WineWindow* window; @@ -556,6 +557,14 @@ static NSString* WineLocalizedString(unsigned int stringID) NSInteger origLevel = [window level]; NSInteger newLevel = [window minimumLevelForActive:active]; + if (window.floating) + { + if (minFloatingLevel <= maxNonfloatingLevel) + minFloatingLevel = maxNonfloatingLevel + 1; + if (newLevel < minFloatingLevel) + newLevel = minFloatingLevel; + } + if (newLevel < maxLevel) newLevel = maxLevel; else

1 0

Nikolay Sivov : dwrite: Skip entries prefixed with '@' in system font file enumerator.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 93ac04d6082f1f64eeaf61e17f5f664539ea1469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ac04d6082f1f64eeaf61e17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 2 01:31:56 2016 +0300 dwrite: Skip entries prefixed with '@' in system font file enumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2e1eab0..76a90bd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3808,10 +3808,12 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato /* iterate until we find next string value */ while (1) { DWORD type = 0, count, val_count; + val_count = max_val_count; + value[0] = 0; if (RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, NULL, &count)) break; - if (type == REG_SZ) { + if (type == REG_SZ && *value && *value != '@') { *current = TRUE; break; }

1 0