wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Nikolay Sivov : include: Add DIRID_DRIVER_STORE.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 53023c93e7376ab53452d013554851a16505b8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53023c93e7376ab53452d013… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 20:15:46 2021 +0300 include: Add DIRID_DRIVER_STORE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/setupapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/setupapi.h b/include/setupapi.h index e52dc253afd..14e3774fc42 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1118,6 +1118,7 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define DIRID_SYSTEM 11 #define DIRID_DRIVERS 12 #define DIRID_IOSUBSYS DIRID_DRIVERS +#define DIRID_DRIVER_STORE 13 #define DIRID_INF 17 #define DIRID_HELP 18 #define DIRID_FONTS 20

1 0

Anton Baskanov : amstream: Support the event parameter in IDirectDrawStreamSample::Update.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: b8a646f4997b1f695f340ed97fde716f834652e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a646f4997b1f695f340ed9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 21 12:53:34 2021 +0700 amstream: Support the event parameter in IDirectDrawStreamSample::Update. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50628 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 12 +++++------- dlls/amstream/tests/amstream.c | 17 +++++++---------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index b1ef12cb524..150e622ad33 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -77,6 +77,7 @@ struct ddraw_sample STREAM_TIME end_time; BOOL continuous_update; CONDITION_VARIABLE update_cv; + HANDLE external_event; struct list entry; HRESULT update_hr; @@ -91,6 +92,8 @@ static void remove_queued_update(struct ddraw_sample *sample) sample->busy = FALSE; list_remove(&sample->entry); WakeConditionVariable(&sample->update_cv); + if (sample->external_event) + SetEvent(sample->external_event); } static void flush_update_queue(struct ddraw_stream *stream, HRESULT update_hr) @@ -1596,12 +1599,6 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, return E_NOTIMPL; } - if (event) - { - FIXME("Event parameter support is not implemented!\n"); - return E_NOTIMPL; - } - EnterCriticalSection(&sample->parent->cs); if (sample->parent->state != State_Running) @@ -1625,10 +1622,11 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, sample->update_hr = MS_S_NOUPDATE; sample->busy = TRUE; + sample->external_event = event; list_add_tail(&sample->parent->update_queue, &sample->entry); WakeConditionVariable(&sample->parent->update_queued_cv); - if (flags & SSUPDATE_ASYNC) + if ((flags & SSUPDATE_ASYNC) || event) { LeaveCriticalSection(&sample->parent->cs); return MS_S_PENDING; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ceb72c720ab..db2d6e977ca 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -8512,20 +8512,17 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_Update(stream_sample, 0, event, NULL, 0); - todo_wine ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - if (hr == MS_S_PENDING) - { - media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); - hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = IMediaSample_Release(media_sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); - todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr);

1 0

Anton Baskanov : amstream/tests: Add a test for event parameter of IDirectDrawStreamSample::Update.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 3088ce35cbcadf330fd5c66d8be7908876fd0ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3088ce35cbcadf330fd5c66d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 21 12:53:33 2021 +0700 amstream/tests: Add a test for event parameter of IDirectDrawStreamSample::Update. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5226a072364..ceb72c720ab 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -8511,6 +8511,22 @@ static void test_ddrawstreamsample_update(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample, 0, event, NULL, 0); + todo_wine ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + if (hr == MS_S_PENDING) + { + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); EXPECT_REF(stream_sample, 1);

1 0

