Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 33623: Stefan Ginsberg <stefan__100__@hotmail.com> - Fix NtFlushVirtualMemory definition in PSDK. - Fix NtFlushVirtualMemory's usage in kernel32. - Fix FlushViewOfFile's prototype (DWORD -> SIZE_T, as it is in PlatformSDK). - Add a C_ASSERT definition to winnt.h. - Change a meaningless ASSERT to a C_ASSERT.
by fireball＠svn.reactos.org 21 May '08

21 May '08

Author: fireball Date: Wed May 21 11:10:00 2008 New Revision: 33623 URL: http://svn.reactos.org/svn/reactos?rev=33623&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Fix NtFlushVirtualMemory definition in PSDK. - Fix NtFlushVirtualMemory's usage in kernel32. - Fix FlushViewOfFile's prototype (DWORD -> SIZE_T, as it is in PlatformSDK). - Add a C_ASSERT definition to winnt.h. - Change a meaningless ASSERT to a C_ASSERT. Modified: trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Wed May 21 11:10:00 2008 @@ -255,7 +255,7 @@ LocalLock(HLOCAL hMem) { /* This is the same as a GlobalLock, assuming these never change */ - ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); + C_ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); return GlobalLock(hMem); } Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Wed May 21 11:10:00 2008 @@ -353,16 +353,20 @@ BOOL NTAPI FlushViewOfFile(LPCVOID lpBaseAddress, - DWORD dwNumberOfBytesToFlush) -{ - NTSTATUS Status; - ULONG NumberOfBytesFlushed; + SIZE_T dwNumberOfBytesToFlush) +{ + SIZE_T NumberOfBytesToFlush; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + + /* Save amount of bytes to flush to a local var */ + NumberOfBytesToFlush = dwNumberOfBytesToFlush; /* Flush the view */ Status = NtFlushVirtualMemory(NtCurrentProcess(), (LPVOID)lpBaseAddress, - dwNumberOfBytesToFlush, - &NumberOfBytesFlushed); + &NumberOfBytesToFlush, + &IoStatusBlock); if (!NT_SUCCESS(Status)) { /* We failed */ Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed May 21 11:10:00 2008 @@ -1398,7 +1398,7 @@ #endif BOOL WINAPI FlushFileBuffers(HANDLE); BOOL WINAPI FlushInstructionCache(HANDLE,PCVOID,DWORD); -BOOL WINAPI FlushViewOfFile(PCVOID,DWORD); +BOOL WINAPI FlushViewOfFile(PCVOID,SIZE_T); DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION); PVOID WINAPI FlsGetValue(DWORD); BOOL WINAPI FlsSetValue(DWORD,PVOID); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed May 21 11:10:00 2008 @@ -237,6 +237,13 @@ typedef BYTE FCHAR; typedef WORD FSHORT; typedef DWORD FLONG; + +#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) +#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) +#define __C_ASSERT_DO_JOIN2(X, Y) X##Y + +#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] + #ifdef __GNUC__ #include "intrin.h" Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Wed May 21 11:10:00 2008 @@ -1739,7 +1739,7 @@ NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); NTSTATUS WINAPI NtFlushKey(HANDLE); -NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,PIO_STATUS_BLOCK); NTSTATUS WINAPI NtFlushWriteBuffer(VOID); NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);

1 0

[janderwald] 33622: - check input parameters in LoadString[A|W] - fixes a winetest issue - patch by Kamil Hornicek (Pigglesworth)
by janderwald＠svn.reactos.org 21 May '08

21 May '08

Author: janderwald Date: Wed May 21 10:33:38 2008 New Revision: 33622 URL: http://svn.reactos.org/svn/reactos?rev=33622&view=rev Log: - check input parameters in LoadString[A|W] - fixes a winetest issue - patch by Kamil Hornicek (Pigglesworth) Modified: trunk/reactos/dll/win32/user32/misc/resources.c Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Wed May 21 10:33:38 2008 @@ -116,11 +116,13 @@ INT retSize; /* parameter validation */ - if - ( - (nBufferMax < 1) || - (IsBadWritePtr(lpBuffer, nBufferMax * sizeof(lpBuffer[0]))) - ) + + if(nBufferMax < 1) + { + return -1; + } + + if(IsBadWritePtr(lpBuffer, nBufferMax * sizeof(lpBuffer[0]))) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -196,7 +198,8 @@ /* parameter validation */ if ( - (nBufferMax < 1) || + (nBufferMax < 0) || + (lpBuffer == NULL) || ((nBufferMax > 0) && IsBadWritePtr(lpBuffer, nBufferMax * sizeof(lpBuffer[0]))) || /* undocumented: If nBufferMax is 0, LoadStringW will copy a pointer to the in-memory image of the string to the specified buffer and return the length

1 0

[fireball] 33621: - Fix a few typos in SHARED_CACHE_MAP definition in NDK. - Minor fix to BITMAP_RANGE structure in ntifs.h.
by fireball＠svn.reactos.org 21 May '08

21 May '08

Author: fireball Date: Wed May 21 10:28:43 2008 New Revision: 33621 URL: http://svn.reactos.org/svn/reactos?rev=33621&view=rev Log: - Fix a few typos in SHARED_CACHE_MAP definition in NDK. - Minor fix to BITMAP_RANGE structure in ntifs.h. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=33… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Wed May 21 10:28:43 2008 @@ -643,7 +643,7 @@ typedef struct _BITMAP_RANGE { LIST_ENTRY Links; - LARGE_INTEGER BasePage; + LONGLONG BasePage; ULONG FirstDirtyPage; ULONG LastDirtyPage; ULONG DirtyPages; Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Wed May 21 10:28:43 2008 @@ -97,7 +97,7 @@ LARGE_INTEGER ValidDataLength; LARGE_INTEGER ValidDataGoal; PVACB InitialVacbs[4]; - PVACB Vacbs; + PVACB *Vacbs; PFILE_OBJECT FileObject; PVACB ActiveVacb; PVOID NeedToZero; @@ -117,7 +117,7 @@ LONGLONG BeyondLastFlush; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; - PLIST_ENTRY PrivateList; + LIST_ENTRY PrivateList; PVOID LogHandle; PVOID FlushToLsnRoutine; ULONG DirtyPageThreshold;

