August 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : services: Hold an additional process reference while waiting for startup.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 049ac1d827c5e56e6256998564fa3b6170ceb81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=049ac1d827c5e56e625699856… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:22:55 2016 +0200 services: Hold an additional process reference while waiting for startup. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index b0d008d..f7a2725 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -778,7 +778,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_entry->status.dwCurrentState = SERVICE_START_PENDING; scmdatabase_add_process(service_entry->db, process); - service_entry->process = process; + service_entry->process = grab_process(process); service_unlock(service_entry); @@ -788,6 +788,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p { err = GetLastError(); process_terminate(process); + release_process(process); return err; } @@ -916,6 +917,8 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * ReleaseMutex(process->control_mutex); else process_terminate(process); + + release_process(process); } scmdatabase_unlock_startup(service->db);

1 0

Sebastian Lackner : services: Store process id in the process object.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 46b27469383b603bb00e29de80784abbb21938a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b27469383b603bb00e29de8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:21:23 2016 +0200 services: Store process id in the process object. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 51 ++++++++++++-------------------------------- programs/services/services.c | 4 +--- programs/services/services.h | 3 ++- 3 files changed, 17 insertions(+), 41 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 4036f7d..36a0620 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -761,13 +761,7 @@ DWORD __cdecl svcctl_SetServiceStatus( service_lock(service->service_entry); /* FIXME: be a bit more discriminant about what parts of the status we set * and check that fields are valid */ - service->service_entry->status.dwServiceType = lpServiceStatus->dwServiceType; - service->service_entry->status.dwCurrentState = lpServiceStatus->dwCurrentState; - service->service_entry->status.dwControlsAccepted = lpServiceStatus->dwControlsAccepted; - service->service_entry->status.dwWin32ExitCode = lpServiceStatus->dwWin32ExitCode; - service->service_entry->status.dwServiceSpecificExitCode = lpServiceStatus->dwServiceSpecificExitCode; - service->service_entry->status.dwCheckPoint = lpServiceStatus->dwCheckPoint; - service->service_entry->status.dwWaitHint = lpServiceStatus->dwWaitHint; + service->service_entry->status = *lpServiceStatus; if ((process = service->service_entry->process)) { if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) @@ -886,6 +880,14 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, return err; } +static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_entry *service) +{ + struct process_entry *process = service->process; + memcpy(status, &service->status, sizeof(service->status)); + status->dwProcessId = process ? process->process_id : 0; + status->dwServiceFlags = 0; +} + DWORD __cdecl svcctl_QueryServiceStatusEx( SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel, @@ -918,17 +920,7 @@ DWORD __cdecl svcctl_QueryServiceStatusEx( } service_lock(service->service_entry); - - pSvcStatusData->dwServiceType = service->service_entry->status.dwServiceType; - pSvcStatusData->dwCurrentState = service->service_entry->status.dwCurrentState; - pSvcStatusData->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - pSvcStatusData->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - pSvcStatusData->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - pSvcStatusData->dwCheckPoint = service->service_entry->status.dwCheckPoint; - pSvcStatusData->dwWaitHint = service->service_entry->status.dwWaitHint; - pSvcStatusData->dwProcessId = service->service_entry->status.dwProcessId; - pSvcStatusData->dwServiceFlags = service->service_entry->status.dwServiceFlags; - + fill_status_process(pSvcStatusData, service->service_entry); service_unlock(service->service_entry); return ERROR_SUCCESS; @@ -1151,16 +1143,7 @@ DWORD __cdecl svcctl_ControlService( if (result != ERROR_SUCCESS) { - if (lpServiceStatus) - { - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; - } + if (lpServiceStatus) *lpServiceStatus = service->service_entry->status; service_unlock(service->service_entry); return result; } @@ -1195,13 +1178,7 @@ DWORD __cdecl svcctl_ControlService( if (lpServiceStatus) { service_lock(service->service_entry); - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + *lpServiceStatus = service->service_entry->status; service_unlock(service->service_entry); } @@ -1365,7 +1342,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( s->lpDisplayName = (WCHAR *)offset; offset += sz; } - memcpy(&s->ServiceStatus, &service->status, sizeof(SERVICE_STATUS)); + s->ServiceStatus = service->status; s++; } } @@ -1490,7 +1467,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( s->lpDisplayName = (WCHAR *)offset; offset += sz; } - s->ServiceStatusProcess = service->status; + fill_status_process(&s->ServiceStatusProcess, service); s++; } } diff --git a/programs/services/services.c b/programs/services/services.c index 56c3e45..feb137d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -791,7 +791,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p return err; } - service_entry->status.dwProcessId = pi.dwProcessId; + process->process_id = pi.dwProcessId; process->process = pi.hProcess; CloseHandle( pi.hThread ); @@ -936,7 +936,6 @@ void service_terminate(struct service_entry *service) release_process(process); service->process = NULL; } - service->status.dwProcessId = 0; service->status.dwCurrentState = SERVICE_STOPPED; service_unlock(service); } @@ -951,7 +950,6 @@ void process_terminate(struct process_entry *process) LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) { if (service->process != process) continue; - service->status.dwProcessId = 0; service->status.dwCurrentState = SERVICE_STOPPED; service->process = NULL; release_process(process); diff --git a/programs/services/services.h b/programs/services/services.h index ff9d582..778b30a 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -37,6 +37,7 @@ struct process_entry struct list entry; struct scmdatabase *db; LONG ref_count; + DWORD process_id; HANDLE process; HANDLE control_mutex; HANDLE control_pipe; @@ -50,7 +51,7 @@ struct service_entry struct scmdatabase *db; LONG ref_count; /* number of references - if goes to zero and the service is deleted the structure will be freed */ LPWSTR name; - SERVICE_STATUS_PROCESS status; + SERVICE_STATUS status; QUERY_SERVICE_CONFIGW config; DWORD preshutdown_timeout; LPWSTR description;

1 0

Sebastian Lackner : services: Fix leak of process object in process_terminate.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: c8187d62f83c5f660df980d6a0e3beea24199e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8187d62f83c5f660df980d6a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:21:12 2016 +0200 services: Fix leak of process object in process_terminate. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/services.c b/programs/services/services.c index 8e49906..56c3e45 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -954,6 +954,7 @@ void process_terminate(struct process_entry *process) service->status.dwProcessId = 0; service->status.dwCurrentState = SERVICE_STOPPED; service->process = NULL; + release_process(process); } scmdatabase_unlock(db); }

