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

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

11 Aug '16

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

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

11 Aug '16

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: Unlink process immediately after service stopped.
by Alexandre Julliard 11 Aug '16

11 Aug '16

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

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

11 Aug '16

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

Sebastian Lackner : services: Remove service_terminate function.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: cafcf6448fcd0099c08565d28ff3f6afdf4a1209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafcf6448fcd0099c08565d28… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:22:27 2016 +0200 services: Remove service_terminate function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 3 ++- programs/services/services.c | 19 ++----------------- programs/services/services.h | 1 - 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 228371c..45366fb 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1137,7 +1137,8 @@ DWORD __cdecl svcctl_ControlService( if (result == ERROR_SUCCESS && service->service_entry->force_shutdown) { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; - service_terminate(service->service_entry); + if ((process = service->service_entry->process)) + process_terminate(process); } if (result != ERROR_SUCCESS) diff --git a/programs/services/services.c b/programs/services/services.c index feb137d..b0d008d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -787,7 +787,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p if (!r) { err = GetLastError(); - service_terminate(service_entry); + process_terminate(process); return err; } @@ -915,7 +915,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) ReleaseMutex(process->control_mutex); else - service_terminate(service); + process_terminate(process); } scmdatabase_unlock_startup(service->db); @@ -925,21 +925,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return err; } -void service_terminate(struct service_entry *service) -{ - struct process_entry *process; - - service_lock(service); - if ((process = service->process)) - { - TerminateProcess(process->process, 0); - release_process(process); - service->process = NULL; - } - service->status.dwCurrentState = SERVICE_STOPPED; - service_unlock(service); -} - void process_terminate(struct process_entry *process) { struct scmdatabase *db = process->db; diff --git a/programs/services/services.h b/programs/services/services.h index 778b30a..16f99f89 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,7 +88,6 @@ void release_service(struct service_entry *service); void service_lock(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); -void service_terminate(struct service_entry *service); /* Process functions */

1 0

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

11 Aug '16

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

Daniel Lehman : msvcp140: Forward __ExceptionPtr* to msvcr120.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 4686a5ee59f91e1033daeeb5bc5d5f5121a8075e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686a5ee59f91e1033daeeb5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jun 16 16:38:08 2016 -0700 msvcp140: Forward __ExceptionPtr* to msvcr120. 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/msvcp140/msvcp140.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6e17e0d..f5a0838 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1693,22 +1693,22 @@ @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z @ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z -@ stub -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv

1 0

Daniel Lehman : msvcp110: Use sentry in istream<>::tellg.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 3888aa4d8d406fce2c63b79e4e8fe164cd549a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3888aa4d8d406fce2c63b79e4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 13:24:21 2016 -0700 msvcp110: Use sentry in istream<>::tellg. 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 | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fbbb320..6b9a820 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8746,6 +8746,20 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_char_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -8758,6 +8772,7 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_char_setstate(base, IOSTATE_failbit); +#endif return ret; } @@ -10270,6 +10285,20 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_wchar_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -10281,7 +10310,7 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i ret, 0, SEEKDIR_cur, OPENMODE_in); if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); - +#endif return ret; }

1 0

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

11 Aug '16

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

Daniel Lehman : msvcr120: Add forwards for wcstoll and wcstoll_l.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: beb94094d03ab533f20e0a9aab6df6966e0b5b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb94094d03ab533f20e0a9aa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 11 08:22:41 2016 +0200 msvcr120: Add forwards for wcstoll and wcstoll_l. 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/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index e2b5ab9..29b7a4c 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -57,7 +57,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 @@ -110,7 +110,7 @@ @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s @ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0ac1de8..f65d150 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1894,7 +1894,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2476,7 +2476,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 99e1fa9..de68b87 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1587,7 +1587,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcr120._wcstoui64 @@ -2138,7 +2138,7 @@ @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcr120.wcstoul diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7582ba9..bb18d4f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2043,7 +2043,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2583,7 +2583,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul

1 0