1 0

[fireball] 33620: - Convert imagehlp's .def file to .spec format (keeping same ordinals, etc), since ---enable-stdcall-fuxup does not really work for linking. - Uncomment function declarations in psdk/imagehlp.h and thus make crypt32 use them to prevent stack corruption (it was generating implicit declarations warnings).
by fireball＠svn.reactos.org 21 May '08

21 May '08

Author: fireball Date: Wed May 21 09:43:29 2008 New Revision: 33620 URL: http://svn.reactos.org/svn/reactos?rev=33620&view=rev Log: - Convert imagehlp's .def file to .spec format (keeping same ordinals, etc), since ---enable-stdcall-fuxup does not really work for linking. - Uncomment function declarations in psdk/imagehlp.h and thus make crypt32 use them to prevent stack corruption (it was generating implicit declarations warnings). Added: trunk/reactos/dll/win32/imagehlp/imagehlp.spec (with props) Removed: trunk/reactos/dll/win32/imagehlp/imagehlp.def Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild trunk/reactos/include/psdk/imagehlp.h Removed: trunk/reactos/dll/win32/imagehlp/imagehlp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.def (removed) @@ -1,111 +1,0 @@ -LIBRARY imagehlp.dll - -EXPORTS -BindImage @2 -BindImageEx @3 -CheckSumMappedFile @4 -EnumerateLoadedModules=Dbghelp.EnumerateLoadedModules @5 -EnumerateLoadedModules64=Dbghelp.EnumerateLoadedModules64 @6 -FindDebugInfoFile=Dbghelp.FindDebugInfoFile @7 -FindDebugInfoFileEx=Dbghelp.FindDebugInfoFileEx @8 -FindExecutableImage=Dbghelp.FindExecutableImage @9 -FindExecutableImageEx=Dbghelp.FindExecutableImageEx @10 -FindFileInPath=Dbghelp.FindFileInPath @11 -FindFileInSearchPath=Dbghelp.FindFileInSearchPath @12 -GetImageConfigInformation @13 -GetImageUnusedHeaderBytes @14 -GetTimestampForLoadedLibrary @15 -ImageAddCertificate @16 -ImageDirectoryEntryToData @17 -ImageDirectoryEntryToDataEx @18 -ImageEnumerateCertificates @19 -ImageGetCertificateData @20 -ImageGetCertificateHeader @21 -ImageGetDigestStream @22 -ImagehlpApiVersion=Dbghelp.ImagehlpApiVersion @29 -ImagehlpApiVersionEx=Dbghelp.ImagehlpApiVersionEx @30 -ImageLoad @23 -ImageNtHeader @24 -ImageRemoveCertificate @25 -ImageRvaToSection @26 -ImageRvaToVa @27 -ImageUnload @28 -MakeSureDirectoryPathExists=Dbghelp.MakeSureDirectoryPathExists @31 -MapAndLoad @32 -MapDebugInformation=Dbghelp.MapDebugInformation @33 -MapFileAndCheckSumA @34 -MapFileAndCheckSumW @35 -ReBaseImage @37 -;ReBaseImage64 @36 -;RemovePrivateCvSymbolic @38 -;RemovePrivateCvSymbolicEx @39 -RemoveRelocations @1 -SearchTreeForFile=Dbghelp.SearchTreeForFile @40 -SetImageConfigInformation @41 -SplitSymbols @42 -StackWalk=Dbghelp.StackWalk @43 -StackWalk64=Dbghelp.StackWalk64 @44 -SymCleanup=Dbghelp.SymCleanup @45 -SymEnumerateModules=Dbghelp.SymEnumerateModules @51 -SymEnumerateModules64=Dbghelp.SymEnumerateModules64 @50 -SymEnumerateSymbols=Dbghelp.SymEnumerateSymbols @53 -SymEnumerateSymbols64=Dbghelp.SymEnumerateSymbols64 @52 -SymEnumerateSymbolsW=Dbghelp.SymEnumerateSymbolsW @55 -SymEnumerateSymbolsW64=Dbghelp.SymEnumerateSymbolsW64 @54 -SymEnumSourceFiles=Dbghelp.SymEnumSourceFiles @46 -SymEnumSym=Dbghelp.SymEnumSym @47 -SymEnumSymbols=Dbghelp.SymEnumSymbols @48 -SymEnumTypes=Dbghelp.SymEnumTypes @49 -SymFindFileInPath=Dbghelp.SymFindFileInPath @56 -SymFromAddr=Dbghelp.SymFromAddr @57 -SymFromName=Dbghelp.SymFromName @58 -SymFunctionTableAccess=Dbghelp.SymFunctionTableAccess @60 -SymFunctionTableAccess64=Dbghelp.SymFunctionTableAccess64 @59 -SymGetLineFromAddr=Dbghelp.SymGetLineFromAddr @62 -SymGetLineFromAddr64=Dbghelp.SymGetLineFromAddr64 @61 -SymGetLineFromName=Dbghelp.SymGetLineFromName @64 -SymGetLineFromName64=Dbghelp.SymGetLineFromName64 @63 -SymGetLineNext=Dbghelp.SymGetLineNext @66 -SymGetLineNext64=Dbghelp.SymGetLineNext64 @65 -SymGetLinePrev=Dbghelp.SymGetLinePrev @68 -SymGetLinePrev64=Dbghelp.SymGetLinePrev64 @67 -SymGetModuleBase=Dbghelp.SymGetModuleBase @70 -SymGetModuleBase64=Dbghelp.SymGetModuleBase64 @69 -SymGetModuleInfo=Dbghelp.SymGetModuleInfo @72 -SymGetModuleInfo64=Dbghelp.SymGetModuleInfo64 @71 -SymGetModuleInfoW=Dbghelp.SymGetModuleInfoW @74 -SymGetModuleInfoW64=Dbghelp.SymGetModuleInfoW64 @73 -SymGetOptions=Dbghelp.SymGetOptions @76 -SymGetSearchPath=Dbghelp.SymGetSearchPath @75 -SymGetSymFromAddr=Dbghelp.SymGetSymFromAddr @78 -SymGetSymFromAddr64=Dbghelp.SymGetSymFromAddr64 @77 -SymGetSymFromName=Dbghelp.SymGetSymFromName @80 -SymGetSymFromName64=Dbghelp.SymGetSymFromName64 @79 -SymGetSymNext=Dbghelp.SymGetSymNext @82 -SymGetSymNext64=Dbghelp.SymGetSymNext64 @81 -SymGetSymPrev=Dbghelp.SymGetSymPrev @84 -SymGetSymPrev64=Dbghelp.SymGetSymPrev64 @83 -SymGetTypeFromName=Dbghelp.SymGetTypeFromName @85 -SymGetTypeInfo=Dbghelp.SymGetTypeInfo @86 -SymInitialize=Dbghelp.SymInitialize @87 -SymLoadModule=Dbghelp.SymLoadModule @89 -SymLoadModule64=Dbghelp.SymLoadModule64 @88 -SymMatchFileName=Dbghelp.SymMatchFileName @90 -SymMatchString=Dbghelp.SymMatchString @91 -SymRegisterCallback=Dbghelp.SymRegisterCallback @93 -SymRegisterCallback64=Dbghelp.SymRegisterCallback64 @92 -SymRegisterFunctionEntryCallback=Dbghelp.SymRegisterFunctionEntryCallback @95 -SymRegisterFunctionEntryCallback64=Dbghelp.SymRegisterFunctionEntryCallback64 @94 -SymSetContext=Dbghelp.SymSetContext @96 -SymSetOptions=Dbghelp.SymSetOptions @97 -SymSetSearchPath=Dbghelp.SymSetSearchPath @98 -SymUnDName=Dbghelp.SymUnDName @100 -SymUnDName64=Dbghelp.SymUnDName64 @99 -SymUnloadModule=Dbghelp.SymUnloadModule @102 -SymUnloadModule64=Dbghelp.SymUnloadModule64 @101 -TouchFileTimes @103 -UnDecorateSymbolName=Dbghelp.UnDecorateSymbolName @104 -UnMapAndLoad @105 -UnmapDebugInformation=Dbghelp.UnmapDebugInformation @106 -;UpdateDebugInfoFile @107 -;UpdateDebugInfoFileEx @108 Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] Wed May 21 09:43:29 2008 @@ -1,5 +1,5 @@ <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true"> - <importlibrary definition="imagehlp.def" /> + <importlibrary definition="imagehlp.spec.def" /> <include base="imagehlp">.</include> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x0600</define> @@ -12,6 +12,6 @@ <file>integrity.c</file> <file>modify.c</file> <file>imagehlp.rc</file> + <file>imagehlp.spec</file> <pch>precomp.h</pch> - <linkerflag>-enable-stdcall-fixup</linkerflag> </module> Added: trunk/reactos/dll/win32/imagehlp/imagehlp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.spec (added) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.spec [iso-8859-1] Wed May 21 09:43:29 2008 @@ -1,0 +1,108 @@ +@ stdcall BindImage(str str str) +@ stdcall BindImageEx(long str str str ptr) +@ stdcall CheckSumMappedFile(ptr long ptr ptr) +@ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules +@ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 +@ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile +@ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx +@ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage +@ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx +@ stub FindFileInPath +@ stub FindFileInSearchPath +@ stdcall GetImageConfigInformation(ptr ptr) +@ stdcall GetImageUnusedHeaderBytes(ptr ptr) +@ stdcall GetTimestampForLoadedLibrary(long) dbghelp.GetTimestampForLoadedLibrary +@ stdcall ImageAddCertificate(long ptr ptr) +@ stdcall ImageDirectoryEntryToData(ptr long long ptr) +@ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) +@ stdcall ImageEnumerateCertificates(long long ptr ptr long) +@ stdcall ImageGetCertificateData(long long ptr ptr) +@ stdcall ImageGetCertificateHeader(long long ptr) +@ stdcall ImageGetDigestStream(long long ptr long) +@ stdcall ImagehlpApiVersion() dbghelp.ImagehlpApiVersion +@ stdcall ImagehlpApiVersionEx(ptr) dbghelp.ImagehlpApiVersionEx +@ stdcall ImageLoad(str str) +@ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader +@ stdcall ImageRemoveCertificate(long long) +@ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection +@ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa +@ stdcall ImageUnload(ptr) +@ stdcall MakeSureDirectoryPathExists(str) dbghelp.MakeSureDirectoryPathExists +@ stdcall MapAndLoad(str str ptr long long) +@ stdcall MapDebugInformation(long str str long) dbghelp.MapDebugInformation +@ stdcall MapFileAndCheckSumA(str ptr ptr) +@ stdcall MapFileAndCheckSumW(wstr ptr ptr) +@ stdcall ReBaseImage(str str long long long long ptr ptr ptr ptr long) +@ stub ReBaseImage64 +@ stdcall RemovePrivateCvSymbolic(ptr ptr ptr) +@ stub RemovePrivateCvSymbolicEx +@ stdcall RemoveRelocations(ptr) +@ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile +@ stdcall SetImageConfigInformation(ptr ptr) +@ stdcall SplitSymbols(str str str long) +@ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk +@ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 +@ stdcall SymCleanup(long) dbghelp.SymCleanup +@ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules +@ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 +@ stdcall SymEnumerateSymbols(long long ptr ptr) dbghelp.SymEnumerateSymbols +@ stub SymEnumerateSymbols64 +@ stdcall SymEnumerateSymbolsW(long long ptr ptr) dbghelp.SymEnumerateSymbolsW +@ stub SymEnumerateSymbolsW64 +@ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles +@ stub SymEnumSym +@ stdcall SymEnumSymbols(long double str ptr ptr) dbghelp.SymEnumSymbols +@ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes +@ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath +@ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr +@ stdcall SymFromName(long str ptr) dbghelp.SymFromName +@ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess +@ stdcall SymFunctionTableAccess64(long double) dbghelp.SymFunctionTableAccess64 +@ stdcall SymGetLineFromAddr(long long ptr ptr) dbghelp.SymGetLineFromAddr +@ stdcall SymGetLineFromAddr64(long double ptr ptr) dbghelp.SymGetLineFromAddr64 +@ stdcall SymGetLineFromName(long str str long ptr ptr) dbghelp.SymGetLineFromName +@ stdcall SymGetLineFromName64(long str str long ptr ptr) dbghelp.SymGetLineFromName +@ stdcall SymGetLineNext(long ptr) dbghelp.SymGetLineNext +@ stdcall SymGetLineNext64(long ptr) dbghelp.SymGetLineNext64 +@ stdcall SymGetLinePrev(long ptr) dbghelp.SymGetLinePrev +@ stdcall SymGetLinePrev64(long ptr) dbghelp.SymGetLinePrev64 +@ stdcall SymGetModuleBase(long long) dbghelp.SymGetModuleBase +@ stdcall SymGetModuleBase64(long double) dbghelp.SymGetModuleBase64 +@ stdcall SymGetModuleInfo(long long ptr) dbghelp.SymGetModuleInfo +@ stdcall SymGetModuleInfo64(long double ptr) dbghelp.SymGetModuleInfo64 +@ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW +@ stdcall SymGetModuleInfoW64(long double ptr) dbghelp.SymGetModuleInfoW64 +@ stdcall SymGetOptions() dbghelp.SymGetOptions +@ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath +@ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr +@ stdcall SymGetSymFromAddr64(long double ptr ptr) dbghelp.SymGetSymFromAddr64 +@ stdcall SymGetSymFromName(long str ptr) dbghelp.SymGetSymFromName +@ stub SymGetSymFromName64 +@ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext +@ stub SymGetSymNext64 +@ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev +@ stub SymGetSymPrev64 +@ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName +@ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo +@ stdcall SymInitialize(long str long) dbghelp.SymInitialize +@ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule +@ stdcall SymLoadModule64(long long str str double long) dbghelp.SymLoadModule64 +@ stdcall SymMatchFileName(str str ptr ptr) dbghelp.SymMatchFileName +@ stdcall SymMatchString(str str long) dbghelp.SymMatchString +@ stdcall SymRegisterCallback(long ptr ptr) dbghelp.SymRegisterCallback +@ stdcall SymRegisterCallback64(long ptr double) dbghelp.SymRegisterCallback64 +@ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) dbghelp.SymRegisterFunctionEntryCallback +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) dbghelp.SymRegisterFunctionEntryCallback64 +@ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext +@ stdcall SymSetOptions(long) dbghelp.SymSetOptions +@ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath +@ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName +@ stub SymUnDName64 +@ stdcall SymUnloadModule(long long) dbghelp.SymUnloadModule +@ stdcall SymUnloadModule64(long double) dbghelp.SymUnloadModule64 +@ stdcall TouchFileTimes(long ptr) +@ stdcall UnDecorateSymbolName(str str long long) dbghelp.UnDecorateSymbolName +@ stdcall UnMapAndLoad(ptr) +@ stdcall UnmapDebugInformation(ptr) dbghelp.UnmapDebugInformation +@ stdcall UpdateDebugInfoFile(str str str ptr) +@ stdcall UpdateDebugInfoFileEx(str str str ptr long) Propchange: trunk/reactos/dll/win32/imagehlp/imagehlp.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Wed May 21 09:43:29 2008 @@ -319,11 +319,11 @@ BOOL IMAGEAPI SymUnDName(IN PIMAGEHLP_SYMBOL,OUT LPSTR,IN DWORD); BOOL IMAGEAPI SymRegisterCallback(IN HANDLE,IN PSYMBOL_REGISTERED_CALLBACK,IN PVOID); BOOL IMAGEAPI ImageGetDigestStream(IN HANDLE,IN DWORD,IN DIGEST_FUNCTION,IN DIGEST_HANDLE); -//BOOL IMAGEAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); +BOOL IMAGEAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); BOOL IMAGEAPI ImageRemoveCertificate(IN HANDLE,IN DWORD); BOOL IMAGEAPI ImageEnumerateCertificates(IN HANDLE,IN WORD,OUT PDWORD,IN OUT PDWORD OPTIONAL,IN OUT DWORD OPTIONAL); -//BOOL IMAGEAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); -//BOOL IMAGEAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); +BOOL IMAGEAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); +BOOL IMAGEAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); BOOL IMAGEAPI CopyPdb(CHAR const*,CHAR const*,BOOL); BOOL IMAGEAPI RemovePrivateCvSymbolicEx(PCHAR,ULONG,PCHAR*,ULONG*);

