Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[sginsberg] 35984: - [FORMATTING] Clean up tls.c. No code change.
by sginsberg＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: sginsberg Date: Sat Sep 6 09:12:47 2008 New Revision: 35984 URL: http://svn.reactos.org/svn/reactos?rev=35984&view=rev Log: - [FORMATTING] Clean up tls.c. No code change. Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] Sat Sep 6 09:12:47 2008 @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <k32.h> - #define NDEBUG #include <debug.h> @@ -22,169 +21,176 @@ /* * @implemented */ -DWORD STDCALL +DWORD +WINAPI TlsAlloc(VOID) { - ULONG Index; + ULONG Index; - RtlAcquirePebLock(); + RtlAcquirePebLock(); - /* Try to get regular TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); - if (Index == ~0) - { - /* If it fails, try to find expansion TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); - if (Index != ~0) - { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( - GetProcessHeap(), HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * sizeof(PVOID)); - } + /* Try to get regular TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); + if (Index == ~0) + { + /* If it fails, try to find expansion TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); + if (Index != ~0) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); + } - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); - Index = ~0; - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - else - { - /* Clear the value. */ - NtCurrentTeb()->TlsExpansionSlots[Index] = 0; - Index += TLS_MINIMUM_AVAILABLE; - } - } - else - { - SetLastError(ERROR_NO_MORE_ITEMS); - } - } - else - { - /* Clear the value. */ - NtCurrentTeb()->TlsSlots[Index] = 0; - } + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); + Index = ~0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + /* Clear the value. */ + NtCurrentTeb()->TlsExpansionSlots[Index] = 0; + Index += TLS_MINIMUM_AVAILABLE; + } + } + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + } + } + else + { + /* Clear the value. */ + NtCurrentTeb()->TlsSlots[Index] = 0; + } - RtlReleasePebLock(); + RtlReleasePebLock(); - return Index; + return Index; } - /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI TlsFree(DWORD Index) { - BOOL BitSet; + BOOL BitSet; - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return FALSE; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } - RtlAcquirePebLock(); + RtlAcquirePebLock(); - if (Index >= TLS_MINIMUM_AVAILABLE) - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, 1); - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, 1); - } - else - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); - } + if (Index >= TLS_MINIMUM_AVAILABLE) + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, + 1); - if (BitSet) - { - /* Clear the TLS cells (slots) in all threads of the current process. */ - NtSetInformationThread(NtCurrentThread(), ThreadZeroTlsCell, - &Index, sizeof(DWORD)); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, + 1); + } + else + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); + } - RtlReleasePebLock(); + if (BitSet) + { + /* Clear the TLS cells (slots) in all threads of the current process. */ + NtSetInformationThread(NtCurrentThread(), + ThreadZeroTlsCell, + &Index, + sizeof(DWORD)); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } - return BitSet; + RtlReleasePebLock(); + + return BitSet; } - /* * @implemented */ -LPVOID STDCALL +LPVOID +WINAPI TlsGetValue(DWORD Index) { - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } - SetLastError(NO_ERROR); + SetLastError(NO_ERROR); - if (Index >= TLS_MINIMUM_AVAILABLE) - { - /* The expansion slots are allocated on demand, so check for it. */ - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - return NULL; - return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; - } - else - { - return NtCurrentTeb()->TlsSlots[Index]; - } + if (Index >= TLS_MINIMUM_AVAILABLE) + { + /* The expansion slots are allocated on demand, so check for it. */ + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + return NULL; + return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; + } + else + { + return NtCurrentTeb()->TlsSlots[Index]; + } } - /* * @implemented */ -BOOL STDCALL -TlsSetValue(DWORD Index, LPVOID Value) +BOOL +WINAPI +TlsSetValue(DWORD Index, + LPVOID Value) { - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return FALSE; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } - if (Index >= TLS_MINIMUM_AVAILABLE) - { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( - GetProcessHeap(), HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * sizeof(PVOID)); + if (Index >= TLS_MINIMUM_AVAILABLE) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } - NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; - } - else - { - NtCurrentTeb()->TlsSlots[Index] = Value; - } + NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; + } + else + { + NtCurrentTeb()->TlsSlots[Index] = Value; + } - return TRUE; + return TRUE; } - -/* EOF */

1 0