1 0

Joerg Schiermeier : loader/wine.inf: Correct wrong symlink.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 989bb04495ba6069552727995b333abc15f0e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=989bb04495ba6069552727995… Author: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Date: Wed Aug 10 15:07:05 2016 +0200 loader/wine.inf: Correct wrong symlink. Signed-off-by: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 589a1ff..48fcb09 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3313,7 +3313,7 @@ HKLM,Software\Wow6432Node\Microsoft\Notepad\DefaultFonts,"SymbolicLinkValue",0x6 HKLM,Software\Wow6432Node\Microsoft\OLE,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\OLE" HKLM,Software\Wow6432Node\Microsoft\RAS,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RAS" HKLM,Software\Wow6432Node\Microsoft\RPC,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RPC" -HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Software\Microsoft\Shared Tools\MSInfo" +HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Shared Tools\MSInfo" HKLM,Software\Wow6432Node\Microsoft\SystemCertificates,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\SystemCertificates" HKLM,Software\Wow6432Node\Microsoft\TermServLicensing,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\TermServLicensing" HKLM,Software\Wow6432Node\Microsoft\Transaction Server,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Transaction Server"

1 0

Alexandre Julliard : regedit: Don' t die if we fail to open a key during exporting.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: b90628c15e20694f3cc1add8c28e487bac00c2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90628c15e20694f3cc1add8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 11 13:48:42 2016 +0900 regedit: Don't die if we fail to open a key during exporting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 56 ++++++++-------------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bc5c09c..e3e26c0 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -34,8 +34,6 @@ #include <wine/debug.h> #include "regproc.h" -WINE_DEFAULT_DEBUG_CHANNEL(regedit); - #define REG_VAL_BUF_SIZE 4096 /* maximal number of characters in hexadecimal data line, @@ -870,29 +868,6 @@ static void processRegLinesW(FILE *in) HeapFree(GetProcessHeap(), 0, buf); } -/**************************************************************************** - * REGPROC_print_error - * - * Print the message for GetLastError - */ - -static void REGPROC_print_error(void) -{ - WCHAR *str; - DWORD error_code, len; - - error_code = GetLastError(); - len = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (WCHAR *)&str, 0, NULL); - if (len == 0 && GetLastError() != NO_ERROR) { - WINE_FIXME("FormatMessage failed: le=%u, previous=%u\n", GetLastError(), error_code); - exit(1); - } - output_writeconsole(str, len); - LocalFree(str); - exit(1); -} - /****************************************************************************** * Checks whether the buffer has enough room for the string or required size. * Resizes the buffer if necessary. @@ -1097,7 +1072,6 @@ static void export_hkey(FILE *file, HKEY key, DWORD max_val_size; DWORD curr_len; DWORD i; - BOOL more_data; LONG ret; WCHAR key_format[] = {'\r','\n','[','%','s',']','\r','\n',0}; @@ -1105,9 +1079,8 @@ static void export_hkey(FILE *file, HKEY key, if (RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL, NULL, &max_val_name_len, &max_val_size, NULL, NULL - ) != ERROR_SUCCESS) { - REGPROC_print_error(); - } + ) != ERROR_SUCCESS) + return; curr_len = strlenW(*reg_key_name_buf); REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_size, max_sub_key_len + curr_len + 1); @@ -1121,8 +1094,7 @@ static void export_hkey(FILE *file, HKEY key, /* print all the values */ i = 0; - more_data = TRUE; - while(more_data) { + for (;;) { DWORD value_type; DWORD val_name_size1 = *val_name_size; DWORD val_size1 = *val_size; @@ -1132,12 +1104,7 @@ static void export_hkey(FILE *file, HKEY key, /* Increase the size of the buffers and retry */ REGPROC_resize_char_buffer(val_name_buf, val_name_size, val_name_size1); REGPROC_resize_binary_buffer(val_buf, val_size, val_size1); - } else if (ret != ERROR_SUCCESS) { - more_data = FALSE; - if (ret != ERROR_NO_MORE_ITEMS) { - REGPROC_print_error(); - } - } else { + } else if (ret == ERROR_SUCCESS) { DWORD line_len; i++; @@ -1208,12 +1175,12 @@ static void export_hkey(FILE *file, HKEY key, } REGPROC_write_line(file, *line_buf, unicode); } + else break; } i = 0; - more_data = TRUE; (*reg_key_name_buf)[curr_len] = '\\'; - while(more_data) { + for (;;) { DWORD buf_size = *reg_key_name_size - curr_len - 1; ret = RegEnumKeyExW(key, i, *reg_key_name_buf + curr_len + 1, &buf_size, @@ -1221,12 +1188,7 @@ static void export_hkey(FILE *file, HKEY key, if (ret == ERROR_MORE_DATA) { /* Increase the size of the buffer and retry */ REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_size, curr_len + 1 + buf_size); - } else if (ret != ERROR_SUCCESS) { - more_data = FALSE; - if (ret != ERROR_NO_MORE_ITEMS) { - REGPROC_print_error(); - } - } else { + } else if (ret == ERROR_SUCCESS) { HKEY subkey; i++; @@ -1236,10 +1198,10 @@ static void export_hkey(FILE *file, HKEY key, val_name_buf, val_name_size, val_buf, val_size, line_buf, line_buf_size, unicode); RegCloseKey(subkey); - } else { - REGPROC_print_error(); } + else break; } + else break; } (*reg_key_name_buf)[curr_len] = '\0'; }