1 0

[greatlrd] 33619: filter the higher part of DWORD for return value of VBE return value from the BIOS this will make allot ATI card working proper. thx again bear windows for the info and mail response which card need it, more info for this issue at http://www.bearwindows.boot-land.net/vbemp.htm#10
by greatlrd＠svn.reactos.org 21 May '08

21 May '08

Author: greatlrd Date: Wed May 21 08:47:22 2008 New Revision: 33619 URL: http://svn.reactos.org/svn/reactos?rev=33619&view=rev Log: filter the higher part of DWORD for return value of VBE return value from the BIOS this will make allot ATI card working proper. thx again bear windows for the info and mail response which card need it, more info for this issue at http://www.bearwindows.boot-land.net/vbemp.htm#10 Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] Wed May 21 08:47:22 2008 @@ -125,7 +125,7 @@ VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; VideoPortDebugPrint(Info, "VBEMP: VBE/SCI version %x\n", BiosRegisters.Ecx); if ((BiosRegisters.Ebx & 0xF) != 0xF) @@ -141,7 +141,7 @@ VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; /* @@ -198,7 +198,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; /* Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed May 21 08:47:22 2008 @@ -230,7 +230,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { VBEDeviceExtension->Int10Interface.Int10ReadMemory( VBEDeviceExtension->Int10Interface.Context, @@ -341,7 +341,7 @@ VbeModeInfo = VBEDeviceExtension->ModeInfo + SuitableModeCount; /* Is this mode acceptable? */ - if (BiosRegisters.Eax == VBE_SUCCESS && + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS && VbeModeInfo->XResolution >= 640 && VbeModeInfo->YResolution >= 480 && (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL || @@ -626,9 +626,9 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) + if ( VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_NOT_SUPPORTED) return ERROR_DEV_NOT_EXIST; - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; /* @@ -644,7 +644,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { VideoPowerControl->DPMSVersion = BiosRegisters.Ebx & 0xFF; switch (BiosRegisters.Ebx >> 8) @@ -708,9 +708,9 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_NOT_SUPPORTED) return ERROR_DEV_NOT_EXIST; - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; return VBE_SUCCESS; @@ -742,7 +742,7 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { DeviceExtension->CurrentMode = RequestedMode->RequestedMode; } @@ -752,7 +752,7 @@ DeviceExtension->CurrentMode = -1; } - return BiosRegisters.Eax == VBE_SUCCESS; + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; } /* @@ -776,7 +776,7 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - return BiosRegisters.Eax == VBE_SUCCESS; + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; } /* @@ -1080,6 +1080,6 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - return BiosRegisters.Eax == VBE_SUCCESS; - } -} + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; + } +} Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Wed May 21 08:47:22 2008 @@ -104,6 +104,8 @@ #define VBE_NOT_SUPPORTED 0x24F #define VBE_FUNCTION_INVALID 0x34F +#define VBE_GETRETURNCODE(x) (x & 0xFFFF) + /* * VBE specification defined structure for general adapter info * returned by function VBE_GET_CONTROLLER_INFORMATION command.