[sginsberg] 35983: - [FORMATTING] Clean up output.c. No code change.
by sginsberg＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: sginsberg Date: Sat Sep 6 08:57:34 2008 New Revision: 35983 URL: http://svn.reactos.org/svn/reactos?rev=35983&view=rev Log: - [FORMATTING] Clean up output.c. No code change. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Sat Sep 6 08:57:34 2008 @@ -14,64 +14,54 @@ /* FUNCTIONS *****************************************************************/ /* Open or create the mutex used to communicate with the debug monitor */ -HANDLE K32CreateDBMonMutex(void) +HANDLE +K32CreateDBMonMutex(void) { - static SID_IDENTIFIER_AUTHORITY siaNTAuth = {SECURITY_NT_AUTHORITY}; - static SID_IDENTIFIER_AUTHORITY siaWorldAuth = {SECURITY_WORLD_SID_AUTHORITY}; - - HANDLE hMutex; - - /* SIDs to be used in the DACL */ - PSID psidSystem = NULL; - PSID psidAdministrators = NULL; - PSID psidEveryone = NULL; - - /* buffer for the DACL */ - PVOID pDaclBuf = NULL; - - /* - minimum size of the DACL: an ACL descriptor and three ACCESS_ALLOWED_ACE - headers. We'll add the size of SIDs when we'll know it - */ - SIZE_T nDaclBufSize = - sizeof(ACL) + - ( - sizeof(ACCESS_ALLOWED_ACE) - - sizeof(((ACCESS_ALLOWED_ACE*)0)->SidStart) - ) * 3; - - /* security descriptor of the mutex */ - SECURITY_DESCRIPTOR sdMutexSecurity; - - /* attributes of the mutex object we'll create */ - SECURITY_ATTRIBUTES saMutexAttribs = - { - sizeof(saMutexAttribs), - &sdMutexSecurity, - TRUE - }; - - NTSTATUS nErrCode; - - /* first, try to open the mutex */ - hMutex = OpenMutexW - ( - SYNCHRONIZE | READ_CONTROL | MUTANT_QUERY_STATE, - TRUE, - L"DBWinMutex" - ); - - if(hMutex != NULL) - { - /* success */ - return hMutex; - } - /* error other than the mutex not being found */ - else if(GetLastError() != ERROR_FILE_NOT_FOUND) - { - /* failure */ - return NULL; - } + static SID_IDENTIFIER_AUTHORITY siaNTAuth = {SECURITY_NT_AUTHORITY}; + static SID_IDENTIFIER_AUTHORITY siaWorldAuth = {SECURITY_WORLD_SID_AUTHORITY}; + HANDLE hMutex; + + /* SIDs to be used in the DACL */ + PSID psidSystem = NULL; + PSID psidAdministrators = NULL; + PSID psidEveryone = NULL; + + /* buffer for the DACL */ + PVOID pDaclBuf = NULL; + + /* minimum size of the DACL: an ACL descriptor and three ACCESS_ALLOWED_ACE + headers. We'll add the size of SIDs when we'll know it + */ + SIZE_T nDaclBufSize = + sizeof(ACL) + (sizeof(ACCESS_ALLOWED_ACE) - + sizeof(((ACCESS_ALLOWED_ACE*)0)->SidStart)) * 3; + + /* security descriptor of the mutex */ + SECURITY_DESCRIPTOR sdMutexSecurity; + + /* attributes of the mutex object we'll create */ + SECURITY_ATTRIBUTES saMutexAttribs = {sizeof(saMutexAttribs), + &sdMutexSecurity, + TRUE}; + + NTSTATUS nErrCode; + + /* first, try to open the mutex */ + hMutex = OpenMutexW (SYNCHRONIZE | READ_CONTROL | MUTANT_QUERY_STATE, + TRUE, + L"DBWinMutex"); + + if(hMutex != NULL) + { + /* success */ + return hMutex; + } + /* error other than the mutex not being found */ + else if(GetLastError() != ERROR_FILE_NOT_FOUND) + { + /* failure */ + return NULL; + } /* if the mutex doesn't exist, create it */ #if 0 /* please uncomment when GCC supports SEH */ @@ -80,141 +70,120 @@ #else #define __leave goto l_Cleanup #endif - /* first, set up the mutex security */ - /* allocate the NT AUTHORITY\SYSTEM SID */ - nErrCode = RtlAllocateAndInitializeSid - ( - &siaNTAuth, - 1, - SECURITY_LOCAL_SYSTEM_RID, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - &psidSystem - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* allocate the BUILTIN\Administrators SID */ - nErrCode = RtlAllocateAndInitializeSid - ( - &siaNTAuth, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, - 0, - 0, - 0, - 0, - 0, - &psidAdministrators - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* allocate the Everyone SID */ - nErrCode = RtlAllocateAndInitializeSid - ( - &siaWorldAuth, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - &psidEveryone - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* allocate space for the SIDs too */ - nDaclBufSize += RtlLengthSid(psidSystem); - nDaclBufSize += RtlLengthSid(psidAdministrators); - nDaclBufSize += RtlLengthSid(psidEveryone); - - /* allocate the buffer for the DACL */ - pDaclBuf = GlobalAlloc(GMEM_FIXED, nDaclBufSize); - - /* failure */ - if(pDaclBuf == NULL) __leave; - - /* create the DACL */ - nErrCode = RtlCreateAcl(pDaclBuf, nDaclBufSize, ACL_REVISION); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* grant the minimum required access to Everyone */ - nErrCode = RtlAddAccessAllowedAce - ( - pDaclBuf, - ACL_REVISION, - SYNCHRONIZE | READ_CONTROL | MUTANT_QUERY_STATE, - psidEveryone - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* grant full access to BUILTIN\Administrators */ - nErrCode = RtlAddAccessAllowedAce - ( - pDaclBuf, - ACL_REVISION, - MUTANT_ALL_ACCESS, - psidAdministrators - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* grant full access to NT AUTHORITY\SYSTEM */ - nErrCode = RtlAddAccessAllowedAce - ( - pDaclBuf, - ACL_REVISION, - MUTANT_ALL_ACCESS, - psidSystem - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* create the security descriptor */ - nErrCode = RtlCreateSecurityDescriptor - ( - &sdMutexSecurity, - SECURITY_DESCRIPTOR_REVISION - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* set the descriptor's DACL to the ACL we created */ - nErrCode = RtlSetDaclSecurityDescriptor - ( - &sdMutexSecurity, - TRUE, - pDaclBuf, - FALSE - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) __leave; - - /* create the mutex */ - hMutex = CreateMutexW(&saMutexAttribs, FALSE, L"DBWinMutex"); + + /* first, set up the mutex security */ + /* allocate the NT AUTHORITY\SYSTEM SID */ + nErrCode = RtlAllocateAndInitializeSid(&siaNTAuth, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &psidSystem); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* allocate the BUILTIN\Administrators SID */ + nErrCode = RtlAllocateAndInitializeSid(&siaNTAuth, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &psidAdministrators); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* allocate the Everyone SID */ + nErrCode = RtlAllocateAndInitializeSid(&siaWorldAuth, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &psidEveryone); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* allocate space for the SIDs too */ + nDaclBufSize += RtlLengthSid(psidSystem); + nDaclBufSize += RtlLengthSid(psidAdministrators); + nDaclBufSize += RtlLengthSid(psidEveryone); + + /* allocate the buffer for the DACL */ + pDaclBuf = GlobalAlloc(GMEM_FIXED, nDaclBufSize); + + /* failure */ + if(pDaclBuf == NULL) __leave; + + /* create the DACL */ + nErrCode = RtlCreateAcl(pDaclBuf, nDaclBufSize, ACL_REVISION); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* grant the minimum required access to Everyone */ + nErrCode = RtlAddAccessAllowedAce(pDaclBuf, + ACL_REVISION, + SYNCHRONIZE | + READ_CONTROL | + MUTANT_QUERY_STATE, + psidEveryone); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* grant full access to BUILTIN\Administrators */ + nErrCode = RtlAddAccessAllowedAce(pDaclBuf, + ACL_REVISION, + MUTANT_ALL_ACCESS, + psidAdministrators); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* grant full access to NT AUTHORITY\SYSTEM */ + nErrCode = RtlAddAccessAllowedAce(pDaclBuf, + ACL_REVISION, + MUTANT_ALL_ACCESS, + psidSystem); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* create the security descriptor */ + nErrCode = RtlCreateSecurityDescriptor(&sdMutexSecurity, + SECURITY_DESCRIPTOR_REVISION); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* set the descriptor's DACL to the ACL we created */ + nErrCode = RtlSetDaclSecurityDescriptor(&sdMutexSecurity, + TRUE, + pDaclBuf, + FALSE); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) __leave; + + /* create the mutex */ + hMutex = CreateMutexW(&saMutexAttribs, FALSE, L"DBWinMutex"); #if 0 } __finally @@ -222,23 +191,26 @@ #else l_Cleanup: #endif - /* free the buffers */ - if(pDaclBuf) GlobalFree(pDaclBuf); - if(psidEveryone) RtlFreeSid(psidEveryone); - if(psidAdministrators) RtlFreeSid(psidAdministrators); - if(psidSystem) RtlFreeSid(psidSystem); + + /* free the buffers */ + if(pDaclBuf) GlobalFree(pDaclBuf); + if(psidEveryone) RtlFreeSid(psidEveryone); + if(psidAdministrators) RtlFreeSid(psidAdministrators); + if(psidSystem) RtlFreeSid(psidSystem); #if 0 } #endif - return hMutex; + return hMutex; } /* * @implemented */ -VOID WINAPI OutputDebugStringA(LPCSTR _OutputString) +VOID +WINAPI +OutputDebugStringA(LPCSTR _OutputString) { #if 0 /* FIXME: this will be pointless until GCC does SEH */ @@ -255,99 +227,91 @@ __except(EXCEPTION_EXECUTE_HANDLER) { #endif - /* - no user-mode debugger: try the systemwide debug message monitor, or the - kernel debugger as a last resort - */ - - /* mutex used to synchronize invocations of OutputDebugString */ - static HANDLE s_hDBMonMutex = NULL; - /* true if we already attempted to open/create the mutex */ - static BOOL s_bDBMonMutexTriedOpen = FALSE; - - /* local copy of the mutex handle */ - HANDLE hDBMonMutex = s_hDBMonMutex; - /* handle to the Section of the shared buffer */ - HANDLE hDBMonBuffer = NULL; - /* - pointer to the mapped view of the shared buffer. It consist of the current - process id followed by the message string - */ - struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; - /* - event: signaled by the debug message monitor when OutputDebugString can write - to the shared buffer - */ - HANDLE hDBMonBufferReady = NULL; - /* - event: to be signaled by OutputDebugString when it's done writing to the - shared buffer - */ - HANDLE hDBMonDataReady = NULL; - - /* mutex not opened, and no previous attempts to open/create it */ - if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) - { - /* open/create the mutex */ - hDBMonMutex = K32CreateDBMonMutex(); - /* store the handle */ - s_hDBMonMutex = hDBMonMutex; - } + + /* no user-mode debugger: try the systemwide debug message monitor, or the + kernel debugger as a last resort */ + + /* mutex used to synchronize invocations of OutputDebugString */ + static HANDLE s_hDBMonMutex = NULL; + /* true if we already attempted to open/create the mutex */ + static BOOL s_bDBMonMutexTriedOpen = FALSE; + + /* local copy of the mutex handle */ + HANDLE hDBMonMutex = s_hDBMonMutex; + /* handle to the Section of the shared buffer */ + HANDLE hDBMonBuffer = NULL; + + /* pointer to the mapped view of the shared buffer. It consist of the current + process id followed by the message string */ + struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; + + /* event: signaled by the debug message monitor when OutputDebugString can write + to the shared buffer */ + HANDLE hDBMonBufferReady = NULL; + + /* event: to be signaled by OutputDebugString when it's done writing to the + shared buffer */ + HANDLE hDBMonDataReady = NULL; + + /* mutex not opened, and no previous attempts to open/create it */ + if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) + { + /* open/create the mutex */ + hDBMonMutex = K32CreateDBMonMutex(); + /* store the handle */ + s_hDBMonMutex = hDBMonMutex; + } #if 0 __try { #endif - /* opening the mutex failed */ - if(hDBMonMutex == NULL) - { - /* remember next time */ - s_bDBMonMutexTriedOpen = TRUE; - } - /* opening the mutex succeeded */ - else - { + + /* opening the mutex failed */ + if(hDBMonMutex == NULL) + { + /* remember next time */ + s_bDBMonMutexTriedOpen = TRUE; + } + /* opening the mutex succeeded */ + else + { do { - /* synchronize with other invocations of OutputDebugString */ - WaitForSingleObject(hDBMonMutex, INFINITE); - - /* buffer of the system-wide debug message monitor */ - hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); - - /* couldn't open the buffer: send the string to the kernel debugger */ - if(hDBMonBuffer == NULL) break; - - /* map the buffer */ - pDBMonBuffer = MapViewOfFile - ( - hDBMonBuffer, - SECTION_MAP_READ | SECTION_MAP_WRITE, - 0, - 0, - 0 - ); - - /* couldn't map the buffer: send the string to the kernel debugger */ - if(pDBMonBuffer == NULL) break; - - /* open the event signaling that the buffer can be accessed */ - hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); - - /* couldn't open the event: send the string to the kernel debugger */ - if(hDBMonBufferReady == NULL) break; - - /* open the event to be signaled when the buffer has been filled */ - hDBMonDataReady = - OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); + /* synchronize with other invocations of OutputDebugString */ + WaitForSingleObject(hDBMonMutex, INFINITE); + + /* buffer of the system-wide debug message monitor */ + hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); + + /* couldn't open the buffer: send the string to the kernel debugger */ + if(hDBMonBuffer == NULL) break; + + /* map the buffer */ + pDBMonBuffer = MapViewOfFile(hDBMonBuffer, + SECTION_MAP_READ | SECTION_MAP_WRITE, + 0, + 0, + 0); + + /* couldn't map the buffer: send the string to the kernel debugger */ + if(pDBMonBuffer == NULL) break; + + /* open the event signaling that the buffer can be accessed */ + hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); + + /* couldn't open the event: send the string to the kernel debugger */ + if(hDBMonBufferReady == NULL) break; + + /* open the event to be signaled when the buffer has been filled */ + hDBMonDataReady = + OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); } while(0); - /* - we couldn't connect to the system-wide debug message monitor: send the - string to the kernel debugger - */ - if(hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); + /* we couldn't connect to the system-wide debug message monitor: send the + string to the kernel debugger */ + if(hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); } #if 0 @@ -356,76 +320,75 @@ do #endif { - /* size of the current output block */ - SIZE_T nRoundLen; - /* size of the remainder of the string */ - SIZE_T nOutputStringLen; - - for - ( - /* output the whole string */ - nOutputStringLen = strlen(_OutputString); - /* repeat until the string has been fully output */ - nOutputStringLen > 0; - /* move to the next block */ - _OutputString += nRoundLen, nOutputStringLen -= nRoundLen - ) - { - /* - we're connected to the debug monitor: write the current block to the - shared buffer - */ - if(hDBMonDataReady) - { - /* - wait a maximum of 10 seconds for the debug monitor to finish processing - the shared buffer - */ - if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) - { - /* timeout or failure: give up */ - break; - } - - /* write the process id into the buffer */ - pDBMonBuffer->ProcessId = GetCurrentProcessId(); - - /* write only as many bytes as they fit in the buffer */ - if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) - nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; - else - nRoundLen = nOutputStringLen; - - /* copy the current block into the buffer */ - memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - pDBMonBuffer->Buffer[nRoundLen] = 0; - - /* signal that the data contains meaningful data and can be read */ - SetEvent(hDBMonDataReady); - } - /* else, send the current block to the kernel debugger */ - else - { - /* output in blocks of 512 characters */ - CHAR a_cBuffer[512]; - - /* write a maximum of 511 bytes */ - if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) - nRoundLen = sizeof(a_cBuffer) - 1; - else - nRoundLen = nOutputStringLen; - - /* copy the current block */ - memcpy(a_cBuffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - a_cBuffer[nRoundLen] = 0; - - /* send the current block to the kernel debugger */ - DbgPrint("%s", a_cBuffer); - } + /* size of the current output block */ + SIZE_T nRoundLen; + + /* size of the remainder of the string */ + SIZE_T nOutputStringLen; + + for + ( + /* output the whole string */ + nOutputStringLen = strlen(_OutputString); + + /* repeat until the string has been fully output */ + nOutputStringLen > 0; + + /* move to the next block */ + _OutputString += nRoundLen, nOutputStringLen -= nRoundLen + ) + { + /* we're connected to the debug monitor: write the current block to the + shared buffer */ + if(hDBMonDataReady) + { + /* wait a maximum of 10 seconds for the debug monitor to finish processing + the shared buffer */ + if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) + { + /* timeout or failure: give up */ + break; + } + + /* write the process id into the buffer */ + pDBMonBuffer->ProcessId = GetCurrentProcessId(); + + /* write only as many bytes as they fit in the buffer */ + if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) + nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block into the buffer */ + memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + pDBMonBuffer->Buffer[nRoundLen] = 0; + + /* signal that the data contains meaningful data and can be read */ + SetEvent(hDBMonDataReady); + } + /* else, send the current block to the kernel debugger */ + else + { + /* output in blocks of 512 characters */ + CHAR a_cBuffer[512]; + + /* write a maximum of 511 bytes */ + if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) + nRoundLen = sizeof(a_cBuffer) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block */ + memcpy(a_cBuffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + a_cBuffer[nRoundLen] = 0; + + /* send the current block to the kernel debugger */ + DbgPrint("%s", a_cBuffer); + } } } #if 0 @@ -449,15 +412,17 @@ __finally { #endif - /* close all the still open resources */ - if(hDBMonBufferReady) CloseHandle(hDBMonBufferReady); - if(pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); - if(hDBMonBuffer) CloseHandle(hDBMonBuffer); - if(hDBMonDataReady) CloseHandle(hDBMonDataReady); - - /* leave the critical section */ - if(hDBMonDataReady != NULL) - ReleaseMutex(hDBMonMutex); + + /* close all the still open resources */ + if(hDBMonBufferReady) CloseHandle(hDBMonBufferReady); + if(pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); + if(hDBMonBuffer) CloseHandle(hDBMonBuffer); + if(hDBMonDataReady) CloseHandle(hDBMonDataReady); + + /* leave the critical section */ + if(hDBMonDataReady != NULL) + ReleaseMutex(hDBMonMutex); + #if 0 } } @@ -468,32 +433,29 @@ /* * @implemented */ -VOID WINAPI OutputDebugStringW(LPCWSTR _OutputString) +VOID +WINAPI +OutputDebugStringW(LPCWSTR _OutputString) { - UNICODE_STRING wstrOut; - ANSI_STRING strOut; - NTSTATUS nErrCode; - - /* convert the string in ANSI */ - RtlInitUnicodeString(&wstrOut, _OutputString); - nErrCode = RtlUnicodeStringToAnsiString(&strOut, &wstrOut, TRUE); - - if(!NT_SUCCESS(nErrCode)) - { - /* - Microsoft's kernel32.dll always prints something, even in case the conversion - fails - */ - OutputDebugStringA(""); - } - else - { - /* output the converted string */ - OutputDebugStringA(strOut.Buffer); - - /* free the converted string */ - RtlFreeAnsiString(&strOut); - } + UNICODE_STRING wstrOut; + ANSI_STRING strOut; + NTSTATUS nErrCode; + + /* convert the string in ANSI */ + RtlInitUnicodeString(&wstrOut, _OutputString); + nErrCode = RtlUnicodeStringToAnsiString(&strOut, &wstrOut, TRUE); + + if(!NT_SUCCESS(nErrCode)) + { + /* Microsoft's kernel32.dll always prints something, even in case the conversion fails */ + OutputDebugStringA(""); + } + else + { + /* output the converted string */ + OutputDebugStringA(strOut.Buffer); + + /* free the converted string */ + RtlFreeAnsiString(&strOut); + } } - -/* EOF */

