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