1 0

[tkreuzer] 33618: - Fix wrong debug output when a process is terminated, by deleting the it's objects in a proper order, fixes bug 2954 - remove Fireball's, ugly nasty hack. - Fix debug output to show the right problem - For all people who think the handle table might be messed up: add a function that validates the handle table integrity after a process is closed, when GDI_DEBUG is defined. - fix the BaseObjects hHmgr field when converting an object to a stock object. - move all GDI_DEBUG stuff
by tkreuzer＠svn.reactos.org 20 May '08

20 May '08

Author: tkreuzer Date: Tue May 20 15:39:32 2008 New Revision: 33618 URL: http://svn.reactos.org/svn/reactos?rev=33618&view=rev Log: - Fix wrong debug output when a process is terminated, by deleting the it's objects in a proper order, fixes bug 2954 - remove Fireball's, ugly nasty hack. - Fix debug output to show the right problem - For all people who think the handle table might be messed up: add a function that validates the handle table integrity after a process is closed, when GDI_DEBUG is defined. - fix the BaseObjects hHmgr field when converting an object to a stock object. - move all GDI_DEBUG stuff into it's own file See issue #2954 for more details. Added: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Added: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c (added) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Tue May 20 15:39:32 2008 @@ -1,0 +1,272 @@ +#ifdef GDI_DEBUG + +BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); + +static int leak_reported = 0; +#define GDI_STACK_LEVELS 12 +static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +struct DbgOpenGDIHandle +{ + ULONG idx; + int count; +}; +#define H 1024 +static struct DbgOpenGDIHandle h[H]; + +void IntDumpHandleTable(PGDI_HANDLE_TABLE HandleTable) +{ + int i, n = 0, j, k, J; + + if (leak_reported) + { + DPRINT1("gdi handle abusers already reported!\n"); + return; + } + + leak_reported = 1; + DPRINT1("reporting gdi handle abusers:\n"); + + /* step through GDI handle table and find out who our culprit is... */ + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + for (j = 0; j < n; j++) + { +next: + J = h[j].idx; + for (k = 0; k < GDI_STACK_LEVELS; k++) + { + if (GDIHandleAllocator[i][k] + != GDIHandleAllocator[J][k]) + { + if (++j == n) + goto done; + else + goto next; + } + } + goto done; + } +done: + if (j < H) + { + if (j == n) + { + h[j].idx = i; + h[j].count = 1; + n = n + 1; + } + else + h[j].count++; + } + } + /* bubble sort time! weeeeee!! */ + for (i = 0; i < n-1; i++) + { + if (h[i].count < h[i+1].count) + { + struct DbgOpenGDIHandle t; + t = h[i+1]; + h[i+1] = h[i]; + j = i; + while (j > 0 && h[j-1].count < t.count) + j--; + h[j] = t; + } + } + /* print the worst offenders... */ + DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); + for (i = 0; i < n && h[i].count > 1; i++) + { + int j; + DbgPrint(" %i allocs: ", h[i].count); + for (j = 0; j < GDI_STACK_LEVELS; j++) + { + ULONG Addr = GDIHandleAllocator[h[i].idx][j]; + if (!KiRosPrintAddress((PVOID)Addr)) + DbgPrint("<%X>", Addr); + } + DbgPrint("\n"); + } + if (i < n && h[i].count == 1) + DbgPrint("(list terminated - the remaining entries have 1 allocation only)\n"); +} + +ULONG +CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) +{ + ULONG nFrameCount; + + memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); + + nFrameCount = RtlCaptureStackBackTrace(1, nFramesToCapture, pFrames, NULL); + + if (nFrameCount < nFramesToCapture) + { + nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, nFramesToCapture - nFrameCount, 1); + } + + return nFrameCount; +} + +BOOL +GdiDbgHTIntegrityCheck() +{ + ULONG i, nDeleted = 0, nFree = 0, nUsed = 0; + PGDI_TABLE_ENTRY pEntry; + BOOL r = 1; + + KeEnterCriticalRegion(); + + /* FIXME: check reserved entries */ + + /* Now go through the deleted objects */ + i = GdiHandleTable->FirstFree; + if (i) + { + pEntry = &GdiHandleTable->Entries[i]; + for (;;) + { + nDeleted++; + + /* Check the entry */ + if ((pEntry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) + { + r = 0; + DPRINT1("Deleted Entry has a type != 0\n"); + } + if ((ULONG_PTR)pEntry->KernelData >= GDI_HANDLE_COUNT) + { + r = 0; + DPRINT1("Deleted entries KernelPointer too big\n"); + } + if (pEntry->UserData != NULL) + { + r = 0; + DPRINT1("Deleted entry has UserData != 0\n"); + } + if (pEntry->ProcessId != 0) + { + r = 0; + DPRINT1("Deleted entry has ProcessId != 0\n"); + } + + i = (ULONG_PTR)pEntry->KernelData; + if (!i) + { + break; + } + pEntry = &GdiHandleTable->Entries[i]; + } + } + + for (i = GdiHandleTable->FirstUnused; + i < GDI_HANDLE_COUNT; + i++) + { + pEntry = &GdiHandleTable->Entries[i]; + + if ((pEntry->Type) != 0) + { + r = 0; + DPRINT1("Free Entry has a type != 0\n"); + } + if ((ULONG_PTR)pEntry->KernelData != 0) + { + r = 0; + DPRINT1("Free entries KernelPointer != 0\n"); + } + if (pEntry->UserData != NULL) + { + r = 0; + DPRINT1("Free entry has UserData != 0\n"); + } + if (pEntry->ProcessId != 0) + { + r = 0; + DPRINT1("Free entry has ProcessId != 0\n"); + } + nFree++; + } + + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + HGDIOBJ Handle; + ULONG Type; + + pEntry = &GdiHandleTable->Entries[i]; + Type = pEntry->Type; + Handle = (HGDIOBJ)((Type << GDI_ENTRY_UPPER_SHIFT) + i); + + if (Type & GDI_ENTRY_BASETYPE_MASK) + { + if (pEntry->KernelData == NULL) + { + r = 0; + DPRINT1("Used entry has KernelData == 0\n"); + } + if (pEntry->KernelData <= MmHighestUserAddress) + { + r = 0; + DPRINT1("Used entry invalid KernelData\n"); + } + if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) + { + r = 0; + DPRINT1("Used entry %ld, has invalid hHmg %p (expected: %p)\n", + i, ((POBJ)(pEntry->KernelData))->hHmgr, Handle); + } + nUsed++; + } + } + + if (RESERVE_ENTRIES_COUNT + nDeleted + nFree + nUsed != GDI_HANDLE_COUNT) + { + r = 0; + DPRINT1("Number of all entries incorrect: RESERVE_ENTRIES_COUNT = %ld, nDeleted = %ld, nFree = %ld, nUsed = %ld\n", + RESERVE_ENTRIES_COUNT, nDeleted, nFree, nUsed); + } + + KeLeaveCriticalRegion(); + + return r; +} + + +#define GDIDBG_TRACECALLER() \ + DPRINT1("-> called from:\n"); \ + KeRosDumpStackFrames(NULL, 20); +#define GDIDBG_TRACEALLOCATOR(index) \ + DPRINT1("-> allocated from:\n"); \ + KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(index) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREALLOCATOR(index) \ + CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURELOCKER(index) \ + CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_DUMPHANDLETABLE() \ + IntDumpHandleTable(GdiHandleTable) +#define GDIDBG_INITLOOPTRACE() \ + ULONG Attempts = 0; +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) \ + if ((++Attempts % 20) == 0) \ + { \ + DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ + } + +#else + +#define GDIDBG_TRACECALLER() +#define GDIDBG_TRACEALLOCATOR(index) +#define GDIDBG_TRACELOCKER(index) +#define GDIDBG_CAPTUREALLOCATOR(index) +#define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_DUMPHANDLETABLE() +#define GDIDBG_INITLOOPTRACE() +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) + +#endif /* GDI_DEBUG */ + Propchange: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue May 20 15:39:32 2008 @@ -17,11 +17,6 @@ VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); //#define GDI_DEBUG - -#ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); -NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); -#endif #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -89,151 +84,7 @@ /** DEBUGGING *****************************************************************/ -#ifdef GDI_DEBUG - -static int leak_reported = 0; -#define GDI_STACK_LEVELS 12 -static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; -static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; -struct DbgOpenGDIHandle -{ - ULONG idx; - int count; -}; -#define H 1024 -static struct DbgOpenGDIHandle h[H]; - -void IntDumpHandleTable(PGDI_HANDLE_TABLE HandleTable) -{ - int i, n = 0, j, k, J; - - if (leak_reported) - { - DPRINT1("gdi handle abusers already reported!\n"); - return; - } - - leak_reported = 1; - DPRINT1("reporting gdi handle abusers:\n"); - - /* step through GDI handle table and find out who our culprit is... */ - for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) - { - for (j = 0; j < n; j++) - { -next: - J = h[j].idx; - for (k = 0; k < GDI_STACK_LEVELS; k++) - { - if (GDIHandleAllocator[i][k] - != GDIHandleAllocator[J][k]) - { - if (++j == n) - goto done; - else - goto next; - } - } - goto done; - } -done: - if (j < H) - { - if (j == n) - { - h[j].idx = i; - h[j].count = 1; - n = n + 1; - } - else - h[j].count++; - } - } - /* bubble sort time! weeeeee!! */ - for (i = 0; i < n-1; i++) - { - if (h[i].count < h[i+1].count) - { - struct DbgOpenGDIHandle t; - t = h[i+1]; - h[i+1] = h[i]; - j = i; - while (j > 0 && h[j-1].count < t.count) - j--; - h[j] = t; - } - } - /* print the worst offenders... */ - DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); - for (i = 0; i < n && h[i].count > 1; i++) - { - int j; - DbgPrint(" %i allocs: ", h[i].count); - for (j = 0; j < GDI_STACK_LEVELS; j++) - { - ULONG Addr = GDIHandleAllocator[h[i].idx][j]; - if (!KiRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - } - DbgPrint("\n"); - } - if (i < n && h[i].count == 1) - DbgPrint("(list terminated - the remaining entries have 1 allocation only)\n"); -} - -ULONG -CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) -{ - ULONG nFrameCount; - - memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); - - nFrameCount = RtlCaptureStackBackTrace(1, nFramesToCapture, pFrames, NULL); - - if (nFrameCount < nFramesToCapture) - { - nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, nFramesToCapture - nFrameCount, 1); - } - - return nFrameCount; -} - -#define GDIDBG_TRACECALLER() \ - DPRINT1("-> called from:\n"); \ - KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(index) \ - DPRINT1("-> allocated from:\n"); \ - KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(index) \ - DPRINT1("-> locked from:\n"); \ - KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTUREALLOCATOR(index) \ - CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTURELOCKER(index) \ - CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS); -#define GDIDBG_DUMPHANDLETABLE() \ - IntDumpHandleTable(GdiHandleTable) -#define GDIDBG_INITLOOPTRACE() \ - ULONG Attempts = 0; -#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) \ - if ((++Attempts % 20) == 0) \ - { \ - DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ - } - -#else - -#define GDIDBG_TRACECALLER() -#define GDIDBG_TRACEALLOCATOR(index) -#define GDIDBG_TRACELOCKER(index) -#define GDIDBG_CAPTUREALLOCATOR(index) -#define GDIDBG_CAPTURELOCKER(index) -#define GDIDBG_DUMPHANDLETABLE() -#define GDIDBG_INITLOOPTRACE() -#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) - -#endif /* GDI_DEBUG */ - +#include "gdidbg.c" /** INTERNAL FUNCTIONS ********************************************************/ @@ -716,25 +567,19 @@ { if (!Silent) { - if (((ULONG_PTR)PrevProcId & ~0x1) == 0) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == 0) + { + DPRINT1("Attempted to free gdi handle 0x%x that is already deleted!\n", hObj); + } + else if (((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); - DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); - - /* HACK: Ugly and nasty */ - if ((ULONG_PTR)Entry->KernelData < 0x1000) - { - /* It's a memory-corruption bug (probably?), - overcome it by just saying "yes, object destroyed" */ - DPRINT1("Bad kerneldata!!! Blame Win32k developers!\n"); - return TRUE; - } - } else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); } + DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); GDIDBG_TRACECALLER(); GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); } @@ -782,6 +627,57 @@ } } +VOID +FASTCALL +IntDeleteHandlesForProcess(struct _EPROCESS *Process, ULONG ObjectType) +{ + PGDI_TABLE_ENTRY Entry, End; + ULONG Index = RESERVE_ENTRIES_COUNT; + HANDLE ProcId; + PW32PROCESS W32Process; + + W32Process = (PW32PROCESS)Process->Win32Process; + ASSERT(W32Process); + + if (W32Process->GDIObjects > 0) + { + ProcId = Process->UniqueProcessId; + + /* FIXME - Instead of building the handle here and delete it using GDIOBJ_FreeObj + we should delete it directly here! */ + + End = &GdiHandleTable->Entries[GDI_HANDLE_COUNT]; + for (Entry = &GdiHandleTable->Entries[RESERVE_ENTRIES_COUNT]; + Entry != End; + Entry++, Index++) + { + /* ignore the lock bit */ + if ( (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId) + { + if ( (Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType || + ObjectType == GDI_OBJECT_TYPE_DONTCARE) + { + HGDIOBJ ObjectHandle; + + /* Create the object handle for the entry, the lower(!) 16 bit of the + Type field includes the type of the object including the stock + object flag - but since stock objects don't have a process id we can + simply ignore this fact here. */ + ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); + + if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && + W32Process->GDIObjects == 0) + { + /* there are no more gdi handles for this process, bail */ + break; + } + } + } + } + } +} + + /*! * Internal function. Called when the process is destroyed to free the remaining GDI handles. * \param Process - PID of the process that will be destroyed. @@ -789,11 +685,7 @@ BOOL INTERNAL_CALL GDI_CleanupForProcess(struct _EPROCESS *Process) { - PGDI_TABLE_ENTRY Entry, End; PEPROCESS CurrentProcess; - PW32PROCESS W32Process; - HANDLE ProcId; - ULONG Index = RESERVE_ENTRIES_COUNT; DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId); CurrentProcess = PsGetCurrentProcess(); @@ -801,46 +693,23 @@ { KeAttachProcess(&Process->Pcb); } - W32Process = (PW32PROCESS)Process->Win32Process; - ASSERT(W32Process); - - if (W32Process->GDIObjects > 0) - { - /* FIXME - Instead of building the handle here and delete it using GDIOBJ_FreeObj - we should delete it directly here! */ - ProcId = Process->UniqueProcessId; - - End = &GdiHandleTable->Entries[GDI_HANDLE_COUNT]; - for (Entry = &GdiHandleTable->Entries[RESERVE_ENTRIES_COUNT]; - Entry != End; - Entry++, Index++) - { - /* ignore the lock bit */ - if ( (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && - (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 ) - { - HGDIOBJ ObjectHandle; - - /* Create the object handle for the entry, the lower(!) 16 bit of the - Type field includes the type of the object including the stock - object flag - but since stock objects don't have a process id we can - simply ignore this fact here. */ - ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); - - if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && - W32Process->GDIObjects == 0) - { - /* there are no more gdi handles for this process, bail */ - break; - } - } - } - } + + /* Delete objects. Begin with types that are not referenced by other types */ + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_DC_TYPE); + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_BRUSH_TYPE); + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_BITMAP_TYPE); + + /* Finally finish with what's left */ + IntDeleteHandlesForProcess(Process, GDI_OBJECT_TYPE_DONTCARE); if (CurrentProcess != Process) { KeDetachProcess(); } + +#ifdef GDI_DEBUG + GdiDbgHTIntegrityCheck(); +#endif DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); @@ -1240,11 +1109,12 @@ } } + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; + Object->hHmgr = hObj; + /* remove the process id lock and make it global */ (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, GDI_GLOBAL_PROCESS); - - hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); - *phObj = hObj; /* we're done, successfully converted the object */ return TRUE;

