February 2018 - Wine-Commits

Jacek Caban : mshtml: Implement IOleDocumentView and IViewObjectEx interfaces in HTMLDocumentObj object instead of HTMLDocument.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 92e3036c72ea60252e83403d88993833ee6fa5fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e3036c72ea60252e83403d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:31:56 2018 +0100 mshtml: Implement IOleDocumentView and IViewObjectEx interfaces in HTMLDocumentObj object instead of HTMLDocument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 21 ++-- dlls/mshtml/mshtml_private.h | 7 +- dlls/mshtml/oleobj.c | 16 +-- dlls/mshtml/view.c | 245 ++++++++++++++++++++----------------------- 4 files changed, 136 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92e3036c72ea60252e83…

1 0

Jacek Caban : mshtml: Merge propbag.c into pluginhost.c.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: c89fef781b48d65dd379c933b98a1ed3e3bb17ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c89fef781b48d65dd379c933… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:32:13 2018 +0100 mshtml: Merge propbag.c into pluginhost.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/pluginhost.c | 321 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 2 - dlls/mshtml/propbag.c | 357 ----------------------------------------------- 4 files changed, 321 insertions(+), 360 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c89fef781b48d65dd379…

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptGetFontFunctions().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 04fd1fc4bd6a948b9bb3882e7defed7e890a00de URL: https://source.winehq.org/git/wine.git/?a=commit;h=04fd1fc4bd6a948b9bb3882e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 28 10:14:59 2018 +0330 usp10/tests: Cleanup test_ScriptGetFontFunctions(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 205 ++++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04fd1fc4bd6a948b9bb3…

1 0

Jacek Caban : mshtml: Merge htmlscreen.c into imnavigator.c.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 86bdba81ad843283028aebea20a2eb000a39a1d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bdba81ad843283028aebea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:31:41 2018 +0100 mshtml: Merge htmlscreen.c into imnavigator.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlscreen.c | 263 ---------------------------------------------- dlls/mshtml/omnavigator.c | 233 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86bdba81ad843283028a…

1 0

Józef Kucia : wined3d: Add ARB_framebuffer_no_attachments extension.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: beb83eb4ae54dce6bf13df2d28f237a448be6df1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb83eb4ae54dce6bf13df2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:39 2018 +0100 wined3d: Add ARB_framebuffer_no_attachments 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 | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1577c2..a95ded3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -135,6 +135,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_fragment_layer_viewport", ARB_FRAGMENT_LAYER_VIEWPORT }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, + {"GL_ARB_framebuffer_no_attachments", ARB_FRAMEBUFFER_NO_ATTACHMENTS}, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, {"GL_ARB_framebuffer_sRGB", ARB_FRAMEBUFFER_SRGB }, {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, @@ -2737,6 +2738,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetShaderPrecisionFormat) USE_GL_FUNC(glDepthRangef) USE_GL_FUNC(glClearDepthf) + /* GL_ARB_framebuffer_no_attachments */ + USE_GL_FUNC(glFramebufferParameteri) /* GL_ARB_framebuffer_object */ USE_GL_FUNC(glBindFramebuffer) USE_GL_FUNC(glBindRenderbuffer) @@ -3918,6 +3921,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_FRAGMENT_LAYER_VIEWPORT, MAKEDWORD_VERSION(4, 3)}, + {ARB_FRAMEBUFFER_NO_ATTACHMENTS, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cc6f888..ed439e2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -68,6 +68,7 @@ enum wined3d_gl_extension ARB_FRAGMENT_LAYER_VIEWPORT, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, + ARB_FRAMEBUFFER_NO_ATTACHMENTS, ARB_FRAMEBUFFER_OBJECT, ARB_FRAMEBUFFER_SRGB, ARB_GEOMETRY_SHADER4,

1 0