Anton Baskanov : amstream: Implement AMMultiMediaStream::GetEndOfStreamEventHandle.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: c19fb3d70de96adefdfa997333d7b38e3e97e226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19fb3d70de96adefdfa9973… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 21 12:53:32 2021 +0700 amstream: Implement AMMultiMediaStream::GetEndOfStreamEventHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34746 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 13 +++++++++---- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index b34634d89d2..6bac95a243b 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -207,13 +207,18 @@ static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_ return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } -static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *phEOS) +static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *eos) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); + TRACE("mmstream %p, eos %p.\n", mmstream, eos); - return E_NOTIMPL; + if (!eos) + return E_POINTER; + + *eos = (HANDLE)mmstream->event; + + return S_OK; } static HRESULT create_graph(struct multimedia_stream *mmstream, IGraphBuilder *graph) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 56dc8003719..5226a072364 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2991,11 +2991,11 @@ static void test_get_end_of_stream_event_handle(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); event = INVALID_HANDLE_VALUE; hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, &event); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &rgb32_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3013,12 +3013,12 @@ static void test_get_end_of_stream_event_handle(void) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Anton Baskanov : amstream/tests: Add tests for AMMultiMediaStream::GetEndOfStreamEventHandle.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: ba44377fe8fb0c4035a3279aad2b0ccf2150bf82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba44377fe8fb0c4035a3279a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 21 12:53:31 2021 +0700 amstream/tests: Add tests for AMMultiMediaStream::GetEndOfStreamEventHandle. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 182fb06a082..56dc8003719 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2961,6 +2961,87 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_get_end_of_stream_event_handle(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + HANDLE event; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + testfilter_init(&source); + source.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + event = INVALID_HANDLE_VALUE; + hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, &event); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static IUnknown *create_audio_data(void) { IUnknown *audio_data = NULL; @@ -9301,6 +9382,7 @@ START_TEST(amstream) test_set_state(); test_enum_media_types(); test_media_types(); + test_get_end_of_stream_event_handle(); test_avi_path = load_resource(L"test.avi");

1 0

Jacek Caban : mshtml: Return null from IHTMLStorage::getItem stub.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 655adf6521f131c581229077621354c7c91f3b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=655adf6521f131c581229077… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:41 2021 +0200 mshtml: Return null from IHTMLStorage::getItem stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 5 ++++- dlls/mshtml/tests/dom.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3b16027a5f9..c3896475270 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -145,8 +145,11 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); - return E_NOTIMPL; + + V_VT(p) = VT_NULL; + return S_OK; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 564ca87821a..f5e4f393b58 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -412,6 +412,9 @@ sync_test("storage", function() { "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); ok(typeof(window.localStorage) === "object" || typeof(window.localStorage) === "unknown", "typeof(window.localStorage) = " + typeof(window.localStorage)); + + var item = sessionStorage.getItem("nonexisting"); + ok(item === null, "item = " + item); }); async_test("animation", function() {

1 0

Jacek Caban : jscript: Don't expose named functions in expressions as a local variable in ES5 mode.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: e76450946660dc520d0274a10efed8c540f99e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76450946660dc520d0274a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:17 2021 +0200 jscript: Don't expose named functions in expressions as a local variable in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 21 +++++++++++++++++---- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + dlls/mshtml/tests/documentmode.js | 25 +++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 717ae00d053..9bb9ff13d14 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1887,8 +1887,12 @@ static HRESULT visit_function_expression(compiler_ctx_t *ctx, function_expressio expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); - return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier) - ? S_OK : E_OUTOFMEMORY; + if(!expr->identifier || expr->event_target) + return S_OK; + if(!expr->is_statement && ctx->parser->script->version >= SCRIPTLANGUAGEVERSION_ES5) + return S_OK; + + return alloc_variable(ctx, expr->identifier) ? S_OK : E_OUTOFMEMORY; } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -2069,7 +2073,15 @@ static HRESULT visit_statement(compiler_ctx_t *ctx, statement_t *stat) case STAT_CONTINUE: case STAT_EMPTY: break; - case STAT_EXPR: + case STAT_EXPR: { + expression_statement_t *expr_stat = (expression_statement_t*)stat; + if(expr_stat->expr) { + if(expr_stat->expr->type == EXPR_FUNC) + ((function_expression_t*)expr_stat->expr)->is_statement = TRUE; + hres = visit_expression(ctx, expr_stat->expr); + } + break; + } case STAT_RETURN: case STAT_THROW: { expression_statement_t *expr_stat = (expression_statement_t*)stat; @@ -2410,7 +2422,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return hres; TRACE("[%d] func %s\n", i, debugstr_w(func->funcs[i].name)); - if(func->funcs[i].name && !func->funcs[i].event_target) { + if((ctx->parser->script->version < SCRIPTLANGUAGEVERSION_ES5 || iter->is_statement) && + func->funcs[i].name && !func->funcs[i].event_target) { local_ref_t *local_ref = lookup_local(func, func->funcs[i].name); func->funcs[i].local_ref = local_ref->ref; TRACE("found ref %s %d for %s\n", debugstr_w(local_ref->name), local_ref->ref, debugstr_w(func->funcs[i].name)); diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 3fa699c86d3..b88a52af242 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -302,6 +302,7 @@ typedef struct _function_expression_t { const WCHAR *src_str; DWORD src_len; unsigned func_id; + BOOL is_statement; struct _function_expression_t *next; /* for compiler */ } function_expression_t; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index bfc83912ba1..f11119143b8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1386,6 +1386,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; + ret->is_statement = FALSE; ret->next = NULL; return &ret->expr; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index dfaaff44096..bd1255bc960 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -538,6 +538,7 @@ sync_test("delete_prop", function() { }); var func_scope_val = 1; +var func_scope_val2 = 2; sync_test("func_scope", function() { var func_scope_val = 2; @@ -571,4 +572,28 @@ sync_test("func_scope", function() { window = 1; ok(window === window.self, "window = " + window); + + ! function func_scope_val2() {}; + ok(window.func_scope_val2 === 2, "window.func_scope_val2 = " + window.func_scope_val2); + + var o = {}; + (function(x) { + ok(x === o, "x = " + x); + ! function x() {}; + ok(x === o, "x != o"); + })(o); + + (function(x) { + ok(x === o, "x = " + x); + 1, function x() {}; + ok(x === o, "x != o"); + })(o); + + (function() { + ! function x() {}; + try { + x(); + ok(false, "expected exception"); + }catch(e) {} + })(o); });

1 0

Jacek Caban : jscript: Introduce INVALID_LOCAL_REF.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 609e9de65c74233644fd6f9588122bdfc8c64d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609e9de65c74233644fd6f95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:06 2021 +0200 jscript: Introduce INVALID_LOCAL_REF. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 08a5e3af64b..717ae00d053 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2314,6 +2314,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, TRACE("\n"); func->bytecode = ctx->code; + func->local_ref = INVALID_LOCAL_REF; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; ctx->func = func; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3d9d694b2a..e0a6e10e98b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3039,7 +3039,7 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } for(i = 0; i < frame->function->func_cnt; i++) { - if(frame->function->funcs[i].name && !frame->function->funcs[i].event_target) { + if(frame->function->funcs[i].local_ref != INVALID_LOCAL_REF) { jsdisp_t *func_obj; unsigned off; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 483c32232c1..442e7334c41 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -145,6 +145,8 @@ typedef struct { int ref; } local_ref_t; +#define INVALID_LOCAL_REF 0x7fffffff + typedef struct _function_code_t { BSTR name; int local_ref;

1 0

Jacek Caban : mshtml/tests: Allow running external script tests.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 7ba144b46914847b9eec7b86eabb0388e0337ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba144b46914847b9eec7b86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:22:38 2021 +0200 mshtml/tests: Allow running external script tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 749ec21607b..a57468afc65 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2792,7 +2792,7 @@ typedef struct { IStream *stream; char *data; - size_t size; + ULONG size; char *ptr; IUri *uri; @@ -3116,12 +3116,21 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, This->size = strlen(This->data); }else { src = FindResourceW(NULL, *path == '/' ? path+1 : path, (const WCHAR*)RT_HTML); - ok(src != NULL, "Could not find resource for path %s\n", wine_dbgstr_w(path)); if(src) { This->size = SizeofResource(NULL, src); This->data = LoadResource(NULL, src); }else { - hres = E_FAIL; + HANDLE file = CreateFileW(*path == '/' ? path+1 : path, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_READONLY, NULL); + if(file != INVALID_HANDLE_VALUE) { + This->size = GetFileSize(file, NULL); + This->data = malloc(This->size); + ReadFile(file, This->data, This->size, &This->size, NULL); + CloseHandle(file); + }else { + ok(0, "Could not find %s\n", debugstr_w(path)); + hres = E_FAIL; + } } } @@ -3559,10 +3568,17 @@ static BOOL check_ie(void) START_TEST(script) { + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); CoInitialize(NULL); container_hwnd = create_container_window(); - if(check_ie()) { + if(argc > 2) { + init_protocol_handler(); + run_script_as_http_with_mode(argv[2], NULL, "11"); + }else if(check_ie()) { if(winetest_interactive || ! is_ie_hardened()) { if(register_script_engine()) { test_simple_script();

1 0

Rémi Bernon : server: Track desktop users per thread instead of per process.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 769a2616aec500df19e92c47886df3cf99b4d51d URL: https://source.winehq.org/git/wine.git/?a=commit;h=769a2616aec500df19e92c47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 21 10:38:15 2021 +0200 server: Track desktop users per thread instead of per process. As some thread may use a different desktop from their process. This fixes the user32 win tests, which leaks a desktop that never gets closed. The test_shell_window test creates a new desktop, which spawns explorer.exe process, incrementing the desktop user count to 1, then associates the desktop to a thread, which closes it on exit. Never the user count is incremented to 2, and closing the thread desktop doesn't either check whether the desktop process should be terminated. Reversely, it is possible to create a desktop, associate it with a thread /and/ a process, and this time the desktop process would be terminated when the process exits, although the thread may still be using it. Tracking the users per thread is more robust and fixes the problem as set_thread_desktop increments the desktop user count, and thread exit decrements it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 6 +++-- server/thread.c | 15 +++++++++-- server/user.h | 3 ++- server/winstation.c | 72 +++++++++++++++++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/server/process.c b/server/process.c index 8ad5a59a20b..d819f03a615 100644 --- a/server/process.c +++ b/server/process.c @@ -841,7 +841,7 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; - if (!process->is_system) close_process_desktop( process ); + close_process_desktop( process ); process->winstation = 0; process->desktop = 0; cancel_process_asyncs( process ); @@ -1503,6 +1503,7 @@ DECL_HANDLER(get_process_idle_event) DECL_HANDLER(make_process_system) { struct process *process = current->process; + struct thread *thread; if (!shutdown_event) { @@ -1515,8 +1516,9 @@ DECL_HANDLER(make_process_system) if (!process->is_system) { + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + release_thread_desktop( thread, 0 ); process->is_system = 1; - close_process_desktop( process ); if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } diff --git a/server/thread.c b/server/thread.c index fe9f9bdec37..66f1057d1db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -306,6 +306,7 @@ static struct context *create_thread_context( struct thread *thread ) /* create a new thread */ struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { + struct desktop *desktop; struct thread *thread; int request_pipe[2]; @@ -342,7 +343,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu init_thread_structure( thread ); thread->process = (struct process *)grab_object( process ); - thread->desktop = process->desktop; + thread->desktop = 0; thread->affinity = process->affinity; if (!current) current = thread; @@ -369,6 +370,16 @@ struct thread *create_thread( int fd, struct process *process, const struct secu return NULL; } + if (process->desktop) + { + if (!(desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); /* ignore errors */ + else + { + set_thread_default_desktop( thread, desktop, process->desktop ); + release_object( desktop ); + } + } + set_fd_events( thread->request_fd, POLLIN ); /* start listening to events */ add_process_thread( thread->process, thread ); return thread; @@ -416,7 +427,7 @@ static void cleanup_thread( struct thread *thread ) cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); - close_thread_desktop( thread ); + release_thread_desktop( thread, 1 ); for (i = 0; i < MAX_INFLIGHT_FDS; i++) { if (thread->inflight[i].client != -1) diff --git a/server/user.h b/server/user.h index 6267f3e2881..80f7e91f12c 100644 --- a/server/user.h +++ b/server/user.h @@ -188,7 +188,8 @@ extern void connect_process_winstation( struct process *process, struct thread * extern void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ); extern void close_process_desktop( struct process *process ); -extern void close_thread_desktop( struct thread *thread ); +extern void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ); +extern void release_thread_desktop( struct thread *thread, int close ); static inline int is_rect_empty( const rectangle_t *rect ) { diff --git a/server/winstation.c b/server/winstation.c index 1c7552f0687..61f9f77c73f 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -324,15 +324,22 @@ static void add_desktop_user( struct desktop *desktop ) /* remove a user of the desktop and start the close timeout if necessary */ static void remove_desktop_user( struct desktop *desktop ) { + struct process *process; assert( desktop->users > 0 ); desktop->users--; /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } +} + +/* set the thread default desktop handle */ +void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ) +{ + if (thread->desktop) return; /* nothing to do */ + + thread->desktop = handle; + if (!thread->process->is_system) add_desktop_user( desktop ); } /* set the process default desktop handle */ @@ -340,24 +347,14 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt obj_handle_t handle ) { struct thread *thread; - struct desktop *old_desktop; if (process->desktop == handle) return; /* nothing to do */ - if (!(old_desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); process->desktop = handle; /* set desktop for threads that don't have one yet */ LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - if (!thread->desktop) thread->desktop = handle; - - if (!process->is_system && desktop != old_desktop) - { - add_desktop_user( desktop ); - if (old_desktop) remove_desktop_user( old_desktop ); - } - - if (old_desktop) release_object( old_desktop ); + set_thread_default_desktop( thread, desktop, handle ); } /* connect a process to its window station */ @@ -413,23 +410,37 @@ done: /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { - struct desktop *desktop; + obj_handle_t handle; - if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) - { - remove_desktop_user( desktop ); - release_object( desktop ); - } - clear_error(); /* ignore errors */ + if (!(handle = process->desktop)) return; + + process->desktop = 0; + close_handle( process, handle ); } -/* close the desktop of a given thread */ -void close_thread_desktop( struct thread *thread ) +/* release (and eventually close) the desktop of a given thread */ +void release_thread_desktop( struct thread *thread, int close ) { - obj_handle_t handle = thread->desktop; + struct desktop *desktop; + obj_handle_t handle; + + if (!(handle = thread->desktop)) return; + + if (!thread->process->is_system) + { + if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ + else + { + remove_desktop_user( desktop ); + release_object( desktop ); + } + } - thread->desktop = 0; - if (handle) close_handle( thread->process, handle ); + if (close) + { + thread->desktop = 0; + close_handle( thread->process, handle ); + } } /* create a window station */ @@ -624,7 +635,14 @@ DECL_HANDLER(set_thread_desktop) if (old_desktop != new_desktop && current->desktop_users > 0) set_error( STATUS_DEVICE_BUSY ); else + { current->desktop = req->handle; /* FIXME: should we close the old one? */ + if (!current->process->is_system && old_desktop != new_desktop) + { + add_desktop_user( new_desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); + } + } if (!current->process->desktop) set_process_default_desktop( current->process, new_desktop, req->handle );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021