April 2021 - Wine-Commits - list.winehq.org

Piotr Caban : winemac.drv: Don't filter non active displays out.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 5400db15ca9983a06df2f5071705e0256e95e11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5400db15ca9983a06df2f507… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:19 2021 +0200 winemac.drv: Don't filter non active displays out. On Windows 10 the DISPLAY_DEVICE_ACTIVE flag is set even if monitor is in power saving mode or switched off. Monitors without DISPLAY_DEVICE_ACTIVE are only reported when display is disabled. This doesn't match with CGDisplayIsActive function. Current code causes rendering problems when native .NET is used. When monitors are updated when in power saving mode (e.g. due to race on machine wake-up) we might end up with no monitors being enumerated by EnumDisplayMonitors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 89 ++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 05f1c75d53b..3bb1b5151d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -646,65 +646,54 @@ int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitor if (!monitors) return -1; - /* Report an inactive monitor */ - if (!CGDisplayIsActive(adapter_id) && !CGDisplayIsInMirrorSet(adapter_id)) - { - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; - monitor_count++; - } - /* Report active and mirrored monitors in the same mirroring set */ - else - { - if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) - != kCGErrorSuccess) - goto done; + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + goto done; - if (macdrv_get_displays(&displays, &display_count)) - goto done; + if (macdrv_get_displays(&displays, &display_count)) + goto done; - for (i = 0; i < display_id_count; i++) - { - if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) - continue; + for (i = 0; i < display_id_count; i++) + { + if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) + continue; - /* Find and fill in monitor info */ - for (j = 0; j < display_count; j++) + /* Find and fill in monitor info */ + for (j = 0; j < display_count; j++) + { + if (displays[j].displayID == display_ids[i] + || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) { - if (displays[j].displayID == display_ids[i] - || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) + /* Allocate more space if needed */ + if (monitor_count >= capacity) { - /* Allocate more space if needed */ - if (monitor_count >= capacity) - { - capacity *= 2; - realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); - if (!realloc_monitors) - goto done; - monitors = realloc_monitors; - } - - if (j == 0) - primary_index = monitor_count; - - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; - monitors[monitor_count].rc_monitor = displays[j].frame; - monitors[monitor_count].rc_work = displays[j].work_frame; - monitor_count++; - break; + capacity *= 2; + realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; } + + if (j == 0) + primary_index = monitor_count; + + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; + monitors[monitor_count].rc_monitor = displays[j].frame; + monitors[monitor_count].rc_work = displays[j].work_frame; + monitor_count++; + break; } } + } - /* Make sure the first monitor on primary adapter is primary */ - if (primary_index) - { - struct macdrv_monitor tmp; - tmp = monitors[0]; - monitors[0] = monitors[primary_index]; - monitors[primary_index] = tmp; - } + /* Make sure the first monitor on primary adapter is primary */ + if (primary_index) + { + struct macdrv_monitor tmp; + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; } *new_monitors = monitors;

1 0

Nikolay Sivov : mf/tests: Fix mediatype instance leak (Coverity).
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 079c51f6923a53c5c7b0fac897a7ed5a0e8b2abe URL: https://source.winehq.org/git/wine.git/?a=commit;h=079c51f6923a53c5c7b0fac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:10:40 2021 +0300 mf/tests: Fix mediatype instance leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 308c1fae529..a5c306a93a0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5237,6 +5237,7 @@ static void test_MFRequireProtectedEnvironment(void) hr = MFRequireProtectedEnvironment(pd); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(mediatype); IMFStreamDescriptor_Release(sd); IMFPresentationDescriptor_Release(pd); }

1 0

