Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[weiden] 16929: SVN maintainance (ignore proxy makefiles when created directly in the source tree)

by weiden＠svn.reactos.com

SVN maintainance (ignore proxy makefiles when created directly in the source tree) Property changes on: trunk/reactos/apps/utils/net/ftp ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/tracert ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/ps ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.exe *.coff *.sym *.map + *.o *.a *.d *.exe *.coff *.sym *.map makefile Property changes on: trunk/reactos/boot/freeldr/bootsect ___________________________________________________________________ Name: svn:ignore - *.exe + *.exe makefile Property changes on: trunk/reactos/boot/freeldr/install ___________________________________________________________________ Name: svn:ignore - *.exe + *.exe makefile Property changes on: trunk/reactos/drivers/bus/serenum ___________________________________________________________________ Name: svn:ignore - *.coff *.d *.o *.a *.sym *.sys *.map + *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/input/kbdclass ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.a *.sys *.sym *.map + *.coff *.o *.a *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/usb/cromwell/hub ___________________________________________________________________ Name: svn:ignore + makefile Property changes on: trunk/reactos/lib/cfgmgr32 ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/lib/d3d8thk ___________________________________________________________________ Name: svn:ignore - temp.exp *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.map + temp.exp *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.map makefile Property changes on: trunk/reactos/lib/lsasrv ___________________________________________________________________ Name: svn:ignore - *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys makefile Property changes on: trunk/reactos/services/umpnpmgr ___________________________________________________________________ Name: svn:ignore - *.coff *.map *.exe *.a *.d pnp.h pnp_s.c + *.coff *.map *.exe *.a *.d pnp.h pnp_s.c makefile Property changes on: trunk/reactos/subsys/system/cmd/res ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.gch makefile Property changes on: trunk/reactos/subsys/system/cmd/tests ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.gch makefile Property changes on: trunk/reactos/subsys/system/lsass ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.sym *.map *.a + *.coff *.exe *.d *.o *.sym *.map *.a makefile Property changes on: trunk/reactos/subsys/win32k/tests ___________________________________________________________________ Name: svn:ignore - _regtests.c _rtstub.c _hooks.c _stubs.S Makefile.tests *.d *.o *.a *.pch + _regtests.c _rtstub.c _hooks.c _stubs.S Makefile.tests *.d *.o *.a *.pch makefile

19 years, 2 months

[weiden] 16928: fixed some warnings when compiling with -O3

by weiden＠svn.reactos.com