1 0

[janderwald] 35982: - Fix INetCfgComponent::SetDisplayName definition - Add Netcfgx error constants
by janderwald＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: janderwald Date: Sat Sep 6 08:15:26 2008 New Revision: 35982 URL: http://svn.reactos.org/svn/reactos?rev=35982&view=rev Log: - Fix INetCfgComponent::SetDisplayName definition - Add Netcfgx error constants Modified: trunk/reactos/include/psdk/netcfgx.h Modified: trunk/reactos/include/psdk/netcfgx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcfgx.h?rev… ============================================================================== --- trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] Sat Sep 6 08:15:26 2008 @@ -41,7 +41,7 @@ STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(HRESULT,GetDisplayName)(THIS_ LPWSTR *ppszwDisplayName) PURE; - STDMETHOD_(HRESULT,SetDisplayName)(THIS_ LPWSTR *ppszwDisplayName) PURE; + STDMETHOD_(HRESULT,SetDisplayName)(THIS_ LPCWSTR ppszwDisplayName) PURE; STDMETHOD_(HRESULT,GetHelpText)(THIS_ LPWSTR *pszwHelpText) PURE; STDMETHOD_(HRESULT,GetId)(THIS_ LPWSTR *ppszwId) PURE; STDMETHOD_(HRESULT,GetCharacteristics)(THIS_ LPDWORD pdwCharacteristics) PURE; @@ -74,6 +74,8 @@ #define INetCfgComponent_RaisePropertyUi(p,a,b,c) (p)->lpVtbl->RaisePropertyUi(p,a,b,c) #endif +EXTERN_C const IID IID_INetCfgComponent; + #undef INTERFACE #define INTERFACE IEnumNetCfgComponent DECLARE_INTERFACE_(IEnumNetCfgComponent, IUnknown) @@ -99,6 +101,7 @@ #define IEnumNetCfgComponent_Clone(p,a) (p)->lpVtbl->Clone(p,a) #endif +EXTERN_C const IID IID_IEnumNetCfgComponent; #undef INTERFACE #define INTERFACE INetCfg @@ -112,7 +115,7 @@ STDMETHOD_(HRESULT,Apply) (THIS) PURE; STDMETHOD_(HRESULT,Cancel) (THIS) PURE; STDMETHOD_(HRESULT,EnumComponents) (THIS_ const GUID *pguidClass, IEnumNetCfgComponent **ppenumComponent) PURE; - STDMETHOD_(HRESULT,FindComponent) (THIS_ LPCWSTR pszwInfId, IEnumNetCfgComponent **ppenumComponent) PURE; + STDMETHOD_(HRESULT,FindComponent) (THIS_ LPCWSTR pszwInfId, INetCfgComponent **ppenumComponent) PURE; STDMETHOD_(HRESULT,QueryNetCfgClass) (THIS_ const GUID *pguidClass, REFIID riid, void **ppvObject) PURE; }; #undef INTERFACE @@ -134,4 +137,20 @@ EXTERN_C const GUID CLSID_CNetCfg; EXTERN_C const IID IID_INetCfg; +#define NETCFG_E_ALREADY_INITIALIZED 0x8004A020 +#define NETCFG_E_NOT_INITIALIZED 0x8004A021 +#define NETCFG_E_IN_USE 0x8004A022 +#define NETCFG_E_NO_WRITE_LOCK 0x8004A024 +#define NETCFG_E_NEED_REBOOT 0x8004A025 +#define NETCFG_E_ACTIVE_RAS_CONNECTIONS 0x8004A026 +#define NETCFG_E_ADAPTER_NOT_FOUND 0x8004A027 +#define NETCFG_E_COMPONENT_REMOVED_PENDING_REBOOT 0x8004A028 +#define NETCFG_E_MAX_FILTER_LIMIT 0x8004A029 +#define NETCFG_S_REBOOT 0x8004A020 +#define NETCFG_S_DISABLE_QUERY 0x8004A022 +#define NETCFG_S_STILL_REFERENCED 0x8004A023 +#define NETCFG_S_CAUSED_SETUP_CHANGE 0x8004A024 +#define NETCFG_S_COMMIT_NOW 0x8004A025 + + #endif