Jacek Caban : jscript: Add function name to its scope chain in ES5 mode.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 1985f330f8a8790bc3b23b999b84b7f615d6f508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1985f330f8a8790bc3b23b99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:58 2021 +0200 jscript: Add function name to its scope chain in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 ++++++++ dlls/mshtml/tests/documentmode.js | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 06b0fd673b3..f3d9d694b2a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -661,6 +661,14 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(FAILED(hres)) return hres; } + + /* ECMA-262 5.1 Edition 13 */ + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + TRACE("returning a function from scope chain\n"); + ret->type = EXPRVAL_JSVAL; + ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); + return S_OK; + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 75a132e83a7..82f8aae4ed9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -534,3 +534,39 @@ sync_test("delete_prop", function() { todo_wine. ok(!("globalprop4" in obj), "globalprop4 is still in obj"); }); + +var func_scope_val = 1; + +sync_test("func_scope", function() { + var func_scope_val = 2; + + var f = function func_scope_val() { + return func_scope_val; + }; + + func_scope_val = 3; + if(document.documentMode < 9) { + ok(f() === 3, "f() = " + f()); + return; + } + ok(f === f(), "f() = " + f()); + + f = function func_scope_val(a) { + func_scope_val = 4; + return func_scope_val; + }; + + func_scope_val = 3; + ok(f === f(), "f() = " + f()); + ok(func_scope_val === 3, "func_scope_val = " + func_scope_val); + ok(window.func_scope_val === 1, "window.func_scope_val = " + window.func_scope_val); + + f = function func_scope_val(a) { + return (function() { return a ? func_scope_val(false) : func_scope_val; })(); + }; + + ok(f === f(true), "f(true) = " + f(true)); + + window = 1; + ok(window === window.self, "window = " + window); +});

1 0

Jacek Caban : jscript: Ignore an attempt to set visible host object identifier's value in ES5 mode.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: c7fc18a6c771d6796e6dee67c9616467ce697821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fc18a6c771d6796e6dee67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:51 2021 +0200 jscript: Ignore an attempt to set visible host object identifier's value in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 106fdabd81c..06b0fd673b3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1291,7 +1291,8 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } - if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { + if(exprval.type == EXPRVAL_INVALID || + (exprval.type == EXPRVAL_JSVAL && ctx->version < SCRIPTLANGUAGEVERSION_ES5)) { WARN("invalid ref\n"); exprval_release(&exprval); exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED);

1 0

Nikolay Sivov : mf/session: Forward more events to the application.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 662095c6b3e1f039b70da759ff91279b61fd5254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=662095c6b3e1f039b70da759… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:55 2021 +0300 mf/session: Forward more events to the application. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6e0f65e6998..925a8c93d20 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3242,6 +3242,13 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + case MEExtendedType: + case MERendererEvent: + case MEStreamSinkFormatChanged: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Nikolay Sivov : mf/session: Handle shutdown state on GetService().
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: a2728cdeced4d1ae28f56eb73b822b8e9779a7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2728cdeced4d1ae28f56eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:53 2021 +0300 mf/session: Handle shutdown state on GetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 110 ++++++++++++++++++++++++++++++----------------------- dlls/mf/tests/mf.c | 11 ++++++ 2 files changed, 73 insertions(+), 48 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 20ccdd0535e..7a8c7e9f598 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2020,15 +2020,66 @@ static ULONG WINAPI session_get_service_Release(IMFGetService *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } +static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + IMFStreamSink *stream_sink; + IMFTopologyNode *node; + IMFCollection *nodes; + IMFMediaSink *sink; + unsigned int i = 0; + IUnknown *vr; + HRESULT hr = E_FAIL; + + /* Use first sink to support IMFVideoRenderer. */ + if (session->presentation.current_topology) + { + if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, + &nodes))) + { + while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) + { + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + { + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); + } + } + IMFStreamSink_Release(stream_sink); + } + + IMFTopologyNode_Release(node); + + if (*obj) + break; + } + + IMFCollection_Release(nodes); + } + } + + return hr; +} + static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct media_session *session = impl_from_IMFGetService(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); *obj = NULL; - if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) + EnterCriticalSection(&session->cs); + if (FAILED(hr = session_is_shut_down(session))) + { + } + else if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) { if (IsEqualIID(riid, &IID_IMFRateSupport)) { @@ -2038,68 +2089,31 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { *obj = &session->IMFRateControl_iface; } + else + hr = E_NOINTERFACE; + + if (*obj) + IUnknown_AddRef((IUnknown *)*obj); } else if (IsEqualGUID(service, &MF_LOCAL_MFT_REGISTRATION_SERVICE)) { - return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); + hr = IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } else if (IsEqualGUID(service, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE)) { *obj = &session->IMFTopologyNodeAttributeEditor_iface; + IUnknown_AddRef((IUnknown *)*obj); } else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) { - IMFStreamSink *stream_sink; - IMFTopologyNode *node; - IMFCollection *nodes; - IMFMediaSink *sink; - unsigned int i = 0; - IUnknown *vr; - HRESULT hr; - - EnterCriticalSection(&session->cs); - - /* Use first sink to support IMFVideoRenderer. */ - if (session->presentation.current_topology) - { - if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, - &nodes))) - { - while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) - { - if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) - { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) - { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); - } - } - IMFStreamSink_Release(stream_sink); - } - - IMFTopologyNode_Release(node); - - if (*obj) - break; - } - - IMFCollection_Release(nodes); - } - } - - LeaveCriticalSection(&session->cs); + hr = session_get_video_render_service(session, service, riid, obj); } else FIXME("Unsupported service %s.\n", debugstr_guid(service)); - if (*obj) - IUnknown_AddRef((IUnknown *)*obj); + LeaveCriticalSection(&session->cs); - return *obj ? S_OK : E_NOINTERFACE; + return hr; } static const IMFGetServiceVtbl session_get_service_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 20440499227..308c1fae529 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1170,6 +1170,7 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; + IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1271,6 +1272,16 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + + hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFGetService_Release(gs); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status);