1 0

[cfinck] 33617: Create a branch for silverblade's audio work
by cfinck＠svn.reactos.org 20 May '08

20 May '08

Author: cfinck Date: Tue May 20 15:38:22 2008 New Revision: 33617 URL: http://svn.reactos.org/svn/reactos?rev=33617&view=rev Log: Create a branch for silverblade's audio work Added: branches/silverblade-audio/ - copied from r33616, trunk/reactos/

1 0

[mpiulachs] 33616: - Added 'MessageHeader' module type for handling .mc files - turn .mc generated files (RC & Headers) into real dependencies
by mpiulachs＠svn.reactos.org 20 May '08

20 May '08

Author: mpiulachs Date: Tue May 20 14:46:14 2008 New Revision: 33616 URL: http://svn.reactos.org/svn/reactos?rev=33616&view=rev Log: - Added 'MessageHeader' module type for handling .mc files - turn .mc generated files (RC & Headers) into real dependencies Added: trunk/reactos/include/reactos/mc/ trunk/reactos/include/reactos/mc/bugcodes.mc (with props) trunk/reactos/include/reactos/mc/errcodes.mc (with props) trunk/reactos/include/reactos/mc/mc.rbuild (with props) trunk/reactos/include/reactos/mc/ntstatus.mc (with props) Removed: trunk/reactos/dll/ntdll/def/ntstatus.mc trunk/reactos/dll/win32/kernel32/errcodes.mc trunk/reactos/ntoskrnl/bugcodes.mc Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/include/reactos/reactos.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… Removed: trunk/reactos/dll/ntdll/def/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntstatus.mc?… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Removed: trunk/reactos/dll/win32/kernel32/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/errcode… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Added: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… Added: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… Added: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… Added: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… Modified: trunk/reactos/include/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactos.rb… Removed: trunk/reactos/ntoskrnl/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/bugcodes.mc?rev=3… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…

