October 2012 - Wine-commits

Akihiro Sagawa : cmd: Properly handle multibyte characters in batch files.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8daef1649b242e26236df9c9cb1810750113bed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daef1649b242e26236df9c9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 20 01:02:24 2012 +0900 cmd: Properly handle multibyte characters in batch files. --- programs/cmd/batch.c | 58 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index bacb6cd..02d1fcf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -234,31 +234,53 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) { DWORD charsRead; BOOL status; - LARGE_INTEGER filepos; DWORD i; /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ if (!WCMD_is_console_handle(h)) { - /* Save current file position */ - filepos.QuadPart = 0; - SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); - } + LARGE_INTEGER filepos; + char *bufA; + UINT cp; + const char *p; + + cp = GetConsoleCP(); + bufA = HeapAlloc(GetProcessHeap(), 0, noChars); + if (!bufA) return NULL; + + /* Save current file position */ + filepos.QuadPart = 0; + SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); + + status = ReadFile(h, bufA, noChars, &charsRead, NULL); + if (!status || charsRead == 0) { + HeapFree(GetProcessHeap(), 0, bufA); + return NULL; + } - status = WCMD_ReadFile(h, buf, noChars, &charsRead); - if (!status || charsRead == 0) return NULL; + /* Find first EOL */ + for (p = bufA; p < (bufA + charsRead); p = CharNextExA(cp, p, 0)) { + if (*p == '\n' || *p == '\r') + break; + } - /* Find first EOL */ - for (i = 0; i < charsRead; i++) { - if (buf[i] == '\n' || buf[i] == '\r') - break; - } + /* Sets file pointer to the start of the next line, if any */ + filepos.QuadPart += p - bufA + 1 + (*p == '\r' ? 1 : 0); + SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); - if (!WCMD_is_console_handle(h) && i != charsRead) { - /* Sets file pointer to the start of the next line, if any */ - filepos.QuadPart += i + 1 + (buf[i] == '\r' ? 1 : 0); - SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); + i = MultiByteToWideChar(cp, 0, bufA, p - bufA, buf, noChars); + HeapFree(GetProcessHeap(), 0, bufA); + } + else { + status = WCMD_ReadFile(h, buf, noChars, &charsRead); + if (!status || charsRead == 0) return NULL; + + /* Find first EOL */ + for (i = 0; i < charsRead; i++) { + if (buf[i] == '\n' || buf[i] == '\r') + break; + } } /* Truncate at EOL (or end of buffer) */

1 0

Alexandre Julliard : winex11: Remove some remainders of the ddraw HAL support.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 900b5f4b793daca9b8ba2934d6783bdf79a59f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=900b5f4b793daca9b8ba2934d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:36:31 2012 +0200 winex11: Remove some remainders of the ddraw HAL support. --- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/settings.c | 5 ----- include/d3dhal.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a27b052..f03dd4d 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -311,8 +311,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d { switch (*(const INT *)in_data) { - case DCICOMMAND: - return DD_HAL_VERSION; case X11DRV_ESCAPE: return TRUE; } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9512c64..035b0da 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -35,11 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); -/* - * The DDHALMODEINFO type is used to hold all the mode information. - * This is done because the array of DDHALMODEINFO structures must be - * created for use by DirectDraw anyway. - */ static struct x11drv_mode_info *dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; diff --git a/include/d3dhal.h b/include/d3dhal.h index 6c68d4a..9d43313 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,9 +47,6 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; -/* this is to allow keeping the bulk of our OpenGL code out of x11drv */ -#define D3DDD_WINE_OPENGL_DEVICE 0x00008000 - typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps;

1 0

