February 2020 - Wine-Commits

Jacek Caban : jscript: Store error location in jsexcept_t.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

1 0

Jacek Caban : jscript: Propagate compiler error location.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: ed22d71fd2781d91432993027c65274f6a2de320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed22d71fd2781d9143299302… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:46 2020 +0100 jscript: Propagate compiler error location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1bf5f225de..2be5f24fae 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2519,8 +2519,11 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte heap_pool_free(&compiler.heap); parser_release(compiler.parser); if(FAILED(hres)) { + if(hres != DISP_E_EXCEPTION) + throw_error(ctx, hres, NULL); + set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR); release_bytecode(compiler.code); - return hres; + return DISP_E_EXCEPTION; } *ret = compiler.code;

1 0

Zebediah Figura : dsound: Use an SRW lock for the buffer lock.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: e09190399904c6ae13ce256aaa2efbf9360ac8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09190399904c6ae13ce256a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 09:02:56 2020 -0600 dsound: Use an SRW lock for the buffer lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 65 ++++++++++++++++---------------------------- dlls/dsound/capture.c | 1 - dlls/dsound/dsound.c | 1 - dlls/dsound/dsound_convert.c | 1 - dlls/dsound/dsound_main.c | 1 - dlls/dsound/dsound_private.h | 2 +- dlls/dsound/duplex.c | 1 - dlls/dsound/mixer.c | 5 ++-- dlls/dsound/primary.c | 5 ++-- dlls/dsound/propset.c | 1 - dlls/dsound/sound3d.c | 1 - 11 files changed, 29 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e09190399904c6ae13ce…

1 0

Kevin Puetz : oleaut32: Use GetFinalPathNameByHandle to canonicalize file path.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: fa0491f23924d17e6b4f84df1c2706d15e8ab0f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0491f23924d17e6b4f84df… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 3 18:46:04 2020 +0100 oleaut32: Use GetFinalPathNameByHandle to canonicalize file path. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 451753e23b..788d853f63 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3335,27 +3335,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath h = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ - FILE_NAME_INFORMATION size_info; - BOOL br; - - /* GetFileInformationByHandleEx returns the path of the file without - * WOW64 redirection */ - br = GetFileInformationByHandleEx(h, FileNameInfo, &size_info, sizeof(size_info)); - if(br || GetLastError() == ERROR_MORE_DATA){ - FILE_NAME_INFORMATION *info; - DWORD size = sizeof(*info) + size_info.FileNameLength + sizeof(WCHAR); - - info = HeapAlloc(GetProcessHeap(), 0, size); - - br = GetFileInformationByHandleEx(h, FileNameInfo, info, size); - if(br){ - info->FileName[info->FileNameLength / sizeof(WCHAR)] = 0; - lstrcpynW(pszPath + 2, info->FileName, cchPath - 2); - } - - HeapFree(GetProcessHeap(), 0, info); - } - + GetFinalPathNameByHandleW(h, pszPath, cchPath, FILE_NAME_NORMALIZED | VOLUME_NAME_DOS); CloseHandle(h); }

1 0

Nikolay Sivov : dwrite: Implement GetFontFaceReference() for fontfaces.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: fecd13e1bf89f1098014362ff791113797b7ced1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fecd13e1bf89f1098014362f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 19:08:31 2020 +0300 dwrite: Implement GetFontFaceReference() for fontfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 203 ++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 30 +++---- 3 files changed, 213 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fecd13e1bf89f1098014…

1 0