1 0

Sebastian Lackner : services: Unlink process immediately after service stopped.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: fac8ec93893a156842f344e669aa1360b219a18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac8ec93893a156842f344e66… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:21:49 2016 +0200 services: Unlink process immediately after service stopped. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 20 ++++++++++---------- programs/services/tests/service.c | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 36a0620..102b3b5 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -100,21 +100,17 @@ struct timeout_queue_elem struct list entry; FILETIME time; - void (*func)(struct process_entry *); struct process_entry *process; }; -static void run_after_timeout(void (*func)(struct process_entry *), struct process_entry *process, DWORD timeout) +static void terminate_after_timeout(struct process_entry *process, DWORD timeout) { - struct timeout_queue_elem *elem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct timeout_queue_elem)); + struct timeout_queue_elem *elem; ULARGE_INTEGER time; - if(!elem) { - func(process); + if (!(elem = HeapAlloc(GetProcessHeap(), 0, sizeof(*elem)))) return; - } - elem->func = func; elem->process = grab_process(process); GetSystemTimeAsFileTime(&elem->time); @@ -765,7 +761,11 @@ DWORD __cdecl svcctl_SetServiceStatus( if ((process = service->service_entry->process)) { if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - run_after_timeout(process_terminate, process, service_kill_timeout); + { + service->service_entry->process = NULL; + terminate_after_timeout(process, service_kill_timeout); + release_process(process); + } else SetEvent(process->status_changed_event); } @@ -1943,7 +1943,7 @@ DWORD events_loop(void) (err > WAIT_OBJECT_0 + 1 && idx == err - WAIT_OBJECT_0 - 2)) { LeaveCriticalSection(&timeout_queue_cs); - iter->func(iter->process); + process_terminate(iter->process); EnterCriticalSection(&timeout_queue_cs); release_process(iter->process); @@ -1975,7 +1975,7 @@ DWORD events_loop(void) LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) { LeaveCriticalSection(&timeout_queue_cs); - iter->func(iter->process); + process_terminate(iter->process); EnterCriticalSection(&timeout_queue_cs); release_process(iter->process); diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index fea6363..b184bda 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -321,7 +321,9 @@ static DWORD WINAPI pipe_thread(void *arg) static void test_service(void) { SC_HANDLE service_handle = register_service("simple_service"); + SERVICE_STATUS_PROCESS status2; SERVICE_STATUS status; + DWORD bytes; BOOL res; if(!service_handle) @@ -349,6 +351,11 @@ static void test_service(void) ok(status.dwCheckPoint == 0, "status.dwCheckPoint = %d\n", status.dwCheckPoint); todo_wine ok(status.dwWaitHint == 0, "status.dwWaitHint = %d\n", status.dwWaitHint); + res = QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status2, sizeof(status2), &bytes); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status2.dwCurrentState == SERVICE_RUNNING, "status2.dwCurrentState = %x\n", status2.dwCurrentState); + ok(status2.dwProcessId != 0, "status2.dwProcessId = %d\n", status2.dwProcessId); + res = ControlService(service_handle, 128, &status); ok(res, "ControlService failed: %u\n", GetLastError()); expect_event("CUSTOM"); @@ -366,7 +373,9 @@ static void test_service(void) static inline void test_no_stop(void) { SC_HANDLE service_handle = register_service("no_stop"); + SERVICE_STATUS_PROCESS status2; SERVICE_STATUS status; + DWORD bytes; BOOL res; if(!service_handle) @@ -397,6 +406,11 @@ static inline void test_no_stop(void) ok(status.dwCheckPoint == 0, "status.dwCheckPoint = %d\n", status.dwCheckPoint); todo_wine ok(status.dwWaitHint == 0, "status.dwWaitHint = %d\n", status.dwWaitHint); + res = QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status2, sizeof(status2), &bytes); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status2.dwCurrentState == SERVICE_RUNNING, "status2.dwCurrentState = %x\n", status2.dwCurrentState); + ok(status2.dwProcessId != 0, "status2.dwProcessId = %d\n", status2.dwProcessId); + res = ControlService(service_handle, SERVICE_CONTROL_STOP, &status); ok(res, "ControlService failed: %u\n", GetLastError()); expect_event("STOP"); @@ -413,6 +427,11 @@ static inline void test_no_stop(void) ok(status.dwCheckPoint == 0, "status.dwCheckPoint = %d\n", status.dwCheckPoint); ok(status.dwWaitHint == 0, "status.dwWaitHint = %d\n", status.dwWaitHint); + res = QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status2, sizeof(status2), &bytes); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status2.dwProcessId == 0 || broken(status2.dwProcessId != 0), + "status2.dwProcessId = %d\n", status2.dwProcessId); + res = DeleteService(service_handle); ok(res, "DeleteService failed: %u\n", GetLastError()); @@ -428,6 +447,11 @@ static inline void test_no_stop(void) ok(status.dwCheckPoint == 0, "status.dwCheckPoint = %d\n", status.dwCheckPoint); ok(status.dwWaitHint == 0, "status.dwWaitHint = %d\n", status.dwWaitHint); + res = QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status2, sizeof(status2), &bytes); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status2.dwProcessId == 0 || broken(status2.dwProcessId != 0), + "status2.dwProcessId = %d\n", status2.dwProcessId); + CloseServiceHandle(service_handle); res = QueryServiceStatus(service_handle, &status);

