September 2016 - Wine-Commits

Jacek Caban : taskschd/tests: Fixed tests on win10.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: d62ab576e5dbf948087cadf002fb10fd3c1c8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62ab576e5dbf948087cadf00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 13:35:33 2016 +0200 taskschd/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5ddc96f..20f8845 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -156,7 +156,8 @@ todo_wine hr = ITaskService_GetFolder(service, dot, &folder); todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, bslash, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -201,7 +202,8 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); todo_wine @@ -351,7 +353,7 @@ todo_wine ok(hr == S_OK, "DeleteFolder error %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == S_OK /* win7 */, "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, NULL, 0); ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); @@ -764,13 +766,15 @@ static void test_GetTask(void) ITaskFolder_DeleteFolder(root, Wine, 0); hr = ITaskFolder_GetTask(root, Wine_Task1, &task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine, &task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); @@ -938,7 +942,7 @@ todo_wine ok(hr == S_OK, "DeleteTask error %#x\n", hr); hr = ITaskFolder_DeleteTask(folder, Task2, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == S_OK /* win7 */, "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr);

1 0

Huw Davies : webservices/tests: Initialise dictionary to NULL.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: f65b5e354b03b356ae7c3fdca93b0834f8de6ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65b5e354b03b356ae7c3fdca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 6 10:39:25 2016 +0100 webservices/tests: Initialise dictionary to NULL. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d9c3fb1..ebe72fe 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -465,6 +465,7 @@ static void test_WsWriteStartAttribute(void) text.text.textType = WS_XML_TEXT_TYPE_UTF8; text.value.length = 1; text.value.bytes = (BYTE *)"0"; + text.value.dictionary = NULL; hr = WsWriteText( writer, &text.text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); @@ -1130,6 +1131,7 @@ static void test_WsWriteStartCData(void) text.text.textType = WS_XML_TEXT_TYPE_UTF8; text.value.bytes = (BYTE *)"<data>"; text.value.length = 6; + text.value.dictionary = NULL; hr = WsWriteText( writer, &text.text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t><![CDATA[<data>", __LINE__ ); @@ -1818,6 +1820,7 @@ static void test_WsWriteNode(void) utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"value"; utf8.value.length = sizeof("value") - 1; + utf8.value.dictionary = NULL; attr.singleQuote = TRUE; attr.isXmlNs = FALSE; @@ -1840,6 +1843,7 @@ static void test_WsWriteNode(void) comment.node.nodeType = WS_XML_NODE_TYPE_COMMENT; comment.value.bytes = (BYTE *)"comment"; comment.value.length = sizeof("comment") - 1; + comment.value.dictionary = NULL; hr = WsWriteNode( writer, (const WS_XML_NODE *)&comment, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1857,6 +1861,7 @@ static void test_WsWriteNode(void) utf8.value.bytes = (BYTE *)"cdata"; utf8.value.length = sizeof("cdata") - 1; + utf8.value.dictionary = NULL; text.node.nodeType = WS_XML_NODE_TYPE_TEXT; text.text = &utf8.text; hr = WsWriteNode( writer, (const WS_XML_NODE *)&text, NULL ); @@ -1868,6 +1873,7 @@ static void test_WsWriteNode(void) utf8.value.bytes = (BYTE *)"text"; utf8.value.length = sizeof("text") - 1; + utf8.value.dictionary = NULL; hr = WsWriteNode( writer, (const WS_XML_NODE *)&text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2210,6 +2216,7 @@ static void test_WsWriteText(void) utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"test"; utf8.value.length = 4; + utf8.value.dictionary = NULL; hr = WsWriteText( writer, &utf8.text, NULL ); todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr );

1 0

Henri Verbeet : d3drm/tests: Fix some reference leaks.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: f41db1a1637b4b5aff9bcf0dd75ae45305690177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41db1a1637b4b5aff9bcf0dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 12:50:15 2016 +0200 d3drm/tests: Fix some reference leaks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d92823..85af6d2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6273,6 +6273,7 @@ static void test_viewport_clear1(void) IDirect3DRMDevice_Release(device1); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); } @@ -6518,10 +6519,9 @@ static void test_viewport_clear2(void) ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); IDirectDrawSurface_Release(surface); + IDirect3DRMViewport2_Release(viewport2); IDirect3DRMDevice3_Release(device3); IDirect3DDevice2_Release(d3d_device2); - IDirect3D2_Release(d3d2); - IDirectDraw2_Release(ddraw2); cleanup: IDirect3DRMFrame3_Release(camera3); @@ -6529,6 +6529,9 @@ cleanup: IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirect3D2_Release(d3d2); + IDirectDraw2_Release(ddraw2); + IDirectDraw_Release(ddraw1); DestroyWindow(window); }