Zebediah Figura : dsound: Use an SRW lock for buffer_list_lock.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 13087008437d80542123fc3087cbef85f636a50a URL: https://source.winehq.org/git/wine.git/?a=commit;h=13087008437d80542123fc30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 09:02:17 2020 -0600 dsound: Use an SRW lock for buffer_list_lock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48408 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/dsound.c | 15 +++++++-------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f600652914..d585a7605e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (x1 || x2) { - RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); + AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { RtlAcquireResourceShared(&iter->lock, TRUE); @@ -664,7 +664,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, } RtlReleaseResource(&iter->lock); } - RtlReleaseResource(&This->device->buffer_list_lock); + ReleaseSRWLockShared(&This->device->buffer_list_lock); } return hres; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8e2b839fe8..e7ab7922bb 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -181,7 +181,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) InitializeCriticalSection(&(device->mixlock)); device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); - RtlInitializeResource(&(device->buffer_list_lock)); + InitializeSRWLock(&device->buffer_list_lock); *ppDevice = device; @@ -238,7 +238,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); - RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock); HeapFree(GetProcessHeap(),0,device); @@ -612,7 +611,7 @@ HRESULT DirectSoundDevice_AddBuffer( TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->buffers) newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1)); @@ -629,7 +628,7 @@ HRESULT DirectSoundDevice_AddBuffer( hr = DSERR_OUTOFMEMORY; } - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } @@ -644,7 +643,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->nrofbuffers == 1) { assert(device->buffers[0] == pDSB); @@ -662,7 +661,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff device->nrofbuffers--; TRACE("buffer count is now %d\n", device->nrofbuffers); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); } /******************************************************************************* @@ -869,14 +868,14 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); } - RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&device->mixlock); if ((level == DSSCL_WRITEPRIMARY) != (device->priolevel == DSSCL_WRITEPRIMARY)) hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); if (SUCCEEDED(hr)) device->priolevel = level; LeaveCriticalSection(&device->mixlock); - RtlReleaseResource(&device->buffer_list_lock); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 930c3e92ec..5605bded90 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -80,7 +80,7 @@ struct DirectSoundDevice DWORD writelead, buflen, ac_frames, frag_frames, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; - RTL_RWLOCK buffer_list_lock; + SRWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05ca99b5df..c1bd3273f5 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -767,9 +767,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) if (!dev->ref) break; - RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + AcquireSRWLockShared(&dev->buffer_list_lock); DSOUND_PerformMix(dev); - RtlReleaseResource(&(dev->buffer_list_lock)); + ReleaseSRWLockShared(&dev->buffer_list_lock); } return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 852ec51b7f..8d42fe0ed9 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,7 +472,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe } /* **** */ - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); if (device->priolevel == DSSCL_WRITEPRIMARY) { @@ -508,7 +508,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe out: LeaveCriticalSection(&(device->mixlock)); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); /* **** */ return err;

1 0

