wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

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

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: 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: 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: 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: 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

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

11 Aug '16

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 11 Aug '16

11 Aug '16

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

Nikolay Sivov : setupapi: Added CM_Get_Version().
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: af533d1eebd382d7ee72eaaef1cf7461356da9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af533d1eebd382d7ee72eaaef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:30:51 2016 +0300 setupapi: Added CM_Get_Version(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/misc.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 90a05ab..116180c 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -114,7 +114,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index de73966..98a6ed7 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) HeapFree(GetProcessHeap(), 0, msg); return ret; } + +/*********************************************************************** + * CM_Get_Version (SETUPAPI.@) + */ +WORD WINAPI CM_Get_Version(void) +{ + TRACE("()\n"); + return 0x0400; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 897572d..cc873ae 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -125,7 +125,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 09e0fb8..04b2171 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -816,6 +817,14 @@ static void test_SetupLogError(void) SetupCloseLog(); } +static void test_CM_Get_Version(void) +{ + WORD ret; + + ret = CM_Get_Version(); + ok(ret == 0x0400, "got version %#x\n", ret); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -849,4 +858,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); + test_CM_Get_Version(); } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index e3966f9..7dc31e1 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -192,6 +192,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)

1 0

Nikolay Sivov : t2embed: Fix embedding type resolution order.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 8be1357bd50cd230786df16df75ea0888d57ced7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be1357bd50cd230786df16df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:19:21 2016 +0300 t2embed: Fix embedding type resolution order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 15 ++++++++---- dlls/t2embed/tests/Makefile.in | 2 +- dlls/t2embed/tests/t2embed.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9fae0a8..48e20f5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(t2embed); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -89,14 +88,20 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; + otm.otmfsType &= 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; - else if (otm.otmfsType & LICENSE_NOEMBEDDING) - *status = EMBED_NOEMBEDDING; - else if (otm.otmfsType & LICENSE_PREVIEWPRINT) - *status = EMBED_PREVIEWPRINT; else if (otm.otmfsType & LICENSE_EDITABLE) *status = EMBED_EDITABLE; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else + { + WARN("unrecognized flags, %#x\n", otm.otmfsType); + *status = EMBED_INSTALLABLE; + } return E_NONE; } diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index f7a5809..c4f49a3 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = t2embed.dll -IMPORTS = gdi32 t2embed +IMPORTS = user32 gdi32 t2embed C_SRCS = \ t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 79102a6..9f278a5 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -19,10 +19,59 @@ #include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "t2embapi.h" #include "wine/test.h" +static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm, DWORD type, LPARAM lParam) +{ + OUTLINETEXTMETRICA otm; + HDC hdc = GetDC(NULL); + HFONT hfont, old_font; + ULONG status; + LONG ret; + + hfont = CreateFontIndirectA(&enumlf->elfLogFont); + old_font = SelectObject(hdc, hfont); + + otm.otmSize = sizeof(otm); + if (GetOutlineTextMetricsA(hdc, otm.otmSize, &otm)) + { + ULONG expected = 0xffff; + UINT fsType = otm.otmfsType & 0xf; + + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %d\n", ret); + + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } + else + { + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + } + + SelectObject(hdc, old_font); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + + return 1; +} + static void test_TTGetEmbeddingType(void) { HFONT hfont, old_font; @@ -73,6 +122,12 @@ static void test_TTGetEmbeddingType(void) SelectObject(hdc, old_font); DeleteObject(hfont); + + /* repeat for all system fonts */ + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfFaceName[0] = 0; + EnumFontFamiliesExA(hdc, &logfont, (FONTENUMPROCA)enum_font_proc, 0, 0); + DeleteDC(hdc); }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016