January 2018 - Wine-commits

Hans Leidekker : kerberos: Implement SpAcceptLsaModeContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: ce3f72ef32186b8e212c1ca14b6aed9d79f074b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3f72ef32186b8e212c1ca1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:31 2018 +0800 kerberos: Implement SpAcceptLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0821e7c..7f0006d 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -186,6 +186,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); @@ -209,6 +210,7 @@ static BOOL load_gssapi_krb5(void) goto fail; \ } + LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) @@ -336,6 +338,19 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) return ret; } +static ULONG flags_gss_to_asc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ASC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ASC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ASC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ASC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + return ret; +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -483,6 +498,73 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #endif } +static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + SecBufferDesc *input, ULONG context_req, ULONG target_data_rep, LSA_SEC_HANDLE *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, ret_flags, expiry_time; + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req) FIXME( "ignoring flags 0x%08x\n", context_req ); + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, + &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); + TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_BUFFER_TOO_SMALL; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -527,7 +609,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, - NULL, /* AcceptLsaModeContext */ + kerberos_SpAcceptLsaModeContext, NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */

1 0

Hans Leidekker : kerberos: Implement SpDeleteContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 09f040432649eb12741bb9736ef150afd2c1a92e URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f040432649eb12741bb973… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:35 2018 +0800 kerberos: Implement SpDeleteContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7f0006d..4aadd77 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -565,6 +565,26 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential #endif } +static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_ctx_id_t ctxt_handle; + + TRACE( "(%lx)\n", context ); + if (!context) return SEC_E_INVALID_HANDLE; + if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_OK; + + ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", context ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -610,7 +630,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, kerberos_SpAcceptLsaModeContext, - NULL, /* DeleteContext */ + kerberos_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */

1 0

Hans Leidekker : kerberos: Implement SpFreeCredentialsHandle.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 5aaeaa60c2a598a4378437b13b447579fc02f8b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aaeaa60c2a598a4378437b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:39 2018 +0800 kerberos: Implement SpFreeCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 4aadd77..b467119 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -192,6 +192,7 @@ MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); +MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -216,6 +217,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) + LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -419,6 +421,27 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_cred_id_t cred_handle; + + TRACE( "(%lx)\n", credential ); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!(cred_handle = credhandle_sspi_to_gss( credential ))) return SEC_E_OK; + + ret = pgss_release_cred( &minor_status, &cred_handle ); + TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", credential ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, @@ -624,7 +647,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* AcceptCredentials */ kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* FreeCredentialsHandle */ + kerberos_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */

1 0

Sebastian Lackner : shcore: Add stub dll and GetProcessDpiAwareness stub.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 225f8bea79e0c5daf58b2d00c3303625ba91bdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=225f8bea79e0c5daf58b2d00… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:03 2018 -0700 shcore: Add stub dll and GetProcessDpiAwareness stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/Makefile.in | 4 + dlls/shcore/main.c | 50 ++++++ dlls/shcore/shcore.spec | 181 +++++++++++++++++++++ tools/make_specfiles | 7 +- 7 files changed, 245 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=225f8bea79e0c5daf58b…

1 0

Sebastian Lackner : shcore: Implement semi-stub for GetDpiForMonitor.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 4a4bf34f069f9464a3644c0d83875eecd0d300b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4bf34f069f9464a3644c0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:04 2018 -0700 shcore: Implement semi-stub for GetDpiForMonitor. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/Makefile.in | 1 + dlls/shcore/main.c | 16 ++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index acf194a..44c0e93 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetDpiForMonitor +@ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index ec2e95f..8497198 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = shcore.dll +IMPORTS = user32 gdi32 C_SRCS = \ main.c diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 9075a38..9073bd1 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -21,6 +21,8 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "shellscalingapi.h" #include "wine/debug.h" @@ -48,3 +50,17 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val if (value) *value = PROCESS_DPI_UNAWARE; return S_OK; } + +HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) +{ + HDC hDC; + + FIXME("(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y); + + hDC = GetDC(0); + if (x) *x = GetDeviceCaps(hDC, LOGPIXELSX); + if (y) *y = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(0, hDC); + + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 374fafb..958c91f 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -7,7 +7,7 @@ @ stub DllGetActivationFactory @ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stub GetDpiForMonitor +@ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stub GetProcessReference

