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

Nikolay Sivov : mf/tests: Fix mediatype instance leak (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Nikolay Sivov : setupapi: Fix use after free in trace message (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: babdaffff7b25a1db9059598bd3c85da46469d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babdaffff7b25a1db9059598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:28:14 2021 +0300 setupapi: Fix use after free in trace message (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7ff3cb01eb6..0758fef5603 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1773,7 +1773,7 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { SC_HANDLE manager = NULL, service = NULL; struct device *device; - WCHAR *service_name; + WCHAR *service_name = NULL; DWORD size; TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); @@ -1789,7 +1789,6 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) service_name = malloc(size); if (!RegGetValueW(device->key, NULL, L"Service", RRF_RT_REG_SZ, NULL, service_name, &size)) service = OpenServiceW(manager, service_name, SERVICE_USER_DEFINED_CONTROL); - free(service_name); } remove_device(device); @@ -1803,6 +1802,8 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } CloseServiceHandle(manager); + free(service_name); + remove_all_device_ifaces(device); return TRUE;

1 0

Nikolay Sivov : mfreadwrite/reader: Add missing allocation check (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 129e5660e3588f4ccfd919870fb71497b61d3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=129e5660e3588f4ccfd91987… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:40:02 2021 +0300 mfreadwrite/reader: Add missing allocation check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2edc83b8685..8b3230ad4d2 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -442,12 +442,14 @@ static void source_reader_set_sa_response(struct source_reader *reader, struct s } } -static void source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, +static HRESULT source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { struct stream_response *response; - response = calloc(1, sizeof(*response)); + if (!(response = calloc(1, sizeof(*response)))) + return E_OUTOFMEMORY; + response->status = status; response->stream_index = stream->index; response->stream_flags = stream_flags; @@ -466,6 +468,8 @@ static void source_reader_queue_response(struct source_reader *reader, struct me stream->responses++; source_reader_response_ready(reader, response); + + return S_OK; } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -716,8 +720,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) WARN("Sample time wasn't set.\n"); - source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); - return S_OK; + return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); } /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Piotr Caban : winemac.drv: Don't filter non active displays out.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Piotr Caban : winemac.drv: Take all online monitors into account when computing desktop rect.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 66b593049c62978fbbb607117b78fde35f6db936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b593049c62978fbbb60711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:23 2021 +0200 winemac.drv: Take all online monitors into account when computing desktop rect. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 8073a875df5..0acddc1dd98 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -68,7 +68,7 @@ static void compute_desktop_rect(void) uint32_t count, i; desktop_rect = CGRectNull; - if (CGGetActiveDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || + if (CGGetOnlineDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || !count) { displayIDs[0] = CGMainDisplayID();

1 0