fixed some warnings when compiling with -O3 Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/dd/sndblst/irq.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/lib/advapi32/token/token.c Modified: trunk/reactos/lib/kernel32/misc/time.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/region.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/system/regedit/regproc.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -472,7 +472,7 @@ ULONG Command; SERIAL_TIMEOUTS Timeouts; SERIAL_LINE_CONTROL LCR; - ULONG i, Count; + ULONG i, Count = 0; UCHAR Buffer[16]; UNICODE_STRING DeviceDescription; UNICODE_STRING DeviceId; _____ Modified: trunk/reactos/drivers/dd/sndblst/irq.c --- trunk/reactos/drivers/dd/sndblst/irq.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/drivers/dd/sndblst/irq.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -65,7 +65,7 @@ ULONG Vector; KIRQL IRQ_Level; KAFFINITY Affinity; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; Vector = HalGetInterruptVector(Isa, // FIX THIS 0, // FIX THIS _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -511,7 +511,7 @@ static NTSTATUS STDCALL I8042BasicDetect(PDEVICE_EXTENSION DevExt) { NTSTATUS Status; - UCHAR Value; + UCHAR Value = 0; UINT Counter; I8042Flush(); _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -111,7 +111,7 @@ UCHAR Status, PUCHAR Value) { - BOOLEAN ToReturn; + BOOLEAN ToReturn = FALSE; if (I8042MouseCallIsrHook(DevExt, Status, Value, &ToReturn)) return ToReturn; _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/lib/advapi32/token/token.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -327,8 +327,7 @@ PSID SidToCheck, PBOOL IsMember) { - HANDLE AccessToken; - BOOL ReleaseToken = FALSE; + HANDLE AccessToken = NULL; BOOL Result = FALSE; DWORD dwSize; DWORD i; @@ -353,7 +352,6 @@ goto ByeBye; } CloseHandle(ExistingTokenHandle); - ReleaseToken = TRUE; } else { @@ -364,7 +362,6 @@ /* Duplicate token to have a impersonation token */ if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) return FALSE; - ReleaseToken = TRUE; } else AccessToken = ExistingTokenHandle; @@ -395,7 +392,7 @@ ByeBye: if (lpGroups != NULL) HeapFree(GetProcessHeap(), 0, lpGroups); - if (ReleaseToken) + if (AccessToken != NULL && AccessToken != ExistingTokenHandle) CloseHandle(AccessToken); return Result; _____ Modified: trunk/reactos/lib/kernel32/misc/time.c --- trunk/reactos/lib/kernel32/misc/time.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/lib/kernel32/misc/time.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -50,7 +50,7 @@ { PDOSTIME pdtime=(PDOSTIME) lpFatTime; PDOSDATE pddate=(PDOSDATE) lpFatDate; - SYSTEMTIME SystemTime; + SYSTEMTIME SystemTime = { 0 }; if ( lpFileTime == NULL ) return FALSE; _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -4065,6 +4065,10 @@ } NewKeyCell->HashTableOffset = NewHashTableOffset; } + else + { + NewHashTableCell = NULL; + } /* Allocate and copy value list and values */ if (SrcKeyCell->NumberOfValues != 0) _____ Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h --- trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-07-31 23:39:05 UTC (rev 16928) @@ -519,8 +519,8 @@ Elf_Off nFileOffset; Elf_Addr nVirtualAddr; Elf_Size nAdj; - Elf_Size nVirtualSize; - Elf_Size nFileSize; + Elf_Size nVirtualSize = 0; + Elf_Size nFileSize = 0; ASSERT(j <= nPHdrCount); _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -188,12 +188,12 @@ ) { NTSTATUS nStatus; - ULONG cbFileHeaderOffsetSize; - ULONG cbSectionHeadersOffset; + ULONG cbFileHeaderOffsetSize = 0; + ULONG cbSectionHeadersOffset = 0; ULONG cbSectionHeadersSize; - ULONG cbSectionHeadersOffsetSize; + ULONG cbSectionHeadersOffsetSize = 0; ULONG cbOptHeaderSize; - ULONG cbHeadersSize; + ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; const IMAGE_DOS_HEADER * pidhDosHeader; @@ -203,8 +203,8 @@ PMM_SECTION_SEGMENT pssSegments; LARGE_INTEGER lnOffset; PVOID pBuffer; - ULONG nPrevVirtualEndOfSegment; - ULONG nFileSizeOfHeaders; + ULONG nPrevVirtualEndOfSegment = 0; + ULONG nFileSizeOfHeaders = 0; ULONG i; ASSERT(FileHeader); @@ -277,6 +277,7 @@ PVOID pData; l_ReadHeaderFromFile: + cbNtHeaderSize = 0; lnOffset.QuadPart = pidhDosHeader->e_lfanew; /* read the header from the file */ @@ -330,7 +331,7 @@ } else { - ULONG cbOptHeaderOffsetSize; + ULONG cbOptHeaderOffsetSize = 0; nStatus = STATUS_INVALID_IMAGE_FORMAT; _____ Modified: trunk/reactos/ntoskrnl/mm/region.c --- trunk/reactos/ntoskrnl/mm/region.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/ntoskrnl/mm/region.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -110,7 +110,7 @@ ULONG NewType, ULONG NewProtect, PMM_ALTER_REGION_FUNC AlterFunc) { PMM_REGION InitialRegion; - PVOID InitialBaseAddress; + PVOID InitialBaseAddress = NULL; PMM_REGION NewRegion; PLIST_ENTRY CurrentEntry; PMM_REGION CurrentRegion = NULL; _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -224,7 +224,7 @@ CSR_API(CsrAllocConsole) { PCSRSS_CONSOLE Console; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOLEAN NewConsole = FALSE; DPRINT("CsrAllocConsole\n"); _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-07-31 21:51:04 UTC (rev 16927) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-07-31 23:39:05 UTC (rev 16928) @@ -384,7 +384,7 @@ HRESULT setValue(LPSTR val_name, LPSTR val_data) { HRESULT hRes; - DWORD dwDataType, dwParseType; + DWORD dwDataType, dwParseType = REG_BINARY; LPBYTE lpbData; BYTE convert[KEY_MAX_LEN]; BYTE *bBigBuffer = 0;

19 years, 2 months

[weiden] 16927: fixed uninitialized variable warning

by weiden＠svn.reactos.com

fixed uninitialized variable warning Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-31 21:27:56 UTC (rev 16926) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-31 21:51:04 UTC (rev 16927) @@ -729,7 +729,7 @@ int (*closefunc)(), _pclose(), fclose(); void (*oldintr)(int), (*oldintp)(int); void abortrecv(); - int oldverbose, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; + int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; char *gunique(), msg; // static char *buf; // Szurgot: Shouldn't this go SOMEWHERE? char buf[1024];

19 years, 2 months

[hbirr] 16926: - Changed BasepConvertUnicodeEnvironment to obtain the calculated length.

by hbirr＠svn.reactos.com

- Changed BasepConvertUnicodeEnvironment to obtain the calculated length. - Optimized the calculation of the environment length. - Disable the execution of vdm for com-files, because it breaks the execution of batch files. - Removed an unused variable. Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-31 21:24:35 UTC (rev 16925) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-31 21:27:56 UTC (rev 16926) @@ -80,7 +80,8 @@ NTSTATUS STDCALL BasepNotifyCsrOfCreation(ULONG dwCreationFlags, - IN HANDLE ProcessId) + IN HANDLE ProcessId, + IN BOOL InheritHandles) { ULONG Request = CREATE_PROCESS; CSR_API_MESSAGE CsrRequest; @@ -92,6 +93,7 @@ /* Fill out the request */ CsrRequest.Data.CreateProcessRequest.NewProcessId = ProcessId; CsrRequest.Data.CreateProcessRequest.Flags = dwCreationFlags; + CsrRequest.Data.CreateProcessRequest.bInheritHandles = InheritHandles; /* Call CSR */ Status = CsrClientCallServer(&CsrRequest, @@ -164,10 +166,10 @@ */ PVOID STDCALL -BasepConvertUnicodeEnvironment(IN PVOID lpEnvironment) +BasepConvertUnicodeEnvironment(OUT SIZE_T* EnvSize, + IN PVOID lpEnvironment) { PCHAR pcScan; - SIZE_T EnvSize = 0; ANSI_STRING AnsiEnv; UNICODE_STRING UnicodeEnv; NTSTATUS Status; @@ -175,31 +177,43 @@ DPRINT("BasepConvertUnicodeEnvironment\n"); /* Scan the environment to calculate its Unicode size */ - AnsiEnv.Buffer = pcScan = lpEnvironment; - while (*pcScan) while (*pcScan++); + AnsiEnv.Buffer = pcScan = (PCHAR)lpEnvironment; + while (*pcScan) + { + pcScan += strlen(pcScan) + 1; + } /* Create our ANSI String */ - AnsiEnv.Length = (ULONG_PTR)pcScan - (ULONG_PTR)lpEnvironment + 1; + if (pcScan == (PCHAR)lpEnvironment) + { + AnsiEnv.Length = 2 * sizeof(CHAR); + } + else + { + + AnsiEnv.Length = (ULONG_PTR)pcScan - (ULONG_PTR)lpEnvironment + sizeof(CHAR); + } AnsiEnv.MaximumLength = AnsiEnv.Length + 1; /* Allocate memory for the Unicode Environment */ UnicodeEnv.Buffer = NULL; - EnvSize = AnsiEnv.MaximumLength * sizeof(WCHAR); + *EnvSize = AnsiEnv.MaximumLength * sizeof(WCHAR); Status = NtAllocateVirtualMemory(NtCurrentProcess(), (PVOID)&UnicodeEnv.Buffer, 0, - &EnvSize, + EnvSize, MEM_COMMIT, PAGE_READWRITE); /* Failure */ if (!NT_SUCCESS(Status)) { SetLastError(Status); + *EnvSize = 0; return NULL; } /* Use the allocated size */ - UnicodeEnv.MaximumLength = EnvSize; + UnicodeEnv.MaximumLength = *EnvSize; /* Convert */ RtlAnsiStringToUnicodeString(&UnicodeEnv, &AnsiEnv, FALSE); @@ -332,7 +346,8 @@ LPWSTR ApplicationPathName, LPWSTR lpCurrentDirectory, LPWSTR lpCommandLine, - LPVOID Environment, + LPVOID lpEnvironment, + SIZE_T EnvSize, LPSTARTUPINFOW StartupInfo, DWORD CreationFlags, BOOL InheritHandles) @@ -350,6 +365,7 @@ ULONG Size; UNICODE_STRING Desktop, Shell, Runtime, Title; PPEB OurPeb = NtCurrentPeb(); + LPVOID Environment = lpEnvironment; DPRINT("BasepInitializeEnvironment\n"); @@ -437,10 +453,28 @@ /* Find the environment size */ if (ScanChar) { - while (*ScanChar) while (*ScanChar++); - - /* Calculate the size of the block */ - EnviroSize = (ULONG)((ULONG_PTR)ScanChar - (ULONG_PTR)Environment); + if (EnvSize && Environment == lpEnvironment) + { + /* its a converted ansi environment, bypass the length calculation */ + EnviroSize = EnvSize; + } + else + { + while (*ScanChar) + { + ScanChar += wcslen(ScanChar) + 1; + } + + /* Calculate the size of the block */ + if (ScanChar == Environment) + { + EnviroSize = 2 * sizeof(WCHAR); + } + else + { + EnviroSize = (ULONG)((ULONG_PTR)ScanChar - (ULONG_PTR)Environment + sizeof(WCHAR)); + } + } DPRINT("EnvironmentSize %ld\n", EnviroSize); /* Allocate and Initialize new Environment Block */ @@ -513,7 +547,7 @@ BasepCopyHandles(ProcessParameters, OurPeb->ProcessParameters, InheritHandles); - } + } } /* Also set the Console Flag */ @@ -741,7 +775,6 @@ LPWSTR BatchCommandLine; ULONG CmdLineLength; UNICODE_STRING CommandLineString; - LPWSTR TempBuffer; PWCHAR Extension; LPWSTR QuotedCmdLine = NULL; LPWSTR ScanString; @@ -754,6 +787,7 @@ CLIENT_ID ClientId; PPEB OurPeb = NtCurrentPeb(); PPEB RemotePeb; + SIZE_T EnvSize = 0; DPRINT("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" " lpEnvironment: %p lpCurrentDirectory: %S dwCreationFlags: %lx\n", @@ -838,13 +872,6 @@ PriorityClass.Foreground = FALSE; PriorityClass.PriorityClass = BasepConvertPriorityClass(dwCreationFlags); - /* Convert the environment */ - if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) - { - lpEnvironment = BasepConvertUnicodeEnvironment(lpEnvironment); - if (!lpEnvironment) return FALSE; - } - /* Get the application name and do all the proper formating necessary */ GetAppName: /* See if we have an application name (oh please let us have one!) */ @@ -1042,8 +1069,9 @@ case STATUS_INVALID_IMAGE_PROTECT: case STATUS_INVALID_IMAGE_NOT_MZ: - /* If it's a DOS app, use VDM - if ((BasepCheckDosApp(&ApplicationName))) */ +#if 0 + /* If it's a DOS app, use VDM */ + if ((BasepCheckDosApp(&ApplicationName))) { DPRINT1("Launching VDM...\n"); RtlFreeHeap(GetProcessHeap(), 0, NameBuffer); @@ -1058,8 +1086,8 @@ lpCurrentDirectory, lpStartupInfo, lpProcessInformation); - } - + } +#endif /* It's a batch file */ Extension = &ApplicationName.Buffer[ApplicationName.Length / sizeof(WCHAR) - 4]; @@ -1103,10 +1131,8 @@ lpApplicationName = NULL; /* Free memory */ - RtlFreeHeap(GetProcessHeap(), 0, TempBuffer); RtlFreeHeap(GetProcessHeap(), 0, ApplicationName.Buffer); ApplicationName.Buffer = NULL; - TempBuffer = NULL; goto GetAppName; break; @@ -1287,6 +1313,13 @@ sizeof(ProcessBasicInfo), NULL); + /* Convert the environment */ + if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) + { + lpEnvironment = BasepConvertUnicodeEnvironment(&EnvSize, lpEnvironment); + if (!lpEnvironment) return FALSE; + } + /* Create Process Environment */ RemotePeb = ProcessBasicInfo.PebBaseAddress; Status = BasepInitializeEnvironment(hProcess, @@ -1296,9 +1329,17 @@ (QuotesNeeded || CmdLineIsAppName) ? QuotedCmdLine : lpCommandLine, lpEnvironment, + EnvSize, lpStartupInfo, dwCreationFlags, bInheritHandles); + + /* Cleanup Environment */ + if (lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) + { + RtlDestroyEnvironment(lpEnvironment); + } + if (!NT_SUCCESS(Status)) { DPRINT1("Could not initialize Process Environment\n"); @@ -1357,7 +1398,8 @@ /* Notify CSRSS */ Status = BasepNotifyCsrOfCreation(dwCreationFlags, - (HANDLE)ProcessBasicInfo.UniqueProcessId); + (HANDLE)ProcessBasicInfo.UniqueProcessId, + bInheritHandles); if (!NT_SUCCESS(Status)) { @@ -1371,12 +1413,6 @@ NtResumeThread(hThread, &Dummy); } - /* Cleanup Environment */ - if (lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) - { - RtlDestroyEnvironment(lpEnvironment); - } - /* Return Data */ lpProcessInformation->dwProcessId = (DWORD)ClientId.UniqueProcess; lpProcessInformation->dwThreadId = (DWORD)ClientId.UniqueThread;