1 0

Pierre Schweitzer : mpr: Implement provider selection given remote name.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: a65c31e46fa354fc8fbf86c0b9f273f86132a571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65c31e46fa354fc8fbf86c0b… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:50:58 2016 +0200 mpr: Implement provider selection given remote name. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 72 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 50d3d83..c44fec2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1617,10 +1617,36 @@ static void use_connection_set_accessnameW(struct use_connection_context *ctxt, strcpyW(accessname, ctxt->resource->lpRemoteName); } +static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCEW * netres, WNetProvider *provider, BOOLEAN redirect ) +{ + DWORD caps, ret; + + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + ret = WN_ACCESS_DENIED; + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(netres, ctxt->password, ctxt->userid); + + if (ret == WN_ALREADY_CONNECTED && redirect) + netres->lpLocalName[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && netres->lpLocalName[0] >= 'C'); + + if (ret == WN_SUCCESS && ctxt->accessname) + ctxt->set_accessname(ctxt, netres->lpLocalName); + + return ret; +} + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; - DWORD index, ret, caps; + DWORD index, ret = WN_NO_NETWORK; BOOL redirect = FALSE; WCHAR letter[3] = {'Z', ':', 0}; NETRESOURCEW netres; @@ -1647,41 +1673,31 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) netres.lpLocalName = letter; } - if (!netres.lpProvider) - { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; - } - if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(netres.lpProvider); - if (index == BAD_PROVIDER_INDEX) - return ERROR_BAD_PROVIDER; - - provider = &providerTable->table[index]; - caps = provider->getCaps(WNNC_CONNECTION); - if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; - ret = WN_ACCESS_DENIED; - do + if (netres.lpProvider) { - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + index = _findProviderIndexW(netres.lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; - if (ret != NO_ERROR && redirect) - letter[0] -= 1; - } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); - - if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt, netres.lpLocalName); + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + } + else + { + for (index = 0; index < providerTable->numProviders; index++) + { + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + if (ret == WN_SUCCESS || ret == WN_ALREADY_CONNECTED) + break; + } + } return ret; }