1 0

Sebastian Lackner : shcore: Add SetProcessDpiAwareness stub.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 6f7532cb7b58e77492a72b926d8327bafe73957d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7532cb7b58e77492a72b92… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:05 2018 -0700 shcore: Add SetProcessDpiAwareness stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 6 ++++++ dlls/shcore/shcore.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 44c0e93..6194c8c 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -5,5 +5,5 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stub SetProcessDpiAwareness +@ stdcall SetProcessDpiAwareness(long) shcore.SetProcessDpiAwareness @ stub UnregisterScaleChangeEvent diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 9073bd1..739e3ff 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -51,6 +51,12 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val return S_OK; } +HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) +{ + FIXME("(%u): stub\n", value); + return E_NOTIMPL; +} + HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) { HDC hDC; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 958c91f..a9a6f31 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -78,7 +78,7 @@ @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID -@ stub SetProcessDpiAwareness +@ stdcall SetProcessDpiAwareness(long) @ stub SetProcessReference @ stub UnregisterScaleChangeEvent

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_srcElement implementation.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 07954f36215ebef81205437f0ae87b38f0505d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07954f36215ebef81205437f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 24 17:38:12 2018 +0100 mshtml: Added IDOMEvent::get_srcElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 20 ++++++++++++++------ dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abc0a1c..8e977f1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -396,10 +396,12 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - if(This->event && This->event->target) - IDispatchEx_QueryInterface(&This->event->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); - return S_OK; + if(!This->event) { + *p = NULL; + return S_OK; + } + + return IDOMEvent_get_srcElement(&This->event->IDOMEvent_iface, p); } static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) @@ -1167,8 +1169,14 @@ static HRESULT WINAPI DOMEvent_get_cancelBubble(IDOMEvent *iface, VARIANT_BOOL * static HRESULT WINAPI DOMEvent_get_srcElement(IDOMEvent *iface, IHTMLElement **p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->target) + IDispatchEx_QueryInterface(&This->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); + else + *p = NULL; + return S_OK; } static const IDOMEventVtbl DOMEventVtbl = { diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index f471b86..30d23c7 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -469,6 +469,7 @@ function test_dispatch_event() { return function(event) { ok(event === e, "event != e"); ok(event.target === child, "target != child"); + ok(event.srcElement === child, "srcElement != child"); calls += msg + ","; }; } @@ -485,12 +486,14 @@ function test_dispatch_event() { e = document.createEvent("Event"); e.initEvent("click", true, true); ok(e.target === null, "e.target != null"); + ok(e.srcElement === null, "e.srcElement != null"); calls = ""; child.dispatchEvent(e); ok(calls === "parent.click(capture),child.click(capture),child.click(bubble)," + "parent.click(bubble),", "calls = " + calls); ok(e.target === child, "e.target != child"); + ok(e.srcElement === child, "e.srcElement != child"); ok(e.currentTarget === null, "e.currentTarget != null"); e = document.createEvent("Event");

1 0

Huw Davies : ole32: Don't keep the streams open.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 57a5ab21f9d69b404fc5f8e6f686bff55e1aa17f URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a5ab21f9d69b404fc5f8e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 24 09:31:29 2018 +0000 ole32: Don't keep the streams open. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 156 ++++++++++++++----------------------------------- 1 file changed, 44 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57a5ab21f9d69b404fc5…

1 0

Huw Davies : ole32: There' s no need to recreate the static entry when parsing the CONTENTS stream.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: d5be8f57a16dfb8ff5cdfba27f467b28c8766413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5be8f57a16dfb8ff5cdfba2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 24 09:31:30 2018 +0000 ole32: There's no need to recreate the static entry when parsing the CONTENTS stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 47 ++++++++++++++++++++++++++++++----------------- dlls/ole32/tests/ole2.c | 4 ++-- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ba253d9..c07633d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -312,6 +312,29 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR return NULL; } +/* Returns the cache entry associated with a static CLSID. + This will be first in the list with connection id == 1 */ +static HRESULT get_static_entry( DataCache *cache, DataCacheEntry **cache_entry ) +{ + DataCacheEntry *entry; + struct list *head = list_head( &cache->cache_list ); + HRESULT hr = E_FAIL; + + *cache_entry = NULL; + + if (head) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + *cache_entry = entry; + hr = S_OK; + } + } + + return hr; +} + /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ @@ -1698,33 +1721,23 @@ static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) return S_OK; } -static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - -static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) +static HRESULT parse_contents_stream( DataCache *cache, IStorage *stg ) { HRESULT hr; - STATSTG stat; - const FORMATETC *fmt; IStream *stm; + DataCacheEntry *cache_entry; hr = open_pres_stream( stg, STREAM_NUMBER_CONTENTS, &stm ); if (FAILED( hr )) return hr; - hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); - if (FAILED( hr )) goto done; - - if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) - fmt = &static_dib_fmt; - else + hr = get_static_entry( cache, &cache_entry ); + if (hr == S_OK) { - FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); - hr = E_FAIL; - goto done; + cache_entry->load_stream_num = STREAM_NUMBER_CONTENTS; + cache_entry->save_stream_num = STREAM_NUMBER_CONTENTS; + cache_entry->dirty = FALSE; } - hr = add_cache_entry( This, fmt, 0, STREAM_NUMBER_CONTENTS ); - -done: IStream_Release( stm ); return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index d83ca00..1a4fce5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4450,7 +4450,6 @@ static void test_data_cache_contents(void) ok(hr == S_OK, "unexpected %#x\n", hr); hr = IPersistStorage_IsDirty(stg); -todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || test_data[i].in == &stg_def_9) ok(hr == S_FALSE, "%d: unexpected %#x\n", i, hr); hr = IPersistStorage_Save(stg, doc2, FALSE); @@ -4463,7 +4462,8 @@ todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || t todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_5)) +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5 + || test_data[i].in == &stg_def_6)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count);

