December 2007 - Wine-commits

Rob Shearman : rpcrt4: Fix the ALIGN_POINTER_CLEAR macro.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 50cab7736a04c6072fd7c2c318bd3fdfb57abf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cab7736a04c6072fd7c2c31… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:52:57 2007 +0000 rpcrt4: Fix the ALIGN_POINTER_CLEAR macro. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ca40bfa..6aabb23 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -102,7 +102,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) #define ALIGN_POINTER_CLEAR(_Ptr, _Align) \ do { \ - memset((_Ptr), 0, (ULONG_PTR)(_Ptr) & ((_Align) - 1)); \ + memset((_Ptr), 0, ((_Align) - (ULONG_PTR)(_Ptr)) & ((_Align) - 1)); \ ALIGN_POINTER(_Ptr, _Align); \ } while(0)

1 0

Rob Shearman : widl: Fix the length used when clearing alignment space in generated files.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 37c8d8ecacb56bac37eabe366835698fdec1b153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c8d8ecacb56bac37eabe366… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:52:27 2007 +0000 widl: Fix the length used when clearing alignment space in generated files. Only do the clearing when marshalling a base type. --- tools/widl/typegen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8875968..b0edc29 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2553,7 +2553,8 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, size = 0; } - print_file(file, indent, "memset(_StubMsg.Buffer, 0, ((long)_StubMsg.Buffer) & 0x%x);\n", alignment - 1); + if (phase == PHASE_MARSHAL) + print_file(file, indent, "MIDL_memset(_StubMsg.Buffer, 0, (0x%x - (long)_StubMsg.Buffer) & 0x%x);\n", alignment, alignment - 1); print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1);

1 0

Alexandre Julliard : advapi32: Use exponential backoff when waiting for a service to start.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 1f11ad82886aa14d4aae6b9a7c04ad416a9dcb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f11ad82886aa14d4aae6b9a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 15:07:20 2007 +0100 advapi32: Use exponential backoff when waiting for a service to start. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 60c99be..726fb36 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1620,7 +1620,7 @@ static BOOL service_wait_for_startup(SC_HANDLE hService) TRACE("%p\n", hService); - for (i=0; i<30; i++) + for (i=0; i<20; i++) { status.dwCurrentState = 0; r = QueryServiceStatus(hService, &status); @@ -1632,7 +1632,7 @@ static BOOL service_wait_for_startup(SC_HANDLE hService) break; } r = FALSE; - Sleep(1000); + Sleep(100 * i); } return r; }

1 0