Dmitry Timoshkov : adsldp: Implement IADsADSystemInfo::get_ComputerName().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: bc283fcf3d30c709cf064f71461e1b3577c26286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc283fcf3d30c709cf064f71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 28 11:44:49 2018 +0800 adsldp: Implement IADsADSystemInfo::get_ComputerName(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 1 + dlls/adsldp/adsldp.c | 25 +++++++++++++++++++++++-- dlls/adsldp/tests/sysinfo.c | 1 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index e033d91..c96e264 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,4 +1,5 @@ MODULE = adsldp.dll +IMPORTS = oleaut32 secur32 C_SRCS = \ adsldp.c diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 15f1d23..4fc0de4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,6 +28,8 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#define SECURITY_WIN32 +#include "security.h" #include "wine/debug.h" @@ -120,8 +122,27 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - FIXME("%p,%p: stub\n", iface, retval); - return E_NOTIMPL; + UINT size; + WCHAR *name; + + TRACE("%p,%p\n", iface, retval); + + size = 0; + GetComputerObjectNameW(NameFullyQualifiedDN, NULL, &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + name = SysAllocStringLen(NULL, size); + if (!name) return E_OUTOFMEMORY; + + if (!GetComputerObjectNameW(NameFullyQualifiedDN, name, &size)) + { + SysFreeString(name); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *retval = name; + return S_OK; } static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 73435a6..1e3939f 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -79,7 +79,6 @@ static void test_ComputerName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); -todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr == S_OK) {

1 0

Dmitry Timoshkov : secur32/tests: Make GetComputerObjectName() tests pass when computer is part of a domain.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 8be0a5575fdbb46c2aa891f08e834d952e788b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be0a5575fdbb46c2aa891f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 28 11:29:33 2018 +0800 secur32/tests: Make GetComputerObjectName() tests pass when computer is part of a domain. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/secur32.c | 91 +++++++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index df9e627..40c272a 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -28,6 +28,7 @@ #include <security.h> #include <schannel.h> #include <wincred.h> +#include <winsock2.h> #include "wine/test.h" @@ -67,20 +68,40 @@ static void testGetComputerObjectNameA(void) UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = 0; + SetLastError(0xdeadbeef); + rc = pGetComputerObjectNameA(formats[i], NULL, &size); + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + switch (formats[i]) + { + case NameUnknown: + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(GetLastError() == ERROR_NONE_MAPPED || + GetLastError() == ERROR_NO_SUCH_USER || + GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%u: got %u\n", formats[i], GetLastError()); + break; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; + size = sizeof(name); - ZeroMemory(name, sizeof(name)); + SetLastError(0xdeadbeef); rc = pGetComputerObjectNameA(formats[i], name, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), - "GetComputerObjectNameA(%d) failed: %d\n", - formats[i], GetLastError()); - if (rc) - trace("GetComputerObjectNameA() returned %s\n", name); + switch (formats[i]) + { + case NameUnknown: + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(rc, "GetComputerObjectName(%u) error %u\n", formats[i], GetLastError()); + trace("GetComputerObjectName(%u) returned %s\n", formats[i], name); + break; + } } } @@ -92,22 +113,40 @@ static void testGetComputerObjectNameW(void) UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = 0; + SetLastError(0xdeadbeef); + rc = pGetComputerObjectNameW(formats[i], NULL, &size); + ok(!rc || broken(rc) /* win10 */, "GetComputerObjectName(%u) should fail\n", formats[i]); + switch (formats[i]) + { + case NameUnknown: + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(GetLastError() == ERROR_NONE_MAPPED || + GetLastError() == ERROR_NO_SUCH_USER || + GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO || + GetLastError() == WSAHOST_NOT_FOUND || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%u: got %u\n", formats[i], GetLastError()); + break; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; + size = sizeof(nameW)/sizeof(nameW[0]); - ZeroMemory(nameW, sizeof(nameW)); + SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], nameW, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), - "GetComputerObjectNameW(%d) failed: %d\n", - formats[i], GetLastError()); - if (rc) { - char name[256]; - WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, sizeof(name), NULL, NULL ); - trace("GetComputerObjectNameW() returned %s\n", name); + switch (formats[i]) + { + case NameUnknown: + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(rc, "GetComputerObjectName(%u) error %u\n", formats[i], GetLastError()); + trace("GetComputerObjectName(%u) returned %s\n", formats[i], wine_dbgstr_w(nameW)); + break; } } }

1 0

Jacek Caban : activscp.idl: Added SCRIPTLANGUAGEVERSION declaration.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 0a72708126f5b8fc06698172d973bb529944c3bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a72708126f5b8fc06698172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 18:40:45 2018 +0100 activscp.idl: Added SCRIPTLANGUAGEVERSION declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/activscp.idl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/activscp.idl b/include/activscp.idl index e539b04..57179cf 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -45,7 +45,14 @@ cpp_quote("#define SCRIPTPROP_INVOKEVERSIONING 0x00004000") cpp_quote("#define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000") cpp_quote("#define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001") cpp_quote("#define SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION 0x70000002") - + +typedef enum tagSCRIPTLANGUAGEVERSION { + SCRIPTLANGUAGEVERSION_DEFAULT = 0, + SCRIPTLANGUAGEVERSION_5_7 = 1, + SCRIPTLANGUAGEVERSION_5_8 = 2, + SCRIPTLANGUAGEVERSION_MAX = 255 +} SCRIPTLANGUAGEVERSION; + typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0, SCRIPTSTATE_STARTED = 1,

1 0

Jacek Caban : mshtml: Implement IHTMLTextContainer interface directly in HTMLBodyElement object.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: e55e6b8c45ec20d6a189a952f1752764abdfb5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55e6b8c45ec20d6a189a952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:31:33 2018 +0100 mshtml: Implement IHTMLTextContainer interface directly in HTMLBodyElement object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 113 +++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e55e6b8c45ec20d6a189…

1 0

Jacek Caban : mshtml: Merge htmltextcont.c into htmlbody.c.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 49f20a5b74df0bdb5edd8d7dd228df87295c69fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f20a5b74df0bdb5edd8d7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:31:22 2018 +0100 mshtml: Merge htmltextcont.c into htmlbody.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlbody.c | 165 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmltextcont.c | 194 ------------------------------------------- dlls/mshtml/mshtml_private.h | 7 -- 4 files changed, 165 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49f20a5b74df0bdb5edd…

1 0

Vincent Povirk : gdiplus: Silently ignore empty rectangles in GdipAddPathRectangles.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 0943fcf3761be29a011328f1eb5847aaee6ed835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0943fcf3761be29a011328f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 28 09:49:29 2018 -0600 gdiplus: Silently ignore empty rectangles in GdipAddPathRectangles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 3 +++ dlls/gdiplus/tests/graphicspath.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8b13fc5..76ef1c2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2306,6 +2306,9 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, if(!path) return InvalidParameter; + if (width <= 0.0 || height <= 0.0) + return Ok; + /* make a backup copy of path data */ if((retstat = GdipClonePath(path, &backup)) != Ok) return retstat; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9a6dde3..102c33c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1301,6 +1301,7 @@ static void test_empty_rect(void) { GpPath *path; GpStatus status; + INT count; BOOL result; status = GdipCreatePath(FillModeAlternate, &path); @@ -1309,6 +1310,10 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, -5.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); expect(Ok, status); expect(FALSE, status); @@ -1316,12 +1321,31 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 0.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.1); + expect(Ok, status); + + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(4, count); + GdipDeletePath(path); }

1 0

Jacek Caban : mshtml: Merge ipwindow.c into pluginhost.c.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: f0372fbfbeaca81dd8a577bf5af3f03d258b4eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0372fbfbeaca81dd8a577bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 16:32:05 2018 +0100 mshtml: Merge ipwindow.c into pluginhost.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/ipwindow.c | 347 ----------------------------------------------- dlls/mshtml/pluginhost.c | 311 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 3 - 4 files changed, 311 insertions(+), 351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0372fbfbeaca81dd8a5…

1 0

Józef Kucia : d3d11/tests: Add test for unbound multisample textures.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: d75ec29384c0d992e64955be9e9ccf8212e744c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d75ec29384c0d992e64955be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:38 2018 +0100 d3d11/tests: Add test for unbound multisample textures. 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/d3d11/tests/d3d11.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5a36bc2..713a030 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25020,6 +25020,93 @@ done: release_test_context(&test_context); } +static void test_unbound_multisample_texture(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + struct uvec4 cb_data; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + Texture2DMS<float4, 4> t; + + uint sample_index; + + float4 main(float4 position : SV_Position) : SV_Target + { + float3 p; + t.GetDimensions(p.x, p.y, p.z); + p *= float3(position.x / 640.0f, position.y / 480.0f, 0.0f); + /* sample index must be a literal */ + switch (sample_index) + { + case 1: return t.Load(int2(p.xy), 1); + case 2: return t.Load(int2(p.xy), 2); + case 3: return t.Load(int2(p.xy), 3); + default: return t.Load(int2(p.xy), 0); + } + } +#endif + 0x43425844, 0x03d62416, 0x1914ee8b, 0xccd08d68, 0x27f42136, 0x00000001, 0x000002f8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000025c, 0x00000040, + 0x00000097, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04042058, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, 0x00000000, 0x00004001, 0x00000000, 0x00107e46, + 0x00000000, 0x07000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00101046, 0x00000000, + 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, + 0x00000000, 0x00000000, 0x0400004c, 0x0020800a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, + 0x00000001, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, + 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + 0x03000006, 0x00004001, 0x00000002, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, + 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, + 0x00000002, 0x0100003e, 0x03000006, 0x00004001, 0x00000003, 0x0500001b, 0x00100032, 0x00000001, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, + 0x00000000, 0x00004001, 0x00000003, 0x0100003e, 0x0100000a, 0x0500001b, 0x00100032, 0x00000000, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000017, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + memset(&cb_data, 0, sizeof(cb_data)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_data), &cb_data); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + for (i = 0; i < 4; ++i) + { + cb_data.x = i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &cb_data, 0, 0); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 1); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -25149,4 +25236,5 @@ START_TEST(d3d11) test_combined_clip_and_cull_distances(); test_generate_mips(); test_alpha_to_coverage(); + test_unbound_multisample_texture(); }

1 0

Sebastian Lackner : bcrypt: Correctly check the size in BCryptGetProperty.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 1db5170f49781a23d20424d1617a9a09fb131831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db5170f49781a23d20424d1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 28 04:15:55 2018 +0000 bcrypt: Correctly check the size in BCryptGetProperty. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72b5df2..28cf2d8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -532,7 +532,7 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, } if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC)) + if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR)) { memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC)); *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6fa04b0..b716688 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -452,6 +452,12 @@ static void test_aes(void) ok(size == 64, "got %u\n", size); size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode);

