Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[sginsberg] 38074: - Get rid off STATIC, DECL_IMPORT and DECL_EXPORT - Fix FIELD_OFFSET

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Dec 14 04:02:46 2008 New Revision: 38074 URL: http://svn.reactos.org/svn/reactos?rev=38074&view=rev Log: - Get rid off STATIC, DECL_IMPORT and DECL_EXPORT - Fix FIELD_OFFSET Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=38… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -58,14 +58,6 @@ // #ifndef CONST #define CONST const -#endif - - -// -// FIXME: Non standard, should be deprecated -// -#ifndef STATIC -#define STATIC static #endif // @@ -164,7 +156,7 @@ // #ifndef FIELD_OFFSET #define FIELD_OFFSET(Type, Field) \ - ((LONG_PTR) (&(((Type *) 0)->Field))) + ((LONG)(LONG_PTR) (&(((Type *) 0)->Field))) #endif // @@ -193,14 +185,8 @@ // // Import and Export Specifiers // -#ifndef DECL_IMPORT -#define DECL_IMPORT DECLSPEC_IMPORT //FIXME: DECL_IMPORT -> DECLSPEC_IMPORT -#endif -#ifndef DECL_EXPORT -#define DECL_EXPORT DECLSPEC_EXPORT //FIXME: DECL_EXPORT -> DECLSPEC_EXPORT -#endif - -// Done the same way as in windef.h (for now *cough*) + +// Done the same way as in windef.h for now #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) #define DECLSPEC_NORETURN __declspec(noreturn) Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -34,8 +34,8 @@ extern "C" { #endif -#ifndef DECL_IMPORT -#define DECL_IMPORT __attribute__((dllimport)) +#ifndef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT __attribute__((dllimport)) #endif #ifndef WIN32KAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -3122,10 +3122,10 @@ } HAL_DISPATCH, *PHAL_DISPATCH; #if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTHAL_) -extern DECL_IMPORT PHAL_DISPATCH HalDispatchTable; +extern DECLSPEC_IMPORT PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) #else -extern DECL_EXPORT HAL_DISPATCH HalDispatchTable; +extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #endif

15 years, 9 months

[sserapion] 38073: same here.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Dec 14 00:18:50 2008 New Revision: 38073 URL: http://svn.reactos.org/svn/reactos?rev=38073&view=rev Log: same here. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sun Dec 14 00:18:50 2008 @@ -626,7 +626,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;

15 years, 9 months

[sserapion] 38072: revert CryptReleaseContext "fix", WINE headers made a fool out of me... need sleep. fix FARPROC, NEARPROC, PROC definitions, for real this time

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Dec 14 00:17:16 2008 New Revision: 38072 URL: http://svn.reactos.org/svn/reactos?rev=38072&view=rev Log: revert CryptReleaseContext "fix", WINE headers made a fool out of me... need sleep. fix FARPROC, NEARPROC, PROC definitions, for real this time Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h branches/ros-amd64-bringup/reactos/include/psdk/windef.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 14 00:17:16 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Sun Dec 14 00:17:16 2008 @@ -358,9 +358,15 @@ typedef int HFILE; typedef HICON HCURSOR; typedef DWORD COLORREF; -typedef INT_PTR (WINAPI *FARPROC)(); -typedef INT_PTR (WINAPI *NEARPROC)(); +#ifdef _WIN64 +typedef INT_PTR (FAR WINAPI *FARPROC)(); +typedef INT_PTR (NEAR WINAPI *NEARPROC)(); typedef INT_PTR (WINAPI *PROC)(); +#else +typedef int (FAR WINAPI *FARPROC)(); +typedef int (NEAR WINAPI *NEARPROC)(); +typedef int (WINAPI *PROC)(); +#endif typedef struct tagRECT { LONG left; LONG top;

15 years, 9 months

[sserapion] 38071: Fix CryptReleaseContext.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sat Dec 13 23:37:45 2008 New Revision: 38071 URL: http://svn.reactos.org/svn/reactos?rev=38071&view=rev Log: Fix CryptReleaseContext. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Dec 13 23:37:45 2008 @@ -626,7 +626,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;

15 years, 9 months

[sserapion] 38070: Fix CryptReleaseContext definition.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sat Dec 13 22:36:07 2008 New Revision: 38070 URL: http://svn.reactos.org/svn/reactos?rev=38070&view=rev Log: Fix CryptReleaseContext definition. Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Sat Dec 13 22:36:07 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

15 years, 9 months

