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

Jacek Caban : server: Signal pipe server fd in create_pipe_server.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: d8bfbbdc07f7562e8ab3283ac160f94b428ade75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bfbbdc07f7562e8ab3283ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 2 13:37:59 2016 +0100 server: Signal pipe server fd in create_pipe_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++++++++ server/named_pipe.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 6c311a4..28bac91 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -110,6 +110,13 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD return (BOOL)rpcargs.returnValue; } +#define test_signaled(h) _test_signaled(__LINE__,h) +static void _test_signaled(unsigned line, HANDLE handle) +{ + DWORD res = WaitForSingleObject(handle, 0); + ok_(__FILE__,line)(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -176,6 +183,7 @@ static void test_CreateNamedPipe(int pipemode) /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, /* lpSecurityAttrib */ NULL); ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); ret = WaitNamedPipeA(PIPENAME, 2000); ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError()); diff --git a/server/named_pipe.c b/server/named_pipe.c index 55d05c1..d93c40f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -690,6 +690,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned release_object( server ); return NULL; } + set_fd_signaled( server->ioctl_fd, 1 ); set_server_state( server, ps_idle_server ); return server; }

1 0

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

Dec. 2, 2016

Module: wine Branch: master Commit: f4334f29f81714da25d3e0b7e77346ef2d64725b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4334f29f81714da25d3e0b7e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:45 2016 +0000 reg/tests: Test whether comment lines 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/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d338620..6447d45 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -971,6 +971,16 @@ static void test_import(void) if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1143,6 +1153,16 @@ static void test_import(void) if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

André Hentschel : Add WWN 403
by Jeremy Newman Dec. 2, 2016

Dec. 2, 2016

Module: website Branch: master Commit: d5cee8eff5a2ee3211877af31250e68e05a2461e URL: http://source.winehq.org/git/website.git/?a=commit;h=d5cee8eff5a2ee3211877a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 2 21:39:17 2016 +0100 Add WWN 403 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016120201.xml | 11 + news/en/2016120201.xml | 11 + wwn/en/wn20161202_403.xml | 10038 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 10060 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d5cee8eff5a2ee3211…

1 0

Bruno Jesus : iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 95298b4442504d9e977fbdb72ce1417273340265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95298b4442504d9e977fbdb72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 1 10:23:36 2016 -0200 iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++------ dlls/iphlpapi/tests/iphlpapi.c | 3 +++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 90dcda3..54f7a37 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -134,17 +134,27 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, } -static int IpAddrTableSorter(const void *a, const void *b) +static int IpAddrTableNumericSorter(const void *a, const void *b) { - int ret; + int ret = 0; if (a && b) ret = ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; - else - ret = 0; return ret; } +static int IpAddrTableLoopbackSorter(const void *a, const void *b) +{ + const MIB_IPADDRROW *left = a, *right = b; + int ret = 0; + + if (isIfIndexLoopback(left->dwIndex)) + ret = 1; + else if (isIfIndexLoopback(right->dwIndex)) + ret = -1; + + return ret; +} /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) @@ -173,7 +183,7 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, ret = getIPAddrTable(ppIpAddrTable, heap, flags); if (!ret && bOrder) qsort((*ppIpAddrTable)->table, (*ppIpAddrTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); TRACE("returning %d\n", ret); return ret; } @@ -1988,9 +1998,14 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL else { *pdwSize = size; memcpy(pIpAddrTable, table, size); + /* sort by numeric IP value */ if (bOrder) qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); + /* sort ensuring loopback interfaces are in the end */ + else + qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, + sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter); ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 73e4302..9f59910 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -261,6 +261,9 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + /* loopback must never be the first when more than one interface is found */ + if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) + ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Aric Stewart : hidclass: All reports read or written to user space lead with a reportId.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: d0039106dea1f4f6e6d762f564c8f12364a2db01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0039106dea1f4f6e6d762f56… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 29 07:58:27 2016 -0600 hidclass: All reports read or written to user space lead with a reportId. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 31 ++++---------- dlls/hidclass.sys/device.c | 94 ++++++++++++++++++++++++++++-------------- dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++- 3 files changed, 107 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0039106dea1f4f6e6d76…

1 0