Gijs Vermeulen : rasapi32: Update spec file.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: a8d4ea1d0aae4c2c7c172029cf4789415e9fe337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8d4ea1d0aae4c2c7c172029… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Apr 11 16:12:24 2021 +0200 rasapi32: Update spec file. File version: 10.0.19041.450 (Windows 10). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50851 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi32.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814e..90ebcbce072 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -1,5 +1,32 @@ +# @ stub DDMComputeLuid +# @ stub DDMFreeDialingParam +# @ stub DDMFreePhonebookContext +# @ stub DDMFreeRemoteEndpoint +# @ stub DDMGetAddressesFromPhonebook +# @ stub DDMGetEapInfo +# @ stub DDMGetEapUserIdentityW +# @ stub DDMGetPhoneBookContext +# @ stub DDMGetPhonebookInfo +# @ stub DDMGetProtocolStartParams +# @ stub DDMGetRasDialParams +# @ stub DDMGetRasDialingParams +# @ stub DDMGetTunnelEndpoints +# @ stub DDMRasPbkEntryCleanup +# @ stub DDMUpdateProtocolConfigInfoFromEntry +# @ stub DwCloneEntry +# @ stub DwEnumEntryDetails +# @ stub DwEnumEntryDetailsEx +# @ stub DwRasUninitialize +# @ stub GetAutoTriggerProfileInfo +# @ stub IsActiveAutoTriggerConnection +# @ stub IsActiveAutoTriggerConnectionEx +# @ stub RasAutoDialSharedConnection @ stub RasAutodialAddressToNetwork @ stub RasAutodialEntryToNetwork +@ stub RasClearConnectionStatistics +# @ stub RasClearLinkStatistics +# @ stub RasCompleteDialMachineCleanup +# @ stub RasConfigUserProxySettingsW @ stdcall RasConnectionNotificationA(ptr long long) @ stdcall RasConnectionNotificationW(ptr long long) @ stdcall RasCreatePhonebookEntryA(long str) @@ -23,6 +50,10 @@ @ stdcall RasEnumEntriesA(str str ptr ptr ptr) @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow +# @ stub RasFreeEapUserIdentityA +# @ stub RasFreeEapUserIdentityW +# @ stub RasFreeEntryAdvancedProperties +# @ stub RasGetAutoTriggerConnectStatus @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) @ stdcall RasGetAutodialEnableA(long ptr) @@ -33,13 +64,22 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +# @ stub RasGetConnectionErrorStringW @ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA @ stub RasGetCredentialsW +# @ stub RasGetCustomAuthDataA +# @ stub RasGetCustomAuthDataW +# @ stub RasGetEapUserDataA +# @ stub RasGetEapUserDataW +# @ stub RasGetEapUserIdentityA +# @ stub RasGetEapUserIdentityW +# @ stub RasGetEntryAdvancedProperties @ stdcall RasGetEntryDialParamsA(str ptr ptr) @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) +# @ stub RasGetEntryHrasconnW @ stdcall RasGetEntryPropertiesA(str str ptr ptr ptr ptr) @ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) @ stdcall RasGetErrorStringA(long ptr long) @@ -47,17 +87,39 @@ @ stub RasGetErrorStringWow @ stub RasGetHport @ stdcall RasGetLinkStatistics(ptr long ptr) +# @ stub RasGetNapStatus +# @ stub RasGetPCscf +# @ stub RasGetPbkPath @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) +# @ stub RasGetProjectionInfoEx @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @ stub RasGetSubEntryPropertiesW +# @ stub RasHandleTriggerConnDisconnect @ stdcall RasHangUpA(long) @ stdcall RasHangUpW(long) @ stub RasHangUpWow +# @ stub RasInvokeEapUI +# @ stub RasIsPublicPhonebook +# @ stub RasIsSharedConnection +# @ stub RasNQMStateEnteredNotification +# @ stub RasQueryRedialOnLinkFailure +# @ stub RasQuerySharedAutoDial +# @ stub RasQuerySharedConnection +# @ stub RasRegisterEntryChangeNotification @ stdcall RasRenameEntryA(str str str) @ stdcall RasRenameEntryW(wstr wstr wstr) +# @ stub RasRestoreDefaultLegacyProxySettings +# @ stub RasScriptExecute +# @ stub RasScriptGetIpAddress +# @ stub RasScriptInit +# @ stub RasScriptReceive +# @ stub RasScriptSend +# @ stub RasScriptTerm +# @ stub RasSetAutoTriggerProfile +# @ stub RasSetAutoTriggerProfileEx @ stdcall RasSetAutodialAddressA(str long ptr long long) @ stdcall RasSetAutodialAddressW(wstr long ptr long long) @ stdcall RasSetAutodialEnableA(long long) @@ -68,15 +130,30 @@ @ stub RasSetCredentialsW @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) +# @ stub RasSetEapUserDataA +# @ stub RasSetEapUserDataAEx +# @ stub RasSetEapUserDataW +# @ stub RasSetEapUserDataWEx +# @ stub RasSetEntryAdvancedProperties @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) @ stdcall RasSetEntryPropertiesW(wstr wstr ptr long ptr long) @ stub RasSetOldPassword +# @ stub RasSetPerConnectionProxy +# @ stub RasSetSharedAutoDial @ stdcall RasSetSubEntryPropertiesA(str str long ptr long ptr long) @ stdcall RasSetSubEntryPropertiesW(wstr wstr long ptr long ptr long) +# @ stub RasTriggerConnection +# @ stub RasTriggerConnectionEx +# @ stub RasTriggerDisconnection +# @ stub RasTriggerDisconnectionEx +# @ stub RasUnregisterEntryChangeNotification +# @ stub RasUpdateConnection @ stdcall RasValidateEntryNameA(str str) @ stdcall RasValidateEntryNameW(wstr wstr) +# stub @ RasWriteSharedPbkOptions +# stub @ UnInitializeRAS 500 stub RnaEngineRequest 501 stub DialEngineRequest

1 0

Rémi Bernon : mfplat: Read queue subscriber within the critical section.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 4904d90870a716fda971fc12240ddbc23323475c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4904d90870a716fda971fc12… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 12 18:36:02 2021 +0200 mfplat: Read queue subscriber within the critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6fb8661dba4..9078702c854 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data = (MFASYNCRESULT *)queue->subscriber; + MFASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,7 +7121,7 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if (result_data) + else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) { if (result_data->pCallback == callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ?

1 0

Nikolay Sivov : sc: Fix typos in CLI arguments parsing.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Nikolay Sivov : include: Remove duplicated ComboEx item mask flags.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: e78742bc4b57ecfdef0ea9883b92cffdd4e3bacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78742bc4b57ecfdef0ea988… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 07:43:22 2021 +0300 include: Remove duplicated ComboEx item mask flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 5614f64a979..41abceb0138 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4417,14 +4417,6 @@ static const WCHAR WC_COMBOBOXEXW[] = { 'C','o','m','b','o', #endif #define WC_COMBOBOXEX WINELIB_NAME_AW(WC_COMBOBOXEX) -#define CBEIF_TEXT 0x00000001 -#define CBEIF_IMAGE 0x00000002 -#define CBEIF_SELECTEDIMAGE 0x00000004 -#define CBEIF_OVERLAY 0x00000008 -#define CBEIF_INDENT 0x00000010 -#define CBEIF_LPARAM 0x00000020 -#define CBEIF_DI_SETITEM 0x10000000 - #define CBEM_INSERTITEMA (WM_USER+1) #define CBEM_INSERTITEMW (WM_USER+11) #define CBEM_INSERTITEM WINELIB_NAME_AW(CBEM_INSERTITEM)

1 0

Hugh McMaster : po: Remove duplicate line in Dutch translation.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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