1 0

[hpoussin] 35981: Open registry entry with only the required rights Free memory with the right tag See issue #3713 for more details.
by hpoussin＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: hpoussin Date: Sat Sep 6 06:45:36 2008 New Revision: 35981 URL: http://svn.reactos.org/svn/reactos?rev=35981&view=rev Log: Open registry entry with only the required rights Free memory with the right tag See issue #3713 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Sep 6 06:45:36 2008 @@ -3410,14 +3410,14 @@ InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&DevInstRegKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes); + Status = ZwOpenKey(&DevInstRegKey, KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to open registry key %wZ (Status 0x%08lx)\n", &RegistryKey, Status); - ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); + ExFreePoolWithTag(RegistryKey.Buffer, TAG_RTLREGISTRY); return DISP_CHANGE_FAILED; } - ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); + ExFreePoolWithTag(RegistryKey.Buffer, TAG_RTLREGISTRY); /* Update needed fields */ if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL)

1 0

[cwittich] 35980: set WINETEST_PLATFORM to wine for sysreg
by cwittich＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: cwittich Date: Sat Sep 6 06:06:01 2008 New Revision: 35980 URL: http://svn.reactos.org/svn/reactos?rev=35980&view=rev Log: set WINETEST_PLATFORM to wine for sysreg Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Sep 6 06:06:01 2008 @@ -2221,7 +2221,8 @@ /* winetests */ - hFind = FindFirstFileA("c:\\reactos\\bin\\*.exe", &ffd); /* %windir% isn't working on ros */ + fprintf(file, "%s\n", "SET WINETEST_PLATFORM=wine"); + hFind = FindFirstFileA("c:\\reactos\\bin\\*.exe", &ffd); /* %windir% isn't working on ros */ if (hFind != INVALID_HANDLE_VALUE) { do