Bruno Jesus : winmm: Return meaningful value in WINMM_CreateIData.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: a6f43ecf9b58133430cce9a266264c3c6407ad4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f43ecf9b58133430cce9a26… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 1 11:32:34 2016 -0200 winmm: Return meaningful value in WINMM_CreateIData. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f2d0858..0f3cd5d 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -79,7 +79,7 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - return TRUE; + return psLastEvent != NULL; } /****************************************************************** @@ -137,9 +137,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - if (!WINMM_CreateIData(hInstDLL)) - return FALSE; - break; + if (!WINMM_CreateIData(hInstDLL)) + return FALSE; + + break; case DLL_PROCESS_DETACH: if(fImpLoad) break;

1 0

Jacek Caban : server: Get rid of no loner used cancel_async from fd_ops.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: ad1e0609a0f388345b0dc3f8777f6c60c595fe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1e0609a0f388345b0dc3f87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:34 2016 +0100 server: Get rid of no loner used cancel_async from fd_ops. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 6 ++---- server/console.c | 3 +-- server/device.c | 3 +-- server/fd.c | 6 ------ server/file.c | 3 +-- server/file.h | 3 --- server/mailslot.c | 9 +++------ server/mapping.c | 3 +-- server/named_pipe.c | 9 +++------ server/request.c | 3 +-- server/serial.c | 3 +-- server/signal.c | 3 +-- server/sock.c | 6 ++---- server/thread.c | 3 +-- 14 files changed, 18 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad1e0609a0f388345b0dc…

1 0

Andrew Eikum : user32: Support IDC_PEN.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: d1064669f416ad2e354218852535250717bc34dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1064669f416ad2e354218852… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 30 13:13:47 2016 -0600 user32: Support IDC_PEN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_pen.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 3 +++ include/winuser.h | 1 + include/winuser.rh | 1 + 4 files changed, 5 insertions(+) diff --git a/dlls/user32/resources/ocr_pen.cur b/dlls/user32/resources/ocr_pen.cur new file mode 100644 index 0000000..51be164 Binary files /dev/null and b/dlls/user32/resources/ocr_pen.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 4826e04..28a6c74 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -263,6 +263,9 @@ OCR_HELP CURSOR resources/ocr_help.cur /* @makedep: resources/ocr_dragobject.cur */ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur +/* @makedep: resources/ocr_pen.cur */ +OCR_PEN CURSOR resources/ocr_pen.cur + /****************************************************************/ /* Icons */ diff --git a/include/winuser.h b/include/winuser.h index cb7c37b..2b8331c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2215,6 +2215,7 @@ typedef struct tagCBTACTIVATESTRUCT #define IDC_WAIT MAKEINTRESOURCE(32514) #define IDC_CROSS MAKEINTRESOURCE(32515) #define IDC_UPARROW MAKEINTRESOURCE(32516) +#define IDC_PEN MAKEINTRESOURCE(32631) #define IDC_SIZE MAKEINTRESOURCE(32640) #define IDC_ICON MAKEINTRESOURCE(32641) #define IDC_SIZENWSE MAKEINTRESOURCE(32642) diff --git a/include/winuser.rh b/include/winuser.rh index 1d2a0bb..e48a935 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -999,6 +999,7 @@ #define OCR_WAIT 32514 #define OCR_CROSS 32515 #define OCR_UP 32516 +#define OCR_PEN 32631 #define OCR_SIZE 32640 #define OCR_ICON 32641 #define OCR_SIZENWSE 32642

1 0

Nikolay Sivov : include: Update various shell enums and flags.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 5669a710b228cf08f9669f66088538886d4b912f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5669a710b228cf08f9669f660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 10:42:02 2016 +0300 include: Update various shell enums and flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 203 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 122 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5669a710b228cf08f9669…

1 0