Alexandre Julliard : explorer: Remove support for the old-style X11 desktop configuration key.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 78b86e34464a30d57d342b0beb3aede740b06b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b86e34464a30d57d342b0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:37:00 2012 +0200 explorer: Remove support for the old-style X11 desktop configuration key. --- programs/explorer/desktop.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 84f6fa3..c646f2d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -255,7 +255,6 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; HWND hwnd, msg_hwnd; @@ -288,27 +287,6 @@ void manage_desktop( WCHAR *arg ) { if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - else /* check for the X11 driver key for backwards compatibility (to be removed) */ - { - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; - static const WCHAR x11_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'X','1','1',' ','D','r','i','v','e','r',0}; - HKEY hkey; - WCHAR buffer[64]; - DWORD size = sizeof(buffer); - - width = height = 0; - /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, x11_keyW, &hkey )) - { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) - { - name = defaultW; - if (!parse_size( buffer, &width, &height )) width = height = 0; - } - RegCloseKey( hkey ); - } - } if (name && width && height) xwin = create_desktop( name, width, height );

1 0

Alexandre Julliard : gdi32: Export a function to retrieve the module handle of the graphics driver for a DC .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 5c1a752d613a681b54120718e033d3166f4122a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1a752d613a681b54120718e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 15:05:54 2012 +0200 gdi32: Export a function to retrieve the module handle of the graphics driver for a DC. --- dlls/gdi32/dc.c | 5 ++++- dlls/gdi32/driver.c | 42 +++++++++++++++++++++++++++++++++++++----- dlls/gdi32/gdi32.spec | 3 +++ dlls/gdi32/gdi_private.h | 4 ++-- include/wine/gdi_driver.h | 1 + 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index be9b016..7d70bf4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -81,6 +81,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->nulldrv.funcs = &null_driver; dc->physDev = &dc->nulldrv; + dc->module = gdi32_module; dc->thread = GetCurrentThreadId(); dc->refcount = 1; dc->wndExtX = 1; @@ -568,6 +569,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; + HMODULE module; WCHAR buf[300]; GDI_CheckNotLock(); @@ -582,7 +584,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, strcpyW(buf, driver); } - if (!(funcs = DRIVER_load_driver( buf ))) + if (!(funcs = DRIVER_load_driver( buf, &module ))) { ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; @@ -590,6 +592,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; + dc->module = module; dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(driver=%s, device=%s, output=%s): returning %p\n", diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 9c5ddb8..ca21d4d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -48,6 +48,7 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static DWORD display_driver_load_error; const struct gdi_dc_funcs *font_driver = NULL; @@ -92,14 +93,18 @@ static struct graphics_driver *create_driver( HMODULE module ) * * Special case for loading the display driver: get the name from the config file */ -static const struct gdi_dc_funcs *get_display_driver(void) +static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) { struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; - if (display_driver) return display_driver->funcs; /* already loaded */ + if (display_driver) + { + *module_ret = display_driver->module; + return display_driver->funcs; /* already loaded */ + } strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -121,6 +126,8 @@ static const struct gdi_dc_funcs *get_display_driver(void) name = next; } + if (!module) display_driver_load_error = GetLastError(); + if (!(driver = create_driver( module ))) { MESSAGE( "Could not create graphics driver '%s'\n", buffer ); @@ -140,7 +147,7 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * DRIVER_load_driver */ -const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) +const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret ) { HMODULE module; struct graphics_driver *driver, *new_driver; @@ -148,11 +155,16 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) + return get_display_driver( module_ret ); if ((module = GetModuleHandleW( name ))) { - if (display_driver && display_driver->module == module) return display_driver->funcs; + if (display_driver && display_driver->module == module) + { + *module_ret = module; + return display_driver->funcs; + } EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { @@ -182,11 +194,31 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); done: + *module_ret = driver->module; LeaveCriticalSection( &driver_section ); return driver->funcs; } +/*********************************************************************** + * __wine_get_driver_module (GDI32.@) + */ +HMODULE CDECL __wine_get_driver_module( HDC hdc ) +{ + DC *dc; + HMODULE ret = 0; + + if ((dc = get_dc_ptr( hdc ))) + { + ret = dc->module; + release_dc_ptr( dc ); + if (!ret) SetLastError( display_driver_load_error ); + } + else SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} + + static INT nulldrv_AbortDoc( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index cdc7b4b..80b1b68 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -513,5 +513,8 @@ @ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) +# Graphics drivers +@ cdecl __wine_get_driver_module(long) + # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 70589b9..806ca35 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -71,7 +71,7 @@ typedef struct tagDC struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ - + HMODULE module; /* module handle of the graphics driver */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ @@ -272,7 +272,7 @@ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs path_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *font_driver DECLSPEC_HIDDEN; -extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index e942ed9..3d4e6c5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -275,6 +275,7 @@ WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ); +extern HMODULE CDECL __wine_get_driver_module( HDC hdc ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Alexandre Julliard : user32: Retrieve the graphics driver module from gdi32 .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: e17cdb266d6333428bef8e9a86d0b96cada0dda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17cdb266d6333428bef8e9a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 15:06:59 2012 +0200 user32: Retrieve the graphics driver module from gdi32. --- dlls/user32/driver.c | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 20837d0..00564b6 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -25,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" +#include "wine/gdi_driver.h" #include "user_private.h" @@ -36,38 +37,18 @@ static DWORD driver_load_error; /* load the graphics driver */ static const USER_DRIVER *load_driver(void) { - char buffer[MAX_PATH], libname[32], *name, *next; - HKEY hkey; + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + HDC hdc; void *ptr; HMODULE graphics_driver; USER_DRIVER *driver, *prev; - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((graphics_driver = LoadLibraryA( libname )) != 0) break; - name = next; - } - - if (!graphics_driver) - driver_load_error = GetLastError(); - driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = null_driver; + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + + graphics_driver = __wine_get_driver_module( hdc ); if (graphics_driver) { #define GET_USER_FUNC(name) \ @@ -129,15 +110,18 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(WindowPosChanged); #undef GET_USER_FUNC } + else driver_load_error = GetLastError(); prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) { /* another thread beat us to it */ HeapFree( GetProcessHeap(), 0, driver ); - FreeLibrary( graphics_driver ); driver = prev; } + else LdrAddRefDll( 0, graphics_driver ); + + DeleteDC( hdc ); return driver; } @@ -334,7 +318,7 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) switch (driver_load_error) { case ERROR_MOD_NOT_FOUND: - MESSAGE( "The X11 driver is missing. Check your build!\n" ); + MESSAGE( "The graphics driver is missing. Check your build!\n" ); break; case ERROR_DLL_INIT_FAILED: MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );

1 0

Piotr Caban : advapi32: Validate arguments in StartServiceCtrlDispatcher.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 6027fe2dafa89456d9f000d8c4b0a879737ed2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027fe2dafa89456d9f000d8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:13 2012 +0200 advapi32: Validate arguments in StartServiceCtrlDispatcher. --- dlls/advapi32/service.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 49d56d1..2ec6d8e 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -565,6 +565,12 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++) @@ -610,6 +616,12 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++)