Gabriel Ivăncescu : vbscript: Lookup the named item in compile_script.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 729c9eab58a34c0251cf4e4b5f5fb1dd1b42a128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=729c9eab58a34c0251cf4e4b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 31 15:28:59 2020 +0200 vbscript: Lookup the named item in compile_script. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 23 ++++++++++++++++++----- dlls/vbscript/vbscript.c | 19 ++++--------------- dlls/vbscript/vbscript.h | 4 ++-- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index eac048daa1..9888109e79 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1921,16 +1921,25 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, - unsigned start_line, DWORD flags, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *item_name, const WCHAR *delimiter, + DWORD_PTR cookie, unsigned start_line, DWORD flags, vbscode_t **ret) { function_decl_t *func_decl; + named_item_t *item = NULL; class_decl_t *class_decl; function_t *new_func; compile_ctx_t ctx; vbscode_t *code; HRESULT hres; + if(item_name) { + item = lookup_named_item(script, item_name, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(item_name)); + return E_INVALIDARG; + } + } + memset(&ctx, 0, sizeof(ctx)); code = ctx.code = alloc_vbscode(&ctx, src, cookie, start_line); if(!ctx.code) @@ -1993,19 +2002,23 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.code = NULL; release_compiler(&ctx); + if(item && item->disp) + IDispatch_AddRef(code->context = item->disp); + list_add_tail(&script->code_list, &code->entry); *ret = code; return S_OK; } -HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, - unsigned start_line, DWORD flags, class_desc_t **ret) +HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *item_name, const WCHAR *delimiter, + DWORD_PTR cookie, unsigned start_line, DWORD flags, class_desc_t **ret) { class_desc_t *desc; vbscode_t *code; HRESULT hres; - hres = compile_script(script, src, delimiter, cookie, start_line, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); + hres = compile_script(script, src, item_name, delimiter, cookie, start_line, + flags & ~SCRIPTTEXT_ISPERSISTENT, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 0bbff30bf6..b597389a9a 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -870,7 +870,6 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - named_item_t *item = NULL; vbscode_t *code; HRESULT hres; @@ -881,21 +880,11 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - if(pstrItemName) { - item = lookup_named_item(This->ctx, pstrItemName, 0); - if(!item) { - WARN("Unknown context %s\n", debugstr_w(pstrItemName)); - return E_INVALIDARG; - } - } - - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLine, dwFlags, &code); + hres = compile_script(This->ctx, pstrCode, pstrItemName, pstrDelimiter, dwSourceContextCookie, + ulStartingLine, dwFlags, &code); if(FAILED(hres)) return hres; - if(item && item->disp) - IDispatch_AddRef(code->context = item->disp); - if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; return S_OK; @@ -953,8 +942,8 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLineNumber, - dwFlags, &desc); + hres = compile_procedure(This->ctx, pstrCode, pstrItemName, pstrDelimiter, dwSourceContextCookie, + ulStartingLineNumber, dwFlags, &desc); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a3f32fdf0b..f37b0ce0ee 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -368,8 +368,8 @@ static inline void grab_vbscode(vbscode_t *code) } void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : vbscript: Return the named item itself from lookup_named_item.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 07f902b0800e3388885109951f1fb6b0017f2a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f902b0800e338888510995… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 31 15:28:58 2020 +0200 vbscript: Return the named item itself from lookup_named_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 7 +++---- dlls/vbscript/vbscript.c | 16 ++++++++-------- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 906545cf4a..b328674b60 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -114,7 +114,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ { ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; - IDispatch *disp; unsigned i; DISPID id; HRESULT hres; @@ -196,10 +195,10 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - disp = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); - if(disp) { + item = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); + if(item && item->disp) { ref->type = REF_OBJ; - ref->u.obj = disp; + ref->u.obj = item->disp; return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2b691af583..0bbff30bf6 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -189,7 +189,7 @@ static void exec_queued_code(script_ctx_t *ctx) } } -IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) +named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) { named_item_t *item; HRESULT hres; @@ -214,7 +214,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag } } - return item->disp; + return item; } } @@ -870,7 +870,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - IDispatch *context = NULL; + named_item_t *item = NULL; vbscode_t *code; HRESULT hres; @@ -882,9 +882,9 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, return E_UNEXPECTED; if(pstrItemName) { - context = lookup_named_item(This->ctx, pstrItemName, 0); - if(!context) { - WARN("Inknown context %s\n", debugstr_w(pstrItemName)); + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); return E_INVALIDARG; } } @@ -893,8 +893,8 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; - if(context) - IDispatch_AddRef(code->context = context); + if(item && item->disp) + IDispatch_AddRef(code->context = item->disp); if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 33ecb45bf4..a3f32fdf0b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -372,7 +372,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigne HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; -IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Propagate parser error location.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 27e4881c686ad44c0fabb5928bde33d31d3fa2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e4881c686ad44c0fabb592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:39 2020 +0100 jscript: Propagate parser error location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/parser.h | 4 +++- dlls/jscript/parser.y | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f1e005a6d3..1bf5f225de 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2508,7 +2508,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte } } - hres = script_parse(ctx, &compiler, compiler.code->source, delimiter, from_eval, &compiler.parser); + hres = script_parse(ctx, &compiler, compiler.code, delimiter, from_eval, &compiler.parser); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 1870e6ae50..3fa699c86d 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,6 +19,7 @@ typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; +struct _bytecode_t; typedef struct { BOOL is_num; @@ -41,6 +42,7 @@ typedef struct _parser_ctx_t { BOOL is_html; BOOL lexer_error; HRESULT hres; + unsigned error_loc; ccval_t ccval; unsigned cc_if_depth; @@ -48,7 +50,7 @@ typedef struct _parser_ctx_t { heap_pool_t heap; } parser_ctx_t; -HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,const WCHAR*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; +HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,struct _bytecode_t*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3eebebbcaa..5a71a84ffa 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static int parser_error(unsigned*,parser_ctx_t*,const char*); -static void set_error(parser_ctx_t*,UINT); +static void set_error(parser_ctx_t*,unsigned,HRESULT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); @@ -495,7 +495,7 @@ Expression_opt Expression_err : Expression { $$ = $1; } - | error { set_error(ctx, JS_E_SYNTAX); YYABORT; } + | error { set_error(ctx, @$, JS_E_SYNTAX); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ Expression @@ -881,19 +881,19 @@ BooleanLiteral semicolon_opt : ';' - | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} else { ctx->hres = S_OK; } } + | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} else { ctx->hres = S_OK; ctx->error_loc = -1; } } left_bracket : '(' - | error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_LBRACKET); YYABORT; } right_bracket : ')' - | error { set_error(ctx, JS_E_MISSING_RBRACKET); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_RBRACKET); YYABORT; } semicolon : ';' - | error { set_error(ctx, JS_E_MISSING_SEMICOLON); YYABORT; } + | error { set_error(ctx, @$, JS_E_MISSING_SEMICOLON); YYABORT; } %% @@ -1464,22 +1464,25 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->error_loc == -1) + ctx->error_loc = *loc; if(ctx->hres == S_OK) ctx->hres = JS_E_SYNTAX; WARN("%s: %s\n", debugstr_w(ctx->begin + *loc), str); return 0; } -static void set_error(parser_ctx_t *ctx, UINT error) +static void set_error(parser_ctx_t *ctx, unsigned loc, HRESULT error) { ctx->hres = error; + ctx->error_loc = loc; } static BOOL explicit_error(parser_ctx_t *ctx, void *obj, WCHAR next) { if(obj || *(ctx->ptr-1)==next) return TRUE; - set_error(ctx, JS_E_SYNTAX); + set_error(ctx, ctx->ptr - ctx->begin /* FIXME */, JS_E_SYNTAX); return FALSE; } @@ -1563,7 +1566,7 @@ void parser_release(parser_ctx_t *ctx) heap_free(ctx); } -HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, +HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, bytecode_t *code, const WCHAR *delimiter, BOOL from_eval, parser_ctx_t **ret) { parser_ctx_t *parser_ctx; @@ -1576,9 +1579,10 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const if(!parser_ctx) return E_OUTOFMEMORY; + parser_ctx->error_loc = -1; parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); - parser_ctx->begin = parser_ctx->ptr = code; + parser_ctx->begin = parser_ctx->ptr = code->source; parser_ctx->end = parser_ctx->begin + lstrlenW(parser_ctx->begin); script_addref(ctx); @@ -1596,8 +1600,11 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const if(FAILED(hres)) { WARN("parser failed around %s\n", debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20)); + + throw_error(ctx, hres, NULL); + set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR); parser_release(parser_ctx); - return hres; + return DISP_E_EXCEPTION; } *ret = parser_ctx;

1 0

Marcus Meissner : mshtml: Use ARRAY_SIZE instead of sizeof in MultiByteToWideChar.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: fa468b2f03e671d02f7430caa0436f2a3d6a8329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa468b2f03e671d02f7430ca… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Feb 3 11:45:48 2020 +0100 mshtml: Use ARRAY_SIZE instead of sizeof in MultiByteToWideChar. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1c4a54cf63..2b0a5cde95 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6370,7 +6370,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = ObtainUserAgentString(0, bufa, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, ARRAY_SIZE(buf)); bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); @@ -6390,7 +6390,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres);

1 0