1 0

Nikolay Sivov : comctl32/tests: Link to comctl32.dll dynamically.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 3845cc10e812ac26360debaae0c64c808ba6efc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3845cc10e812ac26360debaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 24 15:47:09 2018 +0300 comctl32/tests: Link to comctl32.dll dynamically. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/animate.c | 22 +---------- dlls/comctl32/tests/combo.c | 29 +++++++------- dlls/comctl32/tests/datetime.c | 22 ++++++----- dlls/comctl32/tests/dpa.c | 67 +++++++++++++------------------- dlls/comctl32/tests/header.c | 38 +++++++++--------- dlls/comctl32/tests/imagelist.c | 36 ++++++++--------- dlls/comctl32/tests/ipaddress.c | 25 ------------ dlls/comctl32/tests/listview.c | 74 +++++++++++++++++++---------------- dlls/comctl32/tests/monthcal.c | 25 ++++++------ dlls/comctl32/tests/mru.c | 30 +++++++------- dlls/comctl32/tests/pager.c | 1 - dlls/comctl32/tests/progress.c | 34 +++++++++------- dlls/comctl32/tests/propsheet.c | 86 +++++++++++++++++++++++++---------------- dlls/comctl32/tests/rebar.c | 35 ++++++++--------- dlls/comctl32/tests/status.c | 21 +++++++++- dlls/comctl32/tests/subclass.c | 2 +- dlls/comctl32/tests/tab.c | 42 ++++++++++++++------ dlls/comctl32/tests/toolbar.c | 63 +++++++++++++++++++----------- dlls/comctl32/tests/tooltips.c | 2 +- dlls/comctl32/tests/trackbar.c | 3 +- dlls/comctl32/tests/treeview.c | 34 ++++++++-------- dlls/comctl32/tests/updown.c | 21 +++++++--- 23 files changed, 378 insertions(+), 336 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3845cc10e812ac26360d…

1 0