1 0

Piotr Caban : advapi32: Return from StartServiceCtrlDispatcher when service status is changed to stopped .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: a936b58b8b76b56c3a0755cfdfef427b2f427030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a936b58b8b76b56c3a0755cfd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:37 2012 +0200 advapi32: Return from StartServiceCtrlDispatcher when service status is changed to stopped. --- dlls/advapi32/service.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2ec6d8e..1f585dc 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -86,6 +86,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; +static HANDLE stop_event; extern HANDLE CDECL __wine_make_process_system(void); @@ -465,11 +466,13 @@ static BOOL service_run_main_thread(void) UINT wait_services[MAXIMUM_WAIT_OBJECTS]; service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); /* FIXME: service_control_dispatcher should be merged into the main thread */ wait_handles[0] = __wine_make_process_system(); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, NULL, 0, NULL ); wait_handles[2] = service_event; + wait_handles[3] = stop_event; TRACE("Starting %d services running as process %d\n", nb_services, GetCurrentProcessId()); @@ -478,7 +481,7 @@ static BOOL service_run_main_thread(void) for (;;) { EnterCriticalSection( &service_cs ); - for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + for (i = 0, n = 4; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) { if (!services[i]->thread) continue; wait_services[n] = i; @@ -536,11 +539,15 @@ static BOOL service_run_main_thread(void) { continue; /* rebuild the list */ } + else if (ret == 3) + { + return TRUE; + } else if (ret < n) { services[wait_services[ret]]->thread = 0; CloseHandle( wait_handles[ret] ); - if (n == 4) return TRUE; /* it was the last running thread */ + if (n == 5) return TRUE; /* it was the last running thread */ } else return FALSE; } @@ -727,8 +734,10 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) return FALSE; } - if (lpStatus->dwCurrentState == SERVICE_STOPPED) + if (lpStatus->dwCurrentState == SERVICE_STOPPED) { + SetEvent(stop_event); CloseServiceHandle((SC_HANDLE)hService); + } return TRUE; }

