- Wine-Devel - list.winehq.org

[PATCH] mshtml: Implement IOleObject::[Get|Set]Extent.
by Gijs Vermeulen Sept. 23, 2020

Sept. 23, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45797 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/oleobj.c | 22 ++++++-- dlls/mshtml/tests/htmldoc.c | 99 ++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2c14ec0bec..0b24f1a390 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -642,6 +642,8 @@ struct HTMLDocument { HTMLOuterWindow *window; ConnectionPointContainer cp_container; + + SIZEL extent; }; static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 1d8d62669e..7499a2f88d 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -606,15 +606,27 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + This->extent = *psizel; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + *psizel = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) @@ -1473,4 +1485,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; This->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; + This->extent.cx = 1; + This->extent.cy = 1; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index dee448144e..89311c5d8c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6922,6 +6922,104 @@ static void test_OnAmbientPropertyChange(IHTMLDocument2 *doc) +static void test_GetSetExtent(IHTMLDocument2 *doc) +{ + IOleObject *oleobj = NULL; + HRESULT hres; + SIZE extent; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + todo_wine ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d} (expected {800 700})\n", + extent.cx, extent.cy ); + + extent.cx = 1; + extent.cy = 1; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + IOleObject_Release(oleobj); +} + static void test_OnAmbientPropertyChange2(IHTMLDocument2 *doc) { IOleControl *control = NULL; @@ -7605,6 +7703,7 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) doc_unk = (IUnknown*)doc; test_QueryInterface(doc); + test_GetSetExtent(doc); test_Advise(doc); test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); -- 2.28.0

3 2

[PATCH V2] vbscript: fix vanishing statements.
by Robert Wilhelm Sept. 23, 2020

Sept. 23, 2020

vbscript: fix vanishing statements. When adding multiple statements (e.g. colon separated SimpleStatements) in function source_add_statement(), tail of linked list was not adjusted. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2: in first mail the patch vanished... --- dlls/vbscript/parser.y | 5 +++++ dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 80f8699bd8..924d0b973b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -516,12 +516,17 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) if(!stat) return; + /* concatenate both linked lists */ if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; }else { ctx->stats = ctx->stats_tail = stat; } + /* find new tail */ + while(ctx->stats_tail->next) { + ctx->stats_tail=ctx->stats_tail->next; + } } static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 621b390523..9f254f502b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -67,6 +67,9 @@ Call ok(W = 5, "W = " & W & " expected " & 5) x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") +Dim public1 : public1 = 42 +Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) + Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true") -- 2.26.2

3 2

[PATCH] conhost: Validate width param in write_output.
by Jacek Caban Sept. 23, 2020

Sept. 23, 2020

From: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH v2] conhost: Input should be restored and input_thread handle should be closed before return.
by Haidong Yu Sept. 23, 2020

Sept. 23, 2020

2 1

[PATCH] crypt32: Add support for CRYPT_MACHINE_KEYSET in PFXImportCertStore.
by Hans Leidekker Sept. 23, 2020

Sept. 23, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49857 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/pfx.c | 15 +++++++++------ dlls/crypt32/tests/store.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 3f38ae50565..80e6a3d017e 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -138,7 +138,7 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) HCRYPTPROV prov = 0; HCRYPTKEY cryptkey; BYTE *buf, *src, *dst; - DWORD size; + DWORD size, acquire_flags; if ((ret = pgnutls_x509_privkey_get_pk_algorithm2( key, &bitlen )) < 0) { @@ -208,17 +208,20 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) else src = d.data; for (i = bitlen / 8 - 1; i >= 0; i--) *dst++ = src[i]; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET )) + acquire_flags = (flags & CRYPT_MACHINE_KEYSET) | CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { if (GetLastError() != NTE_EXISTS) goto done; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, 0 )) + + acquire_flags &= ~CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { WARN( "CryptAcquireContextW failed %08x\n", GetLastError() ); goto done; } } - if (!CryptImportKey( prov, buf, size, 0, flags, &cryptkey )) + if (!CryptImportKey( prov, buf, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08x\n", GetLastError() ); CryptReleaseContext( prov, 0 ); @@ -346,7 +349,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } - if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY)) + if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|CRYPT_MACHINE_KEYSET|PKCS12_NO_PERSIST_KEY)) { FIXME( "flags %08x not supported\n", flags ); return NULL; @@ -373,7 +376,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor goto error; } - if (!(prov = import_key( key, flags & CRYPT_EXPORTABLE ))) goto error; + if (!(prov = import_key( key, flags ))) goto error; if (!(store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, 0, NULL ))) { WARN( "CertOpenStore failed %08x\n", GetLastError() ); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b2d5c7cb7e0..46c9102686d 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3348,6 +3348,16 @@ static void test_PFXImportCertStore(void) ok(ret, "got %u\n", GetLastError()); CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); + + /* CRYPT_MACHINE_KEYSET */ + store = PFXImportCertStore( &pfx, NULL, CRYPT_MACHINE_KEYSET ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %08x\n", GetLastError() ); + + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); } static void test_CryptQueryObject(void) -- 2.20.1

1 0

[PATCH 3/5] include/ddraw.h: Add missing dwFlags of DD_BLTDATA struct.
by Biswapriyo Nath Sept. 23, 2020

Sept. 23, 2020

2 1

[PATCH 5/5] include/ddraw.h: Add DDSCAPS2.dwCaps3 flags.
by Biswapriyo Nath Sept. 23, 2020

Sept. 23, 2020

2 1

[PATCH 1/5] include/ddraw.h: Add missing members in DDPIXELFORMAT struct.
by Biswapriyo Nath Sept. 23, 2020

Sept. 23, 2020

2 1

[PATCH 4/5] include/ddraw.h: Add missing DDSCAPS2.dwCaps2 flags.
by Biswapriyo Nath Sept. 23, 2020

Sept. 23, 2020

2 1

[PATCH 2/5] include/ddraw.h: Add missing UpdateOverlay flags.
by Biswapriyo Nath Sept. 23, 2020

Sept. 23, 2020

2 1