1 0

Jacek Caban : msctf: Added IID_ITfThreadFocusSink support to AdviseSink.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 63859e382f499828ef9d96d3d06bc2c3f7e52b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63859e382f499828ef9d96d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 13:57:54 2016 +0200 msctf: Added IID_ITfThreadFocusSink support to AdviseSink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 528414f..aa838da 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -615,6 +615,12 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) + { + WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); + return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; }

1 0

Aric Stewart : winebus.sys: Add stub driver.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: f839f1f8aadac5d7853044537f22a127f20d6487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f839f1f8aadac5d7853044537… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 1 15:18:17 2016 +0200 winebus.sys: Add stub driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/winebus.sys/Makefile.in | 5 +++++ dlls/winebus.sys/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/winebus.sys.spec | 1 + loader/wine.inf.in | 14 ++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/configure b/configure index a7eac8d..da08e8f 100755 --- a/configure +++ b/configure @@ -1383,6 +1383,7 @@ enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv +enable_winebus_sys enable_winecoreaudio_drv enable_wined3d enable_winegstreamer @@ -18148,6 +18149,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test wine_fn_config_dll windowscodecsext enable_windowscodecsext implib wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv +wine_fn_config_dll winebus.sys enable_winebus_sys wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib diff --git a/configure.ac b/configure.ac index 0331c36..0154baa 100644 --- a/configure.ac +++ b/configure.ac @@ -3368,6 +3368,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) +WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in new file mode 100644 index 0000000..d646dc3 --- /dev/null +++ b/dlls/winebus.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = winebus.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c new file mode 100644 index 0000000..d495cd9 --- /dev/null +++ b/dlls/winebus.sys/main.c @@ -0,0 +1,38 @@ +/* + * WINE Platform native bus driver + * + * Copyright 2016 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/winebus.sys/winebus.sys.spec b/dlls/winebus.sys/winebus.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/winebus.sys/winebus.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f611ea0..4e29026 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -130,6 +130,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -144,6 +145,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -158,6 +160,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2518,6 +2521,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys,- 12,,ndis.sys,- 12,,tdi.sys,- +12,,winebus.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2560,6 +2564,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys +12,,winebus.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -3176,6 +3181,15 @@ ServiceType=32 StartType=3 ErrorControl=1 +[WineBusService] +Description="Wine Platform Bus Kernel" +DisplayName="Platform Bus Kernel" +ServiceBinary="%12%\winebus.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 + [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler"

1 0

Sebastian Lackner : jscript: Simplify jsstr_release implementation.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 736983632316d2b0dc426add0789e150792f0ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736983632316d2b0dc426add0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:47:02 2016 +0200 jscript: Simplify jsstr_release implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 2ad03f1..48fa2be 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -106,12 +106,8 @@ void jsstr_free(jsstr_t*) DECLSPEC_HIDDEN; static inline void jsstr_release(jsstr_t *str) { - if(!--str->ref) { - if(jsstr_is_inline(str)) - heap_free(str); - else - jsstr_free(str); - } + if(!--str->ref) + jsstr_free(str); } static inline jsstr_t *jsstr_addref(jsstr_t *str)

1 0

Michael Stefaniuc : mshtml: Avoid using the COM method implementations directly.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 0793d01d1c6e29eeaa1e9b2cccce04b4c8547308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793d01d1c6e29eeaa1e9b2cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 13:36:19 2016 +0200 mshtml: Avoid using the COM method implementations directly. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2b79226..407de0c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -524,7 +524,7 @@ static HRESULT WINAPI HTMLWindow2_get_frames(IHTMLWindow2 *iface, IHTMLFramesCol /* FIXME: Should return a separate Window object */ *p = (IHTMLFramesCollection2*)&This->IHTMLWindow2_iface; - HTMLWindow2_AddRef(iface); + IHTMLWindow2_AddRef(iface); return S_OK; }