Michael Müller : shell32: Add IDragSourceHelper stub.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 117c0dc5ba81fb44be2fb4a79106533d67135751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117c0dc5ba81fb44be2fb4a79… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 1 07:33:19 2016 +0300 shell32: Add IDragSourceHelper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 96 +++++++++++++++++++++++++++++++++++-------- dlls/shell32/tests/shellole.c | 5 +++ 2 files changed, 83 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 0b91449..425ee71 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -47,14 +47,21 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); * IDropTargetHelper implementation */ -typedef struct { +typedef struct +{ IDropTargetHelper IDropTargetHelper_iface; + IDragSourceHelper IDragSourceHelper_iface; LONG ref; -} IDropTargetHelperImpl; +} dragdrophelper; + +static inline dragdrophelper *impl_from_IDropTargetHelper(IDropTargetHelper *iface) +{ + return CONTAINING_RECORD(iface, dragdrophelper, IDropTargetHelper_iface); +} -static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelper *iface) +static inline dragdrophelper *impl_from_IDragSourceHelper(IDragSourceHelper *iface) { - return CONTAINING_RECORD(iface, IDropTargetHelperImpl, IDropTargetHelper_iface); + return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper_iface); } /************************************************************************** @@ -62,14 +69,19 @@ static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelp */ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDropTargetHelper)) { - *ppvObj = &This->IDropTargetHelper_iface; + if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDropTargetHelper)) + { + *ppvObj = &This->IDropTargetHelper_iface; + } + else if (IsEqualIID (riid, &IID_IDragSourceHelper)) + { + *ppvObj = &This->IDragSourceHelper_iface; } if (*ppvObj) { @@ -83,7 +95,7 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE ("(%p)->(count=%u)\n", This, refCount - 1); @@ -93,7 +105,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE ("(%p)->(count=%u)\n", This, refCount + 1); @@ -113,40 +125,40 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL fShow) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%u)\n", This, fShow); return E_NOTIMPL; } -static const IDropTargetHelperVtbl vt_IDropTargetHelper = +static const IDropTargetHelperVtbl DropTargetHelperVtbl = { IDropTargetHelper_fnQueryInterface, IDropTargetHelper_fnAddRef, @@ -158,12 +170,59 @@ static const IDropTargetHelperVtbl vt_IDropTargetHelper = IDropTargetHelper_fnShow }; +static HRESULT WINAPI DragSourceHelper_QueryInterface (IDragSourceHelper * iface, REFIID riid, LPVOID * ppv) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnQueryInterface(&This->IDropTargetHelper_iface, riid, ppv); +} + +static ULONG WINAPI DragSourceHelper_AddRef (IDragSourceHelper * iface) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnAddRef(&This->IDropTargetHelper_iface); +} + +static ULONG WINAPI DragSourceHelper_Release (IDragSourceHelper * iface) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnRelease(&This->IDropTargetHelper_iface); +} + +static HRESULT WINAPI DragSourceHelper_InitializeFromBitmap(IDragSourceHelper *iface, + SHDRAGIMAGE *dragimage, IDataObject *object) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, dragimage, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DragSourceHelper_InitializeFromWindow(IDragSourceHelper *iface, HWND hwnd, + POINT *pt, IDataObject *object) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + + FIXME("(%p)->(%p, %s, %p): stub\n", This, hwnd, wine_dbgstr_point(pt), object); + + return E_NOTIMPL; +} + +static const IDragSourceHelperVtbl DragSourceHelperVtbl = +{ + DragSourceHelper_QueryInterface, + DragSourceHelper_AddRef, + DragSourceHelper_Release, + DragSourceHelper_InitializeFromBitmap, + DragSourceHelper_InitializeFromWindow +}; + /************************************************************************** * IDropTargetHelper_Constructor */ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - IDropTargetHelperImpl *dth; + dragdrophelper *dth; HRESULT hr; TRACE ("outer=%p %s %p\n", pUnkOuter, shdebugstr_guid (riid), ppv); @@ -173,10 +232,11 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); + dth = LocalAlloc (LMEM_ZEROINIT, sizeof (dragdrophelper)); if (!dth) return E_OUTOFMEMORY; - dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; + dth->IDropTargetHelper_iface.lpVtbl = &DropTargetHelperVtbl; + dth->IDragSourceHelper_iface.lpVtbl = &DragSourceHelperVtbl; dth->ref = 1; hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 5d56431..f611faf 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -892,12 +892,17 @@ static void test_SHCreateSessionKey(void) static void test_dragdrophelper(void) { + IDragSourceHelper *dragsource; IDropTargetHelper *target; HRESULT hr; hr = CoCreateInstance(&CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER, &IID_IDropTargetHelper, (void **)&target); ok(hr == S_OK, "Failed to create IDropTargetHelper, %#x\n", hr); + hr = IDropTargetHelper_QueryInterface(target, &IID_IDragSourceHelper, (void **)&dragsource); + ok(hr == S_OK, "QI failed, %#x\n", hr); + IDragSourceHelper_Release(dragsource); + IDropTargetHelper_Release(target); }