1 0

[mpiulachs] 33615: - Add svchost to build
by mpiulachs＠svn.reactos.org 20 May '08

20 May '08

Author: mpiulachs Date: Tue May 20 14:33:00 2008 New Revision: 33615 URL: http://svn.reactos.org/svn/reactos?rev=33615&view=rev Log: - Add svchost to build Modified: trunk/reactos/base/services/services.rbuild trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Tue May 20 14:33:00 2008 @@ -13,6 +13,9 @@ <directory name="rpcss"> <xi:include href="rpcss/rpcss.rbuild" /> </directory> + <directory name="svchost"> + <xi:include href="svchost/svchost.rbuild" /> + </directory> <directory name="tcpsvcs"> <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> </directory> Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Tue May 20 14:33:00 2008 @@ -9,6 +9,8 @@ /* INCLUDES ******************************************************************/ #include "svchost.h" + +#define NDEBUG #include <debug.h> #ifdef _MSC_VER Modified: trunk/reactos/base/services/svchost/svchost.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] Tue May 20 14:33:00 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe"> <include base="svchost">.</include> - <define name="__USE_W32API" /> <library>kernel32</library> <library>advapi32</library> <file>svchost.c</file>

1 0

[dchapyshev] 33614: - Add code for getting language name
by dchapyshev＠svn.reactos.org 20 May '08