1 0

Roman Pišl : comctl32/tooltips: Set window size before TTN_SHOW and preserve it after.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 4803b7abc9633125d38e2fa4cc099d44fe497edc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4803b7abc9633125d38e2fa4… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Wed Feb 28 09:00:05 2018 +0300 comctl32/tooltips: Set window size before TTN_SHOW and preserve it after. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 1 - dlls/comctl32/tooltips.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7f37d5f..af95a56 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -304,7 +304,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP break; case TTN_SHOW: GetWindowRect(hdr->hwndFrom, &rect); - todo_wine ok(!EqualRect(&g_ttip_rect, &rect), "Unexpected window rectangle.\n"); break; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e5b966a..5460101 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -624,18 +624,10 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } toolPtr = &infoPtr->tools[nTool]; - - TRACE("Show tooltip %d\n", nTool); - - hdr.hwndFrom = infoPtr->hwndSelf; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - TOOLTIPS_CalcTipSize (infoPtr, &size); - TRACE("size %d x %d\n", size.cx, size.cy); + + TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText), + size.cx, size.cy); if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { @@ -824,9 +816,16 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos (infoPtr->hwndSelf, NULL, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + + hdr.hwndFrom = infoPtr->hwndSelf; + hdr.idFrom = toolPtr->uId; + hdr.code = TTN_SHOW; + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); + + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOACTIVATE); /* repaint the tooltip */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);

1 0

Alexandre Julliard : ntdll: Allow loading 32-bit IL-only binaries on 64-bit.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 97b0907439183cb86e6c05a4d8c9bf14d73805c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b0907439183cb86e6c05a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 09:57:59 2018 +0100 ntdll: Allow loading 32-bit IL-only binaries on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6884e8d..46a7d22 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1809,18 +1809,27 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ -static BOOL is_valid_binary( const pe_image_info_t *info ) +static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) { #ifdef __i386__ return info->machine == IMAGE_FILE_MACHINE_I386; -#elif defined(__x86_64__) - return info->machine == IMAGE_FILE_MACHINE_AMD64 || !info->contains_code; #elif defined(__arm__) return info->machine == IMAGE_FILE_MACHINE_ARM || info->machine == IMAGE_FILE_MACHINE_THUMB || info->machine == IMAGE_FILE_MACHINE_ARMNT; -#elif defined(__aarch64__) - return info->machine == IMAGE_FILE_MACHINE_ARM64 || !info->contains_code; +#elif defined(__x86_64__) || defined(__aarch64__) /* support 32-bit IL-only images on 64-bit */ + const IMAGE_COR20_HEADER *cor_header; + DWORD size; + +#ifdef __x86_64__ + if (info->machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; +#else + if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; +#endif + if (!info->contains_code) return TRUE; + cor_header = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); + if (cor_header && (cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return TRUE; + return FALSE; #else return FALSE; /* no wow64 support on other platforms */ #endif @@ -1855,7 +1864,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, NtClose( mapping ); if ((status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE) && - !is_valid_binary( &image_info )) + !is_valid_binary( module, &image_info )) { NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_INVALID_IMAGE_FORMAT;

1 0

Nikolay Sivov : gdiplus/tests: Add some invalid arguments tests for GdipLoadImageFromStream().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 279cad235242dd0d34aa1993dfd8c24d479a3130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=279cad235242dd0d34aa1993… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 09:34:35 2018 +0300 gdiplus/tests: Add some invalid arguments tests for GdipLoadImageFromStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 28f0fce..34222e7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5161,6 +5161,37 @@ static void test_png_color_formats(void) } } +static void test_GdipLoadImageFromStream(void) +{ + IStream *stream; + GpStatus status; + GpImage *image; + HGLOBAL hglob; + BYTE *data; + HRESULT hr; + + status = GdipLoadImageFromStream(NULL, NULL); + ok(status == InvalidParameter, "Unexected return value %d.\n", status); + + image = (void *)0xdeadbeef; + status = GdipLoadImageFromStream(NULL, &image); + ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(image == (void *)0xdeadbeef, "Unexpected image pointer.\n"); + + hglob = GlobalAlloc(0, sizeof(pngimage)); + data = GlobalLock (hglob); + memcpy(data, pngimage, sizeof(pngimage)); + GlobalUnlock(hglob); + + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream.\n"); + + status = GdipLoadImageFromStream(stream, NULL); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); + + IStream_Release(stream); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5234,6 +5265,7 @@ START_TEST(image) test_getadjustedpalette(); test_histogram(); test_imageabort(); + test_GdipLoadImageFromStream(); GdiplusShutdown(gdiplusToken); }

1 0

Louis Lenders : gdiplus: Fix argument check in GdipLoadImageFromStream().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 1ac02c2385a68b39438c5a869b0e620b705ece88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac02c2385a68b39438c5a86… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Feb 28 09:34:34 2018 +0300 gdiplus: Fix argument check in GdipLoadImageFromStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c0b54d0..b03630c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4314,6 +4314,11 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) HRESULT hr; const struct image_codec *codec=NULL; + TRACE("%p %p\n", stream, image); + + if (!stream || !image) + return InvalidParameter; + /* choose an appropriate image decoder */ stat = get_decoder_info(stream, &codec); if (stat != Ok) return stat;

1 0

Michael Stefaniuc : comctl32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 58bb7b39fc59969b851e87db7e9fe22c073f5e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58bb7b39fc59969b851e87db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 01:11:32 2018 +0100 comctl32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index afa6b84..9356624 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1430,7 +1430,7 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark {lCentre + 1, l2 - 3}, }; hOldPen = SelectObject(hDC, hPen); - PolyPolyline(hDC, aptInsertMark, adwPolyPoints, sizeof(adwPolyPoints)/sizeof(adwPolyPoints[0])); + PolyPolyline(hDC, aptInsertMark, adwPolyPoints, ARRAY_SIZE(adwPolyPoints)); SelectObject(hDC, hOldPen); DeleteObject(hPen); }

1 0