Alexandre Julliard : advapi32: Replace the list of services with an array.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: a12b9c52da5617d58c7c80823946287679b43452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12b9c52da5617d58c7c80823… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 17:02:12 2007 +0100 advapi32: Replace the list of services with an array. --- dlls/advapi32/service.c | 101 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 726fb36..41b094f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -35,7 +35,6 @@ #include "winternl.h" #include "lmcons.h" #include "lmserver.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(advapi); @@ -73,7 +72,6 @@ typedef struct service_start_info_t typedef struct service_data_t { - struct list entry; LPHANDLER_FUNCTION_EX handler; LPVOID context; SERVICE_STATUS_PROCESS status; @@ -97,7 +95,8 @@ static CRITICAL_SECTION_DEBUG service_cs_debug = }; static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; -static struct list service_list = LIST_INIT(service_list); +static service_data **services; +static unsigned int nb_services; extern HANDLE __wine_make_process_system(void); @@ -734,27 +733,27 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) */ static BOOL service_run_threads(void) { - service_data *service; - DWORD count, n = 0; + DWORD i, n = 0; HANDLE *handles; - EnterCriticalSection( &service_cs ); + if (nb_services >= MAXIMUM_WAIT_OBJECTS) FIXME( "too many services %u\n", nb_services ); - count = list_count( &service_list ); + EnterCriticalSection( &service_cs ); - TRACE("Starting %d pipe listener threads. Services running as process %d\n", count, GetCurrentProcessId()); + TRACE("Starting %d pipe listener threads. Services running as process %d\n", + nb_services, GetCurrentProcessId()); - handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE) * (count + 1)); + handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE) * (nb_services + 1)); handles[n++] = __wine_make_process_system(); - LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + for (i = 0; i < nb_services; i++) { - service->status.dwProcessId = GetCurrentProcessId(); + services[i]->status.dwProcessId = GetCurrentProcessId(); handles[n++] = CreateThread( NULL, 0, service_control_dispatcher, - service, 0, NULL ); + services[i], 0, NULL ); } - assert(n == count + 1); + assert(n == nb_services + 1); LeaveCriticalSection( &service_cs ); @@ -791,26 +790,29 @@ static BOOL service_run_threads(void) BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) { service_data *info; - DWORD sz, len; + unsigned int i; BOOL ret = TRUE; TRACE("%p\n", servent); - EnterCriticalSection( &service_cs ); - while (servent->lpServiceName) + if (nb_services) { - LPSTR name = servent->lpServiceName; + SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); + return FALSE; + } + while (servent[nb_services].lpServiceName) nb_services++; + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); - len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); - sz = len*sizeof(WCHAR) + sizeof *info; + for (i = 0; i < nb_services; i++) + { + DWORD len = MultiByteToWideChar(CP_ACP, 0, servent[i].lpServiceName, -1, NULL, 0); + DWORD sz = FIELD_OFFSET( service_data, name[len] ); info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz ); - MultiByteToWideChar(CP_ACP, 0, name, -1, info->name, len); - info->proc.a = servent->lpServiceProc; + MultiByteToWideChar(CP_ACP, 0, servent[i].lpServiceName, -1, info->name, len); + info->proc.a = servent[i].lpServiceProc; info->unicode = FALSE; - list_add_head( &service_list, &info->entry ); - servent++; + services[i] = info; } - LeaveCriticalSection( &service_cs ); service_run_threads(); @@ -833,26 +835,29 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) { service_data *info; - DWORD sz, len; + unsigned int i; BOOL ret = TRUE; TRACE("%p\n", servent); - EnterCriticalSection( &service_cs ); - while (servent->lpServiceName) + if (nb_services) { - LPWSTR name = servent->lpServiceName; + SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); + return FALSE; + } + while (servent[nb_services].lpServiceName) nb_services++; + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); - len = strlenW(name); - sz = len*sizeof(WCHAR) + sizeof *info; + for (i = 0; i < nb_services; i++) + { + DWORD len = strlenW(servent[i].lpServiceName) + 1; + DWORD sz = FIELD_OFFSET( service_data, name[len] ); info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz ); - strcpyW(info->name, name); - info->proc.w = servent->lpServiceProc; + strcpyW(info->name, servent[i].lpServiceName); + info->proc.w = servent[i].lpServiceProc; info->unicode = TRUE; - list_add_head( &service_list, &info->entry ); - servent++; + services[i] = info; } - LeaveCriticalSection( &service_cs ); service_run_threads(); @@ -901,7 +906,7 @@ BOOL WINAPI UnlockServiceDatabase (SC_LOCK ScLock) BOOL WINAPI SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) { - service_data *service; + ULONG_PTR index = HandleToULong(hService) - 1; BOOL r = FALSE; TRACE("%p %x %x %x %x %x %x %x\n", hService, @@ -911,15 +916,11 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) lpStatus->dwWaitHint); EnterCriticalSection( &service_cs ); - LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + if (index < nb_services) { - if(service == (service_data*)hService) - { - memcpy( &service->status, lpStatus, sizeof(SERVICE_STATUS) ); - TRACE("Set service status to %d\n",service->status.dwCurrentState); - r = TRUE; - break; - } + memcpy( &services[index]->status, lpStatus, sizeof(SERVICE_STATUS) ); + TRACE("Set service status to %d\n",services[index]->status.dwCurrentState); + r = TRUE; } LeaveCriticalSection( &service_cs ); @@ -2563,19 +2564,19 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA( LPCSTR name, LPHANDL SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) { - service_data *service; SERVICE_STATUS_HANDLE handle = 0; + unsigned int i; TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); EnterCriticalSection( &service_cs ); - LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + for (i = 0; i < nb_services; i++) { - if(!strcmpW(lpServiceName, service->name)) + if(!strcmpW(lpServiceName, services[i]->name)) { - service->handler = lpHandlerProc; - service->context = lpContext; - handle = (SERVICE_STATUS_HANDLE)service; + services[i]->handler = lpHandlerProc; + services[i]->context = lpContext; + handle = ULongToHandle( i + 1 ); break; } }