1 0

Piotr Caban : advapi32: Don' t terminate service when its last thread has exited.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8ebf0a72c941e07563853f9e60fdecf86dcc6a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebf0a72c941e07563853f9e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:54 2012 +0200 advapi32: Don't terminate service when its last thread has exited. --- dlls/advapi32/service.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1f585dc..07b9e4b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -547,7 +547,6 @@ static BOOL service_run_main_thread(void) { services[wait_services[ret]]->thread = 0; CloseHandle( wait_handles[ret] ); - if (n == 5) return TRUE; /* it was the last running thread */ } else return FALSE; }

1 0

Piotr Caban : services: Kill service thread after timeout so it can terminate cleanly.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 522bc15b455ffbd09bb2f594aaaa3e9b13903efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=522bc15b455ffbd09bb2f594a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:26:10 2012 +0200 services: Kill service thread after timeout so it can terminate cleanly. --- programs/services/rpc.c | 118 ++++++++++++++++++++++++++++++++++++++++-- programs/services/services.c | 4 +- programs/services/services.h | 2 +- 3 files changed, 116 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index bf8ce80..9fe81d1 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,6 +84,53 @@ struct sc_lock struct scmdatabase *db; }; +static HANDLE timeout_queue_event; +static CRITICAL_SECTION timeout_queue_cs; +static CRITICAL_SECTION_DEBUG timeout_queue_cs_debug = +{ + 0, 0, &timeout_queue_cs, + { &timeout_queue_cs_debug.ProcessLocksList, &timeout_queue_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": timeout_queue_cs") } +}; +static CRITICAL_SECTION timeout_queue_cs = { &timeout_queue_cs_debug, -1, 0, 0, 0, 0 }; +static struct list timeout_queue = LIST_INIT(timeout_queue); +struct timeout_queue_elem +{ + struct list entry; + + FILETIME time; + void (*func)(struct service_entry*); + struct service_entry *service_entry; +}; + +static void run_after_timeout(void (*func)(struct service_entry*), struct service_entry *service, DWORD timeout) +{ + struct timeout_queue_elem *elem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct timeout_queue_elem)); + ULARGE_INTEGER time; + + if(!elem) { + func(service); + return; + } + + service->ref_count++; + elem->func = func; + elem->service_entry = service; + + GetSystemTimeAsFileTime(&elem->time); + time.LowPart = elem->time.dwLowDateTime; + time.HighPart = elem->time.dwHighDateTime; + time.QuadPart += timeout*10000000; + elem->time.dwLowDateTime = time.LowPart; + elem->time.dwHighDateTime = time.HighPart; + + EnterCriticalSection(&timeout_queue_cs); + list_add_head(&timeout_queue, &elem->entry); + LeaveCriticalSection(&timeout_queue_cs); + + SetEvent(timeout_queue_event); +} + static void free_service_strings(struct service_entry *old, struct service_entry *new) { QUERY_SERVICE_CONFIGW *old_cfg = &old->config; @@ -700,7 +747,7 @@ DWORD __cdecl svcctl_SetServiceStatus( service_unlock(service->service_entry); if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - service_terminate(service->service_entry); + run_after_timeout(service_terminate, service->service_entry, service_kill_timeout); else if (service->service_entry->status_changed_event) SetEvent(service->service_entry->status_changed_event); @@ -1567,10 +1614,16 @@ DWORD RPC_Init(void) return ERROR_SUCCESS; } -DWORD RPC_MainLoop(void) +DWORD events_loop(void) { + struct timeout_queue_elem *iter, *iter_safe; DWORD err; - HANDLE hExitEvent = __wine_make_process_system(); + HANDLE wait_handles[2]; + DWORD timeout = INFINITE; + + wait_handles[0] = __wine_make_process_system(); + wait_handles[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + timeout_queue_event = wait_handles[1]; SetEvent(g_hStartedEvent); @@ -1578,12 +1631,67 @@ DWORD RPC_MainLoop(void) do { - err = WaitForSingleObjectEx(hExitEvent, INFINITE, TRUE); + err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); WINE_TRACE("Wait returned %d\n", err); + + if(err==WAIT_OBJECT_0+1 || err==WAIT_TIMEOUT) + { + FILETIME cur_time; + ULARGE_INTEGER time; + + GetSystemTimeAsFileTime(&cur_time); + time.LowPart = cur_time.dwLowDateTime; + time.HighPart = cur_time.dwHighDateTime; + + EnterCriticalSection(&timeout_queue_cs); + timeout = INFINITE; + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + if(CompareFileTime(&cur_time, &iter->time) >= 0) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + else + { + ULARGE_INTEGER time_diff; + + time_diff.LowPart = iter->time.dwLowDateTime; + time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; + + if(time_diff.QuadPart < timeout) + timeout = time_diff.QuadPart; + } + } + LeaveCriticalSection(&timeout_queue_cs); + + if(timeout != INFINITE) + timeout += 1000; + } } while (err != WAIT_OBJECT_0); WINE_TRACE("Object signaled - wine shutdown\n"); - CloseHandle(hExitEvent); + EnterCriticalSection(&timeout_queue_cs); + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + LeaveCriticalSection(&timeout_queue_cs); + + CloseHandle(wait_handles[0]); + CloseHandle(wait_handles[1]); return ERROR_SUCCESS; } diff --git a/programs/services/services.c b/programs/services/services.c index d28e47e..75abf06 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -40,7 +40,7 @@ HANDLE g_hStartedEvent; struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; -DWORD service_kill_timeout = 20000; +DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; @@ -914,7 +914,7 @@ int main(int argc, char *argv[]) if ((err = RPC_Init()) == ERROR_SUCCESS) { scmdatabase_autostart_services(active_database); - RPC_MainLoop(); + events_loop(); scmdatabase_wait_terminate(active_database); } scmdatabase_destroy(active_database); diff --git a/programs/services/services.h b/programs/services/services.h index b4b895e..3e36141 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,7 +88,7 @@ extern DWORD service_pipe_timeout; extern DWORD service_kill_timeout; DWORD RPC_Init(void); -DWORD RPC_MainLoop(void); +DWORD events_loop(void); /* from utils.c */ LPWSTR strdupW(LPCWSTR str);

1 0

Piotr Caban : services: Added tests for service thread termination without setting service state to stopped .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: afc4284d0520516ab565fdb70ae6abab23227d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc4284d0520516ab565fdb70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 15:00:47 2012 +0200 services: Added tests for service thread termination without setting service state to stopped. --- programs/services/tests/service.c | 219 +++++++++++++++++++++++++++++++----- 1 files changed, 188 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afc4284d0520516ab565f…

1 0