Nikolay Sivov : comctl32/tests: Run some Progress control tests on version 6.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 037d315a2893d642a7b20b19b0dbcc4c9f0f81fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=037d315a2893d642a7b20b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 08:57:53 2018 +0300 comctl32/tests: Run some Progress control tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/progress.c | 49 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index d3b219c..b911021 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -27,8 +27,9 @@ #include "wine/test.h" +#include "v6util.h" -static HWND hProgressParentWnd, hProgressWnd; +static HWND hProgressParentWnd; static const char progressTestClass[] = "ProgressBarTestClass"; static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -119,16 +120,6 @@ static void init(void) CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); ok(hProgressParentWnd != NULL, "failed to create parent wnd\n"); - GetClientRect(hProgressParentWnd, &rect); - hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, - 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); - ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); - progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); - - ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); - ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); - flush_events(); - update_window(hProgressParentWnd); } static void cleanup(void) @@ -151,9 +142,21 @@ static void cleanup(void) */ static void test_redraw(void) { - RECT client_rect; + RECT client_rect, rect; + HWND hProgressWnd; LRESULT ret; + GetClientRect(hProgressParentWnd, &rect); + hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, + 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); + ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); + progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); + + ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); + ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + flush_events(); + update_window(hProgressParentWnd); + SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); SendMessageA(hProgressWnd, PBM_SETSTEP, 20, 0); @@ -162,15 +165,15 @@ static void test_redraw(void) /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 50, 0) == 10, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_DELTAPOS */ ok(SendMessageA(hProgressWnd, PBM_DELTAPOS, 15, 0) == 50, "PBM_DELTAPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_DELTAPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 80, 0) == 65, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_STEPIT */ ok(SendMessageA(hProgressWnd, PBM_STEPIT, 0, 0) == 80, "PBM_STEPIT must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_STEPIT: The progress bar should be redrawn immediately\n"); @@ -179,7 +182,7 @@ static void test_redraw(void) win_skip("PBM_GETPOS needs comctl32 > 4.70\n"); else ok(ret == 100, "PBM_GETPOS returned a wrong position : %d\n", (UINT)ret); - + /* PBM_SETRANGE and PBM_SETRANGE32: Usually the progress bar doesn't repaint itself immediately. If the position is not in the new range, it does. @@ -207,6 +210,8 @@ static void test_redraw(void) wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); + + DestroyWindow(hProgressWnd); } static void test_setcolors(void) @@ -299,6 +304,8 @@ static void init_functions(void) START_TEST(progress) { INITCOMMONCONTROLSEX iccex; + ULONG_PTR ctx_cookie; + HANDLE hCtx; init_functions(); @@ -307,10 +314,18 @@ START_TEST(progress) pInitCommonControlsEx(&iccex); init(); - + test_redraw(); test_setcolors(); test_PBM_STEPIT(); + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_setcolors(); + test_PBM_STEPIT(); + + unload_v6_module(ctx_cookie, hCtx); + cleanup(); }

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in read_from_framebuffer().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 64ba3ee4a065a9032b797312ad9e8a0081830578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ba3ee4a065a9032b797312… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 28 10:14:56 2018 +0330 wined3d: Explicitly calculate the sub-resource level in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 22156b6..751424d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1433,8 +1433,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_surface *restore_rt = NULL; const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; + unsigned int width, height, level; struct wined3d_bo_address data; - unsigned int width, height; BYTE *row, *top, *bottom; BOOL src_is_upside_down; unsigned int i; @@ -1488,14 +1488,15 @@ static void read_from_framebuffer(struct wined3d_surface *surface, checkGLcall("glBindBuffer"); } - wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); + level = sub_resource_idx % texture->level_count; + wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); /* Setup pixel store pack state -- to glReadPixels into the correct place */ gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); - width = wined3d_texture_get_level_width(texture, surface->texture_level); - height = wined3d_texture_get_level_height(texture, surface->texture_level); + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, texture->resource.format->glFormat, texture->resource.format->glType, data.addr);

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 8e7540b602beb658cb10aa576811cc404beac1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7540b602beb658cb10aa57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 28 10:14:57 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 751424d..36ecfaf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1563,6 +1563,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + unsigned int level; GLenum target; restore_rt = context_get_rt_surface(old_ctx); @@ -1585,10 +1586,11 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); + level = sub_resource_idx % texture->level_count; target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, surface->texture_level, - 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, level, 0, 0, 0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); checkGLcall("glCopyTexSubImage2D"); if (restore_rt)

1 0