1 0

Daniel Lehman : msvcp110: Use sentry in istream<>::seekg.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: b04b7e24804640ef3e43b72bd2ca77943bd2c1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04b7e24804640ef3e43b72bd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 13:39:30 2016 -0700 msvcp110: Use sentry in istream<>::seekg. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6b9a820..079c57b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8789,9 +8789,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg, 12) basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this, streamoff off, int dir) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + } + basic_istream_char_sentry_destroy(this); +#else + TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + if(!ios_base_fail(&base->base)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); fpos_int ret; @@ -8805,7 +8823,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this return this; }else basic_ios_char_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -8815,9 +8833,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg_fpos, 28) basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char *this, fpos_int pos) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + } + basic_istream_char_sentry_destroy(this); +#else + TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + if(!ios_base_fail(&base->base)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); fpos_int ret; @@ -8831,7 +8867,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char return this; }else basic_ios_char_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -10328,9 +10364,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg, 12) basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *this, streamoff off, int dir) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + } + basic_istream_wchar_sentry_destroy(this); +#else + TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + if(!ios_base_fail(&base->base)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); fpos_int ret; @@ -10344,7 +10398,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t return this; }else basic_ios_wchar_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -10356,9 +10410,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg_fpos, 28) basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wchar *this, fpos_int pos) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + } + basic_istream_wchar_sentry_destroy(this); +#else + TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + if(!ios_base_fail(&base->base)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); fpos_int ret; @@ -10372,7 +10444,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch return this; }else basic_ios_wchar_clear(base, IOSTATE_goodbit); - +#endif return this; }

1 0

Sebastian Lackner : services: Ignore error in callback only for ControlService requests.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 5137bfd4ba230e3734aefc2bedc98aee07009aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5137bfd4ba230e3734aefc2be… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:22:04 2016 +0200 services: Ignore error in callback only for ControlService requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 102b3b5..228371c 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1027,7 +1027,6 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD return FALSE; } - *result = ERROR_SUCCESS; return TRUE; } @@ -1173,7 +1172,8 @@ DWORD __cdecl svcctl_ControlService( return ERROR_SERVICE_REQUEST_TIMEOUT; } - process_send_control(process, service->service_entry->name, dwControl, NULL, 0, &result); + if (process_send_control(process, service->service_entry->name, dwControl, NULL, 0, &result)) + result = ERROR_SUCCESS; if (lpServiceStatus) {

1 0

Nikolay Sivov : mshtml: Formatting change to get rid of warning on GCC 6.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 8fbaeb3058f0fec147e4690384565571e9f2e707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbaeb3058f0fec147e469038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 22:25:24 2016 +0200 mshtml: Formatting change to get rid of warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 40deda4..f10a702 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -989,10 +989,10 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) do { if(This->bsc.readed >= This->size) { - void *new_buf; - new_buf = heap_realloc(This->buf, This->size << 1); - if(!new_buf) - return E_OUTOFMEMORY; + void *new_buf; + new_buf = heap_realloc(This->buf, This->size << 1); + if(!new_buf) + return E_OUTOFMEMORY; This->size <<= 1; This->buf = new_buf; }

1 0