1 0

Nikolay Sivov : d2d1/tests: A DC target test for switching from one HDC to another.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 35bab5ce643773226393c8164737b078669f5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bab5ce643773226393c8164… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 15:02:01 2016 +0300 d2d1/tests: A DC target test for switching from one HDC to another. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 28b741f..91ede78 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 +IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 gdi32 C_SRCS = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7f9632f..dbbe7d0 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2626,6 +2626,26 @@ todo_wine DestroyWindow(window); } +static void create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) +{ + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + HBITMAP hbm; + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(hbm != NULL, "Failed to create a dib section.\n"); + + DeleteObject(SelectObject(hdc, hbm)); +} + static void test_dc_target(void) { static const D2D1_PIXEL_FORMAT invalid_formats[] = @@ -2641,7 +2661,11 @@ static void test_dc_target(void) D2D1_COLOR_F color; D2D1_SIZE_F size; unsigned int i; + HDC hdc, hdc2; + COLORREF clr; HRESULT hr; + RECT rect; + D2D_RECT_F r; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -2687,6 +2711,76 @@ if (SUCCEEDED(hr)) ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_Release(rt); + + /* BindDC() */ + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc, 16, 16); + + SetRect(&rect, 0, 0, 32, 32); + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + /* target size comes from specified dimensions, not from selected bitmap size */ + size = ID2D1DCRenderTarget_GetSize(rt); + ok(size.width == 32.0f, "got width %.08e.\n", size.width); + ok(size.height == 32.0f, "got height %.08e.\n", size.height); + + /* clear one HDC to red, switch to another one, partially fill it and test contents */ + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc, 0, 0); + ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + + hdc2 = CreateCompatibleDC(NULL); + ok(hdc2 != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc2, 16, 16); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc2, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == 0, "Got color %#x\n", clr); + + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); + hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + r.left = r.top = 0.0f; + r.bottom = 16.0f; + r.right = 8.0f; + ID2D1DCRenderTarget_FillRectangle(rt, &r, (ID2D1Brush*)brush); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + ID2D1SolidColorBrush_Release(brush); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + + clr = GetPixel(hdc2, 10, 0); + ok(clr == 0, "Got color %#x\n", clr); + + DeleteDC(hdc); + DeleteDC(hdc2); + ID2D1DCRenderTarget_Release(rt); } ID2D1Factory_Release(factory); }

1 0

Jacek Caban : dbghelp: Removed no longer needed wine_rb_destroy call.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: b15cccd2dc206aab25db6f1b9a28334b0fe09945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15cccd2dc206aab25db6f1b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 22:08:39 2016 +0200 dbghelp: Removed no longer needed wine_rb_destroy call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 55f123a..9df02df 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -679,7 +679,6 @@ BOOL module_remove(struct process* pcs, struct module* module) } hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_types); - wine_rb_destroy(&module->sources_offsets_tree, NULL, NULL); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool);

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Sept. 6, 2016

Sept. 6, 2016

Module: website Branch: master Commit: 9fdd33e64f8ee2d52ae38cdc2c1e5e8927030f41 URL: http://source.winehq.org/git/website.git/?a=commit;h=9fdd33e64f8ee2d52ae38c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 6 10:39:09 2016 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0