Michael Stefaniuc : dmcompos/tests: Add IDirectMusicObject:: ParseDescriptor() tests.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: c142bc8959ca9700e5d7fc49c8681a8df427a960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c142bc8959ca9700e5d7fc49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 27 22:50:06 2018 +0100 dmcompos/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 188 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 26c6e1f..27cea9e 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmcompos(void) { IDirectMusicComposer *dmc; @@ -398,6 +402,189 @@ static void test_signposttrack(void) while (IDirectMusicTrack8_Release(dmt8)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_CLASS supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -415,6 +602,7 @@ START_TEST(dmcompos) test_chordmap(); test_chordmaptrack(); test_signposttrack(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : user32/tests: Remove commented out traces, use test calls instead of traces.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: d0b1e43c711a50378b07395d6745b67602f06968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b1e43c711a50378b07395d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 09:03:56 2018 +0300 user32/tests: Remove commented out traces, use test calls instead of traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96a2467..ab39ee8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2786,7 +2786,6 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, UlongToHandle(GetWindowLongPtrA(test, GWLP_HINSTANCE)) != GetModuleHandleA(NULL) || GetWindow(test, GW_OWNER) == next)) { - /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDNEXT); } ok_(file, line)(next == test, "%p: expected next %p, got %p\n", hwnd, next, test); @@ -2798,7 +2797,6 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, UlongToHandle(GetWindowLongPtrA(test, GWLP_HINSTANCE)) != GetModuleHandleA(NULL) || GetWindow(test, GW_OWNER) == hwnd)) { - /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDPREV); } ok_(file, line)(prev == test, "%p: expected prev %p, got %p\n", hwnd, prev, test); @@ -3060,8 +3058,6 @@ static void test_SetActiveWindow(HWND hwnd) SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow %p\n", hwnd);*/ - ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3084,7 +3080,7 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow on an invisible window %p\n", hwnd);*/ + /* Invisible window. */ SetActiveWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3176,8 +3172,6 @@ static void test_SetForegroundWindow(HWND hwnd) SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetForegroundWindow %p\n", hwnd);*/ - ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3219,7 +3213,7 @@ static void test_SetForegroundWindow(HWND hwnd) ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetForegroundWindow on an invisible window %p\n", hwnd);*/ + /* Invisible window. */ ret = SetForegroundWindow(hwnd); ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -5206,10 +5200,8 @@ static void test_AWRwindow(LPCSTR class, LONG style, LONG exStyle, BOOL menu) 0, menu ? hmenu : 0, 0, 0); - if (!hwnd) { - trace("Failed to create window class=%s, style=0x%08x, exStyle=0x%08x\n", class, style, exStyle); - return; - } + ok(hwnd != NULL, "Failed to create window class=%s, style=0x%08x, exStyle=0x%08x\n", class, style, exStyle); + ShowWindow(hwnd, SW_SHOW); test_nonclient_area(hwnd); @@ -5354,6 +5346,7 @@ static void test_redrawnow(void) { WNDCLASSA cls; HWND hwndMain; + BOOL ret; cls.style = CS_DBLCLKS; cls.lpfnWndProc = redraw_window_procA; @@ -5365,11 +5358,8 @@ static void test_redrawnow(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "RedrawWindowClass"; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); @@ -5471,6 +5461,7 @@ static void test_csparentdc(void) { WNDCLASSA clsMain, cls; HWND hwndMain, hwnd1, hwnd2; + BOOL ret; RECT rc; struct parentdc_test test_answer; @@ -5536,11 +5527,8 @@ static void test_csparentdc(void) clsMain.hbrBackground = GetStockObject(WHITE_BRUSH); clsMain.lpszMenuName = NULL; clsMain.lpszClassName = "ParentDcMainWindowClass"; - - if(!RegisterClassA(&clsMain)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&clsMain); + ok(ret, "Failed to register a test class.\n"); cls.style = CS_DBLCLKS | CS_PARENTDC; cls.lpfnWndProc = parentdc_window_procA; @@ -5552,11 +5540,8 @@ static void test_csparentdc(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "ParentDcWindowClass"; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); SetRect(&rc, 0, 0, 150, 150); AdjustWindowRectEx(&rc, WS_OVERLAPPEDWINDOW, FALSE, 0); @@ -7041,11 +7026,8 @@ static void test_GetUpdateRect(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = classNameA; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); hgrandparent = CreateWindowA(classNameA, "grandparent", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, 0, NULL);

1 0

Michael Stefaniuc : usp10: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 498bf049711dde06ef643236eaf5f6d120f70900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498bf049711dde06ef643236… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 01:11:33 2018 +0100 usp10: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5f50332..4daba34 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1155,7 +1155,7 @@ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num) if (!props && !num) return E_INVALIDARG; - if (num) *num = sizeof(script_props)/sizeof(script_props[0]); + if (num) *num = ARRAY_SIZE(script_props); if (props) *props = script_props; return S_OK;

1 0

Michael Müller : dwmapi: Add DwmSetIconicThumbnail() stub.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: e6723be683b1435323f1ede30c6a7f7729b825d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6723be683b1435323f1ede3… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 09:41:10 2018 +0300 dwmapi: Add DwmSetIconicThumbnail() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index d81df3d..697cefc 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -81,7 +81,7 @@ # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration @ stub DwmSetIconicLivePreviewBitmap -@ stub DwmSetIconicThumbnail +@ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) # @ stub DwmShowContact diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8c3472a..7ac0b2b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -268,3 +268,12 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params FIXME("(%p %p) stub\n", hwnd, params); return S_OK; }; + +/********************************************************************** + * DwmSetIconicThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) +{ + FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); + return S_OK; +};

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct( ).
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: c8120f526ed16e60b972a5d4c2bbd5b21c131981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8120f526ed16e60b972a5d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 28 10:14:58 2018 +0330 wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36ecfaf..12370ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,12 +1607,12 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; + unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; float xrel, yrel; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; - unsigned int src_height; GLenum dst_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -1660,14 +1660,17 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ERR("Texture filtering not supported in direct blit\n"); } - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_level = src_sub_resource_idx % src_texture->level_count; + dst_level = dst_sub_resource_idx % dst_texture->level_count; + + src_height = wined3d_texture_get_level_height(src_texture, src_level); dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); @@ -1692,14 +1695,14 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc for (col = dst_rect.left; col < dst_rect.right; ++col) { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); }

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_set_compatible_renderbuffer ().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 1cdff1c8a4bb4a547fdc10020b5f9385f3ef533e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdff1c8a4bb4a547fdc1002… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 28 10:14:55 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ada7193..22156b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -981,36 +981,42 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, /* Context activation is done by the caller. */ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) { - const struct wined3d_gl_info *gl_info = &surface->container->resource.device->adapter->gl_info; + unsigned int sub_resource_idx, width, height, level; struct wined3d_renderbuffer_entry *entry; + const struct wined3d_texture *texture; + const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; - unsigned int width, height; GLuint renderbuffer = 0; + texture = surface->container; + gl_info = &texture->resource.device->adapter->gl_info; + sub_resource_idx = surface_get_sub_resource_idx(surface); + level = sub_resource_idx % texture->level_count; + if (rt && rt->resource->format->id != WINED3DFMT_NULL) { - struct wined3d_texture *texture; - unsigned int level; + struct wined3d_texture *rt_texture; + unsigned int rt_level; if (rt->resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); return; } - texture = wined3d_texture_from_resource(rt->resource); - level = rt->sub_resource_idx % texture->level_count; + rt_texture = wined3d_texture_from_resource(rt->resource); + rt_level = rt->sub_resource_idx % rt_texture->level_count; - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); + width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); + height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); } else { - width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); } - src_width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); - src_height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); + src_width = wined3d_texture_get_level_pow2_width(texture, level); + src_height = wined3d_texture_get_level_pow2_height(texture, level); /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return; @@ -1039,7 +1045,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - surface->container->resource.format->glInternal, width, height); + texture->resource.format->glInternal, width, height); entry = heap_alloc(sizeof(*entry)); entry->width = width;

1 0

Nikolay Sivov : wshom: Use global memory allocation helpers.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: f6bf26906547200a6cc23e6e139e357f440dc605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bf26906547200a6cc23e6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 08:56:04 2018 +0300 wshom: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d7b36cf..1aa353a 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -130,7 +131,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) if (!ref) { CloseHandle(This->info.hThread); CloseHandle(This->info.hProcess); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -325,7 +326,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) *ret = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -333,7 +334,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) This->ref = 1; if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return HRESULT_FROM_WIN32(GetLastError()); } @@ -383,7 +384,7 @@ static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -519,7 +520,7 @@ static HRESULT WshEnvironment_Create(IWshEnvironment **env) { WshEnvironment *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; @@ -572,7 +573,7 @@ static ULONG WINAPI WshCollection_Release(IWshCollection *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -721,7 +722,7 @@ static HRESULT WshCollection_Create(IWshCollection **collection) { WshCollection *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; @@ -778,7 +779,7 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) { SysFreeString(This->path_link); IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -1077,7 +1078,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) *shortcut = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; @@ -1087,7 +1088,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) &IID_IShellLinkW, (void**)&This->link); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return hr; } @@ -1095,7 +1096,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) if (!This->path_link) { IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return E_OUTOFMEMORY; } @@ -1426,7 +1427,7 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) unsigned int len = *value - *subkey - 1; WCHAR *ret; - ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + ret = heap_alloc((len + 1)*sizeof(WCHAR)); if (!ret) return E_OUTOFMEMORY; @@ -1466,7 +1467,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v if (ret == ERROR_SUCCESS) { void *data; - data = HeapAlloc(GetProcessHeap(), 0, datalen); + data = heap_alloc(datalen); if (!data) { hr = E_OUTOFMEMORY; goto fail; @@ -1474,7 +1475,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, data, &datalen); if (ret) { - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); hr = HRESULT_FROM_WIN32(ret); goto fail; } @@ -1564,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v hr = E_FAIL; }; - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) VariantInit(value); } @@ -1573,7 +1574,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v fail: if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; } @@ -1661,7 +1662,7 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * fail: VariantClear(&v); if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; }