1 0

Jacek Caban : jscript: Support passing EXPRVAL_JSVAL through JS stack.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 3c91e5ed60c9feb29d517182ee7ca37e54c9f9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c91e5ed60c9feb29d517182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:45 2021 +0200 jscript: Support passing EXPRVAL_JSVAL through JS stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 018597829ed..106fdabd81c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -171,7 +171,10 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) switch(val->type) { case EXPRVAL_JSVAL: - assert(0); + hres = stack_push(ctx, jsval_null()); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, val->u.val); + return hres; case EXPRVAL_IDREF: hres = stack_push(ctx, jsval_disp(val->u.idref.disp)); if(SUCCEEDED(hres)) @@ -245,6 +248,10 @@ static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) assert(is_number(stack_topn(ctx, n))); r->u.hres = get_number(stack_topn(ctx, n)); return FALSE; + case JSV_NULL: + r->type = EXPRVAL_JSVAL; + r->u.val = stack_topn(ctx, n); + return TRUE; default: assert(0); return FALSE; @@ -268,6 +275,9 @@ static HRESULT exprval_propput(script_ctx_t *ctx, exprval_t *ref, jsval_t v) } case EXPRVAL_IDREF: return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + case EXPRVAL_JSVAL: + WARN("ignoring an attempt to set value reference\n"); + return S_OK; default: assert(0); return E_FAIL; @@ -281,6 +291,8 @@ static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) return jsval_copy(ctx->stack[ref->u.off], r); case EXPRVAL_IDREF: return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + case EXPRVAL_JSVAL: + return jsval_copy(ref->u.val, r); default: assert(0); return E_FAIL; @@ -302,6 +314,17 @@ static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsig } case EXPRVAL_IDREF: return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + case EXPRVAL_JSVAL: { + IDispatch *obj; + HRESULT hres; + + hres = to_object(ctx, ref->u.val, &obj); + if(SUCCEEDED(hres)) { + hres = disp_call_value(ctx, obj, NULL, flags, argc, argv, r); + IDispatch_Release(obj); + } + return hres; + } default: assert(0); return E_FAIL;

1 0

Zebediah Figura : ntoskrnl: Start the device even without a function driver if it reports RawDeviceOK.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 48b2e67d095d6c133de94e5545efbc85c58a01d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b2e67d095d6c133de94e55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:17 2021 -0500 ntoskrnl: Start the device even without a function driver if it reports RawDeviceOK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 43 +++++++++++++++++- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 88 +++++++++++++++++++----------------- 3 files changed, 89 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48b2e67d095d6c133de9…

1 0

Nikolay Sivov : sc: Fix typos in CLI arguments parsing.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: d3ddc1186467172c564169e054a82c9f97e99c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ddc1186467172c564169e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 11 22:09:01 2021 +0300 sc: Fix typos in CLI arguments parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a20813b8cd5..02b476957d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -82,7 +82,7 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) { if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; @@ -134,7 +134,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f { if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else if (!wcsicmp( p, L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -159,7 +159,7 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"actions=" )) { @@ -264,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], L"start="L"start" )) + else if (!wcsicmp( argv[1], L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service)

1 0

Hugh McMaster : po: Remove duplicate line in Dutch translation.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 6f7d8a73158cabe192ce6bb4da15f231e8acf4ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7d8a73158cabe192ce6bb4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 12 16:21:47 2021 +1000 po: Remove duplicate line in Dutch translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index e5ea842cfea..b212ed1736e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14785,7 +14785,6 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" " /reg:32\n" " Open de 32-bits weergave van het register.\n" "\n"

1 0