December 2007 - Wine-Commits

Alexandre Julliard : wine.inf: Mark the spool service as disabled, it' s just a stub.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 0b85eee2363bcca934489e15a000b146bb683cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b85eee2363bcca934489e15a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:40:41 2007 +0100 wine.inf: Mark the spool service as disabled, it's just a stub. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index ed9bc97..c3cb89c 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2646,7 +2646,7 @@ HKLM,"%Services%\Spooler","ErrorControl",0x10001,1 HKLM,"%Services%\Spooler","Group",,"SpoolerGroup" HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" -HKLM,"%Services%\Spooler","Start",0x10001,2 +HKLM,"%Services%\Spooler","Start",0x10001,4 HKLM,"%Services%\Spooler","Type",0x10001,0x110 HKLM,"%Services%\MountMgr","Description",,"Device mounting service." HKLM,"%Services%\MountMgr","DisplayName",,"Mount Manager"

1 0

Alexandre Julliard : wineboot: Convert the rest of the code to Unicode.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 4a58b2847c50a3695e8a9fd4df70fbad7872b9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a58b2847c50a3695e8a9fd4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:16:17 2007 +0100 wineboot: Convert the rest of the code to Unicode. Fix Windows File Protection handling to use the correct system directory. --- programs/wineboot/wineboot.c | 105 +++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 61 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 6e21b17..99ba1b4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -77,6 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); extern BOOL shutdown_close_windows( BOOL force ); extern void kill_processes( BOOL kill_desktop ); +static WCHAR windowsdir[MAX_PATH]; /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. @@ -483,79 +484,81 @@ end: * known good versions. The only programs that should install into this dll * cache are Windows Updates and IE (which is treated like a Windows Update) * - * Implementing this allows installing ie in win2k mode to actaully install the + * Implementing this allows installing ie in win2k mode to actually install the * system dlls that we expect and need */ static int ProcessWindowsFileProtection(void) { - WIN32_FIND_DATA finddata; - LPSTR custom_dllcache = NULL; - static CHAR default_dllcache[] = "C:\\Windows\\System32\\dllcache"; + static const WCHAR winlogonW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','l','o','g','o','n',0}; + static const WCHAR cachedirW[] = {'S','F','C','D','l','l','C','a','c','h','e','D','i','r',0}; + static const WCHAR dllcacheW[] = {'\\','d','l','l','c','a','c','h','e','\\','*',0}; + static const WCHAR wildcardW[] = {'\\','*',0}; + WIN32_FIND_DATAW finddata; HANDLE find_handle; BOOL find_rc; DWORD rc; HKEY hkey; - LPSTR dllcache; - CHAR find_string[MAX_PATH]; - CHAR windowsdir[MAX_PATH]; + LPWSTR dllcache = NULL; - rc = RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", &hkey ); - if (rc == ERROR_SUCCESS) + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, winlogonW, &hkey )) { DWORD sz = 0; - rc = RegQueryValueEx( hkey, "SFCDllCacheDir", 0, NULL, NULL, &sz); - if (rc == ERROR_MORE_DATA) + if (!RegQueryValueExW( hkey, cachedirW, 0, NULL, NULL, &sz)) { - sz++; - custom_dllcache = HeapAlloc(GetProcessHeap(),0,sz); - RegQueryValueEx( hkey, "SFCDllCacheDir", 0, NULL, (LPBYTE)custom_dllcache, &sz); + sz += sizeof(WCHAR); + dllcache = HeapAlloc(GetProcessHeap(),0,sz + sizeof(wildcardW)); + RegQueryValueExW( hkey, cachedirW, 0, NULL, (LPBYTE)dllcache, &sz); + strcatW( dllcache, wildcardW ); } } RegCloseKey(hkey); - if (custom_dllcache) - dllcache = custom_dllcache; - else - dllcache = default_dllcache; - - strcpy(find_string,dllcache); - strcat(find_string,"\\*.*"); - - GetWindowsDirectory(windowsdir,MAX_PATH); + if (!dllcache) + { + DWORD sz = GetSystemDirectoryW( NULL, 0 ); + dllcache = HeapAlloc( GetProcessHeap(), 0, sz * sizeof(WCHAR) + sizeof(dllcacheW)); + GetSystemDirectoryW( dllcache, sz ); + strcatW( dllcache, dllcacheW ); + } - find_handle = FindFirstFile(find_string,&finddata); + find_handle = FindFirstFileW(dllcache,&finddata); find_rc = find_handle != INVALID_HANDLE_VALUE; while (find_rc) { - CHAR targetpath[MAX_PATH]; - CHAR currentpath[MAX_PATH]; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WCHAR targetpath[MAX_PATH]; + WCHAR currentpath[MAX_PATH]; UINT sz; UINT sz2; - CHAR tempfile[MAX_PATH]; + WCHAR tempfile[MAX_PATH]; - if (strcmp(finddata.cFileName,".") == 0 || - strcmp(finddata.cFileName,"..") == 0) + if (strcmpW(finddata.cFileName,dotW) == 0 || strcmpW(finddata.cFileName,dotdotW) == 0) { - find_rc = FindNextFile(find_handle,&finddata); + find_rc = FindNextFileW(find_handle,&finddata); continue; } sz = MAX_PATH; sz2 = MAX_PATH; - VerFindFile(VFFF_ISSHAREDFILE, finddata.cFileName, windowsdir, - windowsdir, currentpath, &sz, targetpath,&sz2); + VerFindFileW(VFFF_ISSHAREDFILE, finddata.cFileName, windowsdir, + windowsdir, currentpath, &sz, targetpath, &sz2); sz = MAX_PATH; - rc = VerInstallFile(0, finddata.cFileName, finddata.cFileName, - dllcache, targetpath, currentpath, tempfile,&sz); + rc = VerInstallFileW(0, finddata.cFileName, finddata.cFileName, + dllcache, targetpath, currentpath, tempfile, &sz); if (rc != ERROR_SUCCESS) { - WINE_ERR("WFP: %s error 0x%x\n",finddata.cFileName,rc); - DeleteFile(tempfile); + WINE_ERR("WFP: %s error 0x%x\n",wine_dbgstr_w(finddata.cFileName),rc); + DeleteFileW(tempfile); } - find_rc = FindNextFile(find_handle,&finddata); + find_rc = FindNextFileW(find_handle,&finddata); } FindClose(find_handle); - HeapFree(GetProcessHeap(),0,custom_dllcache); + HeapFree(GetProcessHeap(),0,dllcache); return 1; } @@ -714,36 +717,16 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { /* First, set the current directory to SystemRoot */ - TCHAR gen_path[MAX_PATH]; - DWORD res; int optc; int end_session = 0, force = 0, kill = 0, restart = 0, shutdown = 0; - res=GetWindowsDirectory( gen_path, sizeof(gen_path) ); - - if( res==0 ) + GetWindowsDirectoryW( windowsdir, MAX_PATH ); + if( !SetCurrentDirectoryW( windowsdir ) ) { - WINE_ERR("Couldn't get the windows directory - error %d\n", - GetLastError() ); - - return 100; - } - - if( res>=sizeof(gen_path) ) - { - WINE_ERR("Windows path too long (%d)\n", res ); - - return 100; - } - - if( !SetCurrentDirectory( gen_path ) ) - { - WINE_ERR("Cannot set the dir to %s (%d)\n", gen_path, GetLastError() ); - + WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); return 100; } - while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { switch(optc)

1 0

Alexandre Julliard : advapi32: Move the EnumDependentServicesA/ W stubs in service.c where they belong.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: eb2d8458a371bbfab81a125814ccafebd82e16d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2d8458a371bbfab81a12581… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:00:42 2007 +0100 advapi32: Move the EnumDependentServicesA/W stubs in service.c where they belong. Make the stubs return success. --- dlls/advapi32/security.c | 28 ---------------------------- dlls/advapi32/service.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 89498c2..3462608 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4307,34 +4307,6 @@ BOOL WINAPI DuplicateToken( DuplicateTokenHandle ); } -BOOL WINAPI EnumDependentServicesA( - SC_HANDLE hService, - DWORD dwServiceState, - LPENUM_SERVICE_STATUSA lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned ) -{ - FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, - lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); - - return FALSE; -} - -BOOL WINAPI EnumDependentServicesW( - SC_HANDLE hService, - DWORD dwServiceState, - LPENUM_SERVICE_STATUSW lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned ) -{ - FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, - lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); - - return FALSE; -} - /****************************************************************************** * ComputeStringSidSize */ diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2fd3eb8..f55077a 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2570,3 +2570,31 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam return handle; } + +/****************************************************************************** + * EnumDependentServicesA [ADVAPI32.@] + */ +BOOL WINAPI EnumDependentServicesA( SC_HANDLE hService, DWORD dwServiceState, + LPENUM_SERVICE_STATUSA lpServices, DWORD cbBufSize, + LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned ) +{ + FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, + lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); + + *lpServicesReturned = 0; + return TRUE; +} + +/****************************************************************************** + * EnumDependentServicesW [ADVAPI32.@] + */ +BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, + LPENUM_SERVICE_STATUSW lpServices, DWORD cbBufSize, + LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned ) +{ + FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, + lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); + + *lpServicesReturned = 0; + return TRUE; +}