19 years, 2 months

[hbirr] 16925: Don't use INVALID_HANDLE_VALUE as HANDLE_DETACH_PROCESS.

by hbirr＠svn.reactos.com

Don't use INVALID_HANDLE_VALUE as HANDLE_DETACH_PROCESS. Modified: trunk/reactos/lib/kernel32/include/kernel32.h _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-31 21:23:40 UTC (rev 16924) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-31 21:24:35 UTC (rev 16925) @@ -26,9 +26,9 @@ #define IsConsoleHandle(h) \ (((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE) -#define HANDLE_DETACHED_PROCESS (HANDLE)-1 -#define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-2 -#define HANDLE_CREATE_NO_WINDOW (HANDLE)-3 +#define HANDLE_DETACHED_PROCESS (HANDLE)-2 +#define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-3 +#define HANDLE_CREATE_NO_WINDOW (HANDLE)-4 /* Undocumented CreateProcess flag */ #define STARTF_SHELLPRIVATE 0x400

19 years, 2 months

[hbirr] 16924: - Implemented CsrDuplicateHandleTable.

by hbirr＠svn.reactos.com

- Implemented CsrDuplicateHandleTable. - Duplicate the handle table in CsrCreateProcess if the caller wants to inherit all handles. - Don't allocate new handles in CsrAllocConsole if the caller wants to reuse a console and if the parent handles were inherited. - Do only allow to reuse the console from parent. Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-07-31 21:02:05 UTC (rev 16923) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-07-31 21:23:40 UTC (rev 16924) @@ -33,6 +33,7 @@ { HANDLE NewProcessId; ULONG Flags; + BOOL bInheritHandles; } CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; typedef struct _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-07-31 21:02:05 UTC (rev 16923) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-07-31 21:23:40 UTC (rev 16924) @@ -72,7 +72,7 @@ } if (!CsrIsConsoleHandle(Handle) || ProcessData->HandleTableSize <= h) { - DPRINT1("CsrGetObject returning invalid handle\n"); + DPRINT1("CsrGetObject returning invalid handle (%x)\n", Handle); return STATUS_INVALID_HANDLE; } *Object = ProcessData->HandleTable[h]; @@ -177,6 +177,43 @@ return(STATUS_SUCCESS); } +NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, + PCSRSS_PROCESS_DATA TargetProcessData) +{ + ULONG i; + + if (SourceProcessData == NULL || + TargetProcessData == NULL || + TargetProcessData->HandleTableSize) + { + return STATUS_INVALID_PARAMETER; + } + + RtlEnterCriticalSection(&SourceProcessData->HandleTableLock); + + /* we are called from CreateProcessData, it isn't necessary to lock the target process data */ + + TargetProcessData->HandleTable = RtlAllocateHeap(CsrssApiHeap, + HEAP_ZERO_MEMORY, + SourceProcessData->HandleTableSize * sizeof(HANDLE)); + if (TargetProcessData->HandleTable == NULL) + { + RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); + return(STATUS_UNSUCCESSFUL); + } + TargetProcessData->HandleTableSize = SourceProcessData->HandleTableSize; + for (i = 0; i < SourceProcessData->HandleTableSize; i++) + { + if (SourceProcessData->HandleTable[i]) + { + TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; + InterlockedIncrement( &SourceProcessData->HandleTable[i]->ReferenceCount ); + } + } + RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); + return(STATUS_SUCCESS); +} + NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) { ULONG h = (((ULONG)Handle) >> 2) - 1; _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-31 21:02:05 UTC (rev 16923) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-31 21:23:40 UTC (rev 16924) @@ -192,6 +192,7 @@ CSR_API(CsrCreateProcess) { PCSRSS_PROCESS_DATA NewProcessData; + NTSTATUS Status; Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); @@ -203,6 +204,16 @@ return(STATUS_NO_MEMORY); } + if (!(Request->Data.CreateProcessRequest.Flags & (CREATE_NEW_CONSOLE|DETACHED_PROCESS))) + { + NewProcessData->ParentConsole = ProcessData->Console; + NewProcessData->bInheritHandles = Request->Data.CreateProcessRequest.bInheritHandles; + if (Request->Data.CreateProcessRequest.bInheritHandles) + { + Status = CsrDuplicateHandleTable(ProcessData, NewProcessData); + } + } + /* Set default shutdown parameters */ NewProcessData->ShutdownLevel = 0x280; NewProcessData->ShutdownFlags = 0; _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-07-31 21:02:05 UTC (rev 16923) +++ trunk/reactos/subsys/csrss/include/api.h 2005-07-31 21:23:40 UTC (rev 16924) @@ -35,6 +35,8 @@ typedef struct _CSRSS_PROCESS_DATA { PCSRSS_CONSOLE Console; + PCSRSS_CONSOLE ParentConsole; + BOOL bInheritHandles; RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; Object_t ** HandleTable; @@ -116,6 +118,7 @@ /* api/handle.c */ NTSTATUS FASTCALL CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions); NTSTATUS STDCALL CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object ); +NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData); NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object ); BOOL STDCALL CsrServerInitialization (ULONG ArgumentCount, PWSTR *ArgumentArray); NTSTATUS STDCALL CsrReleaseObjectByPointer(Object_t *Object); _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 21:02:05 UTC (rev 16923) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-31 21:23:40 UTC (rev 16924) @@ -212,7 +212,7 @@ } Console->ActiveBuffer = NewBuffer; /* add a reference count because the buffer is tied to the console */ - Console->ActiveBuffer->Header.ReferenceCount++; + InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); /* make console active, and insert into console list */ /* copy buffer contents to screen */ ConioDrawConsole(Console); @@ -225,6 +225,7 @@ { PCSRSS_CONSOLE Console; NTSTATUS Status; + BOOLEAN NewConsole = FALSE; DPRINT("CsrAllocConsole\n"); @@ -255,9 +256,11 @@ } /* If we already have one, then don't create a new one... */ - if (!Request->Data.AllocConsoleRequest.Console) + if (!Request->Data.AllocConsoleRequest.Console || + Request->Data.AllocConsoleRequest.Console != ProcessData->ParentConsole) { /* Allocate a console structure */ + NewConsole = TRUE; Console = HeapAlloc(Win32CsrApiHeap, 0, sizeof(CSRSS_CONSOLE)); if (NULL == Console) { @@ -290,29 +293,33 @@ /* Add a reference count because the process is tied to the console */ Console->Header.ReferenceCount++; - /* Insert the Objects */ - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, - &Console->Header); - if (! NT_SUCCESS(Status)) + if (NewConsole || !ProcessData->bInheritHandles) { - DPRINT1("Failed to insert object\n"); - ConioDeleteConsole((Object_t *) Console); - ProcessData->Console = 0; - return Request->Status = Status; + /* Insert the Objects */ + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, + &Console->Header); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert object\n"); + ConioDeleteConsole((Object_t *) Console); + ProcessData->Console = 0; + return Request->Status = Status; + } + + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, + &Console->ActiveBuffer->Header); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert object\n"); + ConioDeleteConsole((Object_t *) Console); + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.InputHandle); + ProcessData->Console = 0; + return Request->Status = Status; + } } - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, - &Console->ActiveBuffer->Header); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert object\n"); - Console->Header.ReferenceCount--; - Win32CsrReleaseObject(ProcessData, - Request->Data.AllocConsoleRequest.InputHandle); - ProcessData->Console = 0; - return Request->Status = Status; - } /* Duplicate the Event */ if (!DuplicateHandle(GetCurrentProcess(), @@ -324,14 +331,16 @@ 0)) { DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); - Console->Header.ReferenceCount--; - Win32CsrReleaseObject(ProcessData, - Request->Data.AllocConsoleRequest.OutputHandle); - Win32CsrReleaseObject(ProcessData, - Request->Data.AllocConsoleRequest.InputHandle); + ConioDeleteConsole((Object_t *) Console); + if (NewConsole || !ProcessData->bInheritHandles) + { + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.OutputHandle); + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.InputHandle); + } ProcessData->Console = 0; - Request->Status = Status; - return Status; + return Request->Status = Status; } /* Set the Ctrl Dispatcher */ @@ -358,9 +367,8 @@ } Console = ProcessData->Console; - Console->Header.ReferenceCount--; ProcessData->Console = NULL; - if (0 == Console->Header.ReferenceCount) + if (0 == InterlockedDecrement(&Console->Header.ReferenceCount)) { ConioDeleteConsole((Object_t *) Console); } @@ -1002,7 +1010,7 @@ HeapFree(Win32CsrApiHeap, 0, Event); } - if (0 == --Console->ActiveBuffer->Header.ReferenceCount) + if (0 == InterlockedDecrement(&Console->ActiveBuffer->Header.ReferenceCount)) { ConioDeleteScreenBuffer((Object_t *) Console->ActiveBuffer); }