1 0

Michael Müller : hal: Implement KeQueryPerformanceCounter.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 02a5071674ef2c39f76c7388a10d1cf63a332539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a5071674ef2c39f76c7388… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 18:29:41 2018 -0600 hal: Implement KeQueryPerformanceCounter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 10 ++++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index ddd8710..51bf55d 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -177,3 +177,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } + +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) +{ + LARGE_INTEGER counter; + + TRACE("(%p)\n", frequency); + + NtQueryPerformanceCounter(&counter, frequency); + return counter.QuadPart; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index ae706e0..5dc3fa8 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -72,7 +72,7 @@ @ stub KeFlushWriteBuffer @ stdcall KeGetCurrentIrql() @ stub KeLowerIrql -@ stub KeQueryPerformanceCounter +@ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel

1 0

Michael Stefaniuc : scrrun: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 0194896aa5bf13a1754e95a4eab1a1527b9bb463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0194896aa5bf13a1754e95a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 01:11:31 2018 +0100 scrrun: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0527531..aa16600 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1001,7 +1001,7 @@ static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) return E_POINTER; *name = NULL; - ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + ret = GetVolumeInformationW(This->root, nameW, ARRAY_SIZE(nameW), NULL, NULL, NULL, NULL, 0); if (ret) *name = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -1026,7 +1026,7 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) return E_POINTER; *fs = NULL; - ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, ARRAY_SIZE(nameW)); if (ret) *fs = SysAllocString(nameW); return ret ? S_OK : E_FAIL;

1 0

Alexandre Julliard : ntdll: Check file identity in addition to file name to find a loaded module.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 1cee60d06823a6224646b425243ed0617c4d1c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cee60d06823a6224646b425… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 10:11:55 2018 +0100 ntdll: Check file identity in addition to file name to find a loaded module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 9 ----- dlls/ntdll/loader.c | 91 ++++++++++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cee60d06823a6224646…

1 0

Michael Müller : ntdll: Fix error code when querying too large memory address.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 556ba38dd177198dba7cd8554302536d2e31ff10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=556ba38dd177198dba7cd855… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 17:31:23 2018 -0600 ntdll: Fix error code when querying too large memory address. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/virtual.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b62e035..1f1c675 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1868,6 +1868,10 @@ static void test_queryvirtualmemory(void) "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ + + /* check error code when addr is higher than working set limit */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 106dab2..befb59c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2845,7 +2845,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, base = ROUND_ADDR( addr, page_mask ); - if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_INVALID_PARAMETER; /* Find the view containing the address */

1 0