20 May '08

Author: dchapyshev Date: Tue May 20 13:02:39 2008 New Revision: 33614 URL: http://svn.reactos.org/svn/reactos?rev=33614&view=rev Log: - Add code for getting language name Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue May 20 13:02:39 2008 @@ -281,15 +281,15 @@ HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; - TCHAR szName[MAX_PATH]; + TCHAR szLangName[MAX_PATH]; _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); - GetLayoutName(szLayoutNum, szName); CreateTrayIcon(szLCID); // Switch to the new keyboard layout - UpdateTrayIcon(hwnd, szLCID, szName); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); EnumWindows(EnumWindowsProc, (LPARAM) hKl); @@ -397,13 +397,6 @@ if (hDllLib) FreeLibrary(hDllLib); } -BOOL CALLBACK -EnumChildProc(HWND hwnd, LPARAM lParam) -{ - SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); - return TRUE; -} - ULONG GetNextLayout() { @@ -438,7 +431,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static HMENU hLeftPopupMenu, hRightPopupMenu; - static TCHAR szLCID[MAX_PATH]; + static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; switch (Message) { @@ -454,7 +447,8 @@ case WM_LANG_CHANGED: { GetLayoutIDByHkl((HKL)lParam, szLCID); - UpdateTrayIcon(hwnd, szLCID, _T("")); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); } break; @@ -467,7 +461,8 @@ case WM_WINDOW_ACTIVATE: { GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID); - UpdateTrayIcon(hwnd, szLCID, _T("")); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); } break;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs