Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13645: silence debug message
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

silence debug message Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-02-19 16:36:51 UTC (rev 13644) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-02-19 18:12:44 UTC (rev 13645) @@ -1173,7 +1173,7 @@ if(!(W32Thread = Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); - DPRINT1("Thread is not a GUI Thread!\n"); + DPRINT("Thread is not a GUI Thread!\n"); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; }

1 0

[blight] 13644: One could have the impression that I am bored ; -)
by blight＠svn.reactos.com 19 Feb '05

19 Feb '05

One could have the impression that I am bored ;-) Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-02-19 14:30:32 UTC (rev 13643) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-02-19 16:36:51 UTC (rev 13644) @@ -168,7 +168,9 @@ "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", "Hasta la vista, BABY!\n", - "They live, we sleep!\n" + "They live, we sleep!\n", + "I have come here to chew bubble gum and kick ass.\n" + "And I'm all out of bubble gum!\n" }; LARGE_INTEGER Now;

1 0

[weiden] 13639: 1. made the PEB structure match xp's layout
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

1. made the PEB structure match xp's layout 2. fixed GetVersionEx() Modified: trunk/reactos/include/napi/teb.h Modified: trunk/reactos/lib/kernel32/misc/env.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/include/napi/teb.h --- trunk/reactos/include/napi/teb.h 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/include/napi/teb.h 2005-02-19 03:38:43 UTC (rev 13639) @@ -105,8 +105,8 @@ UCHAR InheritedAddressSpace; /* 00h */ UCHAR ReadImageFileExecOptions; /* 01h */ UCHAR BeingDebugged; /* 02h */ - UCHAR Spare; /* 03h */ - PVOID Mutant; /* 04h */ + BOOLEAN SpareBool; /* 03h */ + HANDLE Mutant; /* 04h */ PVOID ImageBaseAddress; /* 08h */ PPEB_LDR_DATA Ldr; /* 0Ch */ PRTL_USER_PROCESS_PARAMETERS ProcessParameters; /* 10h */ @@ -131,7 +131,6 @@ PVOID UnicodeCaseTableData; /* 60h */ ULONG NumberOfProcessors; /* 64h */ ULONG NtGlobalFlag; /* 68h */ - UCHAR Spare2[0x4]; /* 6Ch */ LARGE_INTEGER CriticalSectionTimeout; /* 70h */ ULONG HeapSegmentReserve; /* 78h */ ULONG HeapSegmentCommit; /* 7Ch */ @@ -139,7 +138,7 @@ ULONG HeapDeCommitFreeBlockThreshold; /* 84h */ ULONG NumberOfHeaps; /* 88h */ ULONG MaximumNumberOfHeaps; /* 8Ch */ - PVOID** ProcessHeaps; /* 90h */ + PVOID* ProcessHeaps; /* 90h */ PVOID GdiSharedHandleTable; /* 94h */ PVOID ProcessStarterHelper; /* 98h */ PVOID GdiDCAttributeList; /* 9Ch */ @@ -147,13 +146,19 @@ ULONG OSMajorVersion; /* A4h */ ULONG OSMinorVersion; /* A8h */ USHORT OSBuildNumber; /* ACh */ - UCHAR SPMajorVersion; /* AEh */ - UCHAR SPMinorVersion; /* AFh */ + USHORT OSCSDVersion; /* AEh */ ULONG OSPlatformId; /* B0h */ ULONG ImageSubSystem; /* B4h */ ULONG ImageSubSystemMajorVersion; /* B8h */ - ULONG ImageSubSystemMinorVersion; /* C0h */ + ULONG ImageSubSystemMinorVersion; /* BCh */ + ULONG ImageProcessAffinityMask; /* C0h */ ULONG GdiHandleBuffer[0x22]; /* C4h */ + PVOID PostProcessInitRoutine; /* 14Ch */ + PVOID *TlsExpansionBitmap; /* 150h */ + ULONG TlsExpansionBitmapBits[0x20]; /* 154h */ + ULONG SessionId; /* 1D4h */ + PVOID AppCompatInfo; /* 1D8h */ + UNICODE_STRING CSDVersion; /* 1DCh */ } PEB; #ifndef __USE_W32API _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-02-19 03:38:43 UTC (rev 13639) @@ -226,21 +226,21 @@ STDCALL GetVersion(VOID) { - PPEB pPeb = NtCurrentPeb(); - DWORD nVersion; + PPEB pPeb = NtCurrentPeb(); + DWORD nVersion; - nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion); + nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion); - /* behave consistently when posing as another operating system */ - /* build number */ - if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS) - nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16; + /* behave consistently when posing as another operating system */ + /* build number */ + if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS) + nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16; - /* non-NT platform flag */ - if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_NT) - nVersion |= 0x80000000; + /* non-NT platform flag */ + if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_NT) + nVersion |= 0x80000000; - return nVersion; + return nVersion; } @@ -253,67 +253,44 @@ LPOSVERSIONINFOW lpVersionInformation ) { - PPEB pPeb = NtCurrentPeb(); - WCHAR *RosVersion; - - /* TODO: move this into RtlGetVersion */ - switch(lpVersionInformation->dwOSVersionInfoSize) - { - case sizeof(OSVERSIONINFOEXW): + NTSTATUS Status; + + if(lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && + lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) { - LPOSVERSIONINFOEXW lpVersionInformationEx = - (LPOSVERSIONINFOEXW)lpVersionInformation; - - lpVersionInformationEx->wServicePackMajor = pPeb->SPMajorVersion; - lpVersionInformationEx->wServicePackMinor = pPeb->SPMinorVersion; - /* TODO: read from the KUSER_SHARED_DATA */ - lpVersionInformationEx->wSuiteMask = 0; - /* TODO: call RtlGetNtProductType */ - lpVersionInformationEx->wProductType = 0; - /* ??? */ - lpVersionInformationEx->wReserved = 0; - /* fall through */ + /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large + enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER + would've been much more appropriate... */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } - case sizeof(OSVERSIONINFOW): + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation); + if(NT_SUCCESS(Status)) { - lpVersionInformation->dwMajorVersion = pPeb->OSMajorVersion; - lpVersionInformation->dwMinorVersion = pPeb->OSMinorVersion; - lpVersionInformation->dwBuildNumber = pPeb->OSBuildNumber; - lpVersionInformation->dwPlatformId = pPeb->OSPlatformId; + int ln, maxlen; + + /* append a reactos specific string to the szCSDVersion string */ - /* First the Windows compatible string */ - _snwprintf(lpVersionInformation->szCSDVersion, - sizeof(lpVersionInformation->szCSDVersion) / sizeof(WCHAR), - L"Service Pack %u", pPeb->SPMajorVersion); - /* Add the Reactos-specific string */ - RosVersion = lpVersionInformation->szCSDVersion + wcslen(lpVersionInformation->szCSDVersion) + 1; - wcsncpy - ( - RosVersion, - L"ReactOS " KERNEL_VERSION_STR L" (Build " KERNEL_VERSION_BUILD_STR L")", - sizeof(lpVersionInformation->szCSDVersion) / sizeof(WCHAR) - - ((RosVersion - lpVersionInformation->szCSDVersion) + 1) - ); + /* FIXME - we shouldn't do this when there is a (ros-specific) compatibility + flag set so we don't screw applications that might depend on a + certain string */ - /* null-terminate, just in case */ - lpVersionInformation->szCSDVersion - [ - sizeof(lpVersionInformation->szCSDVersion) / sizeof(WCHAR) - 1 - ] = 0; - - break; + ln = wcslen(lpVersionInformation->szCSDVersion); + maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1); + if(maxlen > ln) + { + PWCHAR szVer = lpVersionInformation->szCSDVersion + ln; + RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR)); + wcsncpy(szVer, + L" ReactOS " KERNEL_VERSION_STR L" (Build " KERNEL_VERSION_BUILD_STR L")", + maxlen - ln); + } + + return TRUE; } - default: - { - /* unknown version information revision */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - } - - return TRUE; + return FALSE; } @@ -326,111 +303,61 @@ LPOSVERSIONINFOA lpVersionInformation ) { - NTSTATUS nErrCode; - OSVERSIONINFOEXW oviVerInfo; - LPOSVERSIONINFOEXA lpVersionInformationEx; + OSVERSIONINFOEXW viw; + + RtlZeroMemory(&viw, sizeof(viw)); + + switch(lpVersionInformation->dwOSVersionInfoSize) + { + case sizeof(OSVERSIONINFOA): + viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + break; - /* UNICODE_STRING descriptor of the Unicode version string */ - UNICODE_STRING wstrVerStr = - { - /* - gives extra work to RtlUnicodeStringToAnsiString, but spares us an - RtlInitUnicodeString round - */ - 0, - sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion), - oviVerInfo.szCSDVersion - }; + case sizeof(OSVERSIONINFOEXA): + viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + break; - /* ANSI_STRING descriptor of the ANSI version string buffer */ - ANSI_STRING strVerStr = - { - 0, - sizeof(((LPOSVERSIONINFOA)NULL)->szCSDVersion), - lpVersionInformation->szCSDVersion - }; - - switch(lpVersionInformation->dwOSVersionInfoSize) - { - case sizeof(OSVERSIONINFOEXA): - { - oviVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - break; + default: + /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large + enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER + would've been much more appropriate... */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } - - case sizeof(OSVERSIONINFOA): + + if(GetVersionExW((LPOSVERSIONINFOW)&viw)) { - oviVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - break; + ANSI_STRING CSDVersionA; + UNICODE_STRING CSDVersionW; + + /* copy back fields that match both supported structures */ + lpVersionInformation->dwMajorVersion = viw.dwMajorVersion; + lpVersionInformation->dwMinorVersion = viw.dwMinorVersion; + lpVersionInformation->dwBuildNumber = viw.dwBuildNumber; + lpVersionInformation->dwPlatformId = viw.dwPlatformId; + + RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion); + + CSDVersionA.Length = 0; + CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion); + CSDVersionA.Buffer = lpVersionInformation->szCSDVersion; + + RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); + + /* copy back the extended fields */ + if(viw.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + { + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMajor = viw.wServicePackMajor; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMinor = viw.wServicePackMinor; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wSuiteMask = viw.wSuiteMask; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wProductType = viw.wProductType; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wReserved = viw.wReserved; + } + + return TRUE; } - - default: - { - /* unknown version information revision */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - } - - if(!GetVersionExW((LPOSVERSIONINFOW)&oviVerInfo)) + return FALSE; - - /* null-terminate, just in case */ - oviVerInfo.szCSDVersion - [ - sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion) / - sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion[0]) - - 1 - ] = 0; - wstrVerStr.Length = wcslen(wstrVerStr.Buffer) * sizeof(WCHAR); - - /* convert the win version string */ - nErrCode = RtlUnicodeStringToAnsiString(&strVerStr, &wstrVerStr, FALSE); - - if(!NT_SUCCESS(nErrCode)) - { - /* failure */ - SetLastErrorByStatus(nErrCode); - return FALSE; - } - - wstrVerStr.Buffer = oviVerInfo.szCSDVersion + wstrVerStr.Length / sizeof(WCHAR) + 1; - wstrVerStr.MaximumLength = sizeof(oviVerInfo.szCSDVersion) - (wstrVerStr.Length + sizeof(WCHAR)); - wstrVerStr.Length = wcslen(wstrVerStr.Buffer) * sizeof(WCHAR); - strVerStr.Buffer = lpVersionInformation->szCSDVersion + strVerStr.Length + 1; - strVerStr.MaximumLength = sizeof(lpVersionInformation->szCSDVersion) - (strVerStr.Length + 1); - strVerStr.Length = 0; - - /* convert the ReactOS version string */ - nErrCode = RtlUnicodeStringToAnsiString(&strVerStr, &wstrVerStr, FALSE); - - if(!NT_SUCCESS(nErrCode)) - { - /* failure */ - SetLastErrorByStatus(nErrCode); - return FALSE; - } - - /* copy the fields */ - lpVersionInformation->dwMajorVersion = oviVerInfo.dwMajorVersion; - lpVersionInformation->dwMinorVersion = oviVerInfo.dwMinorVersion; - lpVersionInformation->dwBuildNumber = oviVerInfo.dwBuildNumber; - lpVersionInformation->dwPlatformId = oviVerInfo.dwPlatformId; - - if(lpVersionInformation->dwOSVersionInfoSize < sizeof(OSVERSIONINFOEXA)) - /* success */ - return TRUE; - - /* copy the extended fields */ - lpVersionInformationEx = (LPOSVERSIONINFOEXA)lpVersionInformation; - lpVersionInformationEx->wServicePackMajor = oviVerInfo.wServicePackMajor; - lpVersionInformationEx->wServicePackMinor = oviVerInfo.wServicePackMinor; - lpVersionInformationEx->wSuiteMask = oviVerInfo.wSuiteMask; - lpVersionInformationEx->wProductType = oviVerInfo.wProductType; - lpVersionInformationEx->wReserved = oviVerInfo.wReserved; - - /* success */ - return TRUE; } _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-02-19 03:38:43 UTC (rev 13639) @@ -207,10 +207,9 @@ Peb->OSPlatformId = (ULONG)PlatformId; /* optional service pack version numbers */ - if(ReadCompatibilitySetting(SubKeyHandle, L"SPMajorVersion", ValueInfo, &SPMajorVersion)) - Peb->SPMajorVersion = (UCHAR)SPMajorVersion; - if(ReadCompatibilitySetting(SubKeyHandle, L"SPMinorVersion", ValueInfo, &SPMinorVersion)) - Peb->SPMinorVersion = (UCHAR)SPMinorVersion; + if(ReadCompatibilitySetting(SubKeyHandle, L"SPMajorVersion", ValueInfo, &SPMajorVersion) && + ReadCompatibilitySetting(SubKeyHandle, L"SPMinorVersion", ValueInfo, &SPMinorVersion)) + Peb->OSCSDVersion = ((SPMajorVersion & 0xFF) << 8) | (SPMinorVersion & 0xFF); finish: /* we're finished */ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-02-19 03:38:43 UTC (rev 13639) @@ -569,7 +569,7 @@ Peb->OSMinorVersion = 0; Peb->OSBuildNumber = 1381; Peb->OSPlatformId = 2; //VER_PLATFORM_WIN32_NT; - Peb->SPMajorVersion = 6; + Peb->OSCSDVersion = 6 << 8; Peb->AnsiCodePageData = (char*)TableBase + NlsAnsiTableOffset; Peb->OemCodePageData = (char*)TableBase + NlsOemTableOffset;

3 2

[weiden] 13643: revert my changes to RtlTryEnterCriticalSection()
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

revert my changes to RtlTryEnterCriticalSection() Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 13:44:56 UTC (rev 13642) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 14:30:32 UTC (rev 13643) @@ -360,29 +360,29 @@ * None * *--*/ -BOOLEAN +BOOLEAN STDCALL RtlTryEnterCriticalSection( PRTL_CRITICAL_SECTION CriticalSection) -{ +{ /* Try to take control */ - if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { + if (InterlockedCompareExchange(&CriticalSection->LockCount, + 0, + -1) == -1) { - /* It's ours. Changing this information does not have to be serialized - because we just obtained the lock. */ + /* It's ours */ CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; - + } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { - - /* It's already ours, just increment the recursion counter. This doesn't - have to be serialized because only the thread who already holds the - lock can do this. */ + + /* It's already ours */ + InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } - + /* It's not ours */ return FALSE; }

1 0

[weiden] 13642: don't increment the lock count twice in RtlTryEnterCriticalSection() and added some more comments
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

don't increment the lock count twice in RtlTryEnterCriticalSection() and added some more comments Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 13:13:17 UTC (rev 13641) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 13:44:56 UTC (rev 13642) @@ -305,27 +305,33 @@ RtlLeaveCriticalSection( PRTL_CRITICAL_SECTION CriticalSection) { +#ifndef NDEBUG HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + /* In win this case isn't checked. However it's a valid check so it should only + be performed in debug builds! */ if (Thread != CriticalSection->OwningThread) { DPRINT1("Releasing critical section not owned!\n"); - /* FIXME: raise exception */ return STATUS_INVALID_PARAMETER; } +#endif - /* Decrease the Recursion Count */ + /* Decrease the Recursion Count. No need to do this atomically because only + the thread who holds the lock can call this function (unless the program + is totally screwed... */ if (--CriticalSection->RecursionCount) { - /* Someone still owns us, but we are free */ + /* Someone still owns us, but we are free. This needs to be done atomically. */ InterlockedDecrement(&CriticalSection->LockCount); } else { - /* Nobody owns us anymore */ + /* Nobody owns us anymore. No need to do this atomically. See comment + above. */ CriticalSection->OwningThread = 0; - /* Was someone wanting us? */ + /* Was someone wanting us? This needs to be done atomically. */ if (InterlockedDecrement(&CriticalSection->LockCount) >= 0) { /* Let him have us */ @@ -360,19 +366,19 @@ PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (InterlockedCompareExchange(&CriticalSection->LockCount, - 0, - -1) == -1) { + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { - /* It's ours */ + /* It's ours. Changing this information does not have to be serialized + because we just obtained the lock. */ CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { - /* It's already ours */ - InterlockedIncrement(&CriticalSection->LockCount); + /* It's already ours, just increment the recursion counter. This doesn't + have to be serialized because only the thread who already holds the + lock can do this. */ CriticalSection->RecursionCount++; return TRUE; }

1 0

[weiden] 13641: fixed RtlEnterCriticalSection not to fail on wrong assumptions and added comment on why the debug message "Critical section not initialized (guess)" is wrong
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

fixed RtlEnterCriticalSection not to fail on wrong assumptions and added comment on why the debug message "Critical section not initialized (guess)" is wrong Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 11:13:41 UTC (rev 13640) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-02-19 13:13:17 UTC (rev 13641) @@ -144,23 +144,27 @@ */ if (Thread == CriticalSection->OwningThread) { - /* You own it, so you'll get it when you're done with it! */ + /* You own it, so you'll get it when you're done with it! No need to + use the interlocked functions as only the thread who already owns + the lock can modify this data. */ CriticalSection->RecursionCount++; return STATUS_SUCCESS; } - else if (CriticalSection->OwningThread == (HANDLE)0) - { - /* No one else owns it either! */ - DPRINT1("Critical section not initialized (guess)!\n"); - /* FIXME: raise exception */ - return STATUS_INVALID_PARAMETER; - } + + /* NOTE - CriticalSection->OwningThread can be NULL here because changing + this information is not serialized. This happens when thread a + acquires the lock (LockCount == 0) and thread b tries to + acquire it as well (LockCount == 1) but thread a hasn't had a + chance to set the OwningThread! So it's not an error when + OwningThread is NULL here! */ /* We don't own it, so we must wait for it */ RtlpWaitForCriticalSection(CriticalSection); } - /* Lock successful */ + /* Lock successful. Changing this information has not to be serialized because + only one thread at a time can actually change it (the one who acquired + the lock)! */ CriticalSection->OwningThread = Thread; CriticalSection->RecursionCount = 1; return STATUS_SUCCESS;

1 0

[weiden] 13640: don't pass NULL handles to NtGdiCombineRgn
by weiden＠svn.reactos.com 19 Feb '05

19 Feb '05

don't pass NULL handles to NtGdiCombineRgn Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-02-19 03:38:43 UTC (rev 13639) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-02-19 11:13:41 UTC (rev 13640) @@ -309,19 +309,20 @@ -Window->WindowRect.top); hRgnNonClient = NtGdiCreateRectRgn(0, 0, 0, 0); - GDIOBJ_SetOwnership(hRgnNonClient, NULL); if (NtGdiCombineRgn(hRgnNonClient, Window->UpdateRegion, hRgnWindow, RGN_DIFF) == NULLREGION) { - GDIOBJ_SetOwnership(hRgnNonClient, PsGetCurrentProcess()); NtGdiDeleteObject(hRgnNonClient); hRgnNonClient = NULL; } + else + { + GDIOBJ_SetOwnership(hRgnNonClient, NULL); + } /* * Remove the nonclient region from the standard update region. */ - if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, hRgnWindow, RGN_AND) == NULLREGION) { @@ -336,12 +337,12 @@ } else { - NtGdiCombineRgn(Window->NCUpdateRegion, Window->NCUpdateRegion, - hRgnNonClient, RGN_OR); - if (NULL != hRgnNonClient) + if(NULL != hRgnNonClient) { - GDIOBJ_SetOwnership(hRgnNonClient, PsGetCurrentProcess()); - NtGdiDeleteObject(hRgnNonClient); + NtGdiCombineRgn(Window->NCUpdateRegion, Window->NCUpdateRegion, + hRgnNonClient, RGN_OR); + GDIOBJ_SetOwnership(hRgnNonClient, PsGetCurrentProcess()); + NtGdiDeleteObject(hRgnNonClient); } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-02-19 03:38:43 UTC (rev 13639) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-02-19 11:13:41 UTC (rev 13640) @@ -213,7 +213,7 @@ { Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; } - else if (Dce->hClipRgn > (HRGN) 1) + else if (Dce->hClipRgn != NULL) { GDIOBJ_SetOwnership(Dce->hClipRgn, PsGetCurrentProcess()); NtGdiDeleteObject(Dce->hClipRgn); @@ -332,10 +332,21 @@ noparent: if (Flags & DCX_INTERSECTRGN) { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hClipRgn, RGN_AND); + if(Dce->hClipRgn != NULL) + { + NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hClipRgn, RGN_AND); + } + else + { + if(hRgnVisible != NULL) + { + NtGdiDeleteObject(hRgnVisible); + } + hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0); + } } - if (Flags & DCX_EXCLUDERGN) + if (Flags & DCX_EXCLUDERGN && Dce->hClipRgn != NULL) { NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hClipRgn, RGN_DIFF); }

1 0

[gvg] 13638: Include svn revision in build string
by gvg＠svn.reactos.com 18 Feb '05

18 Feb '05

Include svn revision in build string Modified: trunk/reactos/tools/buildno.c _____ Modified: trunk/reactos/tools/buildno.c --- trunk/reactos/tools/buildno.c 2005-02-18 21:20:01 UTC (rev 13637) +++ trunk/reactos/tools/buildno.c 2005-02-18 22:46:49 UTC (rev 13638) @@ -53,28 +53,8 @@ } #endif - -int -elapsed_days ( - time_t t_today, - time_t t_release_day - ) -{ - double seconds = difftime (t_today, t_release_day); - double days = seconds / (double) 86400.0; - char buf [32]; - char * dot = buf; - - sprintf (buf, "%f", days ); - - while ( *dot && *dot != '.') ++dot; - *dot = '\0'; - - return atol (buf); -} - void -write_h (int build) +write_h (int build, char *buildstr) { FILE *h = NULL; char* s; @@ -90,8 +70,8 @@ s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%d\"\n", build); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%d\\0\"\n", build); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); if (0 != KERNEL_VERSION_PATCH_LEVEL) @@ -191,6 +171,48 @@ fclose (h); } +char * +GetRev(void) +{ + static char Unknown[] = "UNKNOWN"; + static char Rev[10]; /* 999999999 revisions should be enough for everyone... */ + FILE *SvnCmd; + char Line[256]; + char *p; + + SvnCmd = popen("svn info", "r"); + if (NULL == SvnCmd) + { + fprintf(stderr, "Failed to run \"svn info\" command\n"); + return Unknown; + } + while (! feof(SvnCmd) && ! ferror(SvnCmd)) + { + if (NULL == fgets(Line, sizeof(Line), SvnCmd)) + { + break; + } + if (0 == strncmp(Line, "Revision: ", 10)) + { + pclose(SvnCmd); + p = Line + 10; + if (sizeof(Rev) < strlen(p)) + { + fprintf(stderr, "Weird SVN revision number %s", p); + return Unknown; + } + strncpy(Rev, p, strlen(p) - 1); + Rev[strlen(p) - 1] = '\0'; + return Rev; + } + } + + pclose(SvnCmd); + + return Unknown; +} + + void usage (void) { @@ -210,6 +232,7 @@ int quiet = FALSE; int build = 0; + char buildstr[64]; time_t t1 = 0; struct tm * t1_tm = NULL; @@ -251,7 +274,7 @@ /* * We are building TODAY! */ - if (FALSE == quiet) + if (! quiet) { printf ( "\nReactOS Build Number Generator\n\n"); } @@ -266,7 +289,7 @@ #ifdef DBG tm_dump ("t1", t1_tm); #endif - if (FALSE == quiet) + if (! quiet) { printf ( "Current date: %4d-%02d-%02d\n\n", @@ -280,7 +303,9 @@ */ build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday; - if (FALSE == quiet) + sprintf(buildstr, "%d-r%s", build, GetRev()); + + if (! quiet) { printf ( "ROS Version : %d.%d", @@ -291,15 +316,15 @@ { printf(".%d", KERNEL_VERSION_PATCH_LEVEL); } - printf("-%S (Build %d)\n\n", KERNEL_VERSION_BUILD_TYPE, build); + printf("-%S (Build %s)\n\n", KERNEL_VERSION_BUILD_TYPE, buildstr); } /* * (Over)write the include file, unless * the user switched on -p. */ - if (FALSE == print_only) + if (! print_only) { - write_h (build); + write_h (build, buildstr); } else {

1 0

[navaraf] 13637: Remove expat.dll from the list.
by navaraf＠svn.reactos.com 18 Feb '05

18 Feb '05

Remove expat.dll from the list. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-18 20:52:24 UTC (rev 13636) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-18 21:20:01 UTC (rev 13637) @@ -74,7 +74,6 @@ lib\dinput8\dinput8.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 -lib\expat\expat.dll 1 lib\fmifs\fmifs.dll 1 lib\freetype\freetype.dll 1 lib\gdi32\gdi32.dll 1

1 0

[blight] 13636: Add shutdown message.
by blight＠svn.reactos.com 18 Feb '05

18 Feb '05

Add shutdown message. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-02-18 20:19:49 UTC (rev 13635) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-02-18 20:52:24 UTC (rev 13636) @@ -167,7 +167,8 @@ "Until then, there must be no regrets, no fears, no anxieties.\n" "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", - "Hasta la vista, BABY!\n" + "Hasta la vista, BABY!\n", + "They live, we sleep!\n" }; LARGE_INTEGER Now;

1 0

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