1 0

Nikolay Sivov : shell32: Simplify drag drop helper object creation.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 8e7a041154e49759d114f928cb6c13d3370c09d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7a041154e49759d114f928c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:33:18 2016 +0300 shell32: Simplify drag drop helper object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 74 ++++++++++++++++++++----------------------- dlls/shell32/tests/shellole.c | 21 ++++++++++++ 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index cae8b8d..0b91449 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -52,43 +52,12 @@ typedef struct { LONG ref; } IDropTargetHelperImpl; -static const IDropTargetHelperVtbl vt_IDropTargetHelper; - static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelper *iface) { return CONTAINING_RECORD(iface, IDropTargetHelperImpl, IDropTargetHelper_iface); } /************************************************************************** -* IDropTargetHelper_Constructor -*/ -HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IDropTargetHelperImpl *dth; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (!ppv) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); - if (!dth) return E_OUTOFMEMORY; - - dth->ref = 0; - dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; - - if (FAILED (IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv))) { - LocalFree(dth); - return E_NOINTERFACE; - } - - TRACE ("--(%p)\n", dth); - return S_OK; -} - -/************************************************************************** * IDropTargetHelper_fnQueryInterface */ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj) @@ -179,12 +148,39 @@ static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL static const IDropTargetHelperVtbl vt_IDropTargetHelper = { - IDropTargetHelper_fnQueryInterface, - IDropTargetHelper_fnAddRef, - IDropTargetHelper_fnRelease, - IDropTargetHelper_fnDragEnter, - IDropTargetHelper_fnDragLeave, - IDropTargetHelper_fnDragOver, - IDropTargetHelper_fnDrop, - IDropTargetHelper_fnShow + IDropTargetHelper_fnQueryInterface, + IDropTargetHelper_fnAddRef, + IDropTargetHelper_fnRelease, + IDropTargetHelper_fnDragEnter, + IDropTargetHelper_fnDragLeave, + IDropTargetHelper_fnDragOver, + IDropTargetHelper_fnDrop, + IDropTargetHelper_fnShow }; + +/************************************************************************** +* IDropTargetHelper_Constructor +*/ +HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IDropTargetHelperImpl *dth; + HRESULT hr; + + TRACE ("outer=%p %s %p\n", pUnkOuter, shdebugstr_guid (riid), ppv); + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); + if (!dth) return E_OUTOFMEMORY; + + dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; + dth->ref = 1; + + hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); + IDropTargetHelper_Release (&dth->IDropTargetHelper_iface); + + return hr; +} diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index be10733..5d56431 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -890,12 +890,33 @@ static void test_SHCreateSessionKey(void) RegCloseKey(hkey2); } +static void test_dragdrophelper(void) +{ + IDropTargetHelper *target; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER, &IID_IDropTargetHelper, (void **)&target); + ok(hr == S_OK, "Failed to create IDropTargetHelper, %#x\n", hr); + + IDropTargetHelper_Release(target); +} + START_TEST(shellole) { + HRESULT hr; + init(); + hr = CoInitialize(NULL); + ok(hr == S_OK, "CoInitialize failed (0x%08x)\n", hr); + if (hr != S_OK) + return; + test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); test_DragQueryFile(); test_SHCreateSessionKey(); + test_dragdrophelper(); + + CoUninitialize(); }

1 0

Nikolay Sivov : shell32: Use standard list for IEnumIDList implementation.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 794efcceeed23fde8c4dbac94d04c23100441a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=794efcceeed23fde8c4dbac94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:30:26 2016 +0300 shell32: Use standard list for IEnumIDList implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/enumidlist.c | 249 ++++++++++++++++++++------------------------ dlls/shell32/shell32_main.h | 16 +-- 2 files changed, 122 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=794efcceeed23fde8c4db…

1 0