Józef Kucia : wined3d: Use wined3d_bit_scan() in find_draw_buffers_mask().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: e27141e01545d55c4b0b8584a859f506aaa7ae43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27141e01545d55c4b0b8584… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:37 2018 +0100 wined3d: Use wined3d_bit_scan() in find_draw_buffers_mask(). 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/context.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4282cfb..975a79c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3128,7 +3128,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const { struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - DWORD rt_mask, rt_mask_bits; + DWORD rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -3138,15 +3138,13 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= context->d3d_info->valid_rt_mask; - rt_mask_bits = rt_mask; - i = 0; - while (rt_mask_bits) + + mask = rt_mask; + while (mask) { - rt_mask_bits &= ~(1u << i); + i = wined3d_bit_scan(&mask); if (!rts[i] || rts[i]->format->id == WINED3DFMT_NULL) rt_mask &= ~(1u << i); - - i++; } return rt_mask;

1 0

Józef Kucia : wined3d: Do not call context_validate_onscreen_formats() in context_apply_blit_state().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: cae8ebab91798856d3f12caf5f8b4d9035693ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae8ebab91798856d3f12caf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:34 2018 +0100 wined3d: Do not call context_validate_onscreen_formats() in context_apply_blit_state(). It does nothing when depth_stencil is NULL. 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/context.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32126b7..4282cfb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2956,8 +2956,6 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - context_validate_onscreen_formats(context, NULL); - if (context->render_offscreen) { wined3d_texture_load(rt, context, FALSE);

1 0

Hans Leidekker : bcrypt: Partial implementation of BCryptImportKey and BCryptExportKey.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: c77d5c65fb0d92b1ef33d41a22f9c49abc767388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c77d5c65fb0d92b1ef33d41a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 28 13:33:06 2018 +0100 bcrypt: Partial implementation of BCryptImportKey and BCryptExportKey. Based on a patch by Michael Müller. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 143 ++++++++++++++++++++++++++++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 51 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 14 +++++ 5 files changed, 186 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c77d5c65fb0d92b1ef33…

1 0

Alexandre Julliard : ntdll: Add a helper function to open a dll file.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: wine Branch: master Commit: 6d6669fb2d208d7ce7fe2365fada1bc1bb96a3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6669fb2d208d7ce7fe2365… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 09:59:02 2018 +0100 ntdll: Add a helper function to open a dll file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d707397..6884e8d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2157,6 +2157,31 @@ done: /*********************************************************************** + * open_dll_file + * + * Open a file for a new dll. Helper for find_dll_file. + */ +static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm ) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + if (NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )) + return 0; + + return handle; +} + + +/*********************************************************************** * find_dll_file * * Find the file (or already loaded module) for a given dll name. @@ -2164,8 +2189,6 @@ done: static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, HANDLE *handle ) { - OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; ULONG len; @@ -2220,13 +2243,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_NO_MEMORY; } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + *handle = open_dll_file( &nt_name, pwm ); goto found; } @@ -2254,15 +2271,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (len >= *size) goto overflow; memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); if (!(*pwm = find_fullname_module( filename )) && handle) - { - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; - } + *handle = open_dll_file( &nt_name, pwm ); + found: RtlFreeUnicodeString( &nt_name ); RtlFreeHeap( GetProcessHeap(), 0, dllname );

1 0

Francois Gouget : testbot: Check the current snapshot in LibvirtTool checkidle.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: 98ec6ba6d7aa219201a2defda745af4febfbeef0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=98ec6ba6d7aa219201a2def… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:54:29 2018 +0100 testbot: Check the current snapshot in LibvirtTool checkidle. If the snapshot does not match then the current VM instance is not actually using the hypervisor domain so mark it off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 670c553..12eaa66 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -320,9 +320,12 @@ sub CheckIdle() my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); FatalError("$ErrMessage\n") if (defined $ErrMessage); - return PowerOff() if ($SnapshotName ne $VM->IdleSnapshot); - return ChangeStatus("dirty", "idle", "done"); + # If the snapshot does not match then the virtual machine may be used by + # another VM instance. So don't touch it. All that counts is that this + # VM instance is not running. + my $NewStatus = ($SnapshotName eq $VM->IdleSnapshot) ? "idle" : "off"; + return ChangeStatus("dirty", $NewStatus, "done"); } sub Revert() diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d893e49..f098639 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -433,9 +433,9 @@ sub _RunVMTool($$$) =item C<RunCheckIdle()> -If the virtual machine state matches that of this VM instance, sets its status -to idle. If not the VM is simply marked as off. While this is happening the -VM status is set to dirty so the job scheduler does not try to use it. +If the hypervisor domain state matches that of this VM instance, sets its +status to idle. If not the VM is simply marked as off. While this is happening +the VM status is set to dirty so the job scheduler does not try to use it. This operation can take a long time so it is performed in a separate process.

1 0

Francois Gouget : testbot/Janitor: Remove a spurious leading 0 in a log message.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: 00112a1ed9e0a692b04fd0fa59b673b8a9212e36 URL: https://source.winehq.org/git/tools.git/?a=commit;h=00112a1ed9e0a692b04fd0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:40:30 2018 +0100 testbot/Janitor: Remove a spurious leading 0 in a log message. The leading 0 is a convention only used to communicate with the Engine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 382408d..d8a9650 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -258,7 +258,7 @@ if (opendir(my $dh, "$DataDir/staging")) } else { - LogMsg "0Unable to open '$DataDir/staging': $!"; + LogMsg "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups

1 0

Francois Gouget : testbot: Avoid race conditions between LibvirtTool monitor and other tools.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: 070b78e17a9a0408eb17f01f96860fcd1d846923 URL: https://source.winehq.org/git/tools.git/?a=commit;h=070b78e17a9a0408eb17f01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 02:01:03 2018 +0100 testbot: Avoid race conditions between LibvirtTool monitor and other tools. If another tool was trying to connect to the VM's TestAgent server when 'LibvirtTool monitor' powered off the VM, that other tool may mark the VM as offline right after it has been put back online. So wait for other tools to time out after monitor powers off a VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 76ea707..c0288e7 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -285,7 +285,12 @@ sub Monitor() else { my $IsPoweredOn; - if (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) + if (!defined $SnapshotName) + { + Debug("$VMKey has no snapshot (reverting?)\n"); + $IsPoweredOn = undef; + } + elsif (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) { $IsPoweredOn = 0; } @@ -298,8 +303,16 @@ sub Monitor() if (defined $ErrMessage) { Error "$ErrMessage\n"; - $IsPoweredOn = undef; } + else + { + # Another process might have been trying to connect to the VM's + # TestAgent server. Wait for it to time out so it does not set the + # VM offline right after we have put it back online. + LogMsg "Powered off $VMKey. Sleep until all other processes accessing it are gone.\n"; + sleep(3 * $WaitForToolsInVM); + } + $IsPoweredOn = undef; } } if (defined $IsPoweredOn)

1 0

Francois Gouget : testbot: Check the current snapshot in LibvirtTool monitor.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: ab35ecaf100d649a8b182e1bfba22c1b754cb8bc URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab35ecaf100d649a8b182e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:54:45 2018 +0100 testbot: Check the current snapshot in LibvirtTool monitor. If the snapshot does not match when the hypervisor domain becomes accessible again, then don't try to power if off and just mark the VM instance as off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 12eaa66..0293bae 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -277,23 +277,39 @@ sub Monitor() return 0; } - my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); - if ($IsPoweredOn) + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + if (defined $ErrMessage) { - my $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - $IsPoweredOn = undef; - } + Error "$ErrMessage\n"; } - if (defined $IsPoweredOn) + else { - return 1 if (ChangeStatus("offline", "off", "done")); - NotifyAdministrator("The $VMKey VM is working again", - "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); - return 0; + my $IsPoweredOn; + if (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) + { + $IsPoweredOn = 0; + } + else + { + $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + $ErrMessage = $VM->GetDomain()->PowerOff(); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } } Debug(Elapsed($Start), " $VMKey is still unreachable\n");

1 0

Zebediah Figura : winetest/dissect: Stop complaining if a test file doesn' t match the current test.
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: 53356b3d3fa5d2cc648e50a8abd7826d1ea1cc4c URL: https://source.winehq.org/git/tools.git/?a=commit;h=53356b3d3fa5d2cc648e50a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 09:56:12 2018 -0600 winetest/dissect: Stop complaining if a test file doesn't match the current test. Now that we have support for custom dlls in e.g. dlls/msi/tests/custom.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9635f0a..7416317 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,6 @@ while ($line = <IN>) { add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or @@ -635,7 +634,6 @@ while ($line = <IN>) { add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or

1 0

Francois Gouget : testbot: Replace poweroff with checkoff in the Engine' s Cleanup().
by Alexandre Julliard Feb. 28, 2018

Feb. 28, 2018

Module: tools Branch: master Commit: cad513a33e9c0f32af427ac2d2caf63f23f168b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cad513a33e9c0f32af427ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:55:41 2018 +0100 testbot: Replace poweroff with checkoff in the Engine's Cleanup(). checkoff verifies that the hypervisor domain state matches that of the current VM instance before powering it off. If the state does not match then the VM is just marked off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 8 ++++---- testbot/bin/LibvirtTool.pl | 28 ++++++++++++++++++++++++++-- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2e62c66..a03fa06 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -206,8 +206,8 @@ sub Cleanup($;$$) { # The VM should not have a process. $VM->KillChild(); - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff (unexpected process)"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check (unexpected process)"); } elsif ($Starting) { @@ -228,8 +228,8 @@ sub Cleanup($;$$) # Power off the VM, even if its status is already off. # This is the simplest way to resync the VM status field. # Also powering off a powered off VM will detect offline VMs. - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check"); } } # $KillVMs is normally used on shutdown so don't start a process that diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0293bae..76ea707 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|checkoff|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|checkoff|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -344,6 +344,26 @@ sub CheckIdle() return ChangeStatus("dirty", $NewStatus, "done"); } +sub CheckOff() +{ + $CurrentStatus = "dirty"; + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + return ChangeStatus("dirty", "offline", "done") if (!defined $IsPoweredOn); + + if ($IsPoweredOn) + { + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + if ($SnapshotName eq $VM->IdleSnapshot) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + } + } + + return ChangeStatus("dirty", "off", "done"); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -405,6 +425,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "checkoff") +{ + $Rc = CheckOff(); +} elsif ($Action eq "monitor") { $Rc = Monitor(); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f098639..afc7af9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -451,6 +451,26 @@ sub RunCheckIdle($) =pod =over 12 +=item C<RunCheckOff()> + +If the hypervisor domain state matches that of this VM instance, power if off. +If not the VM is simply marked as off. While this is happening the VM status +is set to dirty so the job scheduler does not try to use it. + +This operation can take a long time so it is performed in a separate process. + +=back +=cut + +sub RunCheckOff($) +{ + my ($self) = @_; + return $self->_RunVMTool("dirty", ["--log-only", "checkoff", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunMonitor()> Monitors an offline VM to detect when it becomes accessible again.

1 0

Józef Kucia : wined3d: Do not allocate framebuffer state structures dynamically.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: d8c0bc82458b9e8b55fc33bba0da597342c15479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c0bc82458b9e8b55fc33bb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:36 2018 +0100 wined3d: Do not allocate framebuffer state structures dynamically. 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/context.c | 76 ++++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 30 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c0bc82458b9e8b55fc…

1 0

Józef Kucia : wined3d: Try harder to reacquire context.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7b62a970e9ad3b4179394cf54f0232475fe2388a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b62a970e9ad3b4179394cf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:37 2018 +0100 wined3d: Try harder to reacquire context. 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/context.c | 55 +++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index df41689..32126b7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4170,6 +4170,26 @@ static void context_setup_target(struct wined3d_context *context, context_set_render_offscreen(context, render_offscreen); } +static void context_activate(struct wined3d_context *context, + struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + context_enter(context); + context_update_window(context); + context_setup_target(context, texture, sub_resource_idx); + if (!context->valid) + return; + + if (context != context_get_current()) + { + if (!context_set_current(context)) + ERR("Failed to activate the new context.\n"); + } + else if (context->needs_set) + { + context_set_gl_context(context); + } +} + struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { @@ -4228,21 +4248,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, context = swapchain_get_context(device->swapchains[0]); } - context_enter(context); - context_update_window(context); - context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) - return context; - - if (context != current_context) - { - if (!context_set_current(context)) - ERR("Failed to activate the new context.\n"); - } - else if (context->needs_set) - { - context_set_gl_context(context); - } + context_activate(context, texture, sub_resource_idx); return context; } @@ -4250,16 +4256,23 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_context *context_reacquire(const struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_context *current_context; + struct wined3d_context *acquired_context; + + wined3d_from_cs(device->cs); if (!context || context->tid != GetCurrentThreadId()) return NULL; - current_context = context_acquire(device, context->current_rt.texture, - context->current_rt.sub_resource_idx); - if (current_context != context) - ERR("Acquired context %p instead of %p.\n", current_context, context); - return current_context; + if (context->current_rt.texture) + { + context_activate(context, context->current_rt.texture, context->current_rt.sub_resource_idx); + return context; + } + + acquired_context = context_acquire(device, NULL, 0); + if (acquired_context != context) + ERR("Acquired context %p instead of %p.\n", acquired_context, context); + return acquired_context; } void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state,

1 0

Józef Kucia : d3d9/tests: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 3f9857aecb5c494693a6dff6630f54524462dd0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9857aecb5c494693a6dff6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:35 2018 +0100 d3d9/tests: Use ARRAY_SIZE() macro. 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/d3d9/tests/d3d9ex.c | 10 +-- dlls/d3d9/tests/device.c | 4 +- dlls/d3d9/tests/stateblock.c | 16 +++-- dlls/d3d9/tests/visual.c | 149 +++++++++++++++++++++---------------------- 4 files changed, 89 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f9857aecb5c494693a6…

1 0

Alexandre Julliard : ntoskrnl: Avoid forwarding to ntdll, link directly instead.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: bf35c2612c3c2a166e540fb062b96e9f062131e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf35c2612c3c2a166e540fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 13:47:47 2018 +0100 ntoskrnl: Avoid forwarding to ntdll, link directly instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 18 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 732 ++++++++++++++++++------------------ 2 files changed, 375 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf35c2612c3c2a166e54…

1 0

Jacek Caban : mshtml: Merge htmlmeta.c into htmlhead.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: ecc6ee0810f8ca503d1b7dc6ae4fb1347d75646b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc6ee0810f8ca503d1b7dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:04 2018 +0100 mshtml: Merge htmlmeta.c into htmlhead.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlhead.c | 243 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlmeta.c | 273 ------------------------------------------------ 3 files changed, 242 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc6ee0810f8ca503d1b…

1 0

Akihiro Sagawa : ws2_32: Fix ioctlsocket(FIONREAD) with listening socket.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: f6b6c94add5991279828d07f45c6abb4f9f2a74e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b6c94add5991279828d07f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 25 15:01:05 2018 +0900 ws2_32: Fix ioctlsocket(FIONREAD) with listening socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d983633..25ec72a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4648,12 +4648,24 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_FIONREAD: { +#if defined(linux) + int listening = 0; + socklen_t len = sizeof(listening); +#endif if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + +#if defined(linux) + /* On Linux, FIONREAD on listening socket always fails (see tcp(7)). + However, it succeeds on native. */ + if (!getsockopt( fd, SOL_SOCKET, SO_ACCEPTCONN, &listening, &len ) && listening) + (*(WS_u_long *) out_buff) = 0; + else +#endif if (ioctl(fd, FIONREAD, out_buff ) == -1) status = wsaErrno(); release_sock_fd( s, fd ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 06ba3f0..05495b4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5233,8 +5233,8 @@ static void test_ioctlsocket(void) /* test FIONREAD with listening socket */ arg = 0xdeadbeef; ret = ioctlsocket(sock, FIONREAD, &arg); - todo_wine ok(ret == 0, "ioctlsocket failed unexpectedly with error %d\n", WSAGetLastError()); - todo_wine ok(arg == 0, "expected 0, got %u\n", arg); + ok(ret == 0, "ioctlsocket failed unexpectedly with error %d\n", WSAGetLastError()); + ok(arg == 0, "expected 0, got %u\n", arg); closesocket(sock);