1 0

Alexandre Julliard : wineboot: Rewrite wininit. ini processing to use GetPrivateProfileSectionW. Convert to Unicode.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: e34244a3b9c7cb0be4de3c24c99d8de82b5d3815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34244a3b9c7cb0be4de3c24c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:53:53 2007 +0100 wineboot: Rewrite wininit.ini processing to use GetPrivateProfileSectionW. Convert to Unicode. --- programs/wineboot/wineboot.c | 137 +++++++++++------------------------------ 1 files changed, 37 insertions(+), 100 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index e63bbbe..6e21b17 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -61,6 +61,7 @@ # include <getopt.h> #endif #include <windows.h> +#include <wine/unicode.h> #include <wine/debug.h> #define COBJMACROS @@ -76,123 +77,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); extern BOOL shutdown_close_windows( BOOL force ); extern void kill_processes( BOOL kill_desktop ); -static BOOL GetLine( HANDLE hFile, char *buf, size_t buflen ) -{ - unsigned int i=0; - DWORD r; - buf[0]='\0'; - - do - { - DWORD read; - if( !ReadFile( hFile, buf, 1, &read, NULL ) || read!=1 ) - { - return FALSE; - } - - } while( isspace( *buf ) ); - - while( buf[i]!='\n' && i<=buflen && - ReadFile( hFile, buf+i+1, 1, &r, NULL ) ) - { - ++i; - } - - - if( buf[i]!='\n' ) - { - return FALSE; - } - - if( i>0 && buf[i-1]=='\r' ) - --i; - - buf[i]='\0'; - - return TRUE; -} /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ static BOOL wininit(void) { - const char * const RENAME_FILE="wininit.ini"; - const char * const RENAME_FILE_TO="wininit.bak"; - const char * const RENAME_FILE_SECTION="[rename]"; - char buffer[MAX_LINE_LENGTH]; - HANDLE hFile; - + static const WCHAR nulW[] = {'N','U','L',0}; + static const WCHAR renameW[] = {'r','e','n','a','m','e',0}; + static const WCHAR wininitW[] = {'w','i','n','i','n','i','t','.','i','n','i',0}; + static const WCHAR wininitbakW[] = {'w','i','n','i','n','i','t','.','b','a','k',0}; + WCHAR initial_buffer[1024]; + WCHAR *str, *buffer = initial_buffer; + DWORD size = sizeof(initial_buffer)/sizeof(WCHAR); + DWORD res; - hFile=CreateFileA(RENAME_FILE, GENERIC_READ, - FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, - NULL ); - - if( hFile==INVALID_HANDLE_VALUE ) + for (;;) { - DWORD err=GetLastError(); - - if( err==ERROR_FILE_NOT_FOUND ) - { - /* No file - nothing to do. Great! */ - WINE_TRACE("Wininit.ini not present - no renaming to do\n"); - - return TRUE; - } - - WINE_ERR("There was an error in reading wininit.ini file - %d\n", - GetLastError() ); - - return FALSE; + if (!(res = GetPrivateProfileSectionW( renameW, buffer, size, wininitW ))) return TRUE; + if (res < size - 2) break; + if (buffer != initial_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + size *= 2; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return FALSE; } - while( GetLine( hFile, buffer, sizeof(buffer) ) && - lstrcmpiA(buffer,RENAME_FILE_SECTION)!=0 ) - ; /* Read the lines until we match the rename section */ - - while( GetLine( hFile, buffer, sizeof(buffer) ) && buffer[0]!='[' ) + for (str = buffer; *str; str += strlenW(str) + 1) { - /* First, make sure this is not a comment */ - if( buffer[0]!=';' && buffer[0]!='\0' ) - { - char * value; + WCHAR *value; - value=strchr(buffer, '='); + if (*str == ';') continue; /* comment */ + if (!(value = strchrW( str, '=' ))) continue; - if( value==NULL ) - { - WINE_WARN("Line with no \"=\" in it in wininit.ini - %s\n", - buffer); - } else - { - /* split the line into key and value */ - *(value++)='\0'; + /* split the line into key and value */ + *value++ = 0; - if( lstrcmpiA( "NUL", buffer )==0 ) - { - WINE_TRACE("Deleting file \"%s\"\n", value ); - /* A file to delete */ - if( !DeleteFileA( value ) ) - WINE_WARN("Error deleting file \"%s\"\n", value); - } else - { - WINE_TRACE("Renaming file \"%s\" to \"%s\"\n", value, - buffer ); - - if( !MoveFileExA(value, buffer, MOVEFILE_COPY_ALLOWED| - MOVEFILE_REPLACE_EXISTING) ) - { - WINE_WARN("Error renaming \"%s\" to \"%s\"\n", value, - buffer ); - } - } - } - } + if (!lstrcmpiW( nulW, str )) + { + WINE_TRACE("Deleting file %s\n", wine_dbgstr_w(value) ); + if( !DeleteFileW( value ) ) + WINE_WARN("Error deleting file %s\n", wine_dbgstr_w(value) ); + } + else + { + WINE_TRACE("Renaming file %s to %s\n", wine_dbgstr_w(value), wine_dbgstr_w(str) ); + + if( !MoveFileExW(value, str, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING) ) + WINE_WARN("Error renaming %s to %s\n", wine_dbgstr_w(value), wine_dbgstr_w(str) ); + } + str = value; } - CloseHandle( hFile ); + if (buffer != initial_buffer) HeapFree( GetProcessHeap(), 0, buffer ); - if( !MoveFileExA( RENAME_FILE, RENAME_FILE_TO, MOVEFILE_REPLACE_EXISTING) ) + if( !MoveFileExW( wininitW, wininitbakW, MOVEFILE_REPLACE_EXISTING) ) { WINE_ERR("Couldn't rename wininit.ini, error %d\n", GetLastError() );

1 0

Alexandre Julliard : wineboot: Simplify the unnecessarily complex code structure.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 06e888f244a6bb548017f05f03bc4b8418f53e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e888f244a6bb548017f05f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:08:39 2007 +0100 wineboot: Simplify the unnecessarily complex code structure. --- programs/wineboot/wineboot.c | 57 ++++++++++------------------------------- 1 files changed, 14 insertions(+), 43 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 97c8bf5..7da4662 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -146,9 +146,6 @@ static BOOL wininit(void) return FALSE; } - printf("Wine is finalizing your software installation. This may take a few minutes,\n"); - printf("though it never actually does.\n"); - while( GetLine( hFile, buffer, sizeof(buffer) ) && lstrcmpiA(buffer,RENAME_FILE_SECTION)!=0 ) ; /* Read the lines until we match the rename section */ @@ -732,21 +729,8 @@ static const struct option long_options[] = { NULL, 0, 0, 0 } }; -struct op_mask { - BOOL w9xonly; /* Perform only operations done on Windows 9x */ - BOOL ntonly; /* Perform only operations done on Windows NT */ - BOOL startup; /* Perform the operations that are performed every boot */ - BOOL preboot; /* Perform file renames typically done before the system starts */ - BOOL prelogin; /* Perform the operations typically done before the user logs in */ - BOOL postlogin; /* Operations done after login */ -}; - -static const struct op_mask SESSION_START={FALSE, FALSE, TRUE, TRUE, TRUE, TRUE}, - SETUP={FALSE, FALSE, FALSE, TRUE, TRUE, TRUE}; - int main( int argc, char *argv[] ) { - struct op_mask ops = SESSION_START; /* Which of the ops do we want to perform? */ /* First, set the current directory to SystemRoot */ TCHAR gen_path[MAX_PATH]; DWORD res; @@ -801,33 +785,20 @@ int main( int argc, char *argv[] ) if (shutdown) return 0; - if (restart) ops = SETUP; - - /* Perform the ops by order, stopping if one fails, skipping if necessary */ - /* Shachar: Sorry for the perl syntax */ - res=(ops.ntonly || !ops.preboot || wininit())&& - (ops.w9xonly || !ops.preboot || pendingRename()) && - (ops.ntonly || !ops.prelogin || - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], - TRUE, FALSE )) && - (ops.ntonly || !ops.prelogin || - ProcessWindowsFileProtection()) && - (ops.ntonly || !ops.prelogin || !ops.startup || - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], - FALSE, FALSE )) && - (!ops.postlogin || - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], - TRUE, TRUE )) && - (!ops.postlogin || !ops.startup || - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], - FALSE, FALSE )) && - (!ops.postlogin || !ops.startup || - ProcessRunKeys( HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], - FALSE, FALSE )) && - (!ops.postlogin || !ops.startup || - ProcessStartupItems( )); + wininit(); + pendingRename(); - WINE_TRACE("Operation done\n"); + ProcessWindowsFileProtection(); + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE ); + if (!restart) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); + if (!restart) + { + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); + ProcessRunKeys( HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); + ProcessStartupItems(); + } - return res?0:101; + WINE_TRACE("Operation done\n"); + return 0; }

1 0

Alexandre Julliard : wineboot: Add support for starting NT-style services.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 8f6e1db3e0c40bd99035605149d08f54af3f694e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6e1db3e0c40bd9903560514… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:53:03 2007 +0100 wineboot: Add support for starting NT-style services. --- programs/wineboot/wineboot.c | 53 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7da4662..e63bbbe 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -29,7 +29,7 @@ * - PendingRenameOperations (rename operations left in the registry - Win NT+ only) * * Startup (before the user logs in) - * - Services (NT, ?semi-synchronous?, not implemented yet) + * - Services (NT) * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServicesOnce (9x, asynch) * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices (9x, asynch) * @@ -622,6 +622,51 @@ static int ProcessWindowsFileProtection(void) return 1; } +/* start services */ +static void start_services(void) +{ + static const WCHAR servicesW[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'S','e','r','v','i','c','e','s',0}; + static const WCHAR startW[] = {'S','t','a','r','t',0}; + HKEY hkey, skey; + DWORD type, size, start, index = 0; + WCHAR name[MAX_PATH]; + SC_HANDLE manager; + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, servicesW, &hkey )) return; + + if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) + { + RegCloseKey( hkey ); + return; + } + + while (!RegEnumKeyW( hkey, index++, name, sizeof(name) )) + { + if (RegOpenKeyW( hkey, name, &skey )) continue; + size = sizeof(start); + if (!RegQueryValueExW( skey, startW, NULL, &type, (LPBYTE)&start, &size ) && type == REG_DWORD) + { + if (start == SERVICE_BOOT_START || + start == SERVICE_SYSTEM_START || + start == SERVICE_AUTO_START) + { + SC_HANDLE handle = OpenServiceW( manager, name, SERVICE_ALL_ACCESS ); + if (handle) + { + WINE_TRACE( "starting service %s start %u\n", wine_dbgstr_w(name), start ); + StartServiceW( handle, 0, NULL ); + CloseServiceHandle( handle ); + } + } + } + RegCloseKey( skey ); + } + CloseServiceHandle( manager ); + RegCloseKey( hkey ); +} + /* Process items in the StartUp group of the user's Programs under the Start Menu. Some installers put * shell links here to restart themselves after boot. */ static BOOL ProcessStartupItems(void) @@ -790,7 +835,11 @@ int main( int argc, char *argv[] ) ProcessWindowsFileProtection(); ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE ); - if (!restart) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); + if (!restart) + { + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); + start_services(); + } ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); if (!restart) {

1 0

Roy Shea : qmgr: AddRef, QueryInterface, and stub functions for queue manager interface.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 702e6d8d152557f5107f1b55e7ae31cccf8b9441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702e6d8d152557f5107f1b55e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Dec 19 20:02:23 2007 -0800 qmgr: AddRef, QueryInterface, and stub functions for queue manager interface. --- dlls/qmgr/Makefile.in | 3 +- dlls/qmgr/qmgr.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 39 ++++++++++++ 3 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index d01f2b8..3a32cbe 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -4,9 +4,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll IMPORTS = kernel32 -EXTRALIBS = +EXTRALIBS = -luuid C_SRCS = \ + qmgr.c \ qmgr_main.c IDL_I_SRCS = qmgr_local.idl diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c new file mode 100644 index 0000000..b257a16 --- /dev/null +++ b/dlls/qmgr/qmgr.c @@ -0,0 +1,156 @@ +/* + * Queue Manager (BITS) core functions + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +/* Destructor for instances of background copy manager */ +static void BackgroundCopyManagerDestructor(BackgroundCopyManagerImpl *This) +{ + TRACE("%p\n", This); + HeapFree(GetProcessHeap(), 0, This); +} + +/* Add a reference to the iface pointer */ +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( + IBackgroundCopyManager* iface) +{ + BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + ref = InterlockedIncrement(&This->ref); + return ref; +} + +/* Attempt to provide a new interface to interact with iface */ +static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( + IBackgroundCopyManager* iface, + REFIID riid, + LPVOID *ppvObject) +{ + BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; + + TRACE("IID: %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IBackgroundCopyManager)) + { + *ppvObject = &This->lpVtbl; + BITS_IBackgroundCopyManager_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +/* Release an interface to iface */ +static ULONG WINAPI BITS_IBackgroundCopyManager_Release( + IBackgroundCopyManager* iface) +{ + BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + BackgroundCopyManagerDestructor(This); + } + return ref; +} + +/*** IBackgroundCopyManager interface methods ***/ + +static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( + IBackgroundCopyManager* iface, + LPCWSTR DisplayName, + BG_JOB_TYPE Type, + GUID *pJobId, + IBackgroundCopyJob **ppJob) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( + IBackgroundCopyManager* iface, + REFGUID jobID, + IBackgroundCopyJob **ppJob) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( + IBackgroundCopyManager* iface, + DWORD dwFlags, + IEnumBackgroundCopyJobs **ppEnum) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( + IBackgroundCopyManager* iface, + HRESULT hResult, + DWORD LanguageId, + LPWSTR *pErrorDescription) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + + +static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = +{ + BITS_IBackgroundCopyManager_QueryInterface, + BITS_IBackgroundCopyManager_AddRef, + BITS_IBackgroundCopyManager_Release, + BITS_IBackgroundCopyManager_CreateJob, + BITS_IBackgroundCopyManager_GetJob, + BITS_IBackgroundCopyManager_EnumJobs, + BITS_IBackgroundCopyManager_GetErrorDescription +}; + +/* Constructor for instances of background copy manager */ +HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + BackgroundCopyManagerImpl *This; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + { + return E_OUTOFMEMORY; + } + + This->lpVtbl = &BITS_IBackgroundCopyManager_Vtbl; + This->ref = 1; + + *ppObj = &This->lpVtbl; + return S_OK; +} diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h new file mode 100644 index 0000000..0b821cb --- /dev/null +++ b/dlls/qmgr/qmgr.h @@ -0,0 +1,39 @@ +/* + * Queue Manager definitions + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __QMGR_H__ +#define __QMGR_H__ + +#include "windef.h" +#include "objbase.h" + +#define COBJMACROS +#include "bits.h" + +/* Background copy manager vtbl and related data */ +typedef struct +{ + const IBackgroundCopyManagerVtbl *lpVtbl; + LONG ref; +} BackgroundCopyManagerImpl; + +HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); + +#endif /* __QMGR_H__ */

1 0

Alexandre Julliard : server: Use SIGQUIT instead of SIGTERM to terminate a thread.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 3b244b95b29c5c1394b1fdbd1562ae9d2fe736f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b244b95b29c5c1394b1fdbd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 12:19:35 2007 +0100 server: Use SIGQUIT instead of SIGTERM to terminate a thread. This allows keeping the default SIGTERM behavior of killing the whole process. --- dlls/ntdll/signal_i386.c | 10 +++++----- dlls/ntdll/signal_powerpc.c | 8 ++++---- dlls/ntdll/signal_sparc.c | 8 ++++---- dlls/ntdll/signal_x86_64.c | 8 ++++---- server/thread.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index df62a30..993936e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1289,11 +1289,11 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /********************************************************************** - * term_handler + * quit_handler * - * Handler for SIGTERM. + * Handler for SIGQUIT. */ -static void term_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { WORD fs, gs; init_handler( sigcontext, &fs, &gs ); @@ -1392,8 +1392,8 @@ BOOL SIGNAL_Init(void) if (sigaction( SIGFPE, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = abrt_handler; if (sigaction( SIGABRT, &sig_act, NULL ) == -1) goto error; - sig_act.sa_sigaction = term_handler; - if (sigaction( SIGTERM, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = quit_handler; + if (sigaction( SIGQUIT, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = usr1_handler; if (sigaction( SIGUSR1, &sig_act, NULL ) == -1) goto error; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 9f1b52a..a468754 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -581,11 +581,11 @@ static HANDLER_DEF(abrt_handler) /********************************************************************** - * term_handler + * quit_handler * - * Handler for SIGTERM. + * Handler for SIGQUIT. */ -static HANDLER_DEF(term_handler) +static HANDLER_DEF(quit_handler) { server_abort_thread(0); } @@ -657,7 +657,7 @@ BOOL SIGNAL_Init(void) if (set_handler( SIGSEGV, (void (*)())segv_handler ) == -1) goto error; if (set_handler( SIGILL, (void (*)())segv_handler ) == -1) goto error; if (set_handler( SIGABRT, (void (*)())abrt_handler ) == -1) goto error; - if (set_handler( SIGTERM, (void (*)())term_handler ) == -1) goto error; + if (set_handler( SIGQUIT, (void (*)())quit_handler ) == -1) goto error; if (set_handler( SIGUSR1, (void (*)())usr1_handler ) == -1) goto error; #ifdef SIGBUS if (set_handler( SIGBUS, (void (*)())segv_handler ) == -1) goto error; diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 5ea9efc..d72269a 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -389,11 +389,11 @@ static HANDLER_DEF(abrt_handler) /********************************************************************** - * term_handler + * quit_handler * - * Handler for SIGTERM. + * Handler for SIGQUIT. */ -static HANDLER_DEF(term_handler) +static HANDLER_DEF(quit_handler) { server_abort_thread(0); } @@ -468,7 +468,7 @@ BOOL SIGNAL_Init(void) if (set_handler( SIGBUS, (void (*)())bus_handler ) == -1) goto error; if (set_handler( SIGTRAP, (void (*)())trap_handler ) == -1) goto error; if (set_handler( SIGABRT, (void (*)())abrt_handler ) == -1) goto error; - if (set_handler( SIGTERM, (void (*)())term_handler ) == -1) goto error; + if (set_handler( SIGQUIT, (void (*)())quit_handler ) == -1) goto error; if (set_handler( SIGUSR1, (void (*)())usr1_handler ) == -1) goto error; /* 'ta 6' tells the kernel to synthesize any unaligned accesses this process makes, instead of just signalling an error and terminating diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9f77f5e..8225c6a 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -414,11 +414,11 @@ static HANDLER_DEF(abrt_handler) /********************************************************************** - * term_handler + * quit_handler * - * Handler for SIGTERM. + * Handler for SIGQUIT. */ -static HANDLER_DEF(term_handler) +static HANDLER_DEF(quit_handler) { server_abort_thread(0); } @@ -490,7 +490,7 @@ BOOL SIGNAL_Init(void) if (set_handler( SIGSEGV, (void (*)())segv_handler ) == -1) goto error; if (set_handler( SIGILL, (void (*)())segv_handler ) == -1) goto error; if (set_handler( SIGABRT, (void (*)())abrt_handler ) == -1) goto error; - if (set_handler( SIGTERM, (void (*)())term_handler ) == -1) goto error; + if (set_handler( SIGQUIT, (void (*)())quit_handler ) == -1) goto error; if (set_handler( SIGUSR1, (void (*)())usr1_handler ) == -1) goto error; #ifdef SIGBUS if (set_handler( SIGBUS, (void (*)())segv_handler ) == -1) goto error; diff --git a/server/thread.c b/server/thread.c index 5725ec1..a7d51a1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -920,14 +920,14 @@ void kill_thread( struct thread *thread, int violent_death ) { while (thread->wait) end_wait( thread ); send_thread_wakeup( thread, NULL, STATUS_PENDING ); - /* if it is waiting on the socket, we don't need to send a SIGTERM */ + /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0; } kill_console_processes( thread, 0 ); debug_exit_thread( thread ); abandon_mutexes( thread ); wake_up( &thread->obj, 0 ); - if (violent_death) send_thread_signal( thread, SIGTERM ); + if (violent_death) send_thread_signal( thread, SIGQUIT ); cleanup_thread( thread ); remove_process_thread( thread->process, thread ); release_object( thread );

1 0

Alexandre Julliard : kernel32: Forward interrupts in 32-bit code to winedos too.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: e2a366ce338d5b6b0f3c8962d70134f8d4e87f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a366ce338d5b6b0f3c8962d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 12:18:19 2007 +0100 kernel32: Forward interrupts in 32-bit code to winedos too. --- dlls/kernel32/instr.c | 1 - dlls/winedos/interrupts.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index f9b99c8..97a1d14 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -769,7 +769,6 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) break; /* Unable to emulate it */ case 0xcd: /* int <XX> */ - if (wine_ldt_is_system(context->SegCs)) break; /* don't emulate it in 32-bit code */ if (!winedos.EmulateInterruptPM) load_winedos(); if (winedos.EmulateInterruptPM) { diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index 37d7a4b..b482ab0 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -324,6 +324,10 @@ void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum ) DOSVM_IntProcRelay, DOSVM_GetBuiltinHandler(intnum) ); } + else if (wine_ldt_is_system(context->SegCs)) + { + DOSVM_CallBuiltinHandler( context, intnum ); + } else { DOSVM_HardwareInterruptPM( context, intnum );

1 0

Dmitry Timoshkov : riched20: Remove a redundant parameter from trace.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 5a6e0ea46f4b350f477f12cd4f3633ddac74afca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6e0ea46f4b350f477f12cd4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 20 19:03:24 2007 +0800 riched20: Remove a redundant parameter from trace. --- dlls/riched20/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index f46a8cc..ebc9745 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -552,7 +552,7 @@ RTFCharSetToCodePage(RTF_Info *info, int charset) /* FIXME: TranslateCharsetInfo does not work as good as it * should, so let's use it only when all else fails */ if (!TranslateCharsetInfo(&n, &csi, TCI_SRCCHARSET)) - ERR("%s: unknown charset %u\n", __FUNCTION__, charset); + ERR("unknown charset %d\n", charset); else return csi.ciACP; }

1 0