Jacek Caban : server: Store async list in process object and use that to find async in cansel_async request.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 055918c9829d4b31e4599bf3a45faf501116a15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=055918c9829d4b31e4599bf3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:23 2016 +0100 server: Store async list in process object and use that to find async in cansel_async request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 40 +++++++++++++++++++++++++++++----------- server/fd.c | 21 +-------------------- server/file.h | 2 -- server/process.c | 2 ++ server/process.h | 1 + server/sock.c | 16 +--------------- 6 files changed, 34 insertions(+), 48 deletions(-) diff --git a/server/async.c b/server/async.c index 64aa27a..5acd1e7 100644 --- a/server/async.c +++ b/server/async.c @@ -31,12 +31,15 @@ #include "object.h" #include "file.h" #include "request.h" +#include "process.h" +#include "handle.h" struct async { struct object obj; /* object header */ struct thread *thread; /* owning thread */ struct list queue_entry; /* entry in async queue list */ + struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ unsigned int status; /* current status */ struct timeout_user *timeout; @@ -132,6 +135,7 @@ static void async_destroy( struct object *obj ) struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); + list_remove( &async->process_entry ); list_remove( &async->queue_entry ); async_reselect( async ); @@ -244,6 +248,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->signaled = 0; list_add_tail( &queue->queue, &async->queue_entry ); + list_add_tail( &thread->process->asyncs, &async->process_entry ); grab_object( async ); if (queue->fd) set_fd_signaled( queue->fd, 0 ); @@ -343,23 +348,22 @@ int async_waiting( struct async_queue *queue ) return async->status == STATUS_PENDING; } -int async_wake_up_by( struct async_queue *queue, struct process *process, - struct thread *thread, client_ptr_t iosb, unsigned int status ) +static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { - struct list *ptr, *next; + struct async *async; int woken = 0; - if (!queue || (!process && !thread && !iosb)) return 0; - - LIST_FOR_EACH_SAFE( ptr, next, &queue->queue ) +restart: + LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - struct async *async = LIST_ENTRY( ptr, struct async, queue_entry ); - if ( (!process || async->thread->process == process) && - (!thread || async->thread == thread) && - (!iosb || async->data.iosb == iosb) ) + if (async->status == STATUS_CANCELLED) continue; + if ((!obj || (async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && + (!thread || async->thread == thread) && + (!iosb || async->data.iosb == iosb)) { - async_terminate( async, status ); + async_terminate( async, STATUS_CANCELLED ); woken++; + goto restart; } } return woken; @@ -379,3 +383,17 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) if (status == STATUS_ALERTED) break; /* only wake up the first one */ } } + +/* cancels all async I/O */ +DECL_HANDLER(cancel_async) +{ + struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL ); + struct thread *thread = req->only_thread ? current : NULL; + + if (obj) + { + int count = cancel_async( current->process, obj, thread, req->iosb ); + if (!count && req->iosb) set_error( STATUS_NOT_FOUND ); + release_object( obj ); + } +} diff --git a/server/fd.c b/server/fd.c index 66d34d7..a75ff76 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2118,12 +2118,7 @@ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ) /* default cancel_async() fd routine */ int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) { - int n = 0; - - n += async_wake_up_by( fd->read_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( fd->write_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( fd->wait_q, process, thread, iosb, STATUS_CANCELLED ); - return n; + return 0; } static inline int is_valid_mounted_device( struct stat *st ) @@ -2519,20 +2514,6 @@ DECL_HANDLER(register_async) } } -/* cancels all async I/O */ -DECL_HANDLER(cancel_async) -{ - struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); - struct thread *thread = req->only_thread ? current : NULL; - - if (fd) - { - int count = fd->fd_ops->cancel_async( fd, current->process, thread, req->iosb ); - if (!count && req->iosb) set_error( STATUS_NOT_FOUND ); - release_object( fd ); - } -} - /* attach completion object to a fd */ DECL_HANDLER(set_completion_info) { diff --git a/server/file.h b/server/file.h index b643d94..7c68248 100644 --- a/server/file.h +++ b/server/file.h @@ -175,8 +175,6 @@ extern void async_set_result( struct object *obj, unsigned int status, extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); -extern int async_wake_up_by( struct async_queue *queue, struct process *process, - struct thread *thread, client_ptr_t iosb, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); diff --git a/server/process.c b/server/process.c index 528ec74..cca18e9 100644 --- a/server/process.c +++ b/server/process.c @@ -535,6 +535,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->rawinput_kbd = NULL; list_init( &process->thread_list ); list_init( &process->locks ); + list_init( &process->asyncs ); list_init( &process->classes ); list_init( &process->dlls ); list_init( &process->rawinput_devices ); @@ -614,6 +615,7 @@ static void process_destroy( struct object *obj ) /* we can't have a thread remaining */ assert( list_empty( &process->thread_list )); + assert( list_empty( &process->asyncs )); assert( !process->sigkill_timeout ); /* timeout should hold a reference to the process */ diff --git a/server/process.h b/server/process.h index 4e6de69..548796f 100644 --- a/server/process.h +++ b/server/process.h @@ -78,6 +78,7 @@ struct process unsigned int is_terminating:1;/* is process terminating? */ struct job *job; /* job object ascoicated with this process */ struct list job_entry; /* list entry for job object */ + struct list asyncs; /* list of async object owned by the process */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */ diff --git a/server/sock.c b/server/sock.c index 0de6f68..2cd3b0e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -132,7 +132,6 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ); static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); -static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); static int sock_get_ntstatus( int err ); static int sock_get_error( int err ); @@ -171,7 +170,7 @@ static const struct fd_ops sock_fd_ops = sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */ sock_reselect_async, /* reselect_async */ - sock_cancel_async /* cancel_async */ + default_fd_cancel_async /* cancel_async */ }; @@ -611,19 +610,6 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) sock_reselect( sock ); } -static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) -{ - struct sock *sock = get_fd_user( fd ); - int n = 0; - - assert( sock->obj.ops == &sock_ops ); - - n += async_wake_up_by( sock->read_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( sock->write_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( sock->ifchange_q, process, thread, iosb, STATUS_CANCELLED ); - return n; -} - static struct fd *sock_get_fd( struct object *obj ) { struct sock *sock = (struct sock *)obj;