1 0

Akihiro Sagawa : ws2_32/tests: Add ioctlsocket(FIONREAD) tests with listening socket.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 13b66d3d1c34c6f366b1a255d993d4ac5d6b19b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13b66d3d1c34c6f366b1a255… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 25 15:01:03 2018 +0900 ws2_32/tests: Add ioctlsocket(FIONREAD) tests with listening socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7c55c21..06ba3f0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5120,6 +5120,7 @@ static void test_ioctlsocket(void) { SOCKET sock, src, dst; struct tcp_keepalive kalive; + struct sockaddr_in address; int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; UINT i, bytes_rec; @@ -5205,6 +5206,38 @@ static void test_ioctlsocket(void) closesocket(sock); + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); + if(sock == INVALID_SOCKET) + { + skip("Can't continue without a socket.\n"); + return; + } + + /* test FIONREAD with a fresh and non-connected socket */ + arg = 0xdeadbeef; + ret = ioctlsocket(sock, FIONREAD, &arg); + ok(ret == 0, "ioctlsocket failed unexpectedly with error %d\n", WSAGetLastError()); + ok(arg == 0, "expected 0, got %u\n", arg); + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr( SERVERIP ); + address.sin_port = htons( SERVERPORT ); + ret = bind(sock, (struct sockaddr *)&address, sizeof(address)); + ok(ret == 0, "bind failed unexpectedly with error %d\n", WSAGetLastError()); + + ret = listen(sock, SOMAXCONN); + ok(ret == 0, "listen failed unexpectedly with error %d\n", WSAGetLastError()); + + /* test FIONREAD with listening socket */ + arg = 0xdeadbeef; + ret = ioctlsocket(sock, FIONREAD, &arg); + todo_wine ok(ret == 0, "ioctlsocket failed unexpectedly with error %d\n", WSAGetLastError()); + todo_wine ok(arg == 0, "expected 0, got %u\n", arg); + + closesocket(sock); + if (tcp_socketpair(&src, &dst) != 0) { ok(0, "creating socket pair failed, skipping test\n");

1 0