19 years, 2 months

[hbirr] 16923: Fixed a typo.

by hbirr＠svn.reactos.com

Fixed a typo. Modified: trunk/rosapps/sysutils/ctm/ctm.xml _____ Modified: trunk/rosapps/sysutils/ctm/ctm.xml --- trunk/rosapps/sysutils/ctm/ctm.xml 2005-07-31 20:35:08 UTC (rev 16922) +++ trunk/rosapps/sysutils/ctm/ctm.xml 2005-07-31 21:02:05 UTC (rev 16923) @@ -1,4 +1,4 @@ -<module name="cmt" type="win32cui" installbase="system32" installname="cmt.exe" warnings="true"> +<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" warnings="true"> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" />

19 years, 2 months

[weiden] 16922: fixed typo in a comment

by weiden＠svn.reactos.com

fixed typo in a comment Modified: trunk/reactos/lib/advapi32/sec/misc.c _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-31 18:52:36 UTC (rev 16921) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-31 20:35:08 UTC (rev 16922) @@ -1868,7 +1868,7 @@ case SE_REGISTRY_KEY: { /* check the SecurityInfo flags for sanity (both, the protected - and unprotected dacl/sacl flag must not be passed together */ + and unprotected dacl/sacl flag must not be passed together) */ if (((SecurityInfo & DACL_SECURITY_INFORMATION) && (SecurityInfo & (PROTECTED_DACL_SECURITY_INFORMATION | UNPROTECTED_DACL_SECURITY_INFORMATION)) == (PROTECTED_DACL_SECURITY_INFORMATION | UNPROTECTED_DACL_SECURITY_INFORMATION))

19 years, 2 months

[weiden] 16921: fixed success check in RtlpCreateAtomHandle, ExCreateHandle returns EX_INVALID_HANDLE in case of failure. Thx to Filip

by weiden＠svn.reactos.com

fixed success check in RtlpCreateAtomHandle, ExCreateHandle returns EX_INVALID_HANDLE in case of failure. Thx to Filip Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c --- trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-07-31 12:11:56 UTC (rev 16920) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-07-31 18:52:36 UTC (rev 16921) @@ -260,7 +260,7 @@ HandleIndex = ExCreateHandle(AtomTable->ExHandleTable, &ExEntry); - if (HandleIndex != 0) + if (HandleIndex != EX_INVALID_HANDLE) { /* FIXME - Handle Indexes >= 0xC000 ?! */ if (HandleIndex < 0xC000)

19 years, 2 months

[mf] 16920: set svn:eol-style to native

by mf＠svn.reactos.com

set svn:eol-style to native Modified: trunk/reactos/apps/utils/binpatch/patch.c Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Modified: trunk/reactos/apps/utils/net/tracert/tracert.h Modified: trunk/reactos/apps/utils/winetest/port.h Modified: trunk/reactos/apps/utils/winetest/resource.h Modified: trunk/reactos/apps/utils/winetest/util.c Modified: trunk/reactos/apps/utils/winetest/winetest.h Modified: trunk/reactos/drivers/fs/vfat/fastio.c Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.c Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.c Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbd/test.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbport/usbport.h Modified: trunk/reactos/drivers/video/videoprt/agp.c Modified: trunk/reactos/drivers/video/videoprt/ddc.c Modified: trunk/reactos/hal/halx86/include/ioapic.h Modified: trunk/reactos/hal/halx86/mp/ioapic.c Modified: trunk/reactos/hal/halx86/mp/mpconfig.c Modified: trunk/reactos/include/ccros.h Modified: trunk/reactos/include/drivers/diskdump/diskdump.h Modified: trunk/reactos/include/libs/fslib/vfatxlib.h Modified: trunk/reactos/include/libs/pseh/native.h Modified: trunk/reactos/include/libs/pseh/prettybased.h Modified: trunk/reactos/include/ndk/arch/ketypes.h Modified: trunk/reactos/include/ndk/arch/mmtypes.h Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/i386/floatsave.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/mmtypes.h Modified: trunk/reactos/include/ndk/i386/segment.h Modified: trunk/reactos/include/ndk/sysguid.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/include/services/services.h Modified: trunk/reactos/include/subsys/lsass/lsasrv.h Modified: trunk/reactos/include/wine/list.h Modified: trunk/reactos/lib/cabinet/cabextract.c Modified: trunk/reactos/lib/cabinet/cabinet.h Modified: trunk/reactos/lib/cabinet/cabinet_main.c Modified: trunk/reactos/lib/cabinet/fci.c Modified: trunk/reactos/lib/cabinet/fdi.c Modified: trunk/reactos/lib/comctl32/animate.c Modified: trunk/reactos/lib/comctl32/comboex.c Modified: trunk/reactos/lib/comctl32/comctl32.h Modified: trunk/reactos/lib/comctl32/comctl32undoc.c Modified: trunk/reactos/lib/comctl32/commctrl.c Modified: trunk/reactos/lib/comctl32/datetime.c Modified: trunk/reactos/lib/comctl32/draglist.c Modified: trunk/reactos/lib/comctl32/flatsb.c Modified: trunk/reactos/lib/comctl32/header.c Modified: trunk/reactos/lib/comctl32/hotkey.c Modified: trunk/reactos/lib/comctl32/imagelist.c Modified: trunk/reactos/lib/comctl32/imagelist.h Modified: trunk/reactos/lib/comctl32/ipaddress.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/monthcal.c Modified: trunk/reactos/lib/comctl32/nativefont.c Modified: trunk/reactos/lib/comctl32/pager.c Modified: trunk/reactos/lib/comctl32/progress.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/smoothscroll.c Modified: trunk/reactos/lib/comctl32/status.c Modified: trunk/reactos/lib/comctl32/string.c Modified: trunk/reactos/lib/comctl32/syslink.c Modified: trunk/reactos/lib/comctl32/tab.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/tooltips.c Modified: trunk/reactos/lib/comctl32/trackbar.c Modified: trunk/reactos/lib/comctl32/treeview.c Modified: trunk/reactos/lib/comctl32/updown.c Modified: trunk/reactos/lib/comdlg32/cdlg.h Modified: trunk/reactos/lib/comdlg32/cdlg16.h Modified: trunk/reactos/lib/comdlg32/cdlg32.c Modified: trunk/reactos/lib/comdlg32/colordlg.c Modified: trunk/reactos/lib/comdlg32/colordlg16.c Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/filedlg16.c Modified: trunk/reactos/lib/comdlg32/filedlg31.c Modified: trunk/reactos/lib/comdlg32/filedlg31.h Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h Modified: trunk/reactos/lib/comdlg32/filetitle.c Modified: trunk/reactos/lib/comdlg32/finddlg.c Modified: trunk/reactos/lib/comdlg32/finddlg32.c Modified: trunk/reactos/lib/comdlg32/fontdlg.c Modified: trunk/reactos/lib/comdlg32/fontdlg16.c Modified: trunk/reactos/lib/comdlg32/printdlg.c Modified: trunk/reactos/lib/comdlg32/printdlg.h Modified: trunk/reactos/lib/comdlg32/printdlg16.c Modified: trunk/reactos/lib/cpl/liccpa/liccpa.c Modified: trunk/reactos/lib/cpl/liccpa/liccpa.h Modified: trunk/reactos/lib/cpl/liccpa/resource.h [truncated at 100 lines; 289 more skipped] _____ Modified: trunk/reactos/apps/utils/binpatch/patch.c --- trunk/reactos/apps/utils/binpatch/patch.c 2005-07-31 11:06:50 UTC (rev 16919) +++ trunk/reactos/apps/utils/binpatch/patch.c 2005-07-31 12:11:56 UTC (rev 16920) @@ -1,615 +1,615 @@ -#include <conio.h> -#include <io.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -/** DEFINES *******************************************************************/ - -#define PATCH_BUFFER_SIZE 4096 /* Maximum size of a patch */ -#define PATCH_BUFFER_MAGIC "\xde\xad\xbe\xef MaGiC MaRk " -#define SIZEOF_PATCH_BUFFER_MAGIC (sizeof (PATCH_BUFFER_MAGIC) - 1) - -/** TYPES *********************************************************************/ - -typedef struct _PatchedByte -{ - int offset; /*!< File offset of the patched byte. */ - unsigned char expected; /*!< Expected (original) value of the byte. */ - unsigned char patched; /*!< Patched (new) value for the byte. */ -} PatchedByte; - -typedef struct _PatchedFile -{ - const char *name; /*!< Name of the file to be patched. */ - int fileSize; /*!< Size of the file in bytes. */ - int patchCount; /*!< Number of patches for the file. */ - PatchedByte *patches; /*!< Patches for the file. */ -} PatchedFile; - -typedef struct _Patch -{ - const char *name; /*!< Name of the patch. */ - int fileCount; /*!< Number of files in the patch. */ - PatchedFile *files; /*!< Files for the patch. */ -} Patch; - -/** FUNCTION PROTOTYPES *******************************************************/ - -static void printUsage(); - -/** GLOBALS *******************************************************************/ - -static Patch m_patch = { NULL, 0, NULL }; -static int m_argc = 0; -static char **m_argv = NULL; - -/* patch buffer where we put the patch info into */ -static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = - PATCH_BUFFER_MAGIC; - -/** HELPER FUNCTIONS **********************************************************/ - -static void * -loadFile(const char *fileName, int *fileSize_) -{ - FILE *f; - struct stat sb; - int fileSize; - void *p; - - /* Open the file */ - f = fopen(fileName, "rb"); - if (f == NULL) - { - printf("Couldn't open file %s for reading!\n", fileName); - return NULL; - } - - /* Get file size */ - if (fstat(fileno(f), &sb) < 0) - { - fclose(f); - printf("Couldn't get size of file %s!\n", fileName); - return NULL; - } - fileSize = sb.st_size; - - /* Load file */ - p = malloc(fileSize); - if (p == NULL) - { - fclose(f); - printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName); - return NULL; - } - - if (fread(p, fileSize, 1, f) != 1) - { - fclose(f); - free(p); - printf("Couldn't read file %s into memory!\n", fileName); - return NULL; - } - - /* Close file */ - fclose(f); - - *fileSize_ = fileSize; - return p; -} - - -static int -saveFile(const char *fileName, void *file, int fileSize) -{ - FILE *f; - - /* Open the file */ - f = fopen(fileName, "wb"); - if (f == NULL) - { - printf("Couldn't open file %s for writing!\n", fileName); - return -1; - } - - /* Write file */ - if (fwrite(file, fileSize, 1, f) != 1) - { - fclose(f); - printf("Couldn't write file %s!\n", fileName); - return -1; - } - - /* Close file */ - fclose(f); - return 0; -} - - -static int -compareFiles( - PatchedFile *patchedFile, - const char *originalFileName) -{ - const char *patchedFileName = patchedFile->name; - unsigned char *origChunk, *patchedChunk; - int origSize, patchedSize, i, patchCount; - PatchedByte *patches = NULL; - int patchesArrayCount = 0; - - /* Load both files */ - origChunk = loadFile(originalFileName, &origSize); - if (origChunk == NULL) - return -1; - patchedChunk = loadFile(patchedFileName, &patchedSize); - if (patchedChunk == NULL) - { - free(origChunk); - return -1; - } - if (origSize != patchedSize) - { - free(origChunk); - free(patchedChunk); - printf("File size of %s and %s differs (%d != %d)\n", - originalFileName, patchedFileName, - origSize, patchedSize); - return -1; - } - - /* Compare the files and record any differences */ - printf("Comparing %s to %s", originalFileName, patchedFileName); - for (i = 0, patchCount = 0; i < origSize; i++) - { - if (origChunk[i] != patchedChunk[i]) - { - patchCount++; - - /* Resize patches array if needed */ - if (patchesArrayCount < patchCount) - { - PatchedByte *newPatches; - newPatches = realloc(patches, patchCount * sizeof (PatchedByte)); - if (newPatches == NULL) - { - if (patches != NULL) - free(patches); - free(origChunk); - free(patchedChunk); - printf("\nOut of memory (tried to allocated %d bytes)\n", - patchCount * sizeof (PatchedByte)); - return -1; - } - patches = newPatches; - } - - /* Fill in patch info */ - patches[patchCount - 1].offset = i; - patches[patchCount - 1].expected = origChunk[i]; - patches[patchCount - 1].patched = patchedChunk[i]; - } - if ((i % (origSize / 40)) == 0) - printf("."); - } - printf(" %d changed bytes found.\n", patchCount); - - /* Unload the files */ - free(origChunk); - free(patchedChunk); - - /* Save patch info */ - patchedFile->fileSize = patchedSize; - patchedFile->patchCount = patchCount; - patchedFile->patches = patches; - - return 0; -} - - -static int -outputPatch(const char *outputFileName) -{ - unsigned char *patchExe, *patchBuffer; - int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; - Patch *patch; - PatchedFile *files; - - printf("Putting patch into %s...\n", outputFileName); - - /* Calculate size of the patch */ - patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; - stringSize = strlen(m_patch.name) + 1; - for (i = 0; i < m_patch.fileCount; i++) - { - stringSize += strlen(m_patch.files[i].name) + 1; - patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount; - } - if ((stringSize + patchSize) > PATCH_BUFFER_SIZE) - { - printf("Patch is too big - %d bytes maximum, %d bytes needed\n", - PATCH_BUFFER_SIZE, stringSize + patchSize); - return -1; - } - - /* Load patch.exe file into memory... */ - patchExe = loadFile(m_argv[0], &patchExeSize); - if (patchExe == NULL) - { - return -1; - } - - /* Try to find the magic mark for the patch buffer */ - for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++) - { - if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0) - { - patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC; - - break; - } - } - if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC))) - { - free(patchExe); - printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]); - return -1; - } - - /* Pack patch together and replace string pointers by offsets */ - patch = (Patch *)patchBuffer; - files = (PatchedFile *)(patchBuffer + sizeof (Patch)); - patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; - stringOffset = patchSize; - - patch->fileCount = m_patch.fileCount; - patch->files = (PatchedFile *)sizeof (Patch); - - patch->name = (const char *)stringOffset; - strcpy(patchBuffer + stringOffset, m_patch.name); - stringOffset += strlen(m_patch.name) + 1; - - for (i = 0; i < m_patch.fileCount; i++) - { - files[i].fileSize = m_patch.files[i].fileSize; - files[i].patchCount = m_patch.files[i].patchCount; - - files[i].name = (const char *)stringOffset; - strcpy(patchBuffer + stringOffset, m_patch.files[i].name); - stringOffset += strlen(m_patch.files[i].name) + 1; - - size = files[i].patchCount * sizeof (PatchedByte); - files[i].patches = (PatchedByte *)patchOffset; - memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size); - patchOffset += size; - } - size = patchSize + stringSize; - memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size); - - /* Save file */ - if (saveFile(outputFileName, patchExe, patchExeSize) < 0) - { - free(patchExe); - return -1; - } - free(patchExe); - - printf("Patch saved!\n"); - return 0; -} - - -static int -loadPatch() -{ - char *p; - Patch *patch; - int i; - - p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC; - patch = (Patch *)p; - - if (patch->name == NULL) - { - return -1; - } - - m_patch.name = p + (int)patch->name; - m_patch.fileCount = patch->fileCount; - m_patch.files = (PatchedFile *)(p + (int)patch->files); - - for (i = 0; i < m_patch.fileCount; i++) - { - m_patch.files[i].name = p + (int)m_patch.files[i].name; - m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches); - } - - printf("Patch %s loaded...\n", m_patch.name); - return 0; -} - - -/** MAIN FUNCTIONS ************************************************************/ - -static int -createPatch() -{ - int i, status; - const char *outputFileName; - - /* Check argument count */ - if (m_argc < 6 || (m_argc % 2) != 0) - { - printUsage(); - return -1; - } - - outputFileName = m_argv[3]; - m_patch.name = m_argv[2]; - - /* Allocate PatchedFiles array */ - m_patch.fileCount = (m_argc - 4) / 2; - m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile)); - if (m_patch.files == NULL) - { - printf("Out of memory!\n"); - return -1; - } - memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile)); - - /* Compare original to patched files and fill m_patch.files array */ - for (i = 0; i < m_patch.fileCount; i++) - { - m_patch.files[i].name = m_argv[4 + (i * 2) + 1]; - status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]); - if (status < 0) - { - for (i = 0; i < m_patch.fileCount; i++) - { - if (m_patch.files[i].patches != NULL) - free(m_patch.files[i].patches); - } - free(m_patch.files); - m_patch.files = NULL; - m_patch.fileCount = 0; - return status; - } - } - - /* Output patch */ - return outputPatch(outputFileName); -} - - -static int -applyPatch() -{ - int c, i, j, fileSize, makeBackup; - unsigned char *file; - char *p; - const char *fileName; - char buffer[MAX_PATH]; - - - if (m_argc > 1 && strcmp(m_argv[1], "-d") != 0) - { - printUsage(); - return -1; - } - - /* Load patch */ - if (loadPatch() < 0) - { - printf("This executable doesn't contain a patch, use -c to create one.\n"); - return -1; - } - - if (m_argc > 1) - { - /* Dump patch */ - printf("Patch name: %s\n", m_patch.name); - printf("File count: %d\n", m_patch.fileCount); - for (i = 0; i < m_patch.fileCount; i++) - { - printf("----------------------\n" - "File name: %s\n" - "File size: %d bytes\n", - m_patch.files[i].name, m_patch.files[i].fileSize); - printf("Patch count: %d\n", m_patch.files[i].patchCount); - for (j = 0; j < m_patch.files[i].patchCount; j++) - { - printf(" Offset 0x%x 0x%02x -> 0x%02x\n", - m_patch.files[i].patches[j].offset, - m_patch.files[i].patches[j].expected, - m_patch.files[i].patches[j].patched); - } - } - } - else - { - /* Apply patch */ - printf("Applying patch...\n"); - for (i = 0; i < m_patch.fileCount; i++) - { - /* Load original file */ - fileName = m_patch.files[i].name; -applyPatch_retry_file: - file = loadFile(fileName, &fileSize); - if (file == NULL) - { - printf("File %s not found! ", fileName); -applyPatch_file_open_error: - printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename"); - do - { - c = getch(); - } - while (c != 's' && c != 'r' && c != 'a' && c != 'm'); - printf("\n"); - if (c == 's') - { - continue; - } - else if (c == 'r') - { - goto applyPatch_retry_file; - } - else if (c == 'a') - { - return 0; - } - else if (c == 'm') - { - if (fgets(buffer, sizeof (buffer), stdin) == NULL) - { - printf("fgets() failed!\n"); - return -1; - } - p = strchr(buffer, '\r'); - if (p != NULL) - *p = '\0'; - p = strchr(buffer, '\n'); - if (p != NULL) - *p = '\0'; - - fileName = buffer; - goto applyPatch_retry_file; - } - } - - /* Check file size */ - if (fileSize != m_patch.files[i].fileSize) - { - free(file); - printf("File %s has unexpected filesize of %d bytes (%d bytes expected)\n", - fileName, fileSize, m_patch.files[i].fileSize); - if (fileName != m_patch.files[i].name) /* manually entered filename */ - { - goto applyPatch_file_open_error; - } - return -1; - } - - /* Ask for backup */ - printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName); - do - { - c = getch(); - } - while (c != 'y' && c != 'n' && c != 'a'); - printf("\n"); - if (c == 'y') - { - char buffer[MAX_PATH]; - snprintf(buffer, MAX_PATH, "%s.bak", fileName); - buffer[MAX_PATH-1] = '\0'; - makeBackup = 1; - if (access(buffer, 0) >= 0) /* file exists */ - { - printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer); - do - { - c = getch(); - } - while (c != 'y' && c != 'n' && c != 'a'); - printf("\n"); - if (c == 'n') - makeBackup = 0; - else if (c == 'a') - { - free(file); - return 0; - } - } - if (makeBackup && saveFile(buffer, file, fileSize) < 0) - { - free(file); - return -1; - } - } - else if (c == 'a') - { - free(file); - return 0; - } - - /* Patch file */ - for (j = 0; j < m_patch.files[i].patchCount; j++) - { - int offset = m_patch.files[i].patches[j].offset; - if (file[offset] != m_patch.files[i].patches[j].expected) - { - printf("Unexpected value in file %s at offset 0x%x: expected = 0x%02x, found = 0x%02x\n", - fileName, offset, m_patch.files[i].patches[j].expected, file[offset]); - free(file); - return -1; - } - file[offset] = m_patch.files[i].patches[j].patched; - } - - /* Save file */ - if (saveFile(fileName, file, fileSize) < 0) - { - free(file); - return -1; - } - free(file); - } - - printf("Patch applied sucessfully!\n"); - } - - return 0; -} - - -static void -printUsage() -{ - printf("Usage:\n" - "%s -c - Create patch\n" - "%s -d - Dump patch\n" - "%s - Apply patch\n" - "\n" - "A patch can be created like this:\n" - "%s -c \"patch name\" output.exe file1.orig file1.patched[ file2.orig file2.patched[ ...]]\n", - m_argv[0], m_argv[0], m_argv[0], m_argv[0]); -} - - -int -main( - int argc, - char *argv[]) -{ - m_argc = argc; - m_argv = argv; - - if (argc >= 2 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) - { - printUsage(); - return 0; - } - else if (argc >= 2 && argv[1][0] == '-') - { - if (strcmp(argv[1], "-c") == 0) - { - return createPatch(); - } - else if (strcmp(argv[1], "-d") == 0) - { - return applyPatch(); - } - else - { - printf("Unknown option: %s\n" - "Use -h for help.\n", - argv[1]); - return -1; - } - } - - return applyPatch(); -} - +#include <conio.h> +#include <io.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> + +/** DEFINES *******************************************************************/ + +#define PATCH_BUFFER_SIZE 4096 /* Maximum size of a patch */ +#define PATCH_BUFFER_MAGIC "\xde\xad\xbe\xef MaGiC MaRk " +#define SIZEOF_PATCH_BUFFER_MAGIC (sizeof (PATCH_BUFFER_MAGIC) - 1) + +/** TYPES *********************************************************************/ + +typedef struct _PatchedByte +{ + int offset; /*!< File offset of the patched byte. */ + unsigned char expected; /*!< Expected (original) value of the byte. */ + unsigned char patched; /*!< Patched (new) value for the byte. */ +} PatchedByte; + +typedef struct _PatchedFile +{ + const char *name; /*!< Name of the file to be patched. */ + int fileSize; /*!< Size of the file in bytes. */ + int patchCount; /*!< Number of patches for the file. */ + PatchedByte *patches; /*!< Patches for the file. */ +} PatchedFile; + +typedef struct _Patch +{ + const char *name; /*!< Name of the patch. */ + int fileCount; /*!< Number of files in the patch. */ + PatchedFile *files; /*!< Files for the patch. */ +} Patch; + +/** FUNCTION PROTOTYPES *******************************************************/ + +static void printUsage(); + +/** GLOBALS *******************************************************************/ + +static Patch m_patch = { NULL, 0, NULL }; +static int m_argc = 0; +static char **m_argv = NULL; + +/* patch buffer where we put the patch info into */ +static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = + PATCH_BUFFER_MAGIC; + +/** HELPER FUNCTIONS **********************************************************/ + +static void * +loadFile(const char *fileName, int *fileSize_) +{ + FILE *f; + struct stat sb; + int fileSize; + void *p; + + /* Open the file */ + f = fopen(fileName, "rb"); + if (f == NULL) + { + printf("Couldn't open file %s for reading!\n", fileName); + return NULL; + } + + /* Get file size */ + if (fstat(fileno(f), &sb) < 0) + { + fclose(f); + printf("Couldn't get size of file %s!\n", fileName); + return NULL; + } + fileSize = sb.st_size; + + /* Load file */ + p = malloc(fileSize); + if (p == NULL) + { + fclose(f); + printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName); + return NULL; + } + + if (fread(p, fileSize, 1, f) != 1) + { + fclose(f); + free(p); + printf("Couldn't read file %s into memory!\n", fileName); + return NULL; + } + + /* Close file */ + fclose(f); + + *fileSize_ = fileSize; + return p; +} + + +static int +saveFile(const char *fileName, void *file, int fileSize) +{ + FILE *f; + + /* Open the file */ + f = fopen(fileName, "wb"); + if (f == NULL) + { + printf("Couldn't open file %s for writing!\n", fileName); + return -1; + } + + /* Write file */ + if (fwrite(file, fileSize, 1, f) != 1) + { + fclose(f); + printf("Couldn't write file %s!\n", fileName); + return -1; + } + + /* Close file */ + fclose(f); + return 0; +} + + +static int +compareFiles( + PatchedFile *patchedFile, + const char *originalFileName) +{ + const char *patchedFileName = patchedFile->name; + unsigned char *origChunk, *patchedChunk; + int origSize, patchedSize, i, patchCount; + PatchedByte *patches = NULL; + int patchesArrayCount = 0; + + /* Load both files */ + origChunk = loadFile(originalFileName, &origSize); + if (origChunk == NULL) + return -1; + patchedChunk = loadFile(patchedFileName, &patchedSize); + if (patchedChunk == NULL) + { + free(origChunk); + return -1; + } + if (origSize != patchedSize) + { + free(origChunk); + free(patchedChunk); + printf("File size of %s and %s differs (%d != %d)\n", + originalFileName, patchedFileName, + origSize, patchedSize); + return -1; + } + + /* Compare the files and record any differences */ + printf("Comparing %s to %s", originalFileName, patchedFileName); + for (i = 0, patchCount = 0; i < origSize; i++) + { + if (origChunk[i] != patchedChunk[i]) + { + patchCount++; + + /* Resize patches array if needed */ + if (patchesArrayCount < patchCount) + { + PatchedByte *newPatches; + newPatches = realloc(patches, patchCount * sizeof (PatchedByte)); + if (newPatches == NULL) + { + if (patches != NULL) + free(patches); + free(origChunk); + free(patchedChunk); + printf("\nOut of memory (tried to allocated %d bytes)\n", + patchCount * sizeof (PatchedByte)); + return -1; + } + patches = newPatches; + } + + /* Fill in patch info */ + patches[patchCount - 1].offset = i; + patches[patchCount - 1].expected = origChunk[i]; + patches[patchCount - 1].patched = patchedChunk[i]; + } + if ((i % (origSize / 40)) == 0) + printf("."); + } + printf(" %d changed bytes found.\n", patchCount); + + /* Unload the files */ + free(origChunk); + free(patchedChunk); + + /* Save patch info */ + patchedFile->fileSize = patchedSize; + patchedFile->patchCount = patchCount; + patchedFile->patches = patches; + + return 0; +} + + +static int +outputPatch(const char *outputFileName) +{ + unsigned char *patchExe, *patchBuffer; + int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; + Patch *patch; + PatchedFile *files; + + printf("Putting patch into %s...\n", outputFileName); + + /* Calculate size of the patch */ + patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; + stringSize = strlen(m_patch.name) + 1; + for (i = 0; i < m_patch.fileCount; i++) + { + stringSize += strlen(m_patch.files[i].name) + 1; + patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount; + } + if ((stringSize + patchSize) > PATCH_BUFFER_SIZE) + { + printf("Patch is too big - %d bytes maximum, %d bytes needed\n", + PATCH_BUFFER_SIZE, stringSize + patchSize); + return -1; + } + + /* Load patch.exe file into memory... */ + patchExe = loadFile(m_argv[0], &patchExeSize); + if (patchExe == NULL) + { + return -1; + } + + /* Try to find the magic mark for the patch buffer */ + for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++) + { + if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0) + { + patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC; + + break; + } + } + if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC))) + { + free(patchExe); + printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]); + return -1; + } + + /* Pack patch together and replace string pointers by offsets */ + patch = (Patch *)patchBuffer; + files = (PatchedFile *)(patchBuffer + sizeof (Patch)); + patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; + stringOffset = patchSize; + + patch->fileCount = m_patch.fileCount; + patch->files = (PatchedFile *)sizeof (Patch); + + patch->name = (const char *)stringOffset; + strcpy(patchBuffer + stringOffset, m_patch.name); + stringOffset += strlen(m_patch.name) + 1; + + for (i = 0; i < m_patch.fileCount; i++) + { + files[i].fileSize = m_patch.files[i].fileSize; + files[i].patchCount = m_patch.files[i].patchCount; + + files[i].name = (const char *)stringOffset; + strcpy(patchBuffer + stringOffset, m_patch.files[i].name); + stringOffset += strlen(m_patch.files[i].name) + 1; + + size = files[i].patchCount * sizeof (PatchedByte); + files[i].patches = (PatchedByte *)patchOffset; + memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size); + patchOffset += size; + } + size = patchSize + stringSize; + memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size); + + /* Save file */ + if (saveFile(outputFileName, patchExe, patchExeSize) < 0) + { + free(patchExe); + return -1; + } + free(patchExe); + + printf("Patch saved!\n"); + return 0; +} + + +static int +loadPatch() +{ + char *p; + Patch *patch; + int i; + + p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC; + patch = (Patch *)p; + + if (patch->name == NULL) + { + return -1; + } + + m_patch.name = p + (int)patch->name; + m_patch.fileCount = patch->fileCount; + m_patch.files = (PatchedFile *)(p + (int)patch->files); + + for (i = 0; i < m_patch.fileCount; i++) + { + m_patch.files[i].name = p + (int)m_patch.files[i].name; + m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches); + } + + printf("Patch %s loaded...\n", m_patch.name); + return 0; +} + + +/** MAIN FUNCTIONS ************************************************************/ + +static int +createPatch() +{ + int i, status; + const char *outputFileName; + + /* Check argument count */ + if (m_argc < 6 || (m_argc % 2) != 0) + { + printUsage(); + return -1; + } + + outputFileName = m_argv[3]; + m_patch.name = m_argv[2]; + + /* Allocate PatchedFiles array */ + m_patch.fileCount = (m_argc - 4) / 2; + m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile)); + if (m_patch.files == NULL) + { + printf("Out of memory!\n"); + return -1; + } + memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile)); + + /* Compare original to patched files and fill m_patch.files array */ + for (i = 0; i < m_patch.fileCount; i++) + { + m_patch.files[i].name = m_argv[4 + (i * 2) + 1]; + status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]); + if (status < 0) + { + for (i = 0; i < m_patch.fileCount; i++) + { + if (m_patch.files[i].patches != NULL) + free(m_patch.files[i].patches); + } + free(m_patch.files); + m_patch.files = NULL; + m_patch.fileCount = 0; + return status; + } + } + + /* Output patch */ [truncated at 1000 lines; 620300 more skipped]

19 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005