1 0

[cfinck] 35979: - Add the ParserFunctions extension to our Wiki (MW1.12-r34033) - Make it easier to test the Wiki locally by adding a "wiki-connect.php" containing settings for local testing. You now just need to comment out a line and uncomment another one to switch between ReactOS Server configuration and local configuration.
by cfinck＠svn.reactos.org 06 Sep '08

06 Sep '08

1 0

[dreimer] 35978: Fix build of 64 bit. No idea why we need to set the Vars to the 32 bit compiler....
by dreimer＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: dreimer Date: Sat Sep 6 05:59:27 2008 New Revision: 35978 URL: http://svn.reactos.org/svn/reactos?rev=35978&view=rev Log: Fix build of 64 bit. No idea why we need to set the Vars to the 32 bit compiler.... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat Sep 6 05:59:27 2008 @@ -50,8 +50,10 @@ set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= if not .%ROS_ARCH%. == .. ( - for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i + for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i + for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +REM for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +REM for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i ) else ( for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i

1 0

[ekohl] 35977: Fix 64 bit portability issues.
by ekohl＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: ekohl Date: Sat Sep 6 05:44:08 2008 New Revision: 35977 URL: http://svn.reactos.org/svn/reactos?rev=35977&view=rev Log: Fix 64 bit portability issues. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Sep 6 05:44:08 2008 @@ -1963,7 +1963,7 @@ if (dwError == ERROR_SUCCESS) { DPRINT("hService %p\n", hServiceHandle); - *lpServiceHandle = (unsigned long)hServiceHandle; /* FIXME: 64 bit portability */ + *lpServiceHandle = (SC_RPC_HANDLE)hServiceHandle; if (lpdwTagId != NULL) *lpdwTagId = lpService->dwTag; @@ -2356,7 +2356,7 @@ return dwError; } - *lpScHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ + *lpScHandle = (SC_RPC_HANDLE)hHandle; DPRINT("*hScm = %p\n", *lpScHandle); DPRINT("ROpenSCManagerW() done\n"); @@ -2432,7 +2432,7 @@ lpService->dwRefCount++; DPRINT1("OpenService - lpService->dwRefCount %u\n",lpService->dwRefCount); - *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ + *lpServiceHandle = (SC_RPC_HANDLE)hHandle; DPRINT("*hService = %p\n", *lpServiceHandle); DPRINT("ROpenServiceW() done\n");

