Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[jimtabor] 33629: Fix behavior if bmi null in NtGdiCreateDIBSection. Start internal functions for regions, includes a wine port get_region_type.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 21 17:32:13 2008 New Revision: 33629 URL: http://svn.reactos.org/svn/reactos?rev=33629&view=rev Log: Fix behavior if bmi null in NtGdiCreateDIBSection. Start internal functions for regions, includes a wine port get_region_type. Modified: trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Wed May 21 17:32:13 2008 @@ -38,6 +38,9 @@ BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); +INT FASTCALL IntGdiCombineRgn(PROSRGNDATA, PROSRGNDATA, PROSRGNDATA, INT); +INT FASTCALL REGION_Complexity(PROSRGNDATA); + #define UnsafeIntCreateRectRgnIndirect(prc) \ NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed May 21 17:32:13 2008 @@ -994,6 +994,8 @@ DC *dc; BOOL bDesktopDC = FALSE; + if (!bmi) return hbitmap; // Make sure. + // If the reference hdc is null, take the desktop dc if (hDC == 0) { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed May 21 17:32:13 2008 @@ -483,6 +483,20 @@ } #endif /* not NDEBUG */ + +INT +FASTCALL +REGION_Complexity( PROSRGNDATA obj ) +{ + switch(obj->rdh.nCount) + { + DPRINT("Region Complexity -> %d",obj->rdh.nCount); + case 0: return NULLREGION; + case 1: return SIMPLEREGION; + default: return COMPLEXREGION; + } +} + static BOOL FASTCALL @@ -2064,6 +2078,62 @@ ExFreePool(pRgn->Buffer); return TRUE; } + +INT +FASTCALL +IntGdiCombineRgn(PROSRGNDATA destRgn, + PROSRGNDATA src1Rgn, + PROSRGNDATA src2Rgn, + INT CombineMode) +{ + INT result = ERROR; + + if (destRgn) + { + if (src1Rgn) + { + if (CombineMode == RGN_COPY) + { + if ( !REGION_CopyRegion(destRgn, src1Rgn) ) + return ERROR; + result = destRgn->rdh.iType; + } + else + { + if (src2Rgn) + { + switch (CombineMode) + { + case RGN_AND: + REGION_IntersectRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_OR: + REGION_UnionRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_XOR: + REGION_XorRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_DIFF: + REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); + break; + } + result = destRgn->rdh.iType; + } + else if (src2Rgn == NULL) + { + DPRINT1("IntGdiCombineRgn requires hSrc2 != NULL for combine mode %d!\n", CombineMode); + } + } + } + } + else + { + DPRINT("IntGdiCombineRgn: hDest unavailable\n"); + result = ERROR; + } + return result; +} + // NtGdi Exported Functions INT

16 years, 8 months

[cfinck] 33628: Commit an unmodified phpBB 3.0.1, so we can later track my changes. This will be my playground for getting it to work with RosCMS.

by cfinck＠svn.reactos.org

16 years, 8 months

[hpoussin] 33627: Fix precompiled header name. According to http://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html , precompiled header name *must be* the name of the header followed by .gch See issue #3263 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 21 13:00:40 2008 New Revision: 33627 URL: http://svn.reactos.org/svn/reactos?rev=33627&view=rev Log: Fix precompiled header name. According to http://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html , precompiled header name *must be* the name of the header followed by .gch See issue #3263 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed May 21 13:00:40 2008 @@ -1250,7 +1250,7 @@ return NULL; return new FileLocation ( IntermediateDirectory, module.pch->file->relative_path, - ReplaceExtension ( module.pch->file->name, "_" + module.name + ".gch" ) ); + module.pch->file->name + ".gch" ); } Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",

16 years, 8 months

[hpoussin] 33626: Disable precompiled headers for files which are in more than one module (Precompiled header name have a fixed name, but modules may have different compile options)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 21 12:57:24 2008 New Revision: 33626 URL: http://svn.reactos.org/svn/reactos?rev=33626&view=rev Log: Disable precompiled headers for files which are in more than one module (Precompiled header name have a fixed name, but modules may have different compile options) Modified: trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -7,7 +7,6 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> - <pch>cmlib.h</pch> <file>cminit.c</file> <file>hivebin.c</file> <file>hivecell.c</file> @@ -26,7 +25,6 @@ <compilerflag>-Wwrite-strings</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <define name="CMLIB_HOST" /> - <pch>cmlib.h</pch> <file>cminit.c</file> <file>hivebin.c</file> <file>hivecell.c</file> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -4,7 +4,6 @@ <module name="inflib" type="staticlibrary"> <include base="inflib">.</include> <define name="__NO_CTYPE_INLINES" /> - <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file> @@ -22,7 +21,6 @@ <compilerflag>-Wmissing-prototypes</compilerflag> <define name="INFLIB_HOST" /> <include base="ReactOS">include</include> - <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -12,7 +12,6 @@ <define name="_MSVCRT_" /> <define name="_MT" /> <define name="__NO_CTYPE_INLINES" /> - <pch>precomp.h</pch> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -172,6 +172,4 @@ <file>wcsstr.c</file> <file>wcsrev.c</file> </directory> - - <pch>precomp.h</pch> </module>

16 years, 8 months

[cfinck] 33625: Update to Bugzilla 3.0.4

by cfinck＠svn.reactos.org

16 years, 8 months

[fireball] 33624: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 21 11:19:41 2008 New Revision: 33624 URL: http://svn.reactos.org/svn/reactos?rev=33624&view=rev Log: - Fix build. Modified: trunk/reactos/dll/win32/opengl32/gl.c Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… ============================================================================== --- trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Wed May 21 11:19:41 2008 @@ -25,7 +25,6 @@ #include <windows.h> #include "teb.h" -#define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); #include "opengl32.h"

16 years, 8 months

[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

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);

16 years, 8 months

[janderwald] 33622: - check input parameters in LoadString[A|W] - fixes a winetest issue - patch by Kamil Hornicek (Pigglesworth)

by janderwald＠svn.reactos.org

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

16 years, 8 months

[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

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;

16 years, 8 months

[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

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*);

16 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
59
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 May 2008