[hyperion] 38069: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Correctly chain exceptions raised during unwinding by "finally" blocks Sanitize direction flag before any C code is executed, just to be totally safe Clean up code

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Dec 13 20:55:50 2008 New Revision: 38069 URL: http://svn.reactos.org/svn/reactos?rev=38069&view=rev Log: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Correctly chain exceptions raised during unwinding by "finally" blocks Sanitize direction flag before any C code is executed, just to be totally safe Clean up code Modified: trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sat Dec 13 20:55:50 2008 @@ -29,25 +29,28 @@ #include <excpt.h> +#ifndef EXCEPTION_EXIT_UNWIND +#define EXCEPTION_EXIT_UNWIND 4 +#endif + +#ifndef EXCEPTION_UNWINDING +#define EXCEPTION_UNWINDING 2 +#endif + extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); +extern void _SEH2GlobalUnwind(void *); extern int __SEH2Except(void *, void *, void *); extern void __SEH2Finally(void *, void *); +extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); -extern -#if defined(__GNUC__) -__attribute__((noreturn)) -#elif defined(_MSC_VER) -__declspec(noreturn) -#endif -int __SEH2Handle(void *, void *, void *); +extern void __cdecl __SEH2EnterFrame(_SEH2Registration_t *); +extern void __cdecl __SEH2LeaveFrame(void); -static -#if defined(__GNUC__) -__attribute__((always_inline)) -#elif defined(_MSC_VER) -__forceinline -#endif +extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); +extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +FORCEINLINE int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); @@ -56,18 +59,36 @@ static #if defined(__GNUC__) __attribute__((noinline)) -#elif defined(_MSC_VER) -__declspec(noinline) #endif void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); } +extern +int __cdecl _SEH2NestedHandler +( + struct _EXCEPTION_RECORD * ExceptionRecord, + void * EstablisherFrame, + struct _CONTEXT * ContextRecord, + void * DispatcherContext +) +{ + if(ExceptionRecord->ExceptionFlags & (EXCEPTION_EXIT_UNWIND | EXCEPTION_UNWINDING)) + return ExceptionContinueSearch; + + *((void **)DispatcherContext) = EstablisherFrame; + return ExceptionCollidedUnwind; +} + static void _SEH2LocalUnwind(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * dsttrylevel) { volatile _SEH2TryLevel_t * trylevel; + _SEH2Registration_t nestedframe; + + nestedframe.SER_Handler = &__SEH2NestedHandler; + __SEH2EnterFrame(&nestedframe); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) { @@ -76,16 +97,11 @@ } frame->SF_TopTryLevel = dsttrylevel; + + __SEH2LeaveFrame(); } -extern void _SEH2GlobalUnwind(void *); - -static -#if defined(__GNUC__) -__attribute__((noreturn)) -#elif defined(_MSC_VER) -__declspec(noreturn) -#endif +static DECLSPEC_NORETURN void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { _SEH2GlobalUnwind(frame); @@ -93,7 +109,7 @@ __SEH2Handle(trylevel->ST_Body, frame->SF_FramePointer, frame->SF_StackPointer); } -static +extern int __cdecl _SEH2FrameHandler ( struct _EXCEPTION_RECORD * ExceptionRecord, @@ -104,16 +120,10 @@ { _SEH2Frame_t * frame; -#if defined(__GNUC__) - __asm__ __volatile__("cld"); -#elif defined(_MSC_VER) - __asm cld -#endif - frame = EstablisherFrame; /* Unwinding */ - if(ExceptionRecord->ExceptionFlags & (4 | 2)) + if(ExceptionRecord->ExceptionFlags & (EXCEPTION_EXIT_UNWIND | EXCEPTION_UNWINDING)) { _SEH2LocalUnwind(frame, NULL); } @@ -148,18 +158,12 @@ } extern -void __cdecl __SEH2EnterFrame(_SEH2Frame_t *); - -extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) { - frame->SF_Registration.SER_Handler = _SEH2FrameHandler; + frame->SF_Registration.SER_Handler = __SEH2FrameHandler; frame->SF_Code = 0; - __SEH2EnterFrame(frame); + __SEH2EnterFrame(&frame->SF_Registration); } - -extern -void __cdecl __SEH2LeaveFrame(void); extern void __cdecl _SEH2LeaveFrame(void) Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Sat Dec 13 20:55:50 2008 @@ -92,4 +92,20 @@ ret +.globl ___SEH2FrameHandler +___SEH2FrameHandler: + +.extern __SEH2FrameHandler + + cld + jmp __SEH2FrameHandler + +.globl ___SEH2NestedHandler +___SEH2NestedHandler: + +.extern __SEH2NestedHandler + + cld + jmp __SEH2NestedHandler + // EOF

15 years, 9 months

[tkreuzer] 38068: fix utime usage

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 19:43:24 2008 New Revision: 38068 URL: http://svn.reactos.org/svn/reactos?rev=38068&view=rev Log: fix utime usage Modified: trunk/reactos/include/crt/sys/utime.h Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Sat Dec 13 19:43:24 2008 @@ -91,8 +91,11 @@ #endif #endif + _CRTIMP int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf); _CRTIMP int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Time); + _CRTIMP int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf); _CRTIMP int __cdecl _futime32(int _FileDes,struct __utimbuf32 *_Time); + _CRTIMP int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf); _CRTIMP int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Time); #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP int __cdecl _utime64(const char *_Filename,struct __utimbuf64 *_Time); @@ -100,9 +103,10 @@ _CRTIMP int __cdecl _wutime64(const wchar_t *_Filename,struct __utimbuf64 *_Time); #endif +#if 0 #ifndef RC_INVOKED #ifdef _USE_32BIT_TIME_T -__CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { +__CRT_INLINE int __cdecl _utime32(const char *_Filename,struct _utimbuf *_Utimbuf) { return _utime32(_Filename,(struct __utimbuf32 *)_Utimbuf); } __CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { @@ -122,18 +126,13 @@ return _wutime64(_Filename,(struct __utimbuf64 *)_Utimbuf); } #endif +#endif +#endif #ifndef NO_OLDNAMES -#ifdef _USE_32BIT_TIME_T __CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { - return _utime32(_Filename,(struct __utimbuf32 *)_Utimbuf); + return _utime(_Filename,(struct _utimbuf *)_Utimbuf); } -#else -__CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { - return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} -#endif -#endif #endif #ifdef __cplusplus

15 years, 9 months

[tkreuzer] 38067: revert last commit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 19:28:01 2008 New Revision: 38067 URL: http://svn.reactos.org/svn/reactos?rev=38067&view=rev Log: revert last commit Modified: trunk/reactos/include/crt/dos.h Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3806… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Sat Dec 13 19:28:01 2008 @@ -39,8 +39,8 @@ #endif #if (defined(_X86_) && !defined(__x86_64)) - void __cdecl _disable(void); - void __cdecl _enable(void); +// void __cdecl _disable(void); +// void __cdecl _enable(void); #endif #ifndef NO_OLDNAMES

15 years, 9 months

[tkreuzer] 38066: revert 38059 to see if it has effected the output of winetests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 19:13:49 2008 New Revision: 38066 URL: http://svn.reactos.org/svn/reactos?rev=38066&view=rev Log: revert 38059 to see if it has effected the output of winetests Modified: trunk/reactos/include/crt/dos.h Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3806… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Sat Dec 13 19:13:49 2008 @@ -39,8 +39,8 @@ #endif #if (defined(_X86_) && !defined(__x86_64)) -// void __cdecl _disable(void); -// void __cdecl _enable(void); + void __cdecl _disable(void); + void __cdecl _enable(void); #endif #ifndef NO_OLDNAMES

15 years, 9 months

[ekohl] 38065: - Make the service manager wait for LSA. - Winlogon must not wait for the service mananger, otherwise we will get another deadlock.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 13 19:01:16 2008 New Revision: 38065 URL: http://svn.reactos.org/svn/reactos?rev=38065&view=rev Log: - Make the service manager wait for LSA. - Winlogon must not wait for the service mananger, otherwise we will get another deadlock. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Dec 13 19:01:16 2008 @@ -446,6 +446,46 @@ } +VOID +WaitForLSA(VOID) +{ + HANDLE hEvent; + DWORD dwError; + + DPRINT1("WaitForLSA() called\n"); + + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) + { + dwError = GetLastError(); + DPRINT1("Failed to create the notication event (Error %lu)\n", dwError); + + if (dwError == ERROR_ALREADY_EXISTS) + { + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent != NULL) + { + DPRINT1("Could not open the notification event!\n"); + return; + } + } + } + + DPRINT1("Wait for LSA!\n"); + WaitForSingleObject(hEvent, INFINITE); + DPRINT1("LSA is available!\n"); + + CloseHandle(hEvent); + + DPRINT1("WaitForLSA() done\n"); +} + + DWORD ScmCreateServiceDatabase(VOID) { @@ -515,6 +555,9 @@ } RegCloseKey(hServicesKey); + + /* Wait for LSA */ + WaitForLSA(); /* Delete services that are marked for delete */ ScmDeleteMarkedServices(); Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Dec 13 19:01:16 2008 @@ -26,14 +26,13 @@ static BOOL StartServicesManager(VOID) { - HANDLE ServicesInitEvent = NULL; STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; - DWORD Count; LPCWSTR ServiceString = L"services.exe"; BOOL res; /* Start the service control manager (services.exe) */ + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL; StartupInfo.lpDesktop = NULL; @@ -61,29 +60,11 @@ return FALSE; } - /* Wait for event creation (by SCM) for max. 20 seconds */ - for (Count = 0; Count < 20; Count++) - { - Sleep(1000); - - TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3752DX\"\n"); - ServicesInitEvent = OpenEventW( - SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3752DX"); - if (ServicesInitEvent) - break; - } - - if (!ServicesInitEvent) - { - ERR("WL: Failed to open event \"SvcctrlStartEvent_A3752DX\"\n"); - return FALSE; - } - - /* Wait for event signalization */ - WaitForSingleObject(ServicesInitEvent, INFINITE); - CloseHandle(ServicesInitEvent); + TRACE("WL: Created new process - %S\n", ServiceString); + + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + TRACE("WL: StartServicesManager() done.\n"); return TRUE; @@ -99,6 +80,7 @@ BOOL res; /* Start the service control manager (services.exe) */ + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL; StartupInfo.lpDesktop = NULL; @@ -120,6 +102,11 @@ NULL, &StartupInfo, &ProcessInformation); + + TRACE("WL: Created new process - %S\n", ServiceString); + + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); return res; }

15 years, 9 months

← Newer
1
...
40
41
42
43
44
45
46
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008