1 0

[cwittich] 35976: fix a version info winetest by allowing non dll files to be loaded with LOAD_LIBRARY_AS_DATAFILE
by cwittich＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: cwittich Date: Sat Sep 6 05:27:40 2008 New Revision: 35976 URL: http://svn.reactos.org/svn/reactos?rev=35976&view=rev Log: fix a version info winetest by allowing non dll files to be loaded with LOAD_LIBRARY_AS_DATAFILE Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Sep 6 05:27:40 2008 @@ -650,38 +650,43 @@ 0, FullNtFileName.Buffer); - Status = NtReadFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - BlockBuffer, - sizeof(BlockBuffer), - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("Dll header read failed: Status = 0x%08lx\n", Status); - NtClose(FileHandle); - return Status; - } - /* - * Overlay DOS and NT headers structures to the - * buffer with DLL's header raw data. - */ - DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer; - NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew); - /* - * Check it is a PE image file. - */ - if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) - || (DosHeader->e_lfanew == 0L) - || (*(PULONG)(NTHeaders) != IMAGE_NT_SIGNATURE)) - { - DPRINT("NTDLL format invalid\n"); - NtClose(FileHandle); - - return STATUS_UNSUCCESSFUL; + if (!MapAsDataFile) + { + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + BlockBuffer, + sizeof(BlockBuffer), + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("Dll header read failed: Status = 0x%08lx\n", Status); + NtClose(FileHandle); + return Status; + } + + /* + * Overlay DOS and NT headers structures to the + * buffer with DLL's header raw data. + */ + DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer; + NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew); + /* + * Check it is a PE image file. + */ + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) + || (DosHeader->e_lfanew == 0L) + || (*(PULONG)(NTHeaders) != IMAGE_NT_SIGNATURE)) + { + DPRINT("NTDLL format invalid\n"); + NtClose(FileHandle); + + return STATUS_UNSUCCESSFUL; + } } /* @@ -2058,15 +2063,18 @@ { *BaseAddress = ImageBase; } - /* Get and check the NT headers */ - NtHeaders = RtlImageNtHeader(ImageBase); - if (NtHeaders == NULL) + if (!MappedAsDataFile) { - DPRINT1("RtlImageNtHeaders() failed\n"); - NtUnmapViewOfSection (NtCurrentProcess (), ImageBase); - NtClose (SectionHandle); - RtlFreeUnicodeString(&FullDosName); - return STATUS_UNSUCCESSFUL; + /* Get and check the NT headers */ + NtHeaders = RtlImageNtHeader(ImageBase); + if (NtHeaders == NULL) + { + DPRINT1("RtlImageNtHeaders() failed\n"); + NtUnmapViewOfSection (NtCurrentProcess (), ImageBase); + NtClose (SectionHandle); + RtlFreeUnicodeString(&FullDosName); + return STATUS_UNSUCCESSFUL; + } } DPRINT("Mapped %wZ at %x\n", &FullDosName, ImageBase); if (MappedAsDataFile)