1 0

Alexandre Julliard : advapi32: Return from StartServiceCtrlDispatcher when all services are stopped.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: c673b2284d03c17154ccc977203cbc6d05a95e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c673b2284d03c17154ccc9772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 18:28:20 2007 +0100 advapi32: Return from StartServiceCtrlDispatcher when all services are stopped. --- dlls/advapi32/service.c | 74 +++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 41b094f..2fd3eb8 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -97,6 +97,7 @@ static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; static service_data **services; static unsigned int nb_services; +static HANDLE service_event; extern HANDLE __wine_make_process_system(void); @@ -456,6 +457,7 @@ static BOOL service_handle_start(HANDLE pipe, service_data *service, DWORD count args = NULL; service->thread = CreateThread( NULL, 0, service_thread, service, 0, NULL ); + SetEvent( service_event ); /* notify the main loop */ end: HeapFree(GetProcessHeap(), 0, args); @@ -636,24 +638,6 @@ static BOOL service_handle_control(HANDLE pipe, service_data *service, } /****************************************************************************** - * service_reap_thread - */ -static DWORD service_reap_thread(service_data *service) -{ - DWORD exitcode = 0; - - if (!service->thread) - return 0; - GetExitCodeThread(service->thread, &exitcode); - if (exitcode!=STILL_ACTIVE) - { - CloseHandle(service->thread); - service->thread = 0; - } - return exitcode; -} - -/****************************************************************************** * service_control_dispatcher */ static DWORD WINAPI service_control_dispatcher(LPVOID arg) @@ -702,8 +686,6 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) break; } - service_reap_thread(service); - /* handle the request */ switch (req[0]) { @@ -733,53 +715,57 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) */ static BOOL service_run_threads(void) { - DWORD i, n = 0; - HANDLE *handles; + DWORD i, n, ret; + HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; + UINT wait_services[MAXIMUM_WAIT_OBJECTS]; - if (nb_services >= MAXIMUM_WAIT_OBJECTS) FIXME( "too many services %u\n", nb_services ); + service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - EnterCriticalSection( &service_cs ); + wait_handles[0] = __wine_make_process_system(); + wait_handles[1] = service_event; TRACE("Starting %d pipe listener threads. Services running as process %d\n", nb_services, GetCurrentProcessId()); - handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE) * (nb_services + 1)); - - handles[n++] = __wine_make_process_system(); - + EnterCriticalSection( &service_cs ); for (i = 0; i < nb_services; i++) { services[i]->status.dwProcessId = GetCurrentProcessId(); - handles[n++] = CreateThread( NULL, 0, service_control_dispatcher, - services[i], 0, NULL ); + CloseHandle( CreateThread( NULL, 0, service_control_dispatcher, services[i], 0, NULL )); } - assert(n == nb_services + 1); - LeaveCriticalSection( &service_cs ); /* wait for all the threads to pack up and exit */ - while (n > 1) + for (;;) { - DWORD ret = WaitForMultipleObjects( min(n,MAXIMUM_WAIT_OBJECTS), handles, FALSE, INFINITE ); + EnterCriticalSection( &service_cs ); + for (i = 0, n = 2; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + { + if (!services[i]->thread) continue; + wait_services[n] = i; + wait_handles[n++] = services[i]->thread; + } + LeaveCriticalSection( &service_cs ); + + ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { TRACE( "last user process exited, shutting down\n" ); /* FIXME: we should maybe send a shutdown control to running services */ ExitProcess(0); } - if (ret < MAXIMUM_WAIT_OBJECTS) + else if (ret == 1) { - CloseHandle( handles[ret] ); - memmove( &handles[ret], &handles[ret+1], (n - ret - 1) * sizeof(HANDLE) ); - n--; + continue; /* rebuild the list */ } - else break; + else if (ret < n) + { + services[wait_services[ret]]->thread = 0; + CloseHandle( wait_handles[ret] ); + if (n == 3) return TRUE; /* it was the last running thread */ + } + else return FALSE; } - - while (n) CloseHandle( handles[--n] ); - HeapFree(GetProcessHeap(), 0, handles); - - return TRUE; } /******************************************************************************

1 0

Rob Shearman : widl: The detection of types is highly dependent on the ordering of the various type detection functions .
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 57947d9f9c17daa6f7283a69f84515bda49d2422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57947d9f9c17daa6f7283a69f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:52:13 2007 +0000 widl: The detection of types is highly dependent on the ordering of the various type detection functions. Therefore, needs_freeing would have to duplicate a lot of write_remoting_arg in order to get the detection right. Because of this, it is easier and will cause less problems in the future to simply move the logic of needs_freeing into write_remoting_arg in the appropriate handling code for the detected type. --- tools/widl/typegen.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d542163..8875968 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2595,11 +2595,6 @@ static inline int is_size_needed_for_phase(enum remoting_phase phase) return (phase != PHASE_UNMARSHAL); } -static int needs_freeing(const type_t *t) -{ - return !is_base_type(t->type) && (t->type != RPC_FC_RP || !is_base_type(t->ref->type)); -} - expr_t *get_size_is_expr(const type_t *t, const char *name) { expr_t *x = NULL; @@ -2636,12 +2631,7 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (!in_attr && !out_attr) in_attr = 1; - if (phase == PHASE_FREE) - { - if (!needs_freeing(type)) - return; - } - else + if (phase != PHASE_FREE) switch (pass) { case PASS_IN: @@ -2786,7 +2776,8 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } else if (!is_ptr(var->type) && is_base_type(rtype)) { - print_phase_basetype(file, indent, phase, pass, var, var->name); + if (phase != PHASE_FREE) + print_phase_basetype(file, indent, phase, pass, var, var->name); } else if (!is_ptr(var->type)) { @@ -2836,7 +2827,8 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && is_base_type(rtype)) { - print_phase_basetype(file, indent, phase, pass, var, var->name); + if (phase != PHASE_FREE) + print_phase_basetype(file, indent, phase, pass, var, var->name); } else if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && (rtype == RPC_FC_STRUCT)) {

1 0

Alexandre Julliard : advapi32: Reimplement RegisterServiceCtrlHandler on top of RegisterServiceCtrlHandlerEx .
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 865bb0a67a06720c94e1360c5ae4c669b364d60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=865bb0a67a06720c94e1360c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 15:05:04 2007 +0100 advapi32: Reimplement RegisterServiceCtrlHandler on top of RegisterServiceCtrlHandlerEx. --- dlls/advapi32/service.c | 111 ++++++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 68 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 302d649..60c99be 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -74,15 +74,11 @@ typedef struct service_start_info_t typedef struct service_data_t { struct list entry; - union { - LPHANDLER_FUNCTION handler; - LPHANDLER_FUNCTION_EX handler_ex; - } handler; + LPHANDLER_FUNCTION_EX handler; LPVOID context; SERVICE_STATUS_PROCESS status; HANDLE thread; BOOL unicode : 1; - BOOL extended : 1; /* uses handler_ex instead of handler? */ union { LPSERVICE_MAIN_FUNCTIONA a; LPSERVICE_MAIN_FUNCTIONW w; @@ -606,11 +602,6 @@ static BOOL service_accepts_control(const service_data *service, DWORD dwControl case SERVICE_CONTROL_NETBINDDISABLE: if (a&SERVICE_ACCEPT_NETBINDCHANGE) return TRUE; - } - if (!service->extended) - return FALSE; - switch (dwControl) - { case SERVICE_CONTROL_HARDWAREPROFILECHANGE: if (a&SERVICE_ACCEPT_HARDWAREPROFILECHANGE) return TRUE; @@ -639,16 +630,8 @@ static BOOL service_handle_control(HANDLE pipe, service_data *service, if (service_accepts_control(service, dwControl)) { - if (service->extended && service->handler.handler_ex) - { - service->handler.handler_ex(dwControl, 0, NULL, service->context); - ret = ERROR_SUCCESS; - } - else if (service->handler.handler) - { - service->handler.handler(dwControl); - ret = ERROR_SUCCESS; - } + if (service->handler) + ret = service->handler(dwControl, 0, NULL, service->context); } return WriteFile(pipe, &ret, sizeof ret, &count, NULL); } @@ -909,48 +892,6 @@ BOOL WINAPI UnlockServiceDatabase (SC_LOCK ScLock) } /****************************************************************************** - * RegisterServiceCtrlHandlerA [ADVAPI32.@] - */ -SERVICE_STATUS_HANDLE WINAPI -RegisterServiceCtrlHandlerA( LPCSTR lpServiceName, LPHANDLER_FUNCTION lpfHandler ) -{ - LPWSTR lpServiceNameW; - SERVICE_STATUS_HANDLE ret; - - lpServiceNameW = SERV_dup(lpServiceName); - ret = RegisterServiceCtrlHandlerW( lpServiceNameW, lpfHandler ); - HeapFree(GetProcessHeap(), 0, lpServiceNameW); - return ret; -} - -/****************************************************************************** - * RegisterServiceCtrlHandlerW [ADVAPI32.@] - * - * PARAMS - * lpServiceName [] - * lpfHandler [] - */ -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW( LPCWSTR lpServiceName, - LPHANDLER_FUNCTION lpfHandler ) -{ - service_data *service; - SERVICE_STATUS_HANDLE handle = 0; - - EnterCriticalSection( &service_cs ); - LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) - { - if(!strcmpW(lpServiceName, service->name)) - { - service->handler.handler = lpfHandler; - handle = (SERVICE_STATUS_HANDLE)service; - break; - } - } - LeaveCriticalSection( &service_cs ); - return handle; -} - -/****************************************************************************** * SetServiceStatus [ADVAPI32.@] * * PARAMS @@ -2577,13 +2518,48 @@ BOOL WINAPI SetServiceBits( SERVICE_STATUS_HANDLE hServiceStatus, return TRUE; } -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA( LPCSTR lpServiceName, - LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) +/* thunk for calling the RegisterServiceCtrlHandler handler function */ +static DWORD WINAPI ctrl_handler_thunk( DWORD control, DWORD type, void *data, void *context ) { - FIXME("%s %p %p\n", debugstr_a(lpServiceName), lpHandlerProc, lpContext); - return 0; + LPHANDLER_FUNCTION func = context; + + func( control ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerA [ADVAPI32.@] + */ +SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA( LPCSTR name, LPHANDLER_FUNCTION handler ) +{ + return RegisterServiceCtrlHandlerExA( name, ctrl_handler_thunk, handler ); } +/****************************************************************************** + * RegisterServiceCtrlHandlerW [ADVAPI32.@] + */ +SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW( LPCWSTR name, LPHANDLER_FUNCTION handler ) +{ + return RegisterServiceCtrlHandlerExW( name, ctrl_handler_thunk, handler ); +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerExA [ADVAPI32.@] + */ +SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA( LPCSTR name, LPHANDLER_FUNCTION_EX handler, LPVOID context ) +{ + LPWSTR nameW; + SERVICE_STATUS_HANDLE ret; + + nameW = SERV_dup(name); + ret = RegisterServiceCtrlHandlerExW( nameW, handler, context ); + HeapFree( GetProcessHeap(), 0, nameW ); + return ret; +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerExW [ADVAPI32.@] + */ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) { @@ -2597,9 +2573,8 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam { if(!strcmpW(lpServiceName, service->name)) { - service->handler.handler_ex = lpHandlerProc; + service->handler = lpHandlerProc; service->context = lpContext; - service->extended = TRUE; handle = (SERVICE_STATUS_HANDLE)service; break; }

1 0

Alexandre Julliard : advapi32: Fix RegisterServiceCtrlHandler spec entry.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 4889a0edf7a798928a297fb7b1e25f445e839eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4889a0edf7a798928a297fb7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 15:06:19 2007 +0100 advapi32: Fix RegisterServiceCtrlHandler spec entry. --- dlls/advapi32/advapi32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1a346b5..738b4df 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -527,10 +527,10 @@ @ stdcall RegisterEventSourceA(ptr ptr) @ stdcall RegisterEventSourceW(ptr ptr) # @ stub RegisterIdleTask -@ stdcall RegisterServiceCtrlHandlerA (ptr ptr) +@ stdcall RegisterServiceCtrlHandlerA(str ptr) @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) -@ stdcall RegisterServiceCtrlHandlerW (ptr ptr) +@ stdcall RegisterServiceCtrlHandlerW(wstr ptr) @ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub RemoveTraceCallback

1 0

Alexander Nicolaysen Sørnes : distribution: Sort test results by Wine version as well as rating
by Chris Morgan 20 Dec '07

20 Dec '07

Module: appdb Branch: master Commit: 66e884d65a578549824db57dc53f9ca988883b8c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=66e884d65a578549824db57d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 20 01:30:29 2007 +0100 distribution: Sort test results by Wine version as well as rating --- include/distribution.php | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 25526cf..1169bf5 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -51,24 +51,33 @@ class distribution { if($_SESSION['current']->hasPriv("admin")) { $sQuery = "SELECT testingId - FROM testResults - WHERE distributionId = '?' - ORDER BY testedRating;" ; + FROM testResults, ?.versions + WHERE + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND + distributionId = '?' + ORDER BY testedRating,bugs.versions.id DESC"; } else /* only let users view test results that aren't queued and for apps that */ /* aren't queued or versions that aren't queued */ { $sQuery = "SELECT testingId - FROM testResults, appFamily, appVersion + FROM testResults, appFamily, appVersion, ?.versions WHERE testResults.state = 'accepted' AND + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND testResults.versionId = appVersion.versionId AND appFamily.appId = appVersion.appId AND appFamily.state = 'accepted' AND appVersion.state = 'accepted' AND distributionId = '?' - ORDER BY testedRating;"; + ORDER BY testedRating,bugs.versions.id DESC"; } - if($hResult = query_parameters($sQuery, $this->iDistributionId)) + if($hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $this->iDistributionId)) { while($oRow = query_fetch_object($hResult)) {

1 0

Alexander Nicolaysen Sørnes : Order a version's testData table by Wine version, then date
by Chris Morgan 20 Dec '07

20 Dec '07

Module: appdb Branch: master Commit: 42239a63789ec72285523ae24e6174c23edbaadf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=42239a63789ec72285523ae2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 20 01:37:48 2007 +0100 Order a version's testData table by Wine version, then date --- include/testData.php | 20 ++++++++++++++------ unit_test/test_testData.php | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index 81a308d..8dbf0a0 100644 --- a/include/testData.php +++ b/include/testData.php @@ -621,16 +621,20 @@ class testData{ $bShowAll = ($aClean['bShowAll'] == "true") ? true : false; $sQuery = "SELECT * - FROM testResults + FROM testResults, ?.versions WHERE versionId = '?' AND + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND state = '?' - ORDER BY testedDate DESC"; + ORDER BY versions.id DESC,testedDate DESC"; if(!$bShowAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; - $hResult = query_parameters($sQuery, $this->iVersionId, 'accepted'); + $hResult = query_parameters($sQuery, BUGZILLA_DB, $this->iVersionId, BUGZILLA_PRODUCT_ID, 'accepted'); if(!$hResult) return; @@ -682,13 +686,17 @@ class testData{ /* retrieve the latest test result for a given version id */ function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted') { - $sQuery = "SELECT testingId FROM testResults WHERE + $sQuery = "SELECT testingId FROM testResults, ?.versions WHERE + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND versionId = '?' AND state = '?' - ORDER BY testedDate DESC limit 1"; + ORDER BY versions.id DESC,testedDate DESC limit 1"; - $hResult = query_parameters($sQuery, $iVersionId, $sState); + $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, $sState); if(!$hResult) return 0; diff --git a/unit_test/test_testData.php b/unit_test/test_testData.php index c17fdcb..f79f23a 100644 --- a/unit_test/test_testData.php +++ b/unit_test/test_testData.php @@ -18,11 +18,13 @@ function test_testData_getNewestTestidFromVersionId() $oOldTestData = new testData(); $oOldTestData->iVersionId = $iVersionId; + $oOldTestData->sTestedRelease = '0.9.50.'; if(!$oOldTestData->create()) error("oOldTestData->create() failed"); $oNewTestData = new testData(); $oNewTestData->iVersionId = $iVersionId; + $oNewTestData->sTestedRelease = '0.9.51.'; if(!$oNewTestData->create()) error("oNewTestData->create() failed");

1 0