1 0

Bruno Jesus : msg711.acm: Remove an empty fixme.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: d1324882c2bd3b910bb45fd4e41dbd525bc1614d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1324882c2bd3b910bb45fd4e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 19:20:44 2016 -0200 msg711.acm: Remove an empty fixme. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 4593bd9..dc1661c 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -1040,7 +1040,6 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } - FIXME("\n"); return MMSYSERR_NOERROR; }

1 0

Jacek Caban : mshtml: Silence a noisy FIXME.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 61cb24f40faadaaf845af054e625fb22b082cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cb24f40faadaaf845af054e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 15:17:28 2016 +0100 mshtml: Silence a noisy FIXME. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ad949fd..cfa3753 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -500,8 +500,8 @@ static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { BSCallback *This = impl_from_IHttpNegotiate2(iface); - FIXME("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); + return E_NOTIMPL; /* FIXME */ } static const IHttpNegotiate2Vtbl HttpNegotiate2Vtbl = {

1 0

Jacek Caban : server: Cancel process asyncs on process termination.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 6ffe08459fe52e959e30b8a6a3c817611dfcec5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffe08459fe52e959e30b8a6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:47 2016 +0100 server: Cancel process asyncs on process termination. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 +++++ server/file.h | 1 + server/process.c | 1 + 3 files changed, 7 insertions(+) diff --git a/server/async.c b/server/async.c index 5acd1e7..70ebf95 100644 --- a/server/async.c +++ b/server/async.c @@ -369,6 +369,11 @@ restart: return woken; } +void cancel_process_asyncs( struct process *process ) +{ + cancel_async( process, NULL, NULL, 0 ); +} + /* wake up async operations on the queue */ void async_wake_up( struct async_queue *queue, unsigned int status ) { diff --git a/server/file.h b/server/file.h index 19e638e..fb2e905 100644 --- a/server/file.h +++ b/server/file.h @@ -175,6 +175,7 @@ extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); +extern void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA) diff --git a/server/process.c b/server/process.c index cca18e9..e9e2f21 100644 --- a/server/process.c +++ b/server/process.c @@ -840,6 +840,7 @@ static void process_killed( struct process *process ) process->winstation = 0; process->desktop = 0; close_process_handles( process ); + cancel_process_asyncs( process ); if (process->idle_event) { release_object( process->idle_event );

1 0

Bruno Jesus : msg711.acm: Remove dead code in G711_FormatSuggest.
by Alexandre Julliard Dec. 1, 2016

Dec. 1, 2016

Module: wine Branch: master Commit: 5bdc868936e6b49fa14c64ee681d43df42f3500a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdc868936e6b49fa14c64ee6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 19:20:43 2016 -0200 msg711.acm: Remove dead code in G711_FormatSuggest. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index e74d329..4593bd9 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -843,9 +843,6 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; - default: - FIXME("\n"); - break; } return MMSYSERR_NOERROR;

1 0