1 0

[dreimer] 35975: unneeded ifs are a pain and make the "code" harder to read. So byebye
by dreimer＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: dreimer Date: Sat Sep 6 03:11:47 2008 New Revision: 35975 URL: http://svn.reactos.org/svn/reactos?rev=35975&view=rev Log: unneeded ifs are a pain and make the "code" harder to read. So byebye Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Sat Sep 6 03:11:47 2008 @@ -120,29 +120,27 @@ ) goto :ROS ) -if .%ROS_ARCH%. == .. ( + +:: +:: Check if we have something to clean, if so, clean it. +:: +if exist "obj-i386\." ( + echo Cleaning ReactOS source directory... :: - :: Check if we have something to clean, if so, clean it. + : Remove directories created by the build. :: if exist "obj-i386\." ( - echo Cleaning ReactOS source directory... - :: - : Remove directories created by the build. - :: - if exist "obj-i386\." ( - rd /s /q "obj-i386" 1> NUL 2> NUL - ) - if exist "output-i386\." ( - rd /s /q "output-i386" 1> NUL 2> NUL - ) - if exist "makefile.auto" ( - del "makefile.auto" 1> NUL 2> NUL - ) - echo Done cleaning ReactOS source directory. - ) else ( - echo ERROR: There is no compiler output to clean. + rd /s /q "obj-i386" 1> NUL 2> NUL ) - goto :ROS + if exist "output-i386\." ( + rd /s /q "output-i386" 1> NUL 2> NUL + ) + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. +) else ( + echo ERROR: There is no compiler output to clean. ) :ROS Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Sat Sep 6 03:11:47 2008 @@ -15,7 +15,7 @@ :: :: Parse the command line arguments. -:: ROS_ARCH: Set to x86, x64, ppc or arm. +:: ROS_ARCH: Default is i386, can be set to amd64, ppc or arm. :: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32, :: arm arm-pc-mingw32, x64 x86_64-pc-mingw32. :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat Sep 6 03:11:47 2008 @@ -26,6 +26,10 @@ :: :: Set the Arch Variables :: + +set ROS_ARCH= +set ROS_PREFIX= + if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 @@ -37,10 +41,6 @@ if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64 set ROS_PREFIX=x86_64-pc-mingw32 -) -if .%_ROSBE_ARCH%. == .. ( - set ROS_ARCH= - set